[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.hxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6a2cc612decea57b9c3ab31f2f32aa2126c06cf7
Author: Tor Lillqvist
Date: Thu Aug 11 09:09:40 2016 +0300
Fix comments to match new reality: these are no longer optional parameters
Change-Id: Idf054aa4ef095ce37f05a01adf59cb450a6906c6
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index e7b7a60..5d6ce67 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -46,7 +46,7 @@ public:
bool IsNumberFormat( const OUString& rString,/// input string
short& F_Type, /// format type
(in + out)
double& fOutNumber, /// value
determined (out)
- const SvNumberformat* pFormat); /// optional a
number format to which compare against
+ const SvNumberformat* pFormat); /// number format
to which compare against
/// after IsNumberFormat: get decimal position
short GetDecPos() const { return nDecPos; }
@@ -294,7 +294,7 @@ private:
// Get currency symbol and advance string position
bool GetCurrency( const OUString& rString,
sal_Int32& nPos,
- const SvNumberformat* pFormat ); // optional number
format to match against
+ const SvNumberformat* pFormat ); // number format to
match against
// Get symbol AM or PM and advance string position
bool GetTimeAmPm( const OUString& rString,
@@ -335,7 +335,7 @@ private:
// Conversion of date to number
bool GetDateRef( double& fDays, // OUT: days diff
to null date
sal_uInt16& nCounter, // Count of date
substrings
- const SvNumberformat* pFormat ); // optional number
format to match against
+ const SvNumberformat* pFormat );// number format
to match against
// Analyze start of string
bool ScanStartString( const OUString& rString,
@@ -369,7 +369,7 @@ private:
// Main analyzing function
bool IsNumberFormatMain( const OUString& rString,
- const SvNumberformat* pFormat);// optional
number format to match against
+ const SvNumberformat* pFormat);// number
format to match against
static inline bool MyIsdigit( sal_Unicode c );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source compilerplugins/clang cui/source filter/source include/filter include/svx include/vcl sc/source sd/source shell/source svtools/so
accessibility/inc/extended/AccessibleGridControlTable.hxx |3
accessibility/source/extended/AccessibleGridControl.cxx |4
accessibility/source/extended/AccessibleGridControlTable.cxx|5
compilerplugins/clang/constantparam.py |2
cui/source/dialogs/cuifmsearch.cxx | 40 +---
filter/source/msfilter/msdffimp.cxx |5
filter/source/msfilter/svdfppt.cxx |4
include/filter/msfilter/msdffimp.hxx|1
include/svx/fmsrcimp.hxx|8
include/svx/sdr/attribute/sdrtextattribute.hxx |1
include/svx/svdmodel.hxx|2
include/vcl/tabctrl.hxx |2
sc/source/ui/inc/gridwin.hxx|2
sc/source/ui/view/gridwin.cxx |6
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |2
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 94
--
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx |7
shell/source/unix/sysshell/recently_used_file_handler.cxx |5
svtools/source/control/valueacc.cxx | 18 -
svtools/source/control/valueimp.hxx |3
svtools/source/control/valueset.cxx |2
svx/source/form/fmmodel.cxx |2
svx/source/form/fmsrcimp.cxx| 71 ++-
svx/source/sdr/attribute/sdrtextattribute.cxx | 11 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx |1
svx/source/svdraw/svdmodel.cxx |4
vcl/source/control/tabctrl.cxx |4
vcl/unx/generic/gdi/salbmp.cxx |8
writerfilter/source/dmapper/GraphicImport.cxx | 12 -
29 files changed, 127 insertions(+), 202 deletions(-)
New commits:
commit 3716b144265dda695d7dd447dbe692a3f84c588e
Author: Noel Grandin
Date: Mon Aug 8 15:38:59 2016 +0200
loplugin:constantparam
Change-Id: Ia06b9b189033b9409d7a59a211866f66a0614886
Reviewed-on: https://gerrit.libreoffice.org/28016
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx
b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index e784544..df25559 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -40,8 +40,7 @@ class AccessibleGridControlTable : public
AccessibleGridControlTableBase,
public:
AccessibleGridControlTable(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-::svt::table::IAccessibleTable& rTable,
-::svt::table::AccessibleTableControlObjType _eType);
+::svt::table::IAccessibleTable& rTable);
protected:
virtual ~AccessibleGridControlTable();
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index f11a35e..9f7acaa 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -155,7 +155,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32
nChildIndex )
{
if(!m_xImpl->m_xTable.is())
{
-AccessibleGridControlTable* pTable = new
AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable,
svt::table::TCTYPE_TABLE);
+AccessibleGridControlTable* pTable = new
AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable);
m_xImpl->m_xTable = pTable;
m_xImpl->m_pTable = pTable;
}
@@ -306,7 +306,7 @@ AccessibleGridControlTable*
AccessibleGridControl::createAccessibleTable()
{
css::uno::Reference< css::accessibility::XAccessible >
xCreator(m_xImpl->m_aCreator);
OSL_ENSURE( xCreator.is(),
"extended/AccessibleGridControl::createAccessibleTable: my creator died - how
this?" );
-return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
+return new AccessibleGridControlTable( xCreator, m_aTable );
}
void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any&
_rNewValue,const Any& _rOldValue)
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index bdf7ea2..5ac584f 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -37,9 +37,8 @@ namespace accessibility {
AccessibleGridControlTable
[Libreoffice-commits] core.git: svl/source svtools/source svx/inc svx/source ucb/source unodevtools/source
svl/source/items/stylepool.cxx|4 ++-- svl/source/numbers/zforfind.hxx | 12 ++-- svtools/source/contnr/contentenumeration.hxx |2 +- svtools/source/contnr/fileview.cxx|2 +- svtools/source/contnr/imivctl.hxx | 16 svtools/source/control/roadmap.cxx|2 +- svtools/source/uno/treecontrolpeer.cxx|2 +- svx/inc/galbrws2.hxx |2 +- svx/inc/sdr/overlay/overlaymanagerbuffered.hxx|4 ++-- svx/inc/svdibrow.hxx |2 +- svx/source/accessibility/ChildrenManagerImpl.hxx |2 +- svx/source/dialog/contimp.hxx |4 ++-- svx/source/dialog/framelink.cxx |2 +- svx/source/fmcomp/fmgridcl.cxx|2 +- svx/source/form/fmvwimp.cxx |2 +- svx/source/inc/filtnav.hxx|4 ++-- svx/source/inc/fmshimp.hxx|2 +- svx/source/inc/gridcell.hxx |2 +- svx/source/svdraw/svdfmtf.hxx |2 +- svx/source/svdraw/svdhdl.cxx |2 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx|2 +- ucb/source/ucp/file/shell.hxx |2 +- unodevtools/source/skeletonmaker/skeletoncpp.hxx |4 ++-- unodevtools/source/skeletonmaker/skeletonjava.hxx |2 +- 24 files changed, 41 insertions(+), 41 deletions(-) New commits: commit b796b24793827583550279d40bfe565c66ad284d Author: Noel Grandin Date: Wed Aug 10 13:44:57 2016 +0200 loplugin:countusersofdefaultparams in svl..unodevtools Change-Id: Ie3d2cf29e99b8a51b80246aafa23a92e6c3404b2 Reviewed-on: https://gerrit.libreoffice.org/28017 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 8ac1e4f..347334a 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -371,8 +371,8 @@ public: std::shared_ptr insertItemSet( const SfxItemSet& rSet ); // #i86923# -IStylePoolIteratorAccess* createIterator( bool bSkipUnusedItemSets = false, - bool bSkipIgnorableItems = false ); +IStylePoolIteratorAccess* createIterator( bool bSkipUnusedItemSets, + bool bSkipIgnorableItems ); }; std::shared_ptr StylePoolImpl::insertItemSet( const SfxItemSet& rSet ) diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index ba24b87..e7b7a60 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -294,7 +294,7 @@ private: // Get currency symbol and advance string position bool GetCurrency( const OUString& rString, sal_Int32& nPos, - const SvNumberformat* pFormat = nullptr ); // optional number format to match against + const SvNumberformat* pFormat ); // optional number format to match against // Get symbol AM or PM and advance string position bool GetTimeAmPm( const OUString& rString, @@ -335,21 +335,21 @@ private: // Conversion of date to number bool GetDateRef( double& fDays, // OUT: days diff to null date sal_uInt16& nCounter, // Count of date substrings - const SvNumberformat* pFormat = nullptr ); // optional number format to match against + const SvNumberformat* pFormat ); // optional number format to match against // Analyze start of string bool ScanStartString( const OUString& rString, - const SvNumberformat* pFormat = nullptr ); + const SvNumberformat* pFormat ); // Analyze middle substring bool ScanMidString( const OUString& rString, sal_uInt16 nStringPos, -const SvNumberformat* pFormat = nullptr ); +const SvNumberformat* pFormat ); // Analyze end of string bool ScanEndString( const OUString& rString, -const SvNumberformat* pFormat = nullptr ); +const SvNumberformat* pFormat ); // Compare rString to substring of array indexed by nString // nString == 0x => last substring @@ -369,7 +369,7 @@ private: // Main analyzing function bool IsNumberFormatMain( const OUString& rString, - const SvNumberformat* pFormat = nullptr);// optional number format to match against + const SvNumberformat* pFormat);// optional number format to match against static inline bool MyIsdigit( sal_Unicode c ); diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/co
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlimprt.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit a97e6990435bbc47be4a4f6f349404f438e2c315
Author: Eike Rathke
Date: Thu Aug 11 00:34:54 2016 +0200
recognize another release's unknown currency saved as symbol we know
This may happen when saving a currency with a changed symbol in the
current release, load it in an older release, save it there and load it
again in the newer release.
For example DKK
[$kr.-406] #.##0,00;[RED][$kr.-406] -#.##0,00
new in master/5.3 (changed symbol from 'kr' to 'kr.')
loaded and saved in earlier releases writes currency 'kr.' instead of 'DKK'
reloaded in master since there was no match as currency lead to number
format
#.##0,00 [$kr.]
Change-Id: I5c8f165a2f420d77f5a2c0921c33a57797f92526
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 7021f81..5422231 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2689,6 +2689,15 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32
nNumberFormat, const OUString
{
if (sCurrentCurrency.equals(sTemp))
return true;
+// A release that saved an unknown currency may have
+// saved the currency symbol of the number format
+// instead of an ISO code bank symbol. In another
+// release we may have a match for that. In this case
+// sCurrentCurrency is the ISO code obtained through
+// XMLNumberFormatAttributesExportHelper::GetCellType()
+// and sBankSymbol is the currency symbol.
+if (sCurrentCurrency.getLength() == 3 &&
sBankSymbol.equals(sTemp))
+return true;
// #i61657# This may be a legacy currency symbol that
changed in the meantime.
if (SvNumberFormatter::GetLegacyOnlyCurrencyEntry(
sCurrentCurrency, sBankSymbol) != nullptr)
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sfx2/sdi sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 30 +- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 14 sfx2/sdi/sfx.sdi |4 - sw/uiconfig/swriter/ui/notebookbar.ui| 14 4 files changed, 42 insertions(+), 20 deletions(-) New commits: commit 554dc4c33e8e967ef78a8ef3d637102cc9f73ce4 Author: Szymon KÅos Date: Wed Aug 10 23:24:35 2016 +0200 GSoC notebookbar: changed labels Change-Id: I824e7b871edb9506a25ca7918431bf917e237709 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index a77d95c..6bb9f21 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1870,6 +1870,9 @@ + Optimal + + Optimal view @@ -2743,9 +2746,12 @@ - + ~New Style... + + New + 1 @@ -2767,9 +2773,12 @@ - + ~Update Style + + Update + 1 @@ -4173,6 +4182,9 @@ + Grid + + ~Display Grid @@ -4499,6 +4511,9 @@ + Auto Spellcheck + + ~Automatic Spell Checking @@ -4525,6 +4540,9 @@ + Symbol + + S~pecial Character... @@ -4764,11 +4782,14 @@ - Media ~Gallery + Gallery ~Gallery + + Open Clip Art and Media Gallery + 9 @@ -5939,6 +5960,9 @@ + Media + + Audio or ~Video... diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index aac3b05..a5b7fcb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -134,6 +134,9 @@ + Table of Contents + + Insert Table of Contents, Index or Bibliography @@ -177,11 +180,17 @@ + Update All + + Indexes and ~Tables + Update Index + + Current ~Index @@ -484,11 +493,14 @@ - Insert Frame + Frame F~rame... + + Insert Frame + 1 diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 1327d69..6f31f51 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -1554,7 +1554,6 @@ 6 -Update True True True @@ -1570,7 +1569,6 @@ -New True True True @@ -1586,7 +1584,6 @@ -Edit True True True @@ -1922,7 +1919,6 @@ Gallery -Gallery True True True @@ -1973,11 +1969,9 @@ Symbol -Symbol True True True -Insert Audio or Video .uno:InsertSymbol InsertSymbolImg none @@ -2028,7 +2022,6 @@ -
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js | 19 ++-
loleaflet/src/control/Control.RowHeader.js| 19 ++-
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 216ff61bafd420b058912c02d1e1e19f7111cd1e
Author: Henry Castro
Date: Wed Aug 10 17:05:45 2016 -0400
loleaflet: limit vertical/horizontal line movement
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index f248439..a4cb870 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -112,7 +112,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
text.innerHTML = content;
width = Math.round(converter.call(context, twip).x) - 1;
if (width === -1) {
- L.DomUtil.setStyle(text, 'display', 'none');
+ L.DomUtil.setStyle(column, 'display', 'none');
}
else {
L.DomUtil.setStyle(column, 'width', width +
'px');
@@ -170,20 +170,21 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._map.sendUnoCommand('.uno:SelectAll');
},
- _getVertLatLng: function (offset, e) {
+ _getVertLatLng: function (start, offset, e) {
+ var limit = this._map.mouseEventToContainerPoint({clientX:
start.x, clientY: start.y});
var drag = this._map.mouseEventToContainerPoint(e);
return [
- this._map.containerPointToLatLng(new L.Point(drag.x +
offset.x, 0)),
- this._map.containerPointToLatLng(new L.Point(drag.x +
offset.x, this._map.getSize().y))
+ this._map.containerPointToLatLng(new
L.Point(Math.max(limit.x, drag.x + offset.x), 0)),
+ this._map.containerPointToLatLng(new
L.Point(Math.max(limit.x, drag.x + offset.x), this._map.getSize().y))
];
},
onDragStart: function (item, start, offset, e) {
if (!this._vertLine) {
- this._vertLine = L.polyline(this._getVertLatLng(offset,
e), {color: 'darkblue', weight: 1});
+ this._vertLine = L.polyline(this._getVertLatLng(start,
offset, e), {color: 'darkblue', weight: 1});
}
else {
- this._vertLine.setLatLngs(this._getVertLatLng(offset,
e));
+ this._vertLine.setLatLngs(this._getVertLatLng(start,
offset, e));
}
this._map.addLayer(this._vertLine);
@@ -191,7 +192,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
onDragMove: function (item, start, offset, e) {
if (this._vertLine) {
- this._vertLine.setLatLngs(this._getVertLatLng(offset,
e));
+ this._vertLine.setLatLngs(this._getVertLatLng(start,
offset, e));
}
},
@@ -199,7 +200,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
var end = new L.Point(e.clientX + offset.x, e.clientY);
var distance =
this._map._docLayer._pixelsToTwips(end.subtract(start));
- if (distance.x > 0 && item.width != distance.x) {
+ if (item.width != distance.x) {
var command = {
Column: {
type: 'unsigned short',
@@ -207,7 +208,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
Width: {
type: 'unsigned short',
- value: distance.x
+ value: Math.max(distance.x, 0)
}
};
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 24dc811..658f156 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -110,7 +110,7 @@ L.Control.RowHeader = L.Control.Header.extend({
text.innerHTML = content;
height = Math.round(converter.call(context, twip).y) -
1;
if (height === -1) {
- L.DomUtil.setStyle(text, 'display', 'none');
+ L.DomUtil.setStyle(row, 'display', 'none');
} else {
L.DomUtil.setStyle(row, 'height', height +
'px');
L.DomUtil.setStyle(text, 'line-height', height
+ 'px');
@@ -151,20 +151,21 @@ L.Control.RowHeader = L.Control.Header.extend({
this._selectRow(row, modifier);
},
- _getHorzLatLng: function (offset, e
[Libreoffice-commits] core.git: libreofficekit/qa sfx2/sdi sfx2/source sw/inc sw/qa sw/source
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |5 ++
sfx2/sdi/sfx.sdi|4 -
sfx2/source/control/dispatch.cxx| 18
sw/inc/IDocumentUndoRedo.hxx|5 ++
sw/qa/extras/tiledrendering/tiledrendering.cxx | 41
sw/source/core/inc/UndoManager.hxx |4 +
sw/source/core/undo/docundo.cxx | 15 ++-
sw/source/uibase/shells/basesh.cxx | 17 +++-
8 files changed, 103 insertions(+), 6 deletions(-)
New commits:
commit e9bcd3475131b24b0b8818cfdfa256854ca5a59d
Author: Miklos Vajna
Date: Wed Aug 10 17:42:54 2016 +0200
sw undo: add a Repair argument to the .uno:Undo/Redo commands
Undo/redo is limited to undo actions created by the same view in the LOK
case, this argument removes this limit. This can be used by a client for
"document repair" purposes, where undo/redo of others' changes is
intentional.
The sfx command dispatch has support for FASTCALL slots (a state
function is not called, the command is always enabled) and also has
support for state functions, but those functions only get the ID of the
slots, not its parameters. What is needed here is a command that's
disabled by default, but in case a Repair argument is used, then it's
unconditionally enabled. So handle that case in the sfx dispatcher
directly for now.
Change-Id: I96c1130bf51abcdd722684b1fa4a8277f92fd555
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 6c8e2d5..a53bd00 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -535,6 +535,11 @@ static void documentRepair(GtkWidget* pButton, gpointer
/*pItem*/)
boost::property_tree::ptree aTree;
aTree.put(boost::property_tree::ptree::path_type(aKey + "/type",
'/'), "unsigned short");
aTree.put(boost::property_tree::ptree::path_type(aKey + "/value",
'/'), nIndex + 1);
+
+// Without this, we could only undo our own commands.
+aTree.put(boost::property_tree::ptree::path_type("Repair/type",
'/'), "boolean");
+aTree.put(boost::property_tree::ptree::path_type("Repair/value",
'/'), true);
+
std::stringstream aStream;
boost::property_tree::write_json(aStream, aTree);
std::string aArguments = aStream.str();
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index f5e366a..5275aef 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3428,7 +3428,7 @@ SfxBoolItem MacroRecordingFloat SID_RECORDING_FLOATWINDOW
SfxVoidItem Redo SID_REDO
-( SfxUInt16Item Redo SID_REDO )
+( SfxUInt16Item Redo SID_REDO, SfxBoolItem Repair SID_REPAIRPACKAGE )
[
AutoUpdate = FALSE,
FastCall = FALSE,
@@ -4555,7 +4555,7 @@ SfxVoidItem BasicIDEShowWindow SID_BASICIDE_SHOWWINDOW
SfxVoidItem Undo SID_UNDO
-( SfxUInt16Item Undo SID_UNDO )
+( SfxUInt16Item Undo SID_UNDO, SfxBoolItem Repair SID_REPAIRPACKAGE )
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 0d973a9..c464fba 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -313,6 +313,22 @@ bool SfxDispatcher::IsAppDispatcher() const
return !xImp->pFrame;
}
+/// Decides if the request is FASTCALL or not, depending on arguments.
+bool lcl_IsConditionalFastCall(SfxRequest &rReq)
+{
+sal_uInt16 nId = rReq.GetSlot();
+bool bRet = false;
+
+if (nId == SID_UNDO || nId == SID_REDO)
+{
+const SfxItemSet* pArgs = rReq.GetArgs();
+if (pArgs && pArgs->HasItem(SID_REPAIRPACKAGE))
+bRet = true;
+}
+
+return bRet;
+}
+
/** Helper function to check whether a slot can be executed and
check the execution itself
*/
@@ -321,7 +337,7 @@ void SfxDispatcher::Call_Impl(SfxShell& rShell, const
SfxSlot &rSlot, SfxRequest
SFX_STACK(SfxDispatcher::Call_Impl);
// The slot may be called (meaning enabled)
-if ( rSlot.IsMode(SfxSlotMode::FASTCALL) ||
rShell.CanExecuteSlot_Impl(rSlot) )
+if ( rSlot.IsMode(SfxSlotMode::FASTCALL) ||
rShell.CanExecuteSlot_Impl(rSlot) || lcl_IsConditionalFastCall(rReq))
{
if ( GetFrame() )
{
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 6c044f6..2266f30 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -64,6 +64,11 @@ public:
*/
virtual bool DoesDrawUndo() const = 0;
+/// Enable repair mode.
+virtual void DoRepair(bool bRepair) = 0;
+/// Is repair mode active?
+virtual bool DoesRepair() const = 0;
+
/** Set the position at which the document is in the "unmodified" state
to the current position in the Undo stack.
[GSoC] Review of Sidebar & It's functionality - Weekly Report #11
Hi, Another week of GSoC is now over, and this is what I've done over the past week: 1. Adjustments made to Writer Page Deck panels - https://gerrit.libreoffice.org/#/c/27758/ 2. Blog Entry describing the slide content panel for Impress and page content panel for Draw - https://susobhang70.github.io//sidebar-documentation/libreoffice-background-panel-post 3. Added "Edit Master Slide" and "Close Master Slide" Button and a few context changes to Slide/Page Content Panel - https://gerrit.libreoffice.org/#/c/27840/ I haven't made any progress on More Shapes Panel last week as my university had reopened, and I was busy with registration and formalities. TO-DO: 1. Blog Posts describing other content panels and enhancements made during summer. 2. Make the Media Playback Panel patch merge ready (few code duplication issues). 3. Add folder for shapes for More Shapes Panel in extras similar to Gallery. Regards, Susobhan Ghosh IRC: susobhang70 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlnumfi.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 4d993ae8f267e35f7c030861a92226c940bb46cc
Author: Eike Rathke
Date: Wed Aug 10 18:33:41 2016 +0200
XML number format: do not enquote space followed by minus, tdf#97837
follow-up
Which with
[$kr.-406] #.##0,00;[RED][$kr.-406] -#.##0,00
saved and reloaded gave
[$kr.-406] #.##0,00;[RED][$kr.-406]" -"#.##0,00
and thus an almost identical duplicated format with the built-in format.
Change-Id: Ie39b97576842bc29ac301d2fe64f7331f6c57fc4
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 7dc053f..8c2b8e7 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -811,14 +811,16 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer&
rContent, const SvXMLNumForm
bool bQuote = true;
sal_Int32 nLength = rContent.getLength();
-if ( ( nLength == 1 &&
-lcl_ValidChar( rContent[0], rParent ) ) ||
- ( nLength == 2 &&
- lcl_ValidChar( rContent[0], rParent ) &&
- rContent[1] == ' ' ) )
-{
-// don't quote single separator characters like space or percent,
-// or separator characters followed by space (used in date formats)
+if ((nLength == 1 && lcl_ValidChar( rContent[0], rParent)) ||
+(nLength == 2 &&
+ ((rContent[0] == ' ' && rContent[1] == '-') ||
+ (rContent[1] == ' ' && lcl_ValidChar( rContent[0], rParent)
+{
+// Don't quote single separator characters like space or percent,
+// or separator characters followed by space (used in date formats).
+// Or space followed by minus (used in currency formats) that would
+// lead to almost duplicated formats with built-in formats just with
+// the difference of quotes.
bQuote = false;
}
else if ( rParent.GetType() == XML_TOK_STYLES_PERCENTAGE_STYLE && nLength
> 1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Zoner Draw import, Week 11 report
I improved image fill tiling in libzmf, now it works correctly. http://i.imgur.com/fvhGGdz.png Also we probably figured out how to fix incorrect orientation and rotation of some shapes drawn via Zoner Draw "from corner" or "from center" modes, but not implemented it. I used American Fuzzy Lop fuzzer to find and fix some possible crashes (not all yet). Also added test files to libzmf-test for regression testing. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js | 20 ++--
loleaflet/src/control/Control.Header.js | 13 +++--
loleaflet/src/control/Control.RowHeader.js| 20 ++--
3 files changed, 27 insertions(+), 26 deletions(-)
New commits:
commit d32f4e824bd99526858508370eeb8f8b455d538b
Author: Henry Castro
Date: Wed Aug 10 11:33:20 2016 -0400
loleaflet: fix offset while moving vertical/horizontal line
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index 525d881..f248439 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -170,33 +170,33 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._map.sendUnoCommand('.uno:SelectAll');
},
- _getVertLatLng: function (e) {
+ _getVertLatLng: function (offset, e) {
var drag = this._map.mouseEventToContainerPoint(e);
return [
- this._map.containerPointToLatLng(new L.Point(drag.x,
0)),
- this._map.containerPointToLatLng(new L.Point(drag.x,
this._map.getSize().y))
+ this._map.containerPointToLatLng(new L.Point(drag.x +
offset.x, 0)),
+ this._map.containerPointToLatLng(new L.Point(drag.x +
offset.x, this._map.getSize().y))
];
},
- onDragStart: function (item, start, e) {
+ onDragStart: function (item, start, offset, e) {
if (!this._vertLine) {
- this._vertLine = L.polyline(this._getVertLatLng(e),
{color: 'darkblue', weight: 1});
+ this._vertLine = L.polyline(this._getVertLatLng(offset,
e), {color: 'darkblue', weight: 1});
}
else {
- this._vertLine.setLatLngs(this._getVertLatLng(e));
+ this._vertLine.setLatLngs(this._getVertLatLng(offset,
e));
}
this._map.addLayer(this._vertLine);
},
- onDragMove: function (item, start, e) {
+ onDragMove: function (item, start, offset, e) {
if (this._vertLine) {
- this._vertLine.setLatLngs(this._getVertLatLng(e));
+ this._vertLine.setLatLngs(this._getVertLatLng(offset,
e));
}
},
- onDragEnd: function (item, start, e) {
- var end = new L.Point(e.clientX, e.clientY);
+ onDragEnd: function (item, start, offset, e) {
+ var end = new L.Point(e.clientX + offset.x, e.clientY);
var distance =
this._map._docLayer._pixelsToTwips(end.subtract(start));
if (distance.x > 0 && item.width != distance.x) {
diff --git a/loleaflet/src/control/Control.Header.js
b/loleaflet/src/control/Control.Header.js
index 753fc52..3a56fc5 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -25,11 +25,12 @@ L.Control.Header = L.Control.extend({
L.DomEvent.on(document, 'mousemove', this._onMouseMove, this)
L.DomEvent.on(document, 'mouseup', this._onMouseUp, this);
- var rectangle = target.parentNode.getBoundingClientRect();
+ var rect = target.parentNode.getBoundingClientRect();
+ this._start = new L.Point(rect.left, rect.top);
+ this._offset = new L.Point(rect.right - e.clientX, rect.bottom
- e.clientY);
this._item = target;
- this._start = new L.Point(rectangle.left, rectangle.top);
- this.onDragStart(this.item, this._start, e);
+ this.onDragStart(this.item, this._start, this._offset, e);
},
_onMouseMove: function (e) {
@@ -46,7 +47,7 @@ L.Control.Header = L.Control.extend({
L.DomEvent.preventDefault(e);
- this.onDragMove(this._item, this._start, e);
+ this.onDragMove(this._item, this._start, this._offset, e);
},
_onMouseUp: function (e) {
@@ -60,8 +61,8 @@ L.Control.Header = L.Control.extend({
L.DomUtil.enableImageDrag();
L.DomUtil.enableTextSelection();
- this.onDragEnd(this._item, this._start, e);
- this._target = this._cursor = this._item = this._start = null;
+ this.onDragEnd(this._item, this._start, this._offset, e);
+ this._target = this._cursor = this._item = this._start =
this._offset = null;
this._dragging = false;
},
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 716abe0..24dc811 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -151,33 +151,33 @@ L.Control.RowHeader = L.Control.Header.extend({
this._selectRow
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/da_DK.xml | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) New commits: commit 17040a69abe325df05c22dcb811d81785211bf47 Author: Eike Rathke Date: Wed Aug 10 17:12:10 2016 +0200 DKK currency symbol is 'kr.' not 'kr' Change-Id: I35078b36c803e73538a23bbc9cdc5ddd13a3835c diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml index 552f15e..07f5f4f 100644 --- a/i18npool/source/localedata/data/da_DK.xml +++ b/i18npool/source/localedata/data/da_DK.xml @@ -87,22 +87,22 @@ 0,00"Â "% - [$kr-406] #.##0;[$kr-406] -#.##0 + [$kr.-406] #.##0;[$kr.-406] -#.##0 - [$kr-406] #.##0,00;[$kr-406] -#.##0,00 + [$kr.-406] #.##0,00;[$kr.-406] -#.##0,00 - [$kr-406] #.##0;[RED][$kr-406] -#.##0 + [$kr.-406] #.##0;[RED][$kr.-406] -#.##0 - [$kr-406] #.##0,00;[RED][$kr-406] -#.##0,00 + [$kr.-406] #.##0,00;[RED][$kr.-406] -#.##0,00 #.##0,00 CCC - [$kr-406] #.##0,--;[RED][$kr-406] -#.##0,-- + [$kr.-406] #.##0,--;[RED][$kr.-406] -#.##0,-- DD-MM-YY @@ -326,13 +326,20 @@ - + DKK kr DKK Dansk krone 2 + + DKK + kr. + DKK + Dansk krone + 2 + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/loadenv/loadenv.cxx | 18 +++---
1 file changed, 3 insertions(+), 15 deletions(-)
New commits:
commit 38a3743e0c5d52f9386f74097fd512d3133fbbe3
Author: Tor Lillqvist
Date: Wed Aug 10 17:33:22 2016 +0300
Revert "tdf#98837 - Fail loading a new document with read only property set
to true"
There was not really a good enough reason for the change, and it
causes unfortunate regressions in 3rd-party code that previously
worked fine. (It also caused two regressions in LO's own code, but
those were already fixed.)
This reverts commit 5334ff287c65f028753171c7b38da7ffbcebc1cc.
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index a7fcf57..b6f6f4c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -552,25 +552,13 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
OUString&
in a special way .-)
*/
-utl::MediaDescriptor stlMediaDescriptor(lMediaDescriptor);
-utl::MediaDescriptor::const_iterator pIt;
-
// creation of new documents
if (ProtocolCheck::isProtocol(sURL,ProtocolCheck::E_PRIVATE_FACTORY))
-{
-//tdf#98837 - check if read only prop is set to true for a new document
-//if yes then fail loading as doc needs to be saved before being opened
-//in read only mode
-pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_READONLY());
-if( pIt == stlMediaDescriptor.end() ||
-pIt->second == uno::Any(false)
- )
-return E_CAN_BE_LOADED;
-SAL_INFO("fwk", "LoadEnv::classifyContent(): new document can not be
loaded in read only mode");
-return E_UNSUPPORTED_CONTENT;
-}
+return E_CAN_BE_LOADED;
// using of an existing input stream
+utl::MediaDescriptor stlMediaDescriptor(lMediaDescriptor);
+utl::MediaDescriptor::const_iterator pIt;
if (ProtocolCheck::isProtocol(sURL,ProtocolCheck::E_PRIVATE_STREAM))
{
pIt =
stlMediaDescriptor.find(utl::MediaDescriptor::PROP_INPUTSTREAM());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - external/libcmis ucb/source
external/libcmis/UnpackedTarball_cmis.mk |1
external/libcmis/libcmis-sharepoint-repository-root.patch | 24 ++
ucb/source/ucp/cmis/cmis_content.cxx |2 -
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit ea8ba40c06fe2d0702c6dba22d1d4bed4af306b5
Author: Mike Kaganski
Date: Wed Aug 10 21:01:19 2016 +1000
tdf#101385: don't try to get SharePoint folder outside of allowed range
for a given site.
This patch uses the fact that getFolderByServerRelativeUrl API returns
site's root folder if used with empty path ('').
Hopefully this isn't otherwise context-dependent, so that it doesn't
return other folders in some unknown circumstances.
More correct would be instead to use the site's root path directly,
like '/sites/mysite'. But I don't know a reliable way to filter the
API part from the base URI.
To make use of the corrected SharePoint repository root id, the patch
also redirects all cases where "/" object is queried, to session's
getRootFolder().
Reviewed-on: https://gerrit.libreoffice.org/27987
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 1b482aec4e7b6aec86fb20bcda555c4060a80332)
Change-Id: Id31b4c2be0d8d81b94c0e9307acdfbc9e6441828
Reviewed-on: https://gerrit.libreoffice.org/28015
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/external/libcmis/UnpackedTarball_cmis.mk
b/external/libcmis/UnpackedTarball_cmis.mk
index b203f47..039e361d 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/tdf90351.patch
\
external/libcmis/http_auth.patch \
external/libcmis/libcmis-fix-google-drive.patch \
+
external/libcmis/libcmis-sharepoint-repository-root.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/libcmis-sharepoint-repository-root.patch
b/external/libcmis/libcmis-sharepoint-repository-root.patch
new file mode 100644
index 000..f89b134
--- /dev/null
+++ b/external/libcmis/libcmis-sharepoint-repository-root.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+index 780624d..f992689 100644
+--- a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+@@ -35,7 +35,18 @@ SharePointRepository::SharePointRepository( std::string
baseUrl ) :
+ m_description = "SharePoint repository";
+ m_productName = "SharePoint";
+ m_productVersion = "2010/2013";
+-m_rootId = baseUrl + "/getFolderByServerRelativeUrl('/')";
++// getFolderByServerRelativeUrl() API expects path to be
++// *server-relative*, i.e. they must include site path.
++// Given the baseUrl like "https://sp2013/sites/mysite/_api/Web";
++// for a site "mysite" on sharepoint server "sp2013",
++// the site root is '/sites/mysite/', not '/'.
++// Trying to get folder '/' results in "Value does not fall
++// within expected range" error.
++// Preferrable here is to extract the root path from baseUrl,
++// stripping server and api parts. But it can be unreliable
++// if api part (_api/Web) is different for some server.
++// On the other side, just querying empty path '' gives the root folder.
++m_rootId = baseUrl + "/getFolderByServerRelativeUrl('')";
+
+ m_capabilities[ ACL ] = "discover";
+ m_capabilities[ AllVersionsSearchable ] = "true";
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 9963632..0cfc651 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -504,7 +504,7 @@ namespace cmis
throw libcmis::Exception( "Object not found" );
}
}
-else if ( !m_sObjectPath.isEmpty( ) )
+else if (!(m_sObjectPath.isEmpty() || m_sObjectPath == "/"))
{
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source qadevOOo/tests wizards/com
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 25 +---
dbaccess/source/ui/browser/unodatbr.cxx |6 -
dbaccess/source/ui/dlg/queryfilter.cxx | 41
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java |5
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java |5
wizards/com/sun/star/wizards/db/SQLQueryComposer.java| 56 ---
wizards/com/sun/star/wizards/ui/FilterComponent.java |2
7 files changed, 15 insertions(+), 125 deletions(-)
New commits:
commit 2c76fd1e04441889fbc416d4e5815ef31b474193
Author: Fabio Buso
Date: Tue Aug 9 10:25:37 2016 +0200
tdf#67647 getStructuredFilter returns operator
Change-Id: I010ea3c24b4d5411711a93e35d4b173f5bde9e55
Reviewed-on: https://gerrit.libreoffice.org/28000
Reviewed-by: Lionel Elie Mamane
Tested-by: Lionel Elie Mamane
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 1b8f134..4bd1fe4 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1115,7 +1115,7 @@ sal_Int32
OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode *
pCondition, OSQLParseTreeIterator& _rIterator,
::std::vector < PropertyValue >&
rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const
{
-OSL_ENSURE(SQL_ISRULE(pCondition,
comparison_predicate),"setComparsionPredicate: pCondition ist kein
ComparsionPredicate");
+OSL_ENSURE(SQL_ISRULE(pCondition,
comparison_predicate),"setComparsionPredicate: pCondition is not a
ComparsionPredicate");
if (SQL_ISRULE(pCondition->getChild(0), column_ref) ||
SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref))
{
@@ -1128,12 +1128,9 @@ bool
OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi
sal_uInt32 i=1;
aItem.Handle = getPredicateType(pCondition->getChild(i));
-// don't display the equal
-if (pCondition->getChild(i)->getNodeType() == SQLNodeType::Equal)
-i++;
-// go forward
-for (;i < pCondition->count();i++)
+// go forward - don't display the operator
+for (i++;i < pCondition->count();i++)
pCondition->getChild(i)->parseNodeToPredicateStr(
aValue, m_xConnection, xFormatter, m_aLocale,
static_cast(m_sDecimalSep.toChar() ) );
}
@@ -1145,44 +1142,33 @@ bool
OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi
switch (pCondition->getChild(i)->getNodeType())
{
case SQLNodeType::Equal:
-// don't display the equal
-i--;
aItem.Handle = SQLFilterOperator::EQUAL;
break;
case SQLNodeType::NotEqual:
-i--;
aItem.Handle = SQLFilterOperator::NOT_EQUAL;
break;
case SQLNodeType::Less:
// take the opposite as we change the order
-i--;
-aValue = ">=";
aItem.Handle = SQLFilterOperator::GREATER_EQUAL;
break;
case SQLNodeType::LessEq:
// take the opposite as we change the order
-i--;
-aValue = ">";
aItem.Handle = SQLFilterOperator::GREATER;
break;
case SQLNodeType::Great:
// take the opposite as we change the order
-i--;
-aValue = "<=";
aItem.Handle = SQLFilterOperator::LESS_EQUAL;
break;
case SQLNodeType::GreatEq:
// take the opposite as we change the order
-i--;
-aValue = "<";
aItem.Handle = SQLFilterOperator::LESS;
break;
default:
break;
}
-// go backward
-for (; i >= 0; i--)
+// go backward - don't display the operator
+for (i--; i >= 0; i--)
pCondition->getChild(i)->parseNodeToPredicateStr(
aValue, m_xConnection, xFormatter, m_aLocale,
static_cast( m_sDecimalSep.toChar() ) );
}
@@ -1729,6 +1715,7 @@ Sequence< Sequence< PropertyValue > >
OSingleSelectQueryComposer::getStructuredC
Sequence< Sequence< PropertyValue > > aFilterSeq;
OUString sFilter = getStatementPart( _aGetFunctor, m_aAdditiveIterator );
+
if ( !sFilter.isEmpty()
[Libreoffice-commits] core.git: sfx2/source sw/qa
sfx2/source/view/lokhelper.cxx | 10 ++
sw/qa/extras/tiledrendering/tiledrendering.cxx | 37 +
2 files changed, 47 insertions(+)
New commits:
commit d6e8d4f773d970b69baedd8523a426f18a8d8eef
Author: Miklos Vajna
Date: Wed Aug 10 15:51:51 2016 +0200
sfx2: make SfxLokHelper::setView() set also the active frame
Without this, comphelper::dispatchCommand() doesn't work on the current
frame. This causes e.g. undo not working when only a given view is
allowed to do undo.
In the desktop case vcl::Window::ImplGrabFocus() calls both
SfxViewFrame::MakeActive_Impl() and
framework::Desktop::setActiveFrame(), but in the LOK case the first was
called directly, that's how the active frame was outdated.
Change-Id: If97a9de316b4c8dd49e55cd273bdb2dfe9866f38
Reviewed-on: https://gerrit.libreoffice.org/28032
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 856a007..4113160 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -11,12 +11,17 @@
#include
+#include
+
+#include
#include
#include
#include
#include
+using namespace com::sun::star;
+
int SfxLokHelper::createView()
{
SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst();
@@ -59,6 +64,11 @@ void SfxLokHelper::setView(int nId)
SfxViewFrame* pViewFrame = pViewShell->GetViewFrame();
pViewFrame->MakeActive_Impl(false);
+
+// Make comphelper::dispatchCommand() find the correct frame.
+uno::Reference xFrame =
pViewFrame->GetFrame().GetFrameInterface();
+uno::Reference xDesktop =
frame::Desktop::create(comphelper::getProcessComponentContext());
+xDesktop->setActiveFrame(xFrame);
return;
}
}
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 7662682..1219d01 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -61,6 +61,7 @@ public:
void testTextEditViewInvalidations();
void testUndoInvalidations();
void testUndoLimiting();
+void testUndoDispatch();
void testShapeTextUndoShells();
void testShapeTextUndoGroupShells();
@@ -89,6 +90,7 @@ public:
CPPUNIT_TEST(testTextEditViewInvalidations);
CPPUNIT_TEST(testUndoInvalidations);
CPPUNIT_TEST(testUndoLimiting);
+CPPUNIT_TEST(testUndoDispatch);
CPPUNIT_TEST(testShapeTextUndoShells);
CPPUNIT_TEST(testShapeTextUndoGroupShells);
CPPUNIT_TEST_SUITE_END();
@@ -923,6 +925,41 @@ void SwTiledRenderingTest::testUndoLimiting()
comphelper::LibreOfficeKit::setActive(false);
}
+void SwTiledRenderingTest::testUndoDispatch()
+{
+// Load a document and create two views.
+comphelper::LibreOfficeKit::setActive();
+SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
+int nView1 = SfxLokHelper::getView();
+SfxLokHelper::createView();
+
pXTextDocument->initializeForTiledRendering(uno::Sequence());
+int nView2 = SfxLokHelper::getView();
+
+// Insert a character in the first view.
+SfxLokHelper::setView(nView1);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'c', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'c', 0);
+
+// Click before the first word in the second view.
+SfxLokHelper::setView(nView2);
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+Point aStart = pShellCursor->GetSttPos();
+aStart.setX(aStart.getX() - 1000);
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP,
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+uno::Reference xDesktop =
frame::Desktop::create(comphelper::getProcessComponentContext());
+uno::Reference xFrame2 = xDesktop->getActiveFrame();
+
+// Now switch back to the first view, and make sure that the active frame
is updated.
+SfxLokHelper::setView(nView1);
+uno::Reference xFrame1 = xDesktop->getActiveFrame();
+// This failed: setView() did not update the active frame.
+CPPUNIT_ASSERT(xFrame1 != xFrame2);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
void SwTiledRenderingTest::testShapeTextUndoShells()
{
// Load a document and create a view.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - include/LibreOfficeKit libreofficekit/qa sw/inc sw/qa sw/source
include/LibreOfficeKit/LibreOfficeKitInit.h |9 ++-
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 47 +---
sw/inc/IDocumentUndoRedo.hxx|9 ++-
sw/inc/editsh.hxx |7 ++
sw/qa/extras/tiledrendering/tiledrendering.cxx | 28 +++
sw/source/core/edit/edws.cxx| 14 -
sw/source/core/inc/UndoManager.hxx |6 +-
sw/source/core/undo/docundo.cxx | 22 -
sw/source/uibase/shells/basesh.cxx |4 -
sw/source/uibase/wrtsh/wrtundo.cxx |4 -
10 files changed, 114 insertions(+), 36 deletions(-)
New commits:
commit 4fbc3dbe44857b52677844c47a750abc40713d60
Author: Miklos Vajna
Date: Tue Aug 9 18:13:37 2016 +0200
sw lok: limit undo/redo access to undo actions created by the same view
So one view can't undo the changes of an other view by accident. If
this is found to be useful in the desktop case, perhaps a dedicated
config option can be added for it; for now the behavior is LOK-only.
Change-Id: I7ff505d021bd6f6be36953ecc8f8bb971ce8927e
Reviewed-on: https://gerrit.libreoffice.org/28007
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 5d8639aaf2f60157c99c3ee3a8bfa78e4efd010a)
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index d30d4c3..6c044f6 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -27,6 +27,7 @@
class SwRewriter;
class SwNodes;
class SwUndo;
+class SwView;
namespace sw {
class RepeatContext;
@@ -135,10 +136,12 @@ public:
/** Get Id and comment of last Undo action.
@param o_pStr if not 0, receives comment of last Undo action.
@param o_pIdif not 0, receives Id of last Undo action.
+@param pViewif not nullptr, get the info for this view
@return true if there is a Undo action, false if none
*/
virtual bool GetLastUndoInfo(OUString *const o_pStr,
-SwUndoId *const o_pId) const = 0;
+SwUndoId *const o_pId,
+const SwView* pView = nullptr) const = 0;
/** Get comments of Undo actions.
@return comments of all top-level Undo actions.
@@ -154,10 +157,12 @@ public:
/** Get Id and comment of first Redo action.
@param o_pStr if not 0, receives comment of first Redo action.
@param o_pIdif not 0, receives Id of first Redo action.
+@param pViewif not nullptr, get the info for this view
@return true if there is a Redo action, false if none
*/
virtual bool GetFirstRedoInfo(OUString *const o_pStr,
- SwUndoId *const o_pId = nullptr) const = 0;
+ SwUndoId *const o_pId = nullptr,
+ const SwView* pView = nullptr) const = 0;
/** Get comments of Redo actions.
@return comments of all top-level Redo actions.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 7c2dd0e..e0ab5c7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -97,6 +97,7 @@ class SwEndNoteInfo;
class SwLineNumberInfo;
class SwAuthEntry;
class SwRewriter;
+class SwView;
struct SwConversionArgs;
enum class SvtScriptType;
enum class SfxClassificationPolicyType;
@@ -561,8 +562,10 @@ public:
SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter *
pRewriter = nullptr );
bool GetLastUndoInfo(OUString *const o_pStr,
- SwUndoId *const o_pId) const;
-bool GetFirstRedoInfo(OUString *const o_pStr) const;
+ SwUndoId *const o_pId,
+ const SwView* pView = nullptr) const;
+bool GetFirstRedoInfo(OUString *const o_pStr,
+ const SwView* pView = nullptr) const;
SwUndoId GetRepeatInfo(OUString *const o_pStr) const;
/// is it forbidden to modify cursors via API calls?
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 340473d..cba7997 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -61,6 +61,7 @@ public:
void testViewLock();
void testTextEditViewInvalidations();
void testUndoInvalidations();
+void testUndoLimiting();
void testShapeTextUndoShells();
void testShapeTextUndoGroupShells();
@@ -88,6 +89,7 @@ public:
CPPUNIT_TEST(testViewLock);
CPPUNIT_TEST(testTextEditViewInvalidations);
CPPUNIT_TEST(testUndoInvalidations);
+CPPUNIT_TEST(testUndoLimiting);
CPPUNIT_TEST(testShapeTextUndoShells);
CPPUNIT_TEST(testShapeTextUndoGroupShells);
CPPUNIT_TEST_SUITE_END();
@@ -869,10 +871,12 @@ void SwTiledRenderingTest::testUnd
[Libreoffice-commits] core.git: 5 commits - bridges/source vcl/headless vcl/inc vcl/ios vcl/source
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx |1 +
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |2 ++
vcl/headless/svpframe.cxx |8 +++-
vcl/inc/salprn.hxx |1 +
vcl/ios/iosinst.cxx |2 +-
vcl/source/opengl/OpenGLHelper.cxx |4
6 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit f3346b1fc568f044aa02b01758a9598aed0c95e7
Author: Tor Lillqvist
Date: Tue Aug 9 10:58:03 2016 +0300
Intermediate iOS hack
Just to get this one file to compile. More errors come later. I just
spent a short time on this while waiting for something else.
Actually I have no idea what we should do on iOS nowadays. Do we want
to use cairo? Do we want to use OpenGL? Would it make sense to mimic
what we do on Android as much as possible? (But what do we do on
Android, and is that by choice or accident?) Even if that might mean
not using APIs native to iOS, but slower (not HW accelerated) FLOSS
alternatives that perform the same functionality, broadly speaking?
Change-Id: Id88a895b90f753417eced744141376656bcf72c3
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 7eac6b3..0ce76cf 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -26,7 +26,9 @@
#include
+#ifndef IOS
#include
+#endif
using namespace basegfx;
@@ -44,7 +46,9 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
m_pParent( static_cast(pParent) ),
m_nStyle( nSalFrameStyle ),
m_bVisible( false ),
+#ifndef IOS
m_pSurface( nullptr ),
+#endif
m_nMinWidth( 0 ),
m_nMinHeight( 0 ),
m_nMaxWidth( 0 ),
@@ -55,7 +59,7 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
memset( static_cast(&m_aSystemChildData), 0, sizeof( SystemEnvData
) );
m_aSystemChildData.nSize= sizeof( SystemEnvData );
#ifdef IOS
-(void) nScanlineFormat;
+// Nothing
#elif defined ANDROID
// Nothing
#else
@@ -111,8 +115,10 @@ SvpSalFrame::~SvpSalFrame()
}
}
}
+#ifndef IOS
if (m_pSurface)
cairo_surface_destroy(m_pSurface);
+#endif
}
void SvpSalFrame::GetFocus()
commit 8778a3e03945f5bafabb0274e3bd79aab6ee92f4
Author: Tor Lillqvist
Date: Tue Aug 9 10:54:11 2016 +0300
Surround PaintScope code with ifdefs matching declaration in include file
Change-Id: Iede85fc847b330b5586b95facafb690df7209d1b
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 8642844..d904009 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -1072,6 +1072,8 @@ void OpenGLHelper::debugMsgPrint(const int nType, const
char *pFormat, ...)
va_end (aArgs);
}
+#if HAVE_FEATURE_OPENGL || defined(ANDROID)
+
OutputDevice::PaintScope::PaintScope(OutputDevice *pDev)
: pHandle( nullptr )
{
@@ -1108,4 +1110,6 @@ OutputDevice::PaintScope::~PaintScope()
flush();
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 237ff9c497b5ad166032f567aaa1fcde91c81ed1
Author: Tor Lillqvist
Date: Tue Aug 9 10:53:40 2016 +0300
Include for VCL_PLUGIN_PUBLIC
Change-Id: I5e248ed670502a2702f08e31739a8c82c29d5302
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 5472684..e11eaff 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_INC_SALPRN_HXX
#include
+#include
#include "salptype.hxx"
commit c4e89590c6e043c80576e26b61ef444f864359d9
Author: Tor Lillqvist
Date: Tue Aug 9 10:53:15 2016 +0300
gendata.hxx has moved
Change-Id: I55223078e189416c4181141a7a904e93d5c6a01e
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 6ca639e..fa821a2 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -23,7 +23,7 @@
#include "ios/iosinst.hxx"
#include "headless/svpdummies.hxx"
-#include "generic/gendata.hxx"
+#include "unx/gendata.hxx"
#include "quartz/utils.h"
#include
#include
commit 5a833144b516f75e8f2ea1297dd0327c84010cc6
Author: Tor Lillqvist
Date: Tue Aug 9 10:05:48 2016 +0300
SAL_FALLTHROUGH
Change-Id: I347c13b282ccbd40a5e2e4a504f0c8ee1882d602
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index 64a214f..e81c17f 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -408,6 +408,7 @@ namespace
TYPELIB_DANGER_RELEASE( pTD );
}
} // else perform queryInterface()
+SAL_FALLTHROUGH;
default:
eRet = cpp2uno_call(
pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index a48
GSoC : Week #11 : Import Cell Styles via Orcus
Hi, Work I've done this week : 1. Finished with creating tests for imported styles. 2. Fix a few attributes that were not able to set properly. Work I have to do: 1. Add more tests for Number Formatting. 2. Check if Transient Strings is implemented properly in the code I've written. 3. Find a fix for Unicode Problem so that we could release orcus. Regards, Jaskaran Veer Singh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/papersizelistbox.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b2bbebb34efc9b931b4bf0feaf1fdede7cad4f62
Author: Susobhan Ghosh
Date: Wed Aug 10 14:19:21 2016 +0530
Set slide/page format dropdown size to 6 in Slide/Page panel
Change-Id: Iad70e5e946c3209246567b7b6449100a49cb8a40
Reviewed-on: https://gerrit.libreoffice.org/28013
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/svx/source/dialog/papersizelistbox.cxx
b/svx/source/dialog/papersizelistbox.cxx
index 9221084..ded2868 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -27,6 +27,7 @@
PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent, WinBits nStyle)
: ListBox( pParent, nStyle)
{
+SetDropDownLineCount(6);
}
VCL_BUILDER_FACTORY(PaperSizeListBox);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/qa sax/source
sax/qa/cppunit/xmlimport.cxx | 89 +++
sax/source/fastparser/fastparser.cxx | 77 ++-
sax/source/fastparser/legacyfastparser.cxx | 94 +
3 files changed, 206 insertions(+), 54 deletions(-)
New commits:
commit 18edd88edc0c45d9c3b8f6faa45bab481ec078f5
Author: Mohammed Abdul Azeem
Date: Wed Aug 3 17:27:48 2016 +0530
GSoC - Making legacyfastparser to use tokens:
This tokenizes some elements, de-tokenize while consuming
and emits elements through legacy interface. DummyTokenHandler
is just to test the correctness.
Change-Id: I1ea1e4d806ed4d426215f93b3f6b66a9776f6479
Reviewed-on: https://gerrit.libreoffice.org/27849
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index f7fcd73..c50a674 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -40,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -264,6 +266,73 @@ void SAL_CALL NSDocumentHandler::startElement( const
OUString& aName, const Refe
CPPUNIT_ASSERT(false);
}
+class DummyTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler >,
+ public sax_fastparser::FastTokenHandlerBase
+{
+public:
+const static OUString tokens[];
+const static OUString namespaceURIs[];
+const static OUString namespacePrefixes[];
+
+// XFastTokenHandler
+virtual Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken )
+throw (css::uno::RuntimeException, std::exception) override;
+virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence<
sal_Int8 >& Identifier )
+throw (css::uno::RuntimeException, std::exception) override;
+//FastTokenHandlerBase
+virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength )
const override;
+};
+
+const OUString DummyTokenHandler::tokens[] = { "Signature",
"CanonicalizationMethod", "Algorithm", "Type",
+ "DigestMethod", "Reference",
"document",
+ "spacing", "Player", "Height" };
+
+const OUString DummyTokenHandler::namespaceURIs[] = {
"http://www.w3.org/2000/09/xmldsig#";,
+
"http://schemas.openxmlformats.org/wordprocessingml/2006/main/";,
+
"xyzsports.com/players/football/" };
+
+const OUString DummyTokenHandler::namespacePrefixes[] = { "", "w", "Player" };
+
+Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( sal_Int32 nToken )
+throw (uno::RuntimeException, std::exception)
+{
+OString aUtf8Token;
+if ( ( ( nToken & 0x ) != 0 ) ) //namespace
+{
+sal_uInt32 nNamespaceToken = ( nToken >> 16 ) - 1;
+if ( nNamespaceToken < sizeof( namespacePrefixes ) / sizeof( OUString
) )
+aUtf8Token = OUStringToOString( namespacePrefixes[ nNamespaceToken
], RTL_TEXTENCODING_UTF8 );
+}
+else //element or attribute
+{
+sal_uInt32 nElementToken = nToken & 0x;
+if ( nElementToken < sizeof( tokens ) / sizeof( OUString ) )
+aUtf8Token = OUStringToOString( tokens[ nElementToken ],
RTL_TEXTENCODING_UTF8 );
+}
+Sequence< sal_Int8 > aSeq = Sequence< sal_Int8 >( reinterpret_cast< const
sal_Int8* >(
+aUtf8Token.getStr() ), aUtf8Token.getLength() );
+return aSeq;
+}
+
+sal_Int32 DummyTokenHandler::getTokenFromUTF8( const uno::Sequence< sal_Int8
>& rIdentifier )
+throw (uno::RuntimeException, std::exception)
+{
+return getTokenDirect( reinterpret_cast< const char* >(
+rIdentifier.getConstArray() ), rIdentifier.getLength() );
+}
+
+sal_Int32 DummyTokenHandler::getTokenDirect( const char* pToken, sal_Int32
nLength ) const
+{
+OUString sToken( pToken, nLength, RTL_TEXTENCODING_UTF8 );
+for( sal_uInt16 i = 0; i < sizeof(tokens)/sizeof(OUString); i++ )
+{
+if ( tokens[i] == sToken )
+return (sal_Int32)i;
+}
+return FastToken::DONTKNOW;
+}
+
+
class XMLImportTest : public test::BootstrapFixture
{
private:
@@ -298,6 +367,26 @@ void XMLImportTest::setUp()
m_xLegacyFastParser.set(
xContext->getServiceManager()->createInstanceWithContext
( "com.sun.star.xml.sax.LegacyFastParser", xContext ),
UNO_QUERY );
m_xLegacyFastParser->setDocumentHandler( m_xDocumentHandler.get() );
+
+Reference< XFastTokenHandler > xTokenHandler;
+xTokenHandler.set( new DummyTokenHandler() );
+uno::Reference const xInit(m_xLegacyFastParser,
+uno::UNO_QUERY_THROW);
+uno::Sequence args(1);
+args[0] <<= xTokenHandler;
+xInit->initialize( args );
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/unnecessaryvirtual.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e5d24f50b7e527a5991a1d21f40edcb537eeb72d
Author: Noel Grandin
Date: Wed Aug 10 10:35:58 2016 +0200
clang3.9 compatibility
Change-Id: Idbba88f1a890c068c9813aff2287f0983d1b8742
diff --git a/compilerplugins/clang/unnecessaryvirtual.cxx
b/compilerplugins/clang/unnecessaryvirtual.cxx
index 2964748..9403213 100644
--- a/compilerplugins/clang/unnecessaryvirtual.cxx
+++ b/compilerplugins/clang/unnecessaryvirtual.cxx
@@ -74,7 +74,7 @@ std::string niceName(const CXXMethodDecl* functionDecl)
functionDecl->getParent()->getQualifiedNameAsString() + "::"
+ compat::getReturnType(*functionDecl).getAsString() + "-"
+ functionDecl->getNameAsString() + "(";
-for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
+for (const ParmVarDecl *pParmVarDecl : compat::parameters(*functionDecl)) {
s += pParmVarDecl->getType().getAsString();
s += ",";
}
@@ -96,7 +96,7 @@ std::string UnnecessaryVirtual::fullyQualifiedName(const
FunctionDecl* functionD
}
ret += functionDecl->getNameAsString() + "(";
bool bFirst = true;
-for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
+for (const ParmVarDecl *pParmVarDecl : compat::parameters(*functionDecl)) {
if (bFirst)
bFirst = false;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/qa
comphelper/qa/container/comphelper_ifcontainer.cxx | 30 +++
comphelper/qa/container/testifcontainer.cxx|4 +-
comphelper/qa/string/test_string.cxx | 40 ++---
comphelper/qa/unit/variadictemplates.cxx | 10 ++---
4 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 583e41b9c8f734cb403b9ba9ffe2d0844fab981f
Author: Miklos Vajna
Date: Wed Aug 10 09:08:24 2016 +0200
comphelper: fix loplugin:cppunitassertequals warnings
Change-Id: If042462d8f250dbe2e1be278b7524dab243b08e8
Reviewed-on: https://gerrit.libreoffice.org/28012
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx
b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 733a7e0..261dedb 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -68,8 +68,8 @@ namespace comphelper_ifcontainer
pContainer = new comphelper::OInterfaceContainerHelper2(m_aGuard);
-CPPUNIT_ASSERT_MESSAGE("Empty container not empty",
- pContainer->getLength() == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty container not empty",
+ static_cast(0),
pContainer->getLength());
int i;
for (i = 0; i < nTests; i++)
@@ -77,21 +77,21 @@ namespace comphelper_ifcontainer
Reference xRef = new
ContainerListener(&aStats);
int nNewLen = pContainer->addInterface(xRef);
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
- nNewLen == i + 1);
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
- pContainer->getLength() == i + 1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+ i + 1, nNewLen);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+ static_cast(i + 1),
pContainer->getLength());
}
-CPPUNIT_ASSERT_MESSAGE("alive count mismatch",
- aStats.m_nAlive == nTests);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("alive count mismatch",
+ nTests, aStats.m_nAlive);
EventObject aObj;
pContainer->disposeAndClear(aObj);
-CPPUNIT_ASSERT_MESSAGE("dispose count mismatch",
- aStats.m_nDisposed == nTests);
-CPPUNIT_ASSERT_MESSAGE("leaked container left alive",
- aStats.m_nAlive == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("dispose count mismatch",
+ nTests, aStats.m_nDisposed);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("leaked container left alive",
+ 0, aStats.m_nAlive);
delete pContainer;
}
@@ -119,13 +119,13 @@ namespace comphelper_ifcontainer
for (i = 0; i < nTests; i++)
{
CPPUNIT_ASSERT_MESSAGE("mismatching elements",
- aElements[i] == aListeners[i]);
+ bool(aElements[i] ==
aListeners[i]));
}
}
pContainer->clear();
-CPPUNIT_ASSERT_MESSAGE("non-empty container post clear",
- pContainer->getLength() == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("non-empty container post clear",
+ static_cast(0),
pContainer->getLength());
delete pContainer;
}
diff --git a/comphelper/qa/container/testifcontainer.cxx
b/comphelper/qa/container/testifcontainer.cxx
index 85e06c2..3cc8f9c 100644
--- a/comphelper/qa/container/testifcontainer.cxx
+++ b/comphelper/qa/container/testifcontainer.cxx
@@ -117,7 +117,7 @@ void TestInterfaceContainer2::test1()
static_cast(iterator.next())->vetoableChange(
PropertyChangeEvent() );
iterator.remove();
-CPPUNIT_ASSERT( helper.getLength() == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), helper.getLength() );
helper.disposeAndClear( EventObject() );
}
@@ -141,7 +141,7 @@ void TestInterfaceContainer2::test1()
iterator.remove();
}
}
-CPPUNIT_ASSERT( helper.getLength() == 2 );
+CPPUNIT_ASSERT_EQUAL( static_cast(2), helper.getLength() );
{
comphelper::OInterfaceIteratorHelper2 iterator( helper );
while( iterator.hasMoreElements() )
diff --git a/comphelper/qa/string/test_string.cxx
b/comphelper/qa/string/test_string.cxx
index 0d18ac0..94349ba 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/tes
[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/po
loleaflet/Makefile|8 loleaflet/po/README |4 loleaflet/po/template/loleaflet-help.pot | 1428 -- loleaflet/po/template/loleaflet-ui.pot| 857 -- loleaflet/po/templates/loleaflet-help.pot | 1428 ++ loleaflet/po/templates/loleaflet-ui.pot | 857 ++ 6 files changed, 2293 insertions(+), 2289 deletions(-) New commits: commit ff1b071a8f8289baab22441fedc7cb6b76d108e3 Author: Jan Iversen Date: Wed Aug 10 10:36:57 2016 + pot file update, to help automate the pootle connection Added more explanation in the README. Corrected template -> templates diff --git a/loleaflet/Makefile b/loleaflet/Makefile index a409396..be9c11a 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -45,7 +45,7 @@ dist: all rm -rf loleaflet-$(VERSION) pot: - xgettext --from-code=UTF-8 --keyword=_ --output=po/template/loleaflet-ui.pot \ + xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \ evol.colorpicker.strings.js \ unocommands.js \ dist/errormessages.js \ @@ -62,11 +62,11 @@ pot: src/core/Socket.js \ src/map/Map.js - html2po --pot --input=dist/loleaflet-help.html --output=po/template/loleaflet-help.pot + html2po --pot --input=dist/loleaflet-help.html --output=po/templates/loleaflet-help.pot l10n: pot - for i in po/ui-*.po; do pot2po --input=po/loleaflet-ui.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done - for i in po/help-*.po; do pot2po --input=po/loleaflet-help.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done + for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done + for i in po/help-*.po; do pot2po --input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done rm po/loleaflet-ui.pot rm po/loleaflet-help.pot diff --git a/loleaflet/po/README b/loleaflet/po/README index fa966a3..02f3d9c 100644 --- a/loleaflet/po/README +++ b/loleaflet/po/README @@ -6,3 +6,7 @@ The translated .po files are then committed from the pootle server. Remark the directory styles, are not translated by merged from the core translation. +if files are added to the po directory, they are automatically compared/updated from pootle. + +Automatic commits from pootle are done with the user "pootlebot" + diff --git a/loleaflet/po/template/loleaflet-help.pot b/loleaflet/po/templates/loleaflet-help.pot similarity index 100% rename from loleaflet/po/template/loleaflet-help.pot rename to loleaflet/po/templates/loleaflet-help.pot diff --git a/loleaflet/po/template/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot similarity index 100% rename from loleaflet/po/template/loleaflet-ui.pot rename to loleaflet/po/templates/loleaflet-ui.pot ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
AppData additions required for the software center
Hi again! First, apologies for the direct email. I'm emailing you directly as you've been listed as the update contact in one or more AppData files. We've been busy building an awesome software center, and we've been adding more and more metadata fields that upstream authors can set. The software center is now being used in Fedora, Opensuse, Ubuntu, Debian and Arch, with many millions of happy users. Some of the newest features include a way to make it easy for translators to contribute new translations of your applications by specifying a URL in the libreoffice-draw.appdata.xml libreoffice-base.appdata.xml libreoffice-writer.appdata.xml libreoffice-impress.appdata.xml libreoffice-calc.appdata.xml AppData file that tells them where to start looking. This can be specified by adding: http://the-web-site-with-translation-instructions/ Another useful tag to add is to tell end-users where to donate, for instance: http://www.gnome.org/friends/ If it's been some time since you updated the AppData file (and hey, you've got an app to write!) you can get add the latest metadata fields by doing `appstream-util upgrade libreoffice-draw.appdata.xml libreoffice-base.appdata.xml libreoffice-writer.appdata.xml libreoffice-impress.appdata.xml libreoffice-calc.appdata.xml` and then replacing any FIXMEs in the file with actual data. We'll be putting more functionality into the software center in the future that uses this extra data, but we need more upstream software to opt-in before we can enable features, for instance, providing a button for users to donate to specific apps. You can also use `appstream-util validate-relax` on your AppData file to check the various fields meet our style guidelines. If you disagree with any of the validation warnings, please let me know! Of course, you don't have to do a release with these enhancements straight away, and if you have a stable branch it would be a good thing to backport this as well if it does not add translated strings or you have no string freeze policy. When you've changed the file(s) and committed, please email me back and I'll mark your application as completed. If you don't want to hear from me ever again just edit the in the AppData file and change it to somebody else. I'm not planning on emailing more than once every 6 months, so don't worry about me spamming you with even more work to do. Thanks, Richard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.2.1.1'
Tag 'libreoffice-5.2.1.1' created by Christian Lohmaier at 2016-08-10 10:13 + Tag libreoffice-5.2.1.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXqv45AAoJEPQ0oe+v7q6jHgoP/iv+sPECvJ4mYbn8Ir1i6QnD VEQLdAWAT2mYwTJldwB/ODBCj4eOacpxBKMkpQ6EiST9zOP8QZuJXH65Da7MRZTl dRYP0ItReNspP7UMaxsa4zu4WvRnuVqX/HdyQBOWUhYkASuw0PWD0JBKCU4qFlZJ QPKR1ESkVeLrXsODX0/ddCGMVSCzRK97uJQB0BvOBjZ3Hvf5R+CvlcIJ5dZkwvr7 mz2FJwK0OPOJJQ0Dxa6t5km0+H8u2S7c1zqN7hHY86VmgbRcC8RXfI/F9pKCa8Ts HEdGteb4KC5W3UgVuEBWP8yIkvhD/51/cgSgvNp5sV5pS7UFfDJlk5sOv/0zRaS2 Q+WIu57czAIzx2s+D1q0gfmAkOgVWY8Mg4lCKITJpUfkwP4h6T2Fu3qQJPKOdLvJ /2udi85xBC3W9QR9CtS2Rzl/n2dwJBBwBNiP0e9RZzR0VWXbvqGfKdqPPHit/53X wT2YTqUtrU1swsDJX0f2XljCdGfTY9Cimzv5IKcaQpMT0d+Vagd8yvG//OgrwX/n HcsXwnxrRKfzqZnFaKPtJz6iXkteY2OhfUpMY4mtJtve/GEXbfAXkZ49w6MLdTMt 7+ydtidvrrmnQO0knhrel0e2pNf8EQqnf3OaRwnXrw19/rTJb7LbQxhSwNV+g1og coiK0+eDl01C1m44RMFB =U337 -END PGP SIGNATURE- Changes since cp-5.1-branch-point-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.2.1.1'
Tag 'libreoffice-5.2.1.1' created by Christian Lohmaier at 2016-08-10 10:13 + Tag libreoffice-5.2.1.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXqv49AAoJEPQ0oe+v7q6j604QAICLGltUqn7ARoBPOCSXrXJx rleTOixpiETPgh9MI2EcOaRN0tuOwtS+8mIql64t/jvrXgZbH4d3N+ZqFwtJLeIK plvOqhighVSLd98VBGARncQMiv2Hv/lWa/n/vWXEVQuqLSxqEQcu7EgVCJdAx+YS FRHJTUFFrnDPgkqM6ir4hSnA5CK1itgvnauH244c2cVkswKJ1niyesh+Pe2x/vK/ 67tL8o05qrdJyLVzqKoXNxPp+1NusBxJH6JT/LpK+3oFbFnx0aQszTysXtCbJPP8 rHDENtY2XoKvYWTiz2FmpRIfrhIwTAJalfshanphKxvaULlLt/Zr1EYMSLRG28hr xvUp0vK1kFR2LMHYfEzFnfEiqFRdBRsUefNCky2URJDe3+XoWQHoHuzHO+hpyFm7 y85IjCkliEhp7Ujj2639Nu8DmzbhGZvM0E3NjhmL52DufZdkNHrpgF5kbJJBA/wc jxvG5gITn+WYVXyIoEk5CxYxJep7hZXZ1zlL5C/gfoBi1IBUx9plc/Pw6+5GdGDb KL0w+X4glM4yIGU0JSVe/qasqwRnvNzn2FkMHdihEp1TDK/skvVWk1FzLJdJIJq7 LhNThf0521FRkHMomKUqyB17GEin2HazMqZHI/q4WFlFjRPMrGtMEhSIqUIWQYbI PuyxrbaOMq9TZbpfZ81n =rW+7 -END PGP SIGNATURE- Changes since libreoffice-5-2-branch-point-509: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.2.1.1'
Tag 'libreoffice-5.2.1.1' created by Christian Lohmaier at 2016-08-10 10:13 + Tag libreoffice-5.2.1.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXqv4zAAoJEPQ0oe+v7q6jvMQQAISUxOW7tO0Ce9HJADMSeY4z rBAVx2IsLmwX+nxan0NMpzbND2/er5ueZgqrE6pOYEDHhEO+xGShcuhwS2J1Pv9S gt8tvnP5EbFN1UVCnI0JnUb+K9UmD56ZEMOeEff84Hk9yhr1lmMen9xv26jWKuYr Keizzo8tFRwow5VqT3xjAua+2dH722VbT7DRQnvkKYV3uP1f5yB7clLsFlcG2ewK nfwO8hg5LgHMAySijeFV/C3ECAn2Vqg8pGwAMPmCtDN0CF5d/60cXamtK4PfbAGe z7qy34t9CFvCAlny0IaVeNN4Q/yrKygwpH6t5f7T4PKkPfB6SbMiXOM9sc+NJbt0 HnOvrYgBet2YuwOekqMBTjyG8jw2c4IejHMxwE5orYiViXp7Ge+GslqkhM4w+An4 yJ5iyy/AQoi0W8usScmzIdjT3GZvbkutI40LOyN9JgaZtXcLszk1fokimY5N/35y gEXX1habiXT4Qo+s5U4zDsG6cWcbtc0Mr1/jwQilbV4NrwgGuMDPgurIN+naxJaw 2IBBLJ54Ps2HZCPso/1EcsF1G7+ocYGy7yq+1U+sfTxZiD11gxDLoZ1yS7fOMWfC 3rWHylac7ZnvaxByRA1pZEe4bUqKHnq26XTa2dAPfF9oqNQvXcHtHCFazY70z9Q+ msA+0j4WSF9TRQH8ZBlg =CIGP -END PGP SIGNATURE- Changes since cp-5.1-branch-point-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 58248376300644f9fa5aad07a435ca926fe00b40 Author: Christian Lohmaier Date: Wed Aug 10 12:13:46 2016 +0200 bump product verion to 5.2.1.1.0+ Change-Id: I6df7667fc8f6f20dbd98371246d034e09960b94b diff --git a/configure.ac b/configure.ac index fc1e776..b8bb8b5 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],[5.2.1.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.2.1.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.2.1.1'
Tag 'libreoffice-5.2.1.1' created by Christian Lohmaier at 2016-08-10 10:13 + Tag libreoffice-5.2.1.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXqv42AAoJEPQ0oe+v7q6jVaQP/1jJqWgCNJriZCuDBPy5iEaG w1lKlQxQ4fFYf6XooC8Am401m+KFyvrjZJEzdzps3lip9K+pyrxBpGlZMSub6T0x lAS0vStlIcjE+mp7Wjd9eUd2fIYaPkZHFlNOzScVhbHTwPKFmv4Qi4v6ZEBPUvGj Dl0AYj1DbTm1LGp6B/0hr/smKRWWF9FwadfTaM0BB+xfI8FAjMMA/uyVROLrwEdN cHlHCJ+/Q8tizw/+1jeXubSNvAvjh3J0VIWJvL/8gfKhIoxWhiqbP8n48IBAfkqP kU5UCYJ7UEnZZIZP3v+zZKtnuoUXJ+00rOaw7Y4LJgXMOht2b0Zxnl0gc6SJL+27 l6lhBDr7o2jNTvsnvPZDMSARfavk4YAtEad8h4I03qt/dYoQzpNGjOulQaRILyjc qdYll5ynCWZtoh0q2gzzSfLrcJVLL4SN8a8mNwB87YlTxPW0UF8A/gvhdjX87kg3 SeFNqmC+hMew+ACo8Ff4/u9xnsHBDZYhaTNsVZbMSz7lvhOjcrTs+Tmim0gSLSlI OcowwCyVUWiNvC4Kwjtj7UzQplbi7aLIiHgTG2nXcPnyiB6iWMegFiZUY6Rxr/WQ Z6ZzHCVPbtrzSovJmb0IetPeJZoLMyzK6f0yHU+zdjnw8sE75qZBhsDJF7h5AhTf g587cMesA8EMP9A1l8U7 =iV7p -END PGP SIGNATURE- Changes since libreoffice-5-2-branch-point-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a30281168c2bde2d618ec6ad79e1fb158b244e1f Author: Christian Lohmaier Date: Wed Aug 10 12:10:56 2016 +0200 bump product version to 5.2.2.0.0+ Change-Id: Idc38196212df2db49d3f78df9e99dd4ac1684e9b diff --git a/configure.ac b/configure.ac index fc1e776..5b7a89b 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],[5.2.1.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.2.2.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-5-2-1'
New branch 'libreoffice-5-2-1' available with the following commits: commit 3f3b0386ff8ffe2821c0cc122c235b998420b611 Author: Christian Lohmaier Date: Wed Aug 10 12:07:41 2016 +0200 Branch libreoffice-5-2-1 This is 'libreoffice-5-2-1' - the stable branch for the 5.2.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.2.x release, please use the 'libreoffice-5-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I73774938c95bbb11d9bcdd02ae72ddb5563ecff5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-2-1'
New branch 'libreoffice-5-2-1' available with the following commits: commit 7597c7e601d6a0fdc5d20de9022c28d23391c942 Author: Christian Lohmaier Date: Wed Aug 10 12:07:22 2016 +0200 Branch libreoffice-5-2-1 This is 'libreoffice-5-2-1' - the stable branch for the 5.2.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.2.x release, please use the 'libreoffice-5-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ie3689a826fa3400bc0ed91bcc3100f9a09be07e7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-5-2-1'
New branch 'libreoffice-5-2-1' available with the following commits: commit 6eeb237d46b38b846af0735dbe1ffb9b55a8fe8b Author: Christian Lohmaier Date: Wed Aug 10 12:07:22 2016 +0200 Branch libreoffice-5-2-1 This is 'libreoffice-5-2-1' - the stable branch for the 5.2.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.2.x release, please use the 'libreoffice-5-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I5635466eaea41c9cbc667edcca605936d048c6a9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-2-1'
New branch 'libreoffice-5-2-1' available with the following commits: commit d38e720a0741a4b03c58034e412c9ff621ca3d06 Author: Christian Lohmaier Date: Wed Aug 10 12:07:22 2016 +0200 Branch libreoffice-5-2-1 This is 'libreoffice-5-2-1' - the stable branch for the 5.2.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.2.x release, please use the 'libreoffice-5-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia796d562179bd730c3bfdd8018f02f7f8583bec0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - external/libcmis ucb/source
external/libcmis/UnpackedTarball_cmis.mk |1
external/libcmis/libcmis-sharepoint-repository-root.patch | 24 ++
ucb/source/ucp/cmis/cmis_content.cxx |2 -
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 027227f5f7672f30a45b17d4f5d12e66eb36876b
Author: Mike Kaganski
Date: Mon Aug 8 21:29:09 2016 +1000
tdf#101385: don't try to get SharePoint folder outside of allowed range
for a given site.
This patch uses the fact that getFolderByServerRelativeUrl API returns
site's root folder if used with empty path ('').
Hopefully this isn't otherwise context-dependent, so that it doesn't
return other folders in some unknown circumstances.
More correct would be instead to use the site's root path directly,
like '/sites/mysite'. But I don't know a reliable way to filter the
API part from the base URI.
To make use of the corrected SharePoint repository root id, the patch
also redirects all cases where "/" object is queried, to session's
getRootFolder().
libcmis part of the patch will hopefully soon be merged upstream.
Change-Id: I0f3b9930748de3fe4763eb27721739f097b9892d
Reviewed-on: https://gerrit.libreoffice.org/27987
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 1b482aec4e7b6aec86fb20bcda555c4060a80332)
Reviewed-on: https://gerrit.libreoffice.org/28011
Reviewed-by: Christian Lohmaier
diff --git a/external/libcmis/UnpackedTarball_cmis.mk
b/external/libcmis/UnpackedTarball_cmis.mk
index bd66e2e..8fb247f 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/libcmis-libxml2_compatibility.patch \
external/libcmis/libcmis-fix-google-drive.patch \
external/libcmis/libcmis-google-2FA-implementation.patch \
+
external/libcmis/libcmis-sharepoint-repository-root.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/libcmis-sharepoint-repository-root.patch
b/external/libcmis/libcmis-sharepoint-repository-root.patch
new file mode 100644
index 000..f89b134
--- /dev/null
+++ b/external/libcmis/libcmis-sharepoint-repository-root.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+index 780624d..f992689 100644
+--- a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+@@ -35,7 +35,18 @@ SharePointRepository::SharePointRepository( std::string
baseUrl ) :
+ m_description = "SharePoint repository";
+ m_productName = "SharePoint";
+ m_productVersion = "2010/2013";
+-m_rootId = baseUrl + "/getFolderByServerRelativeUrl('/')";
++// getFolderByServerRelativeUrl() API expects path to be
++// *server-relative*, i.e. they must include site path.
++// Given the baseUrl like "https://sp2013/sites/mysite/_api/Web";
++// for a site "mysite" on sharepoint server "sp2013",
++// the site root is '/sites/mysite/', not '/'.
++// Trying to get folder '/' results in "Value does not fall
++// within expected range" error.
++// Preferrable here is to extract the root path from baseUrl,
++// stripping server and api parts. But it can be unreliable
++// if api part (_api/Web) is different for some server.
++// On the other side, just querying empty path '' gives the root folder.
++m_rootId = baseUrl + "/getFolderByServerRelativeUrl('')";
+
+ m_capabilities[ ACL ] = "discover";
+ m_capabilities[ AllVersionsSearchable ] = "true";
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index b097a6f..d82c626 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -522,7 +522,7 @@ namespace cmis
throw libcmis::Exception( "Object not found" );
}
}
-else if ( !m_sObjectPath.isEmpty( ) )
+else if (!(m_sObjectPath.isEmpty() || m_sObjectPath == "/"))
{
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.2' - 10 commits - framework/source package/source sc/source svl/source sw/source vcl/source vcl/unx xmloff/source
framework/source/accelerators/acceleratorconfiguration.cxx |9 +++- framework/source/accelerators/presethandler.cxx| 24 ++--- framework/source/inc/accelerators/presethandler.hxx|3 + framework/source/services/autorecovery.cxx | 13 +++ package/source/manifest/ManifestDefines.hxx|4 +- package/source/manifest/ManifestExport.cxx |4 +- package/source/manifest/ManifestImport.cxx |3 + package/source/manifest/ManifestImport.hxx |1 sc/source/core/data/column4.cxx| 14 +++ sc/source/core/tool/interpr4.cxx | 15 ++-- svl/source/numbers/numfmuno.cxx|2 - sw/source/ui/misc/bookmark.cxx | 12 +++--- sw/source/uibase/inc/bookmark.hxx |1 vcl/source/control/edit.cxx|5 ++ vcl/source/edit/vclmedit.cxx |7 --- vcl/source/window/window2.cxx |2 - vcl/unx/generic/gdi/x11cairotextrender.cxx | 23 xmloff/source/forms/propertyimport.cxx | 11 + 18 files changed, 94 insertions(+), 59 deletions(-) New commits: commit 9e47646c34905a0ac41c12763eb90cfa01ca88a4 Author: anwilli5 Date: Sun Jun 5 23:06:05 2016 -0400 tdf#96607 'Save as' doesn't update global auto-recovery state The auto-recovery service maintains a list of structures (one for each open document) containing information needed to carry out the auto-save functionality. One such piece of information is the location of the backup file, stored in a struct member named 'OldTempURL'. At every auto-save interval, this list is iterated through and a function (implts_saveOneDoc) is called during each iteration to save the current state of the associated document. The algorithm works as follows: 1. A new backup file URL is chosen so as not to conflict with any already existing backup files in the backup directory. This URL is based on the file name and incorporates a number (starting at 0) that is incremented until a name is chosen that doesn't conflict. 2. The document is saved to this new backup file URL 3. The previous backup file (indicated by its structure's 'OldTempURL') is deleted 4. The new backup file URL is stored (in its structure's 'OldTempURL') for the next time the file needs to be saved. Assuming you start with a new Writer doc and then make some changes, when it is time to auto-save, the backup file name 'untitled_0.odt' (excluding path) will be selected, the latest state of the open file will be written to that backup file, and the full URL for the backup file will be saved into the struct 'OldTempURL' member. The next time changes are made and an auto-save occurs, this algorithm will result in the name 'untitled_1.odt' being selected, the file contents saved into this new file, 'untitled_0.odt' being deleted, and the full URL for the new backup file being saved in 'OldTempURL'. The third time through results in 'untitled_0.odt' being selected (since this file doesn't exist on disk), and subsequent iterations of auto-saving cause the backup file name to alternate between the two aforementioned. The problem occurs during a 'Save as' operation. When this happens, the backup file is deleted (which is fine - it was just saved, and the next auto-save will back it up) but 'OldTempURL' is not properly reset (see below for more info.) During the next auto-save, 'untitled_0.odt' will be selected for the new backup file name (since no file exists by this name), and one of two things will happen (based on how many auto-saves have occurred): 1. 'OldTempURL' points to 'untitled_1.odt', and the algorithm above continues to work correctly (at least in that it continues to backup file contents.) 2. 'OldTempURL' points to 'untitled_0.odt', the name chosen for the new backup file. In this case, the document contents will be saved to this file (step 2) but then the file will be deleted (step 3). 'OldTempURL' will maintain this URL from then on out, causing this case to be hit for all future auto-save intervals. So, 50% of the time (30 minutes out of every hour) auto-save will stop backing up file contents on a 'Save as'. The function that handles the 'Save as' case (implts_markDocumentAsSaved) clears 'OldTempURL' and sets other relavent struct members for a local variable copy of the global struct, but doesn't copy them back. :( These changes are effectively lost when the function returns. There
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source
sc/source/core/data/postit.cxx |2 +-
sc/source/core/tool/detfunc.cxx | 16 +---
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 5043795621f25047e166f112821d1f899252f7ce
Author: Caolán McNamara
Date: Tue Aug 9 21:00:59 2016 +0100
Resolves: tdf#101309 crash on deleted SdrObject
when we're not recording undo, then SdrUndoDelObj just deletes
the argument its passed. And this code assumes that it is transferred
to the SdrUndoDelObj and it still exists.
Use the same pattern as ScPostIt::RemoveCaption for this situation
Invalid read of size 8
at 0xB1713B6: SdrObject::GetOrdNum() const (svdobj.cxx:777)
by 0x3C9E029C: ScDetectiveFunc::DeleteArrowsAt(short, int, bool)
(detfunc.cxx:695)
by 0x3C9E1D4C: ScDetectiveFunc::FindSuccLevel(short, int, short, int,
unsigned short, unsigned short) (detfunc.cxx:1118)
by 0x3C9E2405: ScDetectiveFunc::DeleteSucc(short, int) (detfunc.cxx:1207)
by 0x3CF812BA: ScDocFunc::DetectiveRefresh(bool) (docfunc.cxx:480)
by 0x3CFC9FAF: ScDocShell::DoHardRecalc(bool) (docsh4.cxx:1250)
Address 0x50992d50 is 112 bytes inside a block of size 464 free'd
at 0x4C2D22A: operator delete(void*) (vg_replace_malloc.c:576)
by 0xB1D04BC: SdrPathObj::~SdrPathObj() (svdopath.cxx:1681)
by 0xB1701F5: SdrObject::Free(SdrObject*&) (svdobj.cxx:394)
by 0xB258666: SdrUndoObjList::~SdrUndoObjList() (svdundo.cxx:720)
by 0xB258A39: SdrUndoRemoveObj::~SdrUndoRemoveObj() (svdundo.cxx:774)
by 0xB25E29B: SdrUndoDelObj::~SdrUndoDelObj() (svdundo.hxx:298)
by 0xB25E2B7: SdrUndoDelObj::~SdrUndoDelObj() (svdundo.hxx:298)
by 0x3C7E5D0E: ScDrawLayer::AddCalcUndo(SdrUndoAction*)
(drwlayer.cxx:1120)
by 0x3C9E0238: ScDetectiveFunc::DeleteArrowsAt(short, int, bool)
(detfunc.cxx:692)
Change-Id: Idc6d1f8e9ad8b203dac55630f8c100e74d3e017b
(cherry picked from commit d79a4f46926e81a6d0fe353feb3322673c1b509d)
Reviewed-on: https://gerrit.libreoffice.org/28009
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 64f47a5..d872877 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -745,7 +745,7 @@ void ScPostIt::RemoveCaption()
{
pDrawPage->RecalcObjOrdNums();
// create drawing undo action (before removing the object to have
valid draw page in undo action)
-bool bRecording = ( pDrawLayer && pDrawLayer->IsRecording() );
+const bool bRecording = (pDrawLayer && pDrawLayer->IsRecording());
if( bRecording )
pDrawLayer->AddCalcUndo( new SdrUndoDelObj(
*maNoteData.mpCaption ) );
// remove the object from the drawing page, delete if undo is
disabled
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 7e58c7b..740174e 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -688,11 +688,21 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW
nRow, bool bDestPnt )
pObject = aIter.Next();
}
-for (size_t i=1; i<=nDelCount; ++i)
-pModel->AddCalcUndo( new SdrUndoDelObj( *ppObj[nDelCount-i] ) );
+const bool bRecording = pModel->IsRecording();
+
+if (bRecording)
+{
+for (size_t i=1; i<=nDelCount; ++i)
+pModel->AddCalcUndo(new SdrUndoDelObj(*ppObj[nDelCount-i]));
+}
for (size_t i=1; i<=nDelCount; ++i)
-pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
+{
+// remove the object from the drawing page, delete if undo is
disabled
+SdrObject* pObj =
pPage->RemoveObject(ppObj[nDelCount-i]->GetOrdNum());
+if( !bRecording )
+SdrObject::Free( pObj );
+}
ppObj.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - 2 commits - extras/source readlicense_oo/license
extras/source/autocorr/lang/lt/DocumentList.xml| 14 extras/source/autocorr/lang/zh-TW/DocumentList.xml | 108 readlicense_oo/license/CREDITS.fodt| 2724 ++--- 3 files changed, 1501 insertions(+), 1345 deletions(-) New commits: commit 655474f486552c77a07dc3f16c28fe1020851938 Author: Christian Lohmaier Date: Wed Aug 10 11:55:35 2016 +0200 update credits Change-Id: I004192541467afc5d8f31fe4c3c5f466b7b3dd17 (cherry picked from commit b17b4da3a713b935e7eb8cf23978689800d10f7f) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 497903b..8ec686a 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/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.0.4$Linux_X86_64 LibreOffice_project/066b007f5ebcc236395c7d282ba488bca67202652012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 633 + 607 501 41197 21645 @@ -16,9 +16,9 @@ 3676 3471 501 - 633 + 607 41697 - 22276 + 22250 0 0 false @@ -68,7 +68,7 @@ false false true - 5667997 + 5794339 false false false @@ -98,6 +98,7 @@ true true + true false false true @@ -312,24 +313,21 @@ - + - + - + - - - - + - + @@ -393,24 +391,24 @@ - + - + - + - + - + @@ -462,33 +460,36 @@ + + + - + - + - + - + - + - + - + - + - + @@ -770,7 +771,7 @@ - + iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ @@ -1033,14 +1034,13 @@ Credits -1178 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-07-26 22:12:40. +1184 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-08-10 01:48:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1060,10 +1060,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2724 ++-- 1 file changed, 1380 insertions(+), 1344 deletions(-) New commits: commit e19cfef1c0e185f179558ab68b3aec7ecc9b23ed Author: Christian Lohmaier Date: Wed Aug 10 11:55:35 2016 +0200 update credits Change-Id: I004192541467afc5d8f31fe4c3c5f466b7b3dd17 (cherry picked from commit b17b4da3a713b935e7eb8cf23978689800d10f7f) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 497903b..8ec686a 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/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.0.4$Linux_X86_64 LibreOffice_project/066b007f5ebcc236395c7d282ba488bca67202652012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 633 + 607 501 41197 21645 @@ -16,9 +16,9 @@ 3676 3471 501 - 633 + 607 41697 - 22276 + 22250 0 0 false @@ -68,7 +68,7 @@ false false true - 5667997 + 5794339 false false false @@ -98,6 +98,7 @@ true true + true false false true @@ -312,24 +313,21 @@ - + - + - + - - - - + - + @@ -393,24 +391,24 @@ - + - + - + - + - + @@ -462,33 +460,36 @@ + + + - + - + - + - + - + - + - + - + - + @@ -770,7 +771,7 @@ - + iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ @@ -1033,14 +1034,13 @@ Credits -1178 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-07-26 22:12:40. +1184 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-08-10 01:48:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1060,10 +1060,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 19720Joined: 2000-10-10 + Caolán McNamaraCommits: 19816Joi
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2724 ++-- 1 file changed, 1380 insertions(+), 1344 deletions(-) New commits: commit b17b4da3a713b935e7eb8cf23978689800d10f7f Author: Christian Lohmaier Date: Wed Aug 10 11:55:35 2016 +0200 update credits Change-Id: I004192541467afc5d8f31fe4c3c5f466b7b3dd17 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 497903b..8ec686a 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/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.0.4$Linux_X86_64 LibreOffice_project/066b007f5ebcc236395c7d282ba488bca67202652012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 633 + 607 501 41197 21645 @@ -16,9 +16,9 @@ 3676 3471 501 - 633 + 607 41697 - 22276 + 22250 0 0 false @@ -68,7 +68,7 @@ false false true - 5667997 + 5794339 false false false @@ -98,6 +98,7 @@ true true + true false false true @@ -312,24 +313,21 @@ - + - + - + - - - - + - + @@ -393,24 +391,24 @@ - + - + - + - + - + @@ -462,33 +460,36 @@ + + + - + - + - + - + - + - + - + - + - + @@ -770,7 +771,7 @@ - + iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ @@ -1033,14 +1034,13 @@ Credits -1178 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-07-26 22:12:40. +1184 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-08-10 01:48:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1060,10 +1060,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 19720Joined: 2000-10-10 + Caolán McNamaraCommits: 19816Joined: 2000-10-10 - Stephan BergmannCommits: 12455J
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - icon-themes/tango
icon-themes/tango/cmd/sc_trackchangesbar.png |binary icon-themes/tango/cmd/sc_trackchangesbar.xcf.bz2 |binary 2 files changed New commits: commit f79fb5460b79fd40d8877d49c10874a14c306dbe Author: Yousuf Philips Date: Tue Aug 9 13:57:07 2016 +0400 TANGO: Add show track changes bar small icon Change-Id: Ia80da0b1ef394d19073e1f18ee22590010bb0257 Reviewed-on: https://gerrit.libreoffice.org/28002 Tested-by: Jenkins Reviewed-by: Yousuf Philips (cherry picked from commit ae3a78fa5f1a08a9bbfe233a2d6244a4d1fef254) Reviewed-on: https://gerrit.libreoffice.org/28010 Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/tango/cmd/sc_trackchangesbar.png b/icon-themes/tango/cmd/sc_trackchangesbar.png new file mode 100644 index 000..e0e60a1 Binary files /dev/null and b/icon-themes/tango/cmd/sc_trackchangesbar.png differ diff --git a/icon-themes/tango/cmd/sc_trackchangesbar.xcf.bz2 b/icon-themes/tango/cmd/sc_trackchangesbar.xcf.bz2 new file mode 100644 index 000..862454d Binary files /dev/null and b/icon-themes/tango/cmd/sc_trackchangesbar.xcf.bz2 differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/lt/DocumentList.xml| 20 +++ extras/source/autocorr/lang/zh-TW/DocumentList.xml | 109 - 2 files changed, 128 insertions(+), 1 deletion(-) New commits: commit a363ac95bda1a4c3837bcd9dd29670bf0ab1853a Author: Christian Lohmaier Date: Wed Aug 10 01:48:38 2016 +0200 update emoji autocorrect files from po-files Change-Id: Ie8af6c3ee0f655387e12967632f9bd31ace204ff diff --git a/extras/source/autocorr/lang/lt/DocumentList.xml b/extras/source/autocorr/lang/lt/DocumentList.xml index ed3afb8..b9d97d8 100644 --- a/extras/source/autocorr/lang/lt/DocumentList.xml +++ b/extras/source/autocorr/lang/lt/DocumentList.xml @@ -244,6 +244,8 @@ + + @@ -428,6 +430,7 @@ + @@ -456,6 +459,8 @@ + + @@ -516,12 +521,15 @@ + + + @@ -536,6 +544,7 @@ + @@ -585,6 +594,8 @@ + + @@ -624,6 +635,7 @@ + @@ -640,6 +652,9 @@ + + + @@ -647,6 +662,7 @@ + @@ -742,6 +758,8 @@ + + @@ -776,6 +794,7 @@ + @@ -809,6 +828,7 @@ + diff --git a/extras/source/autocorr/lang/zh-TW/DocumentList.xml b/extras/source/autocorr/lang/zh-TW/DocumentList.xml index bf9714d..85ae596 100644 --- a/extras/source/autocorr/lang/zh-TW/DocumentList.xml +++ b/extras/source/autocorr/lang/zh-TW/DocumentList.xml @@ -816,7 +816,6 @@ - @@ -840,6 +839,7 @@ + @@ -856,6 +856,7 @@ + @@ -864,6 +865,8 @@ + + @@ -906,39 +909,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Agnieszka Domanska license statement
Hi Agnieszka, > > Thank you very much for welcome. I hope I will find my way to be useful in > > LibreOffice ;) However I need a bit of help now. Can you point me to Easy > > Hacks for Java Beginners? Wiki page has some issues here or that list is > > empty? > > https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Ski > > ll/Skill_Java If you wouldn't mind hacking on Libreoffice indirectly, I'd have couple of Java entry-level tasks in noa-libre ( https://github.com/LibreOffice/noa-libre ), including (but not limited to) updating code examples, extending its Calc interface, or fixing some small bugs. noa stands for "Nice Office Access" and it is a Java library built around Libreoffice UNO API, one of its most famous users is e.g. gnuaccounting (a free accounting software). It is currently maintained by couple of Libreoffice core developers. I'm one of them and I'll happily help w/ the initial setup and mentor a potential Java easy hacker. Sounds interesting? Let me know ... -- Katarina Behrens Softwareentwicklerin LibreOffice ––– CIB software GmbH Geschäftsstelle Hamburg Flachsland 10 22083 Hamburg ––– T +49 (40) / 28 48 42 -235 F +49 (40) / 28 48 42 -100 katarina.behr...@cib.de www.cib.de ––– Sitz: München Registergericht München, HRB 123286 Geschäftsführer: Dipl.-Ing. Ulrich Brandner ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Agnieszka Domanska license statement
HI Looking forward to see your patches. There are currently not "beginner" easyHack in Java, only the slightly more complicated ones. The reason is that we in general try to reduce the java code. There are a couple of conversion hacks like f.x. https://bugs.documentfoundation.org/show_bug.cgi?id=97362 I hope that can help you get started. rgds jan I. > On 10 Aug 2016, at 09:43, Agnieszka Domańska > wrote: > > Hello Jan, > > Thank you very much for welcome. I hope I will find my way to be useful in > LibreOffice ;) However I need a bit of help now. Can you point me to Easy > Hacks for Java Beginners? Wiki page has some issues here or that list is > empty? > https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill/Skill_Java > > Regards, > Agnieszka > > 2016-08-09 9:35 GMT+01:00 jan iversen : >> WELCOME >> Thanks for your license statement. >> >> I have added you to our wiki: >> https://wiki.documentfoundation.org/Development/Developers >> >> If you want help to get started or have any questions, then please contact >> me. I am here to help you (and others) in getting their first patch >> submitted. >> >> LibreOffice is a very big program and getting it built, setting up gerrit, >> and getting the first patch right can be a bit challenging, therefore do not >> hesitate to email me if you want help. >> >> We have made a step by step guide to help you get started: >> https://wiki.documentfoundation.org/Development/GetInvolved >> >> rgds >> Jan Iversen. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Agnieszka Domanska license statement
Hello Jan, Thank you very much for welcome. I hope I will find my way to be useful in LibreOffice ;) However I need a bit of help now. Can you point me to Easy Hacks for Java Beginners? Wiki page has some issues here or that list is empty? https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill/Skill_Java Regards, Agnieszka 2016-08-09 9:35 GMT+01:00 jan iversen : > WELCOME > Thanks for your license statement. > > I have added you to our wiki: > https://wiki.documentfoundation.org/Development/Developers > > If you want help to get started or have any questions, then please contact > me. I am here to help you (and others) in getting their first patch > submitted. > > LibreOffice is a very big program and getting it built, setting up gerrit, > and getting the first patch right can be a bit challenging, therefore do > not hesitate to email me if you want help. > > We have made a step by step guide to help you get started: > https://wiki.documentfoundation.org/Development/GetInvolved > > rgds > Jan Iversen. > > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/doc.hxx |4 ++
sw/inc/docstyle.hxx|3 +
sw/inc/swundo.hxx |4 +-
sw/inc/tblafmt.hxx |2 +
sw/qa/extras/uiwriter/uiwriter.cxx | 35
sw/source/core/doc/tblafmt.cxx | 16 +
sw/source/core/docnode/ndtbl.cxx | 58 ++
sw/source/core/inc/UndoTable.hxx | 30 +
sw/source/core/undo/undo.hrc |4 +-
sw/source/core/undo/undo.src |8
sw/source/core/undo/untbl.cxx | 63 +
sw/source/uibase/app/docst.cxx | 23 -
sw/source/uibase/app/docstyle.cxx | 49 ++--
13 files changed, 277 insertions(+), 22 deletions(-)
New commits:
commit 0943ee2decb8d5a1a2a5bf3b1c233934a89e9c97
Author: Jakub Trzebiatowski
Date: Tue Aug 2 14:57:17 2016 +0200
GSoC Writer Table Styles; Create by example; fix undo
- Create style by example, tracked by undo;
- Fixed delete style, now is tracked by undo
Change-Id: Ic39b549b0b970b1b15001d527a82fb26e4a630aa
Reviewed-on: https://gerrit.libreoffice.org/27990
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 755c598..cbc3145 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1259,6 +1259,10 @@ public:
/// Return the available table styles.
SwTableAutoFormatTable& GetTableStyles() { return *mpTableStyles.get(); }
const SwTableAutoFormatTable& GetTableStyles() const { return
*mpTableStyles.get(); }
+// Create a new table style. Tracked by Undo.
+SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast =
false);
+// Delete table style named rName. If pAffectedTables is not null, it
contains pointers to affected tables. Tracked by undo.
+std::unique_ptr DelTableStyle(const OUString& rName,
bool bBroadcast = false, std::vector* pAffectedTables = nullptr);
const SwCellStyleTable& GetCellStyles() const { return
*mpCellStyles.get(); }
SwCellStyleTable& GetCellStyles(){ return
*mpCellStyles.get(); }
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index bb43d7d..0e1e959 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
SwFrameFormat* pFrameFormat;
const SwPageDesc* pDesc;
const SwNumRule*pNumRule;
-const SwTableAutoFormat* pTableFormat;
+SwTableAutoFormat* pTableFormat;
const SwBoxAutoFormat* pBoxFormat;
SwDoc& rDoc;
SfxItemSet aCoreSet;
@@ -135,6 +135,7 @@ public:
const SwPageDesc* GetPageDesc();
const SwNumRule*GetNumRule();
voidSetNumRule(const SwNumRule& rRule);
+SwTableAutoFormat* GetTableFormat();
virtual boolIsUsed() const override;
};
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 2617031..9a90d4a 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -150,7 +150,9 @@ enum SwUndoId
// --> #i73249#
UNDO_FLYFRMFMT_TITLE, // 112
UNDO_FLYFRMFMT_DESCRIPTION, // 113
-UNDO_STD_END= UNDO_FLYFRMFMT_DESCRIPTION,
+UNDO_TBLSTYLE_CREATE, // 114
+UNDO_TBLSTYLE_DELETE, // 115
+UNDO_STD_END= UNDO_TBLSTYLE_DELETE,
// UI undo ID's...
UNDO_UI_REPLACE = UNDO_STD_END + 1,
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 92bd534..c403cb0 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -358,6 +358,8 @@ public:
void EraseAutoFormat(size_t i);
void EraseAutoFormat(const OUString& rName);
std::unique_ptr ReleaseAutoFormat(size_t i);
+/// Removes an autoformat. Returns pointer to the removed autoformat or
nullptr.
+std::unique_ptr ReleaseAutoFormat(const OUString&
rName);
/// Find table style with the provided name, return nullptr when not found.
SwTableAutoFormat* FindAutoFormat(const OUString& rName) const;
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e48d67c..40ca4e5 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -62,6 +62,7 @@
#include "UndoManager.hxx"
#include
#include
+#include
#include
#include
@@ -200,6 +201,7 @@ public:
void testTdf99004();
void testTdf84695();
void testTdf84695NormalChar();
+void testTableStyleUndo();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -302,6 +304,7 @@ public:
CPPUNIT_TEST(testTdf99004);
CPPUNIT_TEST(testTdf84695);
CPPUNIT_TEST(testTdf84695NormalChar);
+CPPUNIT_TEST(testTableStyleUndo);
CPPUNIT_TEST_SUITE_END();
private:
@@ -3765,6 +3768,38 @@ void SwUiWriterTest::testTdf84695NormalChar()
CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getStri
[Libreoffice-commits] core.git: external/libcmis ucb/source
external/libcmis/UnpackedTarball_cmis.mk |1
external/libcmis/libcmis-sharepoint-repository-root.patch | 24 ++
ucb/source/ucp/cmis/cmis_content.cxx |2 -
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 1b482aec4e7b6aec86fb20bcda555c4060a80332
Author: Mike Kaganski
Date: Mon Aug 8 21:29:09 2016 +1000
tdf#101385: don't try to get SharePoint folder outside of allowed range
for a given site.
This patch uses the fact that getFolderByServerRelativeUrl API returns
site's root folder if used with empty path ('').
Hopefully this isn't otherwise context-dependent, so that it doesn't
return other folders in some unknown circumstances.
More correct would be instead to use the site's root path directly,
like '/sites/mysite'. But I don't know a reliable way to filter the
API part from the base URI.
To make use of the corrected SharePoint repository root id, the patch
also redirects all cases where "/" object is queried, to session's
getRootFolder().
libcmis part of the patch will hopefully soon be merged upstream.
Change-Id: I0f3b9930748de3fe4763eb27721739f097b9892d
Reviewed-on: https://gerrit.libreoffice.org/27987
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/external/libcmis/UnpackedTarball_cmis.mk
b/external/libcmis/UnpackedTarball_cmis.mk
index bd66e2e..8fb247f 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/libcmis-libxml2_compatibility.patch \
external/libcmis/libcmis-fix-google-drive.patch \
external/libcmis/libcmis-google-2FA-implementation.patch \
+
external/libcmis/libcmis-sharepoint-repository-root.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/libcmis-sharepoint-repository-root.patch
b/external/libcmis/libcmis-sharepoint-repository-root.patch
new file mode 100644
index 000..f89b134
--- /dev/null
+++ b/external/libcmis/libcmis-sharepoint-repository-root.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+index 780624d..f992689 100644
+--- a/src/libcmis/sharepoint-repository.cxx
b/src/libcmis/sharepoint-repository.cxx
+@@ -35,7 +35,18 @@ SharePointRepository::SharePointRepository( std::string
baseUrl ) :
+ m_description = "SharePoint repository";
+ m_productName = "SharePoint";
+ m_productVersion = "2010/2013";
+-m_rootId = baseUrl + "/getFolderByServerRelativeUrl('/')";
++// getFolderByServerRelativeUrl() API expects path to be
++// *server-relative*, i.e. they must include site path.
++// Given the baseUrl like "https://sp2013/sites/mysite/_api/Web";
++// for a site "mysite" on sharepoint server "sp2013",
++// the site root is '/sites/mysite/', not '/'.
++// Trying to get folder '/' results in "Value does not fall
++// within expected range" error.
++// Preferrable here is to extract the root path from baseUrl,
++// stripping server and api parts. But it can be unreliable
++// if api part (_api/Web) is different for some server.
++// On the other side, just querying empty path '' gives the root folder.
++m_rootId = baseUrl + "/getFolderByServerRelativeUrl('')";
+
+ m_capabilities[ ACL ] = "discover";
+ m_capabilities[ AllVersionsSearchable ] = "true";
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 5dd9951..56853fd 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -522,7 +522,7 @@ namespace cmis
throw libcmis::Exception( "Object not found" );
}
}
-else if ( !m_sObjectPath.isEmpty( ) )
+else if (!(m_sObjectPath.isEmpty() || m_sObjectPath == "/"))
{
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/personalization.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ecc43f06a94587e8808c7edf73eae23e5243dc85
Author: Muhammet Kara
Date: Mon Aug 8 14:00:28 2016 +0300
Update api URL for mozilla personas
Currently, entering a search term or clicking on
the category buttons on the Firefox Theme selection
dialog of Personalization option doesn't work at all.
With this url, it returns some results of firefox personas
which are applicable to LibreOffice.
Change-Id: Ie4da58cd987a1834dee969c09367229d3b69a47a
Reviewed-on: https://gerrit.libreoffice.org/27986
Tested-by: Jenkins
Reviewed-by: jan iversen
Tested-by: jan iversen
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index b570c0b..559eb85 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -155,7 +155,7 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas,
Button*, pButton, void )
return;
// 15 results so that invalid and duplicate search results whose names
can't be retrieved can be skipped
-OUString rSearchURL =
"https://services.addons.allizom.org/en-US/firefox/api/1.5/search/"; +
searchTerm + "/9/15";
+OUString rSearchURL =
"https://services.addons.mozilla.org/en-US/firefox/api/1.5/search/"; +
searchTerm + "/9/15";
if ( searchTerm.startsWith( "https://addons.mozilla.org/"; ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3f2165b31a76a84996487bc03911568c031661f1
Author: Miklos Vajna
Date: Wed Aug 10 09:23:16 2016 +0200
LOOLKit: avoid multiplication at int precision
When the result is already stored as long.
Change-Id: If5ef932c08c212432b5aca2a2300908e521f4ce8
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 74c32c9..c59aade 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -673,8 +673,8 @@ public:
size_t tileIndex = 0;
for (Util::Rectangle& tileRect : tileRecs)
{
-const int positionX = (tileRect.getLeft() - renderArea.getLeft())
/ tileCombined.getTileWidth();
-const int positionY = (tileRect.getTop() - renderArea.getTop()) /
tileCombined.getTileHeight();
+const size_t positionX = (tileRect.getLeft() -
renderArea.getLeft()) / tileCombined.getTileWidth();
+const size_t positionY = (tileRect.getTop() - renderArea.getTop())
/ tileCombined.getTileHeight();
const auto oldSize = output.size();
const auto pixelWidth = tileCombined.getWidth();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
