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

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |1 +
 external/firebird/firebird-macosx.patch.1 |8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6040dfb5ecf9945ba9c47a87a92506ad8bc88f0b
Author: Lionel Elie Mamane 
Date:   Tue Nov 22 08:55:38 2016 +0100

tdf#101789 work around DYLD_LIBRARY_PATH limitations on newer MacOS X

Change-Id: I6e3cbff1ec7a75e896ba5bafb9d1fbccc3bc8909

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 3467cc0..f76606d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
+   && export LIBREOFFICE_ICU_LIB="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index b9a685b..8961c42 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -110,11 +110,15 @@
  #elif defined(HPUX)
  const char* const inTemplate = "libicui18n.sl.%s";
  const char* const ucTemplate = "libicuuc.sl.%s";
-@@ -353,6 +353,12 @@
+@@ -353,6 +353,16 @@
s.printf("%d%d", majorVersion, minorVersion);
  
filename.printf(templateName, s.c_str());
-+  const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++  const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++  if(envpath == nullptr)
++  {
++  envpath = getenv("LIBREOFFICE_ICU_LIB");
++  }
 +  if(envpath != nullptr)
 +  {
 +  s = filename.c_str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stanislav Horacek]

 cui/uiconfig/ui/colorpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a306168816755058f246dcffebce5c397ac40e98
Author: Stanislav Horacek 
Date:   Thu Nov 17 18:37:21 2016 +0100

remove redundant space in string

Change-Id: I7fbfe0ac11ef5dbe23b0fa3864c647682d1a73a7
Reviewed-on: https://gerrit.libreoffice.org/30938
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index c75cdeb..e0810b8 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -57,7 +57,7 @@
 center
 0
 0
-Palette 
:
+Palette:
 True
 paletteselector
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tip for debugging CppunitTest_sd_tiledrendering failure

[Khaled Hosny]

On Mon, Nov 21, 2016 at 11:51:09PM -0500, Ashod Nakashian wrote:
> Hi Khaled,
> 
> On Mon, Nov 21, 2016 at 7:19 PM, Khaled Hosny  wrote:
> 
> > I’m having a failure on Linux in this test, I can reproduce it locally
> > but I have no idea how to debug it:
> > http://ci.libreoffice.org/job/lo_gerrit/2956/Config=linux_
> > gcc_release_64/console
> >
> > (for https://gerrit.libreoffice.org/#/c/31053/).
> >
> > The test apparently checks if a mouse event at a certain position does
> > something, and since I’m changing how line spacing is calculated it
> > might have caused some vertical shift. But I don’t understand the code
> > of the test that much and don’t know where to start, any tips?
> >
> >
> It's a hit-test. Basically, it simulates a mouse click (by invoking the
> relevant API) and validates that the cursor position is updated as a result.
> 
> I guess you need to rework the test to take into account the new spacing so
> the mouse would end up in the text-edit control. Line 355 looks relevant.

Thanks for the pointer. Incrementing the Y position by at least 1 fixes
the test, but I’m still not sure what the position is supposed to be in
the first place and why line spacing would matter.

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

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

[Noel Grandin]

 include/svx/svdobj.hxx   |  323 +++
 svx/source/svdraw/svdobj.cxx |   10 -
 2 files changed, 150 insertions(+), 183 deletions(-)

New commits:
commit b39dfb4703ba5225da3cdc2911461e4cae83aa8e
Author: Noel Grandin 
Date:   Mon Nov 21 22:00:56 2016 +0200

re-organise SdrObject class definition

it had public/private/protected sections all over the place.
Also use loplugin can-be-private analysis to make some fields and
methods private.

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

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ace6f53..ec29c00 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -276,110 +276,24 @@ public:
 class SvxShape;
 class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< 
SdrObject >
 {
-private:
-struct Impl;
-std::unique_ptr mpImpl;
-
-SdrObject( const SdrObject& ) = delete;
-
-public:
-void AddObjectUser(sdr::ObjectUser& rNewUser);
-void RemoveObjectUser(sdr::ObjectUser& rOldUser);
-
-// BaseProperties section
-private:
-sdr::properties::BaseProperties*
mpProperties;
-protected:
-virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
-public:
-virtual sdr::properties::BaseProperties& GetProperties() const;
-
-// #110094# DrawContact section
-private:
-sdr::contact::ViewContact*  
mpViewContact;
-protected:
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
-public:
-sdr::contact::ViewContact& GetViewContact() const;
-
-// DrawContact support: Methods for handling Object changes
-void ActionChanged() const;
-
-private:
 friend classSdrObjListIter;
 friend classSdrVirtObj;
 friend classSdrRectObj;
 friend classSdrDelayBroadcastObjectChange;
 
-protected:
-Rectangle   aOutRect; // surrounding rectangle for 
Paint (incl. LineWdt, ...)
-Point   aAnchor;  // anchor position (Writer)
-Point   aGridOffset;  // hack (Calc)
-SdrObjList* pObjList; // list that includes this object
-SdrPage*pPage;
-SdrModel*   pModel;
-SdrObjUserCall* pUserCall;
-SdrObjPlusData* pPlusData;// Broadcaster, UserData, 
connectors, ... (this is the Bitsack)
-
-sal_uInt32  nOrdNum;  // order number of the object in 
the list
-
-SfxGrabBagItem* pGrabBagItem; // holds the GrabBagItem property
-
-
-// Position in the navigation order. SAL_MAX_UINT32 when not used.
-sal_uInt32  mnNavigationPosition;
-SdrLayerID  mnLayerID;
-
-// object is only pointing to another one
-boolbVirtObj : 1;
-boolbSnapRectDirty : 1;
-boolbInserted : 1;  // only if set to true, there 
are RepaintBroadcast & SetModify
-
-// the following flags will be streamed
-boolbMovProt : 1;   // if true, the position is 
protected
-boolbSizProt : 1;   // if true, the size is 
protected
-boolbNoPrint : 1;   // if true, the object is not 
printed.
-boolmbVisible : 1;  // if false, the object is not 
visible on screen (but maybe on printer, depending on bNoprint
-
-// If bEmptyPresObj is true, it is a presentation object that has no 
content yet.
-// The flag's default value is false.
-// The management is done by the application.
-// Neither assign operator nor cloning copies the flag!
-// The flag is persistent.
-boolbEmptyPresObj : 1; // empty presentation 
object (Draw)
-
-// if true, object is invisible as object of the MasterPage
-boolbNotVisibleAsMaster : 1;
-
-// if true, the object is closed, i.e. no line, arc...
-boolbClosedObj : 1;
-
-boolbIsEdge : 1;
-boolbIs3DObj : 1;
-boolbMarkProt : 1;  // marking forbidden, 
persistent
-boolbIsUnoObj : 1;
-boolbNotMasterCachable : 1;
-
-// #i25616#
-boolmbLineIsOutsideGeometry : 1;
+public:
+SdrObject();
 
-// #i25616#
-boolmbSupportTextIndentingOnLineWidthChange : 1;
+void AddObjectUser(sdr::ObjectUser& rNewUser);
+void RemoveObjectUser(sdr::ObjectUser& rOldUser);
 
-private:
-boolmbDelayBroadcastObjectChange : 1

[Libreoffice-commits] core.git: compilerplugins/clang

[Noel Grandin]

 compilerplugins/clang/unusedmethods.cxx |   34 +++-
 compilerplugins/clang/unusedmethods.py  |7 ++
 2 files changed, 32 insertions(+), 9 deletions(-)

New commits:
commit 6f9cdf0814c8364ee675f8c04bc7fa2e51f8
Author: Noel Grandin 
Date:   Mon Nov 21 15:36:08 2016 +0200

can-be-private analysis needs to ignore virtual methods

Change-Id: I1e2f28ed550ff9751912f70e3eec511ddc5b75cf

diff --git a/compilerplugins/clang/unusedmethods.cxx 
b/compilerplugins/clang/unusedmethods.cxx
index 98f19ac..6a2d8d2 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -54,6 +54,7 @@ struct MyFuncInfo
 std::string returnType;
 std::string nameAndParams;
 std::string sourceLocation;
+std::string virtualness;
 
 };
 bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
@@ -88,7 +89,8 @@ public:
 
 std::string output;
 for (const MyFuncInfo & s : definitionSet)
-output += "definition:\t" + s.access + "\t" + s.returnType + "\t" 
+ s.nameAndParams + "\t" + s.sourceLocation + "\n";
+output += "definition:\t" + s.access + "\t" + s.returnType + "\t" 
+ s.nameAndParams
+  + "\t" + s.sourceLocation + "\t" + s.virtualness + "\n";
 // for the "unused method" analysis
 for (const MyFuncInfo & s : callSet)
 output += "call:\t" + s.returnType + "\t" + s.nameAndParams + "\n";
@@ -144,10 +146,12 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* 
functionDecl)
 aInfo.returnType = "";
 }
 
-if (isa(functionDecl)) {
-const CXXRecordDecl* recordDecl = 
dyn_cast(functionDecl)->getParent();
+if (const CXXMethodDecl* methodDecl = 
dyn_cast(functionDecl)) {
+const CXXRecordDecl* recordDecl = methodDecl->getParent();
 aInfo.nameAndParams += recordDecl->getQualifiedNameAsString();
 aInfo.nameAndParams += "::";
+if (methodDecl->isVirtual())
+aInfo.virtualness = "virtual";
 }
 aInfo.nameAndParams += functionDecl->getNameAsString() + "(";
 bool bFirst = true;
@@ -230,12 +234,12 @@ gotfunc:
 
 // Now do the checks necessary for the "can be private" analysis
 CXXMethodDecl* calleeMethodDecl = 
dyn_cast(calleeFunctionDecl);
-if (calleeMethodDecl && calleeMethodDecl->getAccess() == AS_public)
+if (calleeMethodDecl && calleeMethodDecl->getAccess() != AS_private)
 {
-const FunctionDecl* parentFunction = parentFunctionDecl(expr);
-if (parentFunction && parentFunction != calleeFunctionDecl) {
-if (!ignoreLocation(parentFunction)) {
-calledFromOutsideSet.insert(niceName(parentFunction));
+const FunctionDecl* parentFunctionOfCallSite = 
parentFunctionDecl(expr);
+if (parentFunctionOfCallSite != calleeFunctionDecl) {
+if (!parentFunctionOfCallSite || 
!ignoreLocation(parentFunctionOfCallSite)) {
+calledFromOutsideSet.insert(niceName(calleeFunctionDecl));
 }
 }
 }
@@ -316,7 +320,6 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* 
functionDecl )
 return true;
 }
 
-// this catches places that take the address of a method
 bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
 {
 const FunctionDecl* functionDecl = 
dyn_cast(declRefExpr->getDecl());
@@ -325,6 +328,19 @@ bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* 
declRefExpr )
 }
 logCallToRootMethods(functionDecl->getCanonicalDecl(), callSet);
 logCallToRootMethods(functionDecl->getCanonicalDecl(), usedReturnSet);
+
+// Now do the checks necessary for the "can be private" analysis
+const CXXMethodDecl* methodDecl = dyn_cast(functionDecl);
+if (methodDecl && methodDecl->getAccess() != AS_private)
+{
+const FunctionDecl* parentFunctionOfCallSite = 
parentFunctionDecl(declRefExpr);
+if (parentFunctionOfCallSite != functionDecl) {
+if (!parentFunctionOfCallSite || 
!ignoreLocation(parentFunctionOfCallSite)) {
+calledFromOutsideSet.insert(niceName(functionDecl));
+}
+}
+}
+
 return true;
 }
 
diff --git a/compilerplugins/clang/unusedmethods.py 
b/compilerplugins/clang/unusedmethods.py
index bf05c2f..53cc934 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -17,6 +17,7 @@ callSet = set() # set of tuple(return_type, name_and_params)
 # for the "method can be private" analysis
 publicDefinitionSet = set() # set of tuple(return_type, name_and_params)
 calledFromOutsideSet = set() # set of tuple(return_type, name_and_params)
+virtualSet = set() # set of tuple(return_type, name_and_params)
 
 # for the "unused return types" analysis
 usedReturnSet = set() # set of tuple(return_type, name_and_params)
@@ -114,11 +115,15 @@ with io.open("loplugin.unusedmethods.log", "rb", 
buffering=1024*1024) as txt:
 

Re: Tip for debugging CppunitTest_sd_tiledrendering failure

[Ashod Nakashian]

Hi Khaled,

On Mon, Nov 21, 2016 at 7:19 PM, Khaled Hosny  wrote:

> I’m having a failure on Linux in this test, I can reproduce it locally
> but I have no idea how to debug it:
> http://ci.libreoffice.org/job/lo_gerrit/2956/Config=linux_
> gcc_release_64/console
>
> (for https://gerrit.libreoffice.org/#/c/31053/).
>
> The test apparently checks if a mouse event at a certain position does
> something, and since I’m changing how line spacing is calculated it
> might have caused some vertical shift. But I don’t understand the code
> of the test that much and don’t know where to start, any tips?
>
>
It's a hit-test. Basically, it simulates a mouse click (by invoking the
relevant API) and validates that the cursor position is updated as a result.

I guess you need to rework the test to take into account the new spacing so
the mouse would end up in the text-edit control. Line 355 looks relevant.

>From 'git blame' Miklos is the author (CC-ed).



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

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

[Kohei Yoshida]

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

New commits:
commit bf8f90bf3f3db2128c4f61ed5a795166d42cd79a
Author: Kohei Yoshida 
Date:   Mon Nov 21 22:21:27 2016 -0500

Remove excessive parenthesis.

Ugly.

Change-Id: Ifdb9638e998b83c7aeaf9908f9584ff69d56d7b2

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index d73c9bd..7dce852 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2091,7 +2091,7 @@ void ScTabView::KillEditView( bool bNoPaint )
 }
 
 // #108931#; notify accessibility before all things happen
-if ((bNotifyAcc) && (aViewData.GetViewShell()->HasAccessibilityObjects()))
+if (bNotifyAcc && aViewData.GetViewShell()->HasAccessibilityObjects())
 
aViewData.GetViewShell()->BroadcastAccessibility(SfxHint(SC_HINT_ACC_LEAVEEDITMODE));
 
 aViewData.ResetEditView();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/src/control/Control.CharacterMap.js |   42 +-
 1 file changed, 28 insertions(+), 14 deletions(-)

New commits:
commit 1c1ecf20f64561ead3f10a7b36da1309d9cf5eaa
Author: Henry Castro 
Date:   Mon Nov 21 22:43:21 2016 -0400

loleaflet: add double click to insert the symbol

diff --git a/loleaflet/src/control/Control.CharacterMap.js 
b/loleaflet/src/control/Control.CharacterMap.js
index 52089e5..58f15e8 100644
--- a/loleaflet/src/control/Control.CharacterMap.js
+++ b/loleaflet/src/control/Control.CharacterMap.js
@@ -289,6 +289,7 @@ L.Control.CharacterMap = L.Control.extend({
td.innerHTML = '&#x' + start.toString(16);
td.data = start;
L.DomEvent.on(td, 'click', this._onSymbolClick, this);
+   L.DomEvent.on(td, 'dblclick', this._onSymbolDblClick, 
this);
start++;
it++;
}
@@ -425,20 +426,8 @@ L.Control.CharacterMap = L.Control.extend({
},
 
_onInsertClick: function (e) {
-   if (this._hexa.data) {
-   var command = {
-   Symbols: {
-   type: 'string',
-   value: 
String.fromCharCode(this._hexa.data)
-   },
-   FontName: {
-   type: 'string',
-   value: 
this._fontNames.options[this._fontNames.selectedIndex].value
-   }
-   };
-   this._map.sendUnoCommand('.uno:InsertSymbol', command);
-   this._onCloseClick(e);
-   }
+   this._sendSymbol();
+   this._onCloseClick(e);
},
 
_onRenderFontPreview: function (e) {
@@ -454,6 +443,31 @@ L.Control.CharacterMap = L.Control.extend({
' char=' + String.fromCharCode(this._hexa.data));
},
 
+   _onSymbolDblClick: function (e) {
+   var target = e.target || e.srcElement;
+   this._hexa.data = target.data;
+   this._sendSymbol();
+   setTimeout(L.bind(function () {
+   this._onCloseClick();
+   }, this), 0);
+   },
+
+   _sendSymbol: function () {
+   if (this._hexa.data) {
+   var command = {
+   Symbols: {
+   type: 'string',
+   value: 
String.fromCharCode(this._hexa.data)
+   },
+   FontName: {
+   type: 'string',
+   value: 
this._fontNames.options[this._fontNames.selectedIndex].value
+   }
+   };
+   this._map.sendUnoCommand('.uno:InsertSymbol', command);
+   }
+   },
+
_onUnicodeSubsetChange: function (e) {

this.fillCharacters(this._unicodeSubset.options[this._unicodeSubset.selectedIndex].tag);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/src/control/Control.CharacterMap.js |  584 +-
 loleaflet/src/layer/tile/TileLayer.js |5 
 2 files changed, 310 insertions(+), 279 deletions(-)

New commits:
commit 5e143c813d954dd1e2146bdb89148817c264d43e
Author: Henry Castro 
Date:   Sun Nov 20 19:34:37 2016 -0400

loleaflet: process command values .uno:FontSubset

diff --git a/loleaflet/src/control/Control.CharacterMap.js 
b/loleaflet/src/control/Control.CharacterMap.js
index f11a951..52089e5 100644
--- a/loleaflet/src/control/Control.CharacterMap.js
+++ b/loleaflet/src/control/Control.CharacterMap.js
@@ -8,271 +8,273 @@ L.Control.CharacterMap = L.Control.extend({
},
 
unicodeBlocks : [
-   { innerHTML: _('None'), start: 
0x, end: 0x }, /*UBLOCK_NO_BLOCK=0*/
-   { innerHTML: _('Basic Latin'),  start: 
0x0021, end: 0x007F }, /*UBLOCK_BASIC_LATIN=1*/
-   { innerHTML: _('Latin-1'),  start: 
0x0080, end: 0x00FF }, /*UBLOCK_LATIN_1_SUPPLEMENT=2*/
-   { innerHTML: _('Latin Extended-A'), start: 
0x0100, end: 0x017F }, /*UBLOCK_LATIN_EXTENDED_A=3*/
-   { innerHTML: _('Latin Extended-B'), start: 
0x0180, end: 0x024F }, /*UBLOCK_LATIN_EXTENDED_B=4*/
-   { innerHTML: _('IPA Extensions'),   start: 
0x0250, end: 0x02AF }, /*UBLOCK_IPA_EXTENSIONS=5*/
-   { innerHTML: _('Spacing Modifier Letters'), start: 
0x02B0, end: 0x02FF }, /*UBLOCK_SPACING_MODIFIER_LETTERS=6*/
-   { innerHTML: _('Combining Diacritical Marks'),  start: 
0x0300, end: 0x036F }, /*UBLOCK_COMBINING_DIACRITICAL_MARKS=7*/
-   { innerHTML: _('Basic Greek'),  start: 
0x0370, end: 0x03FF }, /*UBLOCK_GREEK=8*/
-   { innerHTML: _('Cyrillic'), start: 
0x0400, end: 0x04FF }, /*UBLOCK_CYRILLIC=9*/
-   { innerHTML: _('Armenian'), start: 
0x0530, end: 0x058F }, /*UBLOCK_ARMENIAN=10*/
-   { innerHTML: _('Basic Hebrew'), start: 
0x0590, end: 0x05FF }, /*UBLOCK_HEBREW=11*/
-   { innerHTML: _('Basic Arabic'), start: 
0x0600, end: 0x06FF }, /*UBLOCK_ARABIC=12*/
-   { innerHTML: _('Syriac'),   start: 
0x0700, end: 0x074F }, /*UBLOCK_SYRIAC=13*/
-   { innerHTML: _('Thaana'),   start: 
0x0780, end: 0x07BF }, /*UBLOCK_THAANA =14*/
-   { innerHTML: _('Devanagari'),   start: 
0x0900, end: 0x097F }, /*UBLOCK_DEVANAGARI=15*/
-   { innerHTML: _('Bengali'),  start: 
0x0980, end: 0x09FF }, /*UBLOCK_BENGALI=16*/
-   { innerHTML: _('Gurmukhi'), start: 
0x0A00, end: 0x0A7F }, /*UBLOCK_GURMUKHI=17*/
-   { innerHTML: _('Gujarati'), start: 
0x0A80, end: 0x0AFF }, /*UBLOCK_GUJARATI=18*/
-   { innerHTML: _('Odia'), start: 
0x0B00, end: 0x0B7F }, /*UBLOCK_ORIYA=19*/
-   { innerHTML: _('Tamil'),start: 
0x0B80, end: 0x0BFF }, /*UBLOCK_TAMIL=20*/
-   { innerHTML: _('Telugu'),   start: 
0x0C00, end: 0x0C7F }, /*UBLOCK_TELUGU=21*/
-   { innerHTML: _('Kannada'),  start: 
0x0C80, end: 0x0CFF }, /*UBLOCK_KANNADA=22*/
-   { innerHTML: _('Malayalam'),start: 
0x0D00, end: 0x0D7F }, /*UBLOCK_MALAYALAM=23*/
-   { innerHTML: _('Sinhala'),  start: 
0x0D80, end: 0x0DFF }, /*UBLOCK_SINHALA=24*/
-   { innerHTML: _('Thai'), start: 
0x0E00, end: 0x0E7F }, /*UBLOCK_THAI=25*/
-   { innerHTML: _('Lao'),  start: 
0x0E80, end: 0x0EFF }, /*UBLOCK_LAO=26*/
-   { innerHTML: _('Tibetan'),  start: 
0x0F00, end: 0x0FFF }, /*UBLOCK_TIBETAN=27*/
-   { innerHTML: _('Myanmar'),  start: 
0x1000, end: 0x109F }, /*UBLOCK_MYANMAR=28*/
-   { innerHTML: _('Basic Georgian'),   start: 
0x10A0, end: 0x10FF }, /*UBLOCK_GEORGIAN=29*/
-   { innerHTML: _('Hangul Jamo'),  start: 
0x1100, end: 0x11FF }, /*UBLOCK_HANGUL_JAMO=30*/
-   { innerHTML: _('Ethiopic'), start: 
0x1200, end: 0x137F }, /*UBLOCK_ETHIOPIC=31*/
-   { innerHTML: _('Cherokee'), start: 
0x13A0, end: 0x13FF }, /*UBLOCK_CHEROKEE=32*/
-   { innerHTML: _('Canadian Aboriginal Syllables'),start: 
0x1400, end: 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/Library_sofficeapp.mk desktop/qa desktop/source

[Henry Castro]

 desktop/Library_sofficeapp.mk   |8 +++
 desktop/qa/desktop_lib/test_desktop_lib.cxx |   27 
 desktop/source/lib/init.cxx |   59 
 3 files changed, 93 insertions(+), 1 deletion(-)

New commits:
commit 714c8772de4255108aa9a0739a37ad422522ff7e
Author: Henry Castro 
Date:   Sun Nov 20 19:37:25 2016 -0400

lok: add command values .uno:FontSubset

Conflicts:
desktop/Library_sofficeapp.mk

Reviewed-on: https://gerrit.libreoffice.org/31033
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

Conflicts:
desktop/CppunitTest_desktop_app.mk
desktop/Library_sofficeapp.mk

Change-Id: Id36a98c32f0eb5e88e4e9a714e260a71d7465c05

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 4b77bb3..a59ca02 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -23,7 +23,12 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 ) \
 ))
 
-$(eval $(call gb_Library_use_external,sofficeapp,boost_headers))
+$(eval $(call gb_Library_use_externals,sofficeapp, \
+boost_headers \
+icu_headers \
+icui18n \
+icuuc \
+))
 
 $(eval $(call gb_Library_use_custom_headers,sofficeapp,\
officecfg/registry \
@@ -54,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 sb \
 sfx \
 svl \
+svx \
 svxcore \
 svt \
 tk \
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 03f3262..d38a6a0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -103,6 +104,7 @@ public:
 void testRedlineCalc();
 void testPaintPartTile();
 void testWriterCommentInsertCursor();
+void testGetFontSubset();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
@@ -135,6 +137,7 @@ public:
 CPPUNIT_TEST(testRedlineCalc);
 CPPUNIT_TEST(testPaintPartTile);
 CPPUNIT_TEST(testWriterCommentInsertCursor);
+CPPUNIT_TEST(testGetFontSubset);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -1389,6 +1392,30 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void DesktopLOKTest::testGetFontSubset()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+OUString aFontName = rtl::Uri::encode(
+OUString("Liberation Sans"),
+rtl_UriCharClassRelSegment,
+rtl_UriEncodeKeepEscapes,
+RTL_TEXTENCODING_UTF8
+);
+OUString aUnoFontSubset(".uno:FontSubset&name=");
+OString aCommand = OUStringToOString(aUnoFontSubset + aFontName, 
RTL_TEXTENCODING_UTF8);
+boost::property_tree::ptree aTree;
+char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
aCommand.getStr());
+std::stringstream aStream(pJSON);
+boost::property_tree::read_json(aStream, aTree);
+CPPUNIT_ASSERT( aTree.size() > 0 );
+CPPUNIT_ASSERT( aTree.get_child("commandName").get_value() == 
".uno:FontSubset" );
+boost::property_tree::ptree aValues = aTree.get_child("commandValues");
+CPPUNIT_ASSERT( aValues.size() > 0 );
+free(pJSON);
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3155ef0..bc724a6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -77,6 +78,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2056,6 +2058,58 @@ static char* getFonts (const char* pCommand)
 return pJson;
 }
 
+static char* getFontSubset (const OString& aFontName)
+{
+OUString aFoundFont(::rtl::Uri::decode(OStringToOUString(aFontName, 
RTL_TEXTENCODING_UTF8), rtl_UriDecodeStrict, RTL_TEXTENCODING_UTF8));
+SfxObjectShell* pDocSh = SfxObjectShell::Current();
+const SvxFontListItem* pFonts = static_cast(
+pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
+const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
+
+boost::property_tree::ptree aTree;
+aTree.put("commandName", ".uno:FontSubset");
+boost::property_tree::ptree aValues;
+
+if ( pList && !aFoundFont.isEmpty() )
+{
+sal_uInt16 nFontCount = pList->GetFontNameCount();
+sal_uInt16 nItFont = 0;
+for (; nItFont < nFontCount; ++nItFont)
+{
+if (aFoundFont.equals(pList->GetFontName(nItFont).GetFamilyName()))
+{
+break;
+}
+}
+
+if ( nItFont < nFontCount )
+{
+FontCharMapPtr pFontCharMap;
+  

[Libreoffice-commits] core.git: desktop/CppunitTest_desktop_app.mk desktop/Library_sofficeapp.mk desktop/qa desktop/source

[Henry Castro]

 desktop/CppunitTest_desktop_app.mk  |4 +
 desktop/Library_sofficeapp.mk   |4 +
 desktop/qa/desktop_lib/test_desktop_lib.cxx |   27 
 desktop/source/lib/init.cxx |   60 
 4 files changed, 95 insertions(+)

New commits:
commit 3aac26671d9a14681dd505d86b58cd6e157434a4
Author: Henry Castro 
Date:   Sun Nov 20 19:37:25 2016 -0400

lok: add command values .uno:FontSubset

Conflicts:
desktop/Library_sofficeapp.mk

Change-Id: Id36a98c32f0eb5e88e4e9a714e260a71d7465c05
Reviewed-on: https://gerrit.libreoffice.org/31033
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/CppunitTest_desktop_app.mk 
b/desktop/CppunitTest_desktop_app.mk
index aa5bf0c..1b1c361 100644
--- a/desktop/CppunitTest_desktop_app.mk
+++ b/desktop/CppunitTest_desktop_app.mk
@@ -16,6 +16,9 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,desktop_app, \
 $(eval $(call gb_CppunitTest_use_externals,desktop_app, \
$(if $(ENABLE_BREAKPAD),breakpad) \
 dbus \
+icu_headers \
+icui18n \
+icuuc \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \
@@ -32,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \
 sb \
 sfx \
 svl \
+svx \
 svxcore \
 svt \
 tk \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 2a3f142..8164260 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -28,6 +28,9 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \
$(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
 boost_headers \
 dbus \
+icu_headers \
+icui18n \
+icuuc \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,sofficeapp,\
@@ -61,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 sb \
 sfx \
 svl \
+svx \
 svxcore \
 svt \
 tk \
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 11c8db4..7200967 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -103,6 +104,7 @@ public:
 void testRedlineCalc();
 void testPaintPartTile();
 void testWriterCommentInsertCursor();
+void testGetFontSubset();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
@@ -135,6 +137,7 @@ public:
 CPPUNIT_TEST(testRedlineCalc);
 CPPUNIT_TEST(testPaintPartTile);
 CPPUNIT_TEST(testWriterCommentInsertCursor);
+CPPUNIT_TEST(testGetFontSubset);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -1623,6 +1626,30 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void DesktopLOKTest::testGetFontSubset()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+OUString aFontName = rtl::Uri::encode(
+OUString("Liberation Sans"),
+rtl_UriCharClassRelSegment,
+rtl_UriEncodeKeepEscapes,
+RTL_TEXTENCODING_UTF8
+);
+OUString aUnoFontSubset(".uno:FontSubset&name=");
+OString aCommand = OUStringToOString(aUnoFontSubset + aFontName, 
RTL_TEXTENCODING_UTF8);
+boost::property_tree::ptree aTree;
+char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
aCommand.getStr());
+std::stringstream aStream(pJSON);
+boost::property_tree::read_json(aStream, aTree);
+CPPUNIT_ASSERT( aTree.size() > 0 );
+CPPUNIT_ASSERT( aTree.get_child("commandName").get_value() == 
".uno:FontSubset" );
+boost::property_tree::ptree aValues = aTree.get_child("commandValues");
+CPPUNIT_ASSERT( aValues.size() > 0 );
+free(pJSON);
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ea543ed..9df6471 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -65,15 +65,18 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2049,6 +2052,58 @@ static char* getFonts (const char* pCommand)
 return pJson;
 }
 
+static char* getFontSubset (const OString& aFontName)
+{
+OUString aFoundFont(::rtl::Uri::decode(OStringToOUString(aFontName, 
RTL_TEXTENCODING_UTF8), rtl_UriDecodeStrict, RTL_TEXTENCODING_UTF8));
+SfxObjectShell* pDocSh = SfxObjectShell::Current();
+const SvxFontListItem* pFonts = static_cast(
+pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
+const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
+
+boost::property_tree::ptree aTree;
+aTree.pu

Tip for debugging CppunitTest_sd_tiledrendering failure

[Khaled Hosny]

I’m having a failure on Linux in this test, I can reproduce it locally
but I have no idea how to debug it:
http://ci.libreoffice.org/job/lo_gerrit/2956/Config=linux_gcc_release_64/console

(for https://gerrit.libreoffice.org/#/c/31053/).

The test apparently checks if a mouse event at a certain position does
something, and since I’m changing how line spacing is calculated it
might have caused some vertical shift. But I don’t understand the code
of the test that much and don’t know where to start, any tips?

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

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

[Eike Rathke]

 sc/qa/unit/ucalc_formula.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f1034343b4a8fe5b540d07029cd97bba7208c9b5
Author: Eike Rathke 
Date:   Tue Nov 22 00:04:16 2016 +0100

unit test for tdf#104096, ScRange::Parse() with trailing characters

Change-Id: I5df087b0ad25b78c6badf72afba6c189e48ec7ca

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index cb4b3f4..cb5d835 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -364,6 +364,10 @@ void Test::testFormulaParseReference()
 CPPUNIT_ASSERT_MESSAGE("Should fail to parse.", !(nRes & 
ScRefFlags::VALID));
 
 aRange.aStart.SetTab(0);
+nRes = aRange.Parse("B1:B2~C1", m_pDoc, formula::FormulaGrammar::CONV_OOO);
+CPPUNIT_ASSERT_MESSAGE("Should fail to parse.", !(nRes & 
ScRefFlags::VALID));
+
+aRange.aStart.SetTab(0);
 nRes = aRange.Parse("B:B", m_pDoc, formula::FormulaGrammar::CONV_OOO);
 CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID));
 CPPUNIT_ASSERT_EQUAL(static_cast(0), aRange.aStart.Tab());
___
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' - connectivity/source

[Michael Stahl]

 connectivity/source/drivers/odbc/OTools.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba2a23afd628d3d183ae6c77569f4ec54490d696
Author: Michael Stahl 
Date:   Mon Nov 21 12:05:05 2016 +0100

connectivity, sc: add missing #include 

These files use the macro OSL_BIGENDIAN but did not include the header
that defines it.

Found via:

git grep -l OSL_.*ENDIAN | grep -v -E '\.h(xx)?$' | while read f; do case 
$f in *cxx) grep -L endian\\.h workdir/Dep/CxxObject/${f%.cxx}.d ;; *) grep -L 
endian\\.h workdir/Dep/CObject/${f%.c}.d ;; esac ; done

(cherry picked from commit e2f08f9def0869460ad38a1c2adb450778290f6e)

Change-Id: Iaf589a8235dbc8062840d2716ab843e64b5cb7a2
Reviewed-on: https://gerrit.libreoffice.org/31039
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index 71109fb..8a4760f 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -21,6 +21,7 @@
 #include "odbc/OFunctions.hxx"
 #include 
 #include 
+#include 
 #include "odbc/OConnection.hxx"
 #include 
 
___
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' - cppcanvas/source include/oox sw/source vcl/inc

[Michael Stahl]

 cppcanvas/source/inc/implrenderer.hxx |2 ++
 include/oox/helper/helper.hxx |1 +
 sw/source/filter/ww8/ww8scan.hxx  |1 +
 vcl/inc/headless/svpgdi.hxx   |1 +
 4 files changed, 5 insertions(+)

New commits:
commit d76a2ba127b3d768412ee5b83363c9f3cce9faf5
Author: Michael Stahl 
Date:   Mon Nov 21 12:16:37 2016 +0100

cppcanvas, oox: add missing #include 

These files use the macro OSL_BIGENDIAN but did not include the header
that defines it.

Found via:

git grep -l OSL_.*ENDIAN | grep -E '\.h(xx)?$' | while read f; do grep -L 
endian\\.h $f ; done

Change-Id: Iffb36336026e49a9c3d8fcf125a54ec857c7552e
(cherry picked from commit 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8)
Reviewed-on: https://gerrit.libreoffice.org/31040
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index f0fa801..60e65a0 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 1d274b1..2dc9243 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 11cb3f7..5d9cde0 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include "sortedarray.hxx"
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index d888001..7ac3809 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/source/core/data/attrib.cxx|3 ---
 sc/source/core/data/documen5.cxx  |1 -
 sc/source/core/data/documen6.cxx  |1 -
 sc/source/core/data/dpgroup.cxx   |2 --
 sc/source/core/data/dpoutput.cxx  |1 -
 sc/source/core/data/dpsave.cxx|3 ---
 sc/source/core/data/dpshttab.cxx  |1 -
 sc/source/core/data/dptabdat.cxx  |1 -
 sc/source/core/data/dptabres.cxx  |1 -
 sc/source/core/data/dptabsrc.cxx  |1 -
 sc/source/core/data/drwlayer.cxx  |6 --
 sc/source/core/data/global.cxx|1 -
 sc/source/core/data/globalx.cxx   |1 -
 sc/source/core/data/table3.cxx|1 -
 sc/source/core/tool/address.cxx   |1 -
 sc/source/core/tool/compiler.cxx  |1 -
 sc/source/core/tool/formulaparserpool.cxx |1 -
 17 files changed, 27 deletions(-)

New commits:
commit 5a4e106be6778f7e96fa36d2076ef4e7a90f81d9
Author: Bartosz Kosiorek 
Date:   Mon Nov 21 19:32:34 2016 +0100

tdf#42949 Remove not needed uno headers from sc/source/core

Change-Id: I1fd2b647caaa947390443ec41591a7ea050c4819
Reviewed-on: https://gerrit.libreoffice.org/31046
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index fe42b62..9da8293 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -18,9 +18,6 @@
  */
 
 #include 
-#include 
-#include 
-#include 
 
 #include "scitems.hxx"
 #include 
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index f5f9f0c..5959618 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index e7713e1..03dee37 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include "document.hxx"
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 50aeeb6..cf3cfbf 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -33,8 +33,6 @@
 #include 
 
 #include 
-#include 
-#include 
 
 #include 
 #include 
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 7124b51..39227bf 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 320be4d..a3fae76 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -39,15 +39,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-#include 
 
 #include 
 #include 
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 3fc321a..c65eb98 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -29,7 +29,6 @@
 #include "rangenam.hxx"
 #include "queryentry.hxx"
 
-#include 
 #include 
 
 #include 
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 634e7eb..4b99682 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 
-#include 
 
 using namespace ::com::sun::star;
 using ::std::vector;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 9f2b53d..6747347 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 using ::std::vector;
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 2454bdf..cc024ac 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -54,7 +54,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e577290..f2e93dd 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -20,13 +20,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 
 #include "scitems.hxx"
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 50c5ba4..68d1d83 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -53,7 +53,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 2b3794a..e1aad64 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/s

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/datamembershadow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 883024d657fb45c7da459017d2f936aac5644bfb
Author: Stephan Bergmann 
Date:   Mon Nov 21 23:02:04 2016 +0100

FieldDecl::getParent fires assert for Objective C @interface members

(like in vcl/inc/osx/a11ywrapper.h's AquaA11yWrapper), at least on recent 
Clang
trunk, from within the call to cast() in

  cast(getDeclContext())

as the decl context apparently is something other than a RecordDecl.

Change-Id: I238bae44d6db0f04bf8f90b0032489e3b4822eee

diff --git a/compilerplugins/clang/datamembershadow.cxx 
b/compilerplugins/clang/datamembershadow.cxx
index a1d4528..96f658c 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -96,7 +96,7 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * 
fieldDecl)
 if (aFileName == SRCDIR "/xmloff/source/draw/ximplink.hxx")
 return true;
 
-const CXXRecordDecl* parentCXXRecordDecl = 
dyn_cast(fieldDecl->getParent());
+const CXXRecordDecl* parentCXXRecordDecl = 
dyn_cast(fieldDecl->getDeclContext());
 if (!parentCXXRecordDecl) {
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/address.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8846cc2218091aa2af8ee3aadd81fd8a80e3b303
Author: Eike Rathke 
Date:   Mon Nov 21 22:55:11 2016 +0100

Resolves: tdf#104096 reset also rRawRes if trailing characters are present

... in lcl_ScAddress_Parse_OOo() so that ScRange::Parse() doesn't receive a
"partially valid" result and does not attempt to follow the entire 
column/row
path.

Change-Id: Ie37c9d22280e30f770422fb621e3b9d972ec1546

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 2636f34..2d73e44 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1439,7 +1439,7 @@ static ScRefFlags lcl_ScAddress_Parse_OOo( const 
sal_Unicode* p, ScDocument* pDo
 nRes |= ScRefFlags::VALID;
 }
 else
-nRes = nBailOutFlags;
+nRes = rRawRes = nBailOutFlags;
 return nRes;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

Hi,

On Monday, 2016-11-21 22:16:24 +0100, Jan Holešovský wrote:

> I fear this is not the best way to communicate this...  Can you please
> join the ESC call on Thursday? - I think it will be a better place to
> discuss the API stability & instability.

Thanks for jumping in.. I'd also prefer if we could discuss this in the
ESC call.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Zolnai Tamás]

Hi Kendy,

I wrote down my opinion. Sorry if I went to far with that word
"ridiculous". Ignore that paragraph and you have what I should say on
an ESC call. I would not bother with this API stability/instability
anymore in general. I'm interested in only this specific case.
Discuss it on ESC if needed and send me your decision. I can't do
anything more with that.

Thanks,
Tamás

2016-11-21 22:16 GMT+01:00 Jan Holesovsky :
> Hi Tamas,
>
> I fear this is not the best way to communicate this...  Can you please
> join the ESC call on Thursday? - I think it will be a better place to
> discuss the API stability & instability.
>
> Thank you,
> Kendy
>
> Zolnai Tamás píše v Po 21. 11. 2016 v 20:14 +:
>> Hi Eike, all,
>>
>> Ok, it's starting to be a bit ridiculous from that point.
>> Is it really the way, if I need to change the API, to create new type
>> like GeneralFunction2 and rewrite the whole pivot table code to use
>> that new type? Really this is our policy to never change API in an
>> incompatible way? Never?! What kind of API is that?
>>
>> You wrote that Java code can bail out if it receives an unknown enum
>> value. This can only be a problem if somebody uses this new
>> functionality I added (pivot median), right? Otherwise this enum value
>> is not set. So you suggest that to revert that API change and also the
>> related new functionality to avoid somebody use this new functionality
>> with a 3rd party code which can't handle that. So better to not have a
>> functionality, than have some 3rd party code which potentially will
>> have problem with that functionality. Why? Who expects that an older
>> 3rd party code can handle a new functionality without updating the
>> code? If a 3rd party code manipulates pivot tables, it won't work for
>> pivot tables with the new median function anyway, right?
>>
>> I checked your suggestion how to extend API on a compatible way, but
>> it seems more risky than extending this GeneralFunction enum. If I
>> understand well your words and if I create a new type called
>> GeneralFunction2 and create new interfaces also (I see about 5 such
>> interfaces) and also rewrite the whole pivot table code to use this
>> new API type and interfaces, then I see that it can lead to regression
>> very easily. I don't think that it's worth it. I don't see that either
>> if the pivot table code uses GeneralFunction2, but a 3rd party code
>> calles API functions with GeneralFunction how it will work. What is
>> needed to make GeneralFunction to be mapped to Generalfunction2.
>>
>> Best Regards,
>> Tamás
>>
>> > On Monday, November 21, 2016 15:20 GMT, Eike Rathke  
>> > wrote:
>> >
>> >> Hi Tamás,
>> >>
>> >> On Monday, 2016-11-21 13:43:18 +, Tamás Zolnai wrote:
>> >>
>> >> >  offapi/com/sun/star/sheet/GeneralFunction.idl |   14 ++
>> >> >  offapi/type_reference/offapi.idl  |   18 +-
>> >>
>> >> This is a no-go, already the previous commit
>> >> eb27a63a38ee7d15292dc40520b0605e4c2228e2 was.. if you have to modify> 
>> >> offapi/type_reference/offapi.idl then obviously you're introducing an
>> >> incompatible change, and the type_reference should *never* be modified,
>> >> as it exactly checks API against incompatibilites with existing API.>
>> >> In this case extending an enum with a new value, even if appended, may
>> >> cause problems with existing Java programs, if it receives an unknown> 
>> >> enum value it will bail out.
>> >>
>> >> Because css::sheet::GeneralFunction is used as readable property, as> 
>> >> return value and also as a member in css::sheet::SubTotalColumn that can
>> >> be returned these changes are not acceptable. Please revert:
>> >>
>> >> commit eabfd1b60f8e181e0ef2721e716210390528f4ce
>> >> Author: Tamás Zolnai 
>> >> Date:   Mon Nov 21 13:57:29 2016 +
>> >>
>> >> commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
>> >> Author: Tamás Zolnai 
>> >> Date:   Sat Nov 19 22:27:20 2016 +0100
>> >>
>> >>
>> >> To introduce new values one has to create a new type, best constant as
>> >> constant values can be extended, add a new optional property using that
>> >> type, overriding the old enum, derive a new interface using the type for
>> >> all interfaces that use GeneralFunction and derive a new struct for
>> >> SubTotalColumn to also use GeneralFunction. Yes this is painful.. and> a 
>> >> reason to never introduce enum types again.
>> >>
>> >> For an example see commit 4c4976f717b3ddce68a872dffc2079ae49c41616
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

Hi Tamas,

I fear this is not the best way to communicate this...  Can you please
join the ESC call on Thursday? - I think it will be a better place to
discuss the API stability & instability.

Thank you,
Kendy

Zolnai Tamás píše v Po 21. 11. 2016 v 20:14 +:
> Hi Eike, all,
> 
> Ok, it's starting to be a bit ridiculous from that point.
> Is it really the way, if I need to change the API, to create new type
> like GeneralFunction2 and rewrite the whole pivot table code to use
> that new type? Really this is our policy to never change API in an
> incompatible way? Never?! What kind of API is that?
> 
> You wrote that Java code can bail out if it receives an unknown enum
> value. This can only be a problem if somebody uses this new
> functionality I added (pivot median), right? Otherwise this enum value
> is not set. So you suggest that to revert that API change and also the
> related new functionality to avoid somebody use this new functionality
> with a 3rd party code which can't handle that. So better to not have a
> functionality, than have some 3rd party code which potentially will
> have problem with that functionality. Why? Who expects that an older
> 3rd party code can handle a new functionality without updating the
> code? If a 3rd party code manipulates pivot tables, it won't work for
> pivot tables with the new median function anyway, right?
> 
> I checked your suggestion how to extend API on a compatible way, but
> it seems more risky than extending this GeneralFunction enum. If I
> understand well your words and if I create a new type called
> GeneralFunction2 and create new interfaces also (I see about 5 such
> interfaces) and also rewrite the whole pivot table code to use this
> new API type and interfaces, then I see that it can lead to regression
> very easily. I don't think that it's worth it. I don't see that either
> if the pivot table code uses GeneralFunction2, but a 3rd party code
> calles API functions with GeneralFunction how it will work. What is
> needed to make GeneralFunction to be mapped to Generalfunction2.
> 
> Best Regards,
> Tamás
> 
> > On Monday, November 21, 2016 15:20 GMT, Eike Rathke  
> > wrote:
> >
> >> Hi Tamás,
> >>
> >> On Monday, 2016-11-21 13:43:18 +, Tamás Zolnai wrote:
> >>
> >> >  offapi/com/sun/star/sheet/GeneralFunction.idl |   14 ++
> >> >  offapi/type_reference/offapi.idl  |   18 +-
> >>
> >> This is a no-go, already the previous commit
> >> eb27a63a38ee7d15292dc40520b0605e4c2228e2 was.. if you have to modify> 
> >> offapi/type_reference/offapi.idl then obviously you're introducing an
> >> incompatible change, and the type_reference should *never* be modified,
> >> as it exactly checks API against incompatibilites with existing API.>
> >> In this case extending an enum with a new value, even if appended, may
> >> cause problems with existing Java programs, if it receives an unknown> 
> >> enum value it will bail out.
> >>
> >> Because css::sheet::GeneralFunction is used as readable property, as> 
> >> return value and also as a member in css::sheet::SubTotalColumn that can
> >> be returned these changes are not acceptable. Please revert:
> >>
> >> commit eabfd1b60f8e181e0ef2721e716210390528f4ce
> >> Author: Tamás Zolnai 
> >> Date:   Mon Nov 21 13:57:29 2016 +
> >>
> >> commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
> >> Author: Tamás Zolnai 
> >> Date:   Sat Nov 19 22:27:20 2016 +0100
> >>
> >>
> >> To introduce new values one has to create a new type, best constant as
> >> constant values can be extended, add a new optional property using that
> >> type, overriding the old enum, derive a new interface using the type for
> >> all interfaces that use GeneralFunction and derive a new struct for
> >> SubTotalColumn to also use GeneralFunction. Yes this is painful.. and> a 
> >> reason to never introduce enum types again.
> >>
> >> For an example see commit 4c4976f717b3ddce68a872dffc2079ae49c41616
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

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

[Stephan Bergmann]

 connectivity/source/drivers/macab/MacabStatement.cxx |   21 +--
 connectivity/source/drivers/macab/MacabStatement.hxx |2 -
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 3ec6de78f62a068b185068886d1beb8d287ddabe
Author: Stephan Bergmann 
Date:   Mon Nov 21 22:15:49 2016 +0100

loplugin:datamembershadow

Change-Id: I773bb19ae33709421fde01426716dcf52065402f

diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx 
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 2fa468e..7140c41 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -65,12 +65,11 @@ IMPLEMENT_SERVICE_INFO(MacabStatement, 
"com.sun.star.sdbc.drivers.MacabStatement
 
 MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
 : MacabCommonStatement_BASE(m_aMutex),
-OPropertySetHelper(MacabCommonStatement_BASE::rBHelper),
+OPropertySetHelper(rBHelper),
 m_aParser(_pConnection->getDriver()->getComponentContext()),
 m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), 
m_aParser ),
 m_pParseTree(nullptr),
-m_pConnection(_pConnection),
-rBHelper(MacabCommonStatement_BASE::rBHelper)
+m_pConnection(_pConnection)
 {
 m_pConnection->acquire();
 }
@@ -374,7 +373,7 @@ void SAL_CALL MacabCommonStatement::cancel(  ) 
throw(RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 // cancel the current sql statement
 }
 
@@ -382,7 +381,7 @@ void SAL_CALL MacabCommonStatement::close(  ) 
throw(SQLException, RuntimeExcepti
 {
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 }
 dispose();
@@ -392,7 +391,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute(
 const OUString& sql ) throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 Reference< XResultSet > xRS = executeQuery(sql);
 
@@ -403,7 +402,7 @@ Reference< XResultSet > SAL_CALL 
MacabCommonStatement::executeQuery(
 const OUString& sql ) throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql));
 
@@ -462,7 +461,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", 
OUtoCStr(sql));
 Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  ) 
throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 // just return our connection here
 return m_pConnection;
@@ -471,7 +470,7 @@ Reference< XConnection > SAL_CALL 
MacabCommonStatement::getConnection(  ) throw(
 sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) 
throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 // the return values gives information about how many rows are affected by 
executing the sql statement
 return 0;
@@ -480,7 +479,7 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( 
const OUString& ) throw(
 Any SAL_CALL MacabCommonStatement::getWarnings(  ) throw(SQLException, 
RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 return makeAny(m_aLastWarning);
 }
@@ -488,7 +487,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings(  ) 
throw(SQLException, RuntimeEx
 void SAL_CALL MacabCommonStatement::clearWarnings(  ) throw(SQLException, 
RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
+checkDisposed(rBHelper.bDisposed);
 
 m_aLastWarning = SQLWarning();
 }
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx 
b/connectivity/source/drivers/macab/MacabStatement.hxx
index 0328649..4b2 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -95,7 +95,7 @@ namespace connectivity
 virtual ~MacabCommonStatement() override;
 
 public:
-::cppu::OBroadcastHelper& rBHelper;
+using MacabCommonStatement_BASE::rBHelper;
 
 explicit MacabCommonStatement(MacabConnection *_pConnection);
 using MacabCommonStatement_BASE::operator css::u

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

[Stephan Bergmann]

 connectivity/source/drivers/macab/MacabCatalog.cxx |3 +--
 connectivity/source/drivers/macab/MacabCatalog.hxx |1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 8442bda2ca252a77b091fdf7140f972220b1895e
Author: Stephan Bergmann 
Date:   Mon Nov 21 22:14:25 2016 +0100

loplugin:datamembershadow

shadowed OCatalog::m_xMetaData can be used here directly

Change-Id: I1041272b98139fda2413442e4621507655ab67ca

diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx 
b/connectivity/source/drivers/macab/MacabCatalog.cxx
index a6c2095..8af9735 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -34,8 +34,7 @@ using namespace ::cppu;
 
 MacabCatalog::MacabCatalog(MacabConnection* _pCon)
 : connectivity::sdbcx::OCatalog(_pCon),
-  m_pConnection(_pCon),
-  m_xMetaData(m_pConnection->getMetaData())
+  m_pConnection(_pCon)
 {
 }
 
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx 
b/connectivity/source/drivers/macab/MacabCatalog.hxx
index 36753c0..d893d3d 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -31,7 +31,6 @@ namespace connectivity
 class MacabCatalog : public connectivity::sdbcx::OCatalog
 {
 MacabConnection* m_pConnection; // used to get the metadata
-css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; 
// just to make things easier
 
 public:
 explicit MacabCatalog(MacabConnection* _pCon);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sw/source/core/doc/tblcpy.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f0fa43ea99ac7564f2cc7ca1d997831808056b68
Author: Julien Nabet 
Date:   Mon Oct 31 13:14:57 2016 +0100

Revert "Revert "std::list to deque""

+ use returned iterator by insert method call
This reverts commit 1a583283d6b58c8951cb52faac82ecb24fdbf1b3.

Change-Id: I02547663230fb7b5959df349c4d395bbadd74c3b
Reviewed-on: https://gerrit.libreoffice.org/30439
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 7a13fd3..b5bc61c 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -68,7 +69,7 @@ namespace
 
 typedef std::vector< BoxSpanInfo > BoxStructure;
 typedef std::vector< BoxStructure > LineStructure;
-typedef std::list< sal_uLong > ColumnStructure;
+typedef std::deque< sal_uLong > ColumnStructure;
 
 struct SubBox
 {
@@ -334,7 +335,7 @@ namespace
 }
 if( rpCol == maCols.end() || *rpCol > rnBorder )
 {
-maCols.insert( rpCol, rnBorder );
+rpCol = maCols.insert( rpCol, rnBorder );
 --rpCol;
 incColSpan( nLine, rnCol );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 vcl/osx/salmenu.cxx |   27 +++
 1 file changed, 27 insertions(+)

New commits:
commit 4c62de279a6783236a5e0811d0733e107c127fe3
Author: Julien Nabet 
Date:   Wed Nov 16 21:50:02 2016 +0100

Fix various "unmapped accelerator key" on MacOs

Add mapping for:
KEY_SEMICOLON
KEY_BACKSPACE
KEY_PAGEUP
KEY_PAGEDOWN
KEY_UP
KEY_DOWN
KEY_RETURN
KEY_BRACKETLEFT
KEY_BRACKETRIGHT

Retrieved from AquaSalFrame::GetKeyName
I would have preferred to use this function and remove custom mapping to 
avoid dup but mapping is a bit different
eg: in AquaSalFrame::GetKeyName KEY_A to KEY_Z uses sal_Unicode( 'A' + (i - 
KEY_A) )
In SetAccelerator, we use sal_Unicode( 'a' + (i - KEY_A) )
and when using GetKeyName, LO segfaults.

Change-Id: I3808cdcd1c0566e768a98a211bc1f41ff012a32f
Reviewed-on: https://gerrit.libreoffice.org/30909
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 4477af4..c567f9e 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -714,6 +714,33 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, 
SalMenuItem* pSalMenuItem,
 case KEY_EQUAL:
 nCommandKey='=';
 break;
+case KEY_SEMICOLON:
+nCommandKey=';';
+break;
+case KEY_BACKSPACE:
+nCommandKey=sal_Unicode( 0x232b );
+break;
+case KEY_PAGEUP:
+nCommandKey=sal_Unicode( 0x21de );
+break;
+case KEY_PAGEDOWN:
+nCommandKey=sal_Unicode( 0x21df );
+break;
+case KEY_UP:
+nCommandKey=sal_Unicode( 0x21e1 );
+break;
+case KEY_DOWN:
+nCommandKey=sal_Unicode( 0x21e3 );
+break;
+case KEY_RETURN:
+nCommandKey=sal_Unicode( 0x21a9 );
+break;
+case KEY_BRACKETLEFT:
+nCommandKey='[';
+break;
+case KEY_BRACKETRIGHT:
+nCommandKey=']';
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

Hi Eike, all,

Ok, it's starting to be a bit ridiculous from that point.
Is it really the way, if I need to change the API, to create new type
like GeneralFunction2 and rewrite the whole pivot table code to use
that new type? Really this is our policy to never change API in an
incompatible way? Never?! What kind of API is that?

You wrote that Java code can bail out if it receives an unknown enum
value. This can only be a problem if somebody uses this new
functionality I added (pivot median), right? Otherwise this enum value
is not set. So you suggest that to revert that API change and also the
related new functionality to avoid somebody use this new functionality
with a 3rd party code which can't handle that. So better to not have a
functionality, than have some 3rd party code which potentially will
have problem with that functionality. Why? Who expects that an older
3rd party code can handle a new functionality without updating the
code? If a 3rd party code manipulates pivot tables, it won't work for
pivot tables with the new median function anyway, right?

I checked your suggestion how to extend API on a compatible way, but
it seems more risky than extending this GeneralFunction enum. If I
understand well your words and if I create a new type called
GeneralFunction2 and create new interfaces also (I see about 5 such
interfaces) and also rewrite the whole pivot table code to use this
new API type and interfaces, then I see that it can lead to regression
very easily. I don't think that it's worth it. I don't see that either
if the pivot table code uses GeneralFunction2, but a 3rd party code
calles API functions with GeneralFunction how it will work. What is
needed to make GeneralFunction to be mapped to Generalfunction2.

Best Regards,
Tamás

> On Monday, November 21, 2016 15:20 GMT, Eike Rathke  wrote:
>
>> Hi Tamás,
>>
>> On Monday, 2016-11-21 13:43:18 +, Tamás Zolnai wrote:
>>
>> >  offapi/com/sun/star/sheet/GeneralFunction.idl |   14 ++
>> >  offapi/type_reference/offapi.idl  |   18 +-
>>
>> This is a no-go, already the previous commit
>> eb27a63a38ee7d15292dc40520b0605e4c2228e2 was.. if you have to modify> 
>> offapi/type_reference/offapi.idl then obviously you're introducing an
>> incompatible change, and the type_reference should *never* be modified,
>> as it exactly checks API against incompatibilites with existing API.>
>> In this case extending an enum with a new value, even if appended, may
>> cause problems with existing Java programs, if it receives an unknown> enum 
>> value it will bail out.
>>
>> Because css::sheet::GeneralFunction is used as readable property, as> return 
>> value and also as a member in css::sheet::SubTotalColumn that can
>> be returned these changes are not acceptable. Please revert:
>>
>> commit eabfd1b60f8e181e0ef2721e716210390528f4ce
>> Author: Tamás Zolnai 
>> Date:   Mon Nov 21 13:57:29 2016 +
>>
>> commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
>> Author: Tamás Zolnai 
>> Date:   Sat Nov 19 22:27:20 2016 +0100
>>
>>
>> To introduce new values one has to create a new type, best constant as
>> constant values can be extended, add a new optional property using that
>> type, overriding the old enum, derive a new interface using the type for
>> all interfaces that use GeneralFunction and derive a new struct for
>> SubTotalColumn to also use GeneralFunction. Yes this is painful.. and> a 
>> reason to never introduce enum types again.
>>
>> For an example see commit 4c4976f717b3ddce68a872dffc2079ae49c41616
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: codemaker/source comphelper/qa cppu/CppunitTest_cppu_any-external.mk cppu/Module_cppu.mk cppu/qa fpicker/source include/com include/comphelper slideshow/source sw/qa

[Stephan Bergmann]

 codemaker/source/cppumaker/cpputype.cxx |   10 +-
 comphelper/qa/unit/variadictemplates.cxx|2 
 cppu/CppunitTest_cppu_any-external.mk   |   26 +
 cppu/Module_cppu.mk |1 
 cppu/qa/any-external.cxx|   63 
 cppu/qa/test_any.cxx|   80 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |3 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |2 
 fpicker/source/win32/filepicker/asyncrequests.hxx   |4 
 include/com/sun/star/uno/Any.h  |   27 +
 include/com/sun/star/uno/Any.hxx|   31 ++
 include/comphelper/propertyvalue.hxx|2 
 include/comphelper/unwrapargs.hxx   |2 
 slideshow/source/inc/tools.hxx  |2 
 sw/qa/extras/inc/swmodeltestbase.hxx|4 
 15 files changed, 166 insertions(+), 93 deletions(-)

New commits:
commit bd614b91352b5a0a291f33a428c95d7bcbf34679
Author: Stephan Bergmann 
Date:   Tue Oct 18 18:14:14 2016 +0200

Delete the "Any-to-Any" template specializations for LIBO_INTERNAL_ONLY

i.e., css::uno::Any function template specializations

  Any::has() const
  Any::get(Any const &) const
  operator >>=(Any const &, Any &)
  operator <<=(Any &, Any const &)

that don't make much sense (the first is always true, the rest can be 
replaced
with operator =, which additionally supports move semantics).  For 3rd-party
compatibility, do this only for LIBO_INTERNAL_ONLY, however.

However, some generic template code did benefit from operator >>= working 
also
for Any, so make up for that with a new (LIBO_INTERNAL_ONLY, given that
operator >>= still covers if fine for !LIBO_INTERNAL_ONLY) fromAny,
complementing the existing toAny.

Change-Id: I8b1b5f803f0b909808159916366d53c948206a88
Reviewed-on: https://gerrit.libreoffice.org/30022
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index e87fed0..e3ce817 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3621,10 +3621,12 @@ void ServiceType::dumpHppFile(
 u2b(j.name), "param",
 
codemaker::cpp::IdentifierTranslationMode::NonGlobal));
 sal_Int32 rank;
-if (m_typeMgr->getSort(
-b2u(codemaker::UnoType::decompose(
-u2b(j.type), &rank)))
-== codemaker::UnoType::Sort::Char)
+if (resolveOuterTypedefs(j.type) == "any") {
+o << "= " << param;
+} else if (m_typeMgr->getSort(
+   b2u(codemaker::UnoType::decompose(
+   u2b(j.type), &rank)))
+   == codemaker::UnoType::Sort::Char)
 {
 o << "= ::css::uno::Any(&" << param
   << ", ::cppu::UnoType< ";
diff --git a/comphelper/qa/unit/variadictemplates.cxx 
b/comphelper/qa/unit/variadictemplates.cxx
index 0f5daff..67e76bb 100644
--- a/comphelper/qa/unit/variadictemplates.cxx
+++ b/comphelper/qa/unit/variadictemplates.cxx
@@ -43,7 +43,7 @@ inline void extract(
 OUString( "No such argument available!"),
 xErrorContext, static_cast(nArg) );
 }
-if (! (seq[nArg] >>= v)) {
+if (! fromAny(seq[nArg], &v)) {
 OUStringBuffer buf;
 buf.append( "Cannot extract ANY { " );
 buf.append( seq[nArg].getValueType().getTypeName() );
diff --git a/cppu/CppunitTest_cppu_any-external.mk 
b/cppu/CppunitTest_cppu_any-external.mk
new file mode 100644
index 000..6119e04
--- /dev/null
+++ b/cppu/CppunitTest_cppu_any-external.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_any-external))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_any-external, \
+cppu/qa/any-external \
+))
+
+$(eval $(call gb_CppunitTest_set_external_code,cppu_any-external))
+
+$(eval $(call gb_CppunitTest_use_libraries,cppu_any-external, \
+cppu \
+sal \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_udk_api,cppu_any-external))
+
+# vim: set noet sw=4 ts=4:
diff --git

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

[Khaled Hosny]

 vcl/inc/sft.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 05d175a8efceccd684c9e3d7f428073f1b142346
Author: Khaled Hosny 
Date:   Mon Nov 21 16:23:19 2016 +0200

Minor

Change-Id: Icb074b628ae479dfe05cc1fe10121f96c492806e

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 80c62c1..04aaf14 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -198,12 +198,12 @@ namespace vcl
 int   winDescent; /**< descender metric for Windows
*/
 bool  symbolEncoded;  /**< true: MS symbol encoded */
 int   rangeFlag;  /**< if set to 1 Unicode Range flags are 
applicable  */
-sal_uInt32 ur1;   /**< bits 0 - 31 of Unicode Range flags  
*/
-sal_uInt32 ur2;   /**< bits 32 - 63 of Unicode Range flags 
*/
-sal_uInt32 ur3;   /**< bits 64 - 95 of Unicode Range flags 
*/
-sal_uInt32 ur4;   /**< bits 96 - 127 of Unicode Range 
flags*/
-sal_uInt8   panose[10];/**< PANOSE classification number   
 */
-sal_uInt32 typeFlags; /**< type flags (copyright bits + 
PS-OpenType flag)   */
+sal_uInt32 ur1;   /**< bits 0 - 31 of Unicode Range flags  
*/
+sal_uInt32 ur2;   /**< bits 32 - 63 of Unicode Range flags 
*/
+sal_uInt32 ur3;   /**< bits 64 - 95 of Unicode Range flags 
*/
+sal_uInt32 ur4;   /**< bits 96 - 127 of Unicode Range flags
*/
+sal_uInt8  panose[10];/**< PANOSE classification number
*/
+sal_uInt32 typeFlags; /**< type flags (copyright bits + 
PS-OpenType flag)   */
 } TTGlobalFontInfo;
 
 #define TYPEFLAG_INVALID0x800
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 6 commits - offapi/com offapi/type_reference sc/inc sc/qa sc/source

[Zolnai Tamás]

Hi Stephan,

2016-11-21 13:23 GMT+01:00 Stephan Bergmann :
> On 11/21/2016 12:53 PM, Zolnai Tamás wrote:
>>
>> 2016-11-21 10:52 GMT+01:00 Stephan Bergmann :
>>>
>>> On 11/20/2016 12:43 AM, Tamás Zolnai wrote:


 commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
 Author: Tamás Zolnai 
 Date:   Sat Nov 19 22:27:20 2016 +0100

 [API Change] PivotMedian: Add median to pivot table function type
>>>
>>>
>>>
>>> Are you sure that this incompatible change is acceptable?  Can you give
>>> some
>>> rationale why that would be so (e.g., this functionality might be known
>>> to
>>> be hardly useful for 3rd party code anyway).
>>
>>
>> Yes. Calc code uses UNO API, that's why I needed to make this
>> modification. The 3rd party code here is Calc.
>
>
> No, 3rd party code is always code that's not shipped as part of LO (so we
> can't adapt it when doing changes like this, so need to rationalize whether
> doing a change like this is acceptable).

I know, what 3rd party code means, thanks. It was irony that Calc is
3rd-party code (well I don't know how to mark a sentence as irony in a
mail). It's problematic that Calc implemented on this way (using API).

But anyway I added a new functionality to Calc and for doing that I
needed to extend API too. I hope it's an acceptable reason. Can we
agree on that?

> The general approach is to avoid incompatible changes as much as possible.
> And if there is compelling reason and consensus to do such a change
> nevertheless, to do it in the least disruptive way.

OK. Then I'll move median to the end of this GeneralFunction enum, to
avoid broke those 3rd party code which uses enums on such way it leads
to problem.

Thanks,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: 6 commits - offapi/com offapi/type_reference sc/inc sc/qa sc/source

[Zolnai Tamás]

Hi Stephan,

2016-11-21 10:52 GMT+01:00 Stephan Bergmann :
> On 11/20/2016 12:43 AM, Tamás Zolnai wrote:
>>
>> commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
>> Author: Tamás Zolnai 
>> Date:   Sat Nov 19 22:27:20 2016 +0100
>>
>> [API Change] PivotMedian: Add median to pivot table function type
>
>
> Are you sure that this incompatible change is acceptable?  Can you give some
> rationale why that would be so (e.g., this functionality might be known to
> be hardly useful for 3rd party code anyway).

Yes. Calc code uses UNO API, that's why I needed to make this
modification. The 3rd party code here is Calc.

> Why did you add the new member in the middle, changing the values of many
> existing members?  Adding it to the end would at least reduce the risk of
> breaking things.

I thought we can change API on an incompatible way in main versions
like 5.3. Was I wrong here?
I added to the middle because I tried to add it to a reasonable place
in this list. Median can be in a group with Average, Maximum and
Minimum in meaning, but of course I can take it down to the end if
that's your main problem.

In general I don't agree with that idea to fear to change anything in
the API, because it ties the development of it. API actually should
follow the changes of the internal code. Of course, I accept that it
should be done a reasonable way, along a reasonable policy. So my
question is, when I can change API in an incompatible way? What is the
policy here?

Thanks,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/core/tool/token.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 5e397250c0ab2c092091c6dfe30d906a17fdca9e
Author: Eike Rathke 
Date:   Thu Nov 17 22:13:19 2016 +0100

Resolves: tdf#103994 AdjustReferenceOnMove: handle external references

Change-Id: I8b104b0c843dd268d8760a2a73cdd3e672e6efd6
(cherry picked from commit 4665be3af48587505bb7f49a53e8422945ec49eb)
Reviewed-on: https://gerrit.libreoffice.org/30941
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 28fdcad..9ce7673 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3216,6 +3216,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
 rRef.Ref1.SetFlag3D(true);
 }
 break;
+case svExternalSingleRef:
+{
+ScSingleRefData& rRef = *p->GetSingleRef();
+ScAddress aAbs = rRef.toAbs(rOldPos);
+rRef.SetAddress(aAbs, rNewPos);
+}
+break;
+case svExternalDoubleRef:
+{
+ScComplexRefData& rRef = *p->GetDoubleRef();
+ScRange aAbs = rRef.toAbs(rOldPos);
+rRef.SetRange(aAbs, rNewPos);
+}
+break;
 default:
 ;
 }
___
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' - xmloff/source

[Eike Rathke]

 xmloff/source/style/escphdl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 775b75a696deb0ea1cc758aee8250663ddfc1d3a
Author: Eike Rathke 
Date:   Thu Nov 17 19:52:10 2016 +0100

ODF: do not write an empty style:text-position="" attribute for 
CharEscapement

... and CharEscapementHeight if the Any is void.
This was a real error complained about in the officeotron validation
https://bugs.documentfoundation.org/attachment.cgi?id=128411
https://bugs.documentfoundation.org/show_bug.cgi?id=103493

Also showed up as console warning

warn:legacy.osl:3269:1:xmloff/source/core/xmlerror.cxx:178: An error or 
a warning has occurred during XML import/export!
Error-Id: 0x20040003
Flags: 2 ERROR
Class: 4 API
Number: 3
Parameters:
0: CharEscapement
Exception-Message: UNKNOWN_PROPERTY
Position:
Public Identifier:
System Identifier: file:///.../103493-LotroPlan%203.8.ods
Row, Column: 2,1850164

Change-Id: Ifc634cc6b3d5d6dfa43741005ef0c9a1f7ff71fe
(cherry picked from commit 8aec9057a169acfda6f2d986af93edca54677fd2)
Reviewed-on: https://gerrit.libreoffice.org/30939
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 9573706..9528f3b 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -95,7 +95,7 @@ bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, 
const uno::Any& rV
 }
 
 rStrExpValue = aOut.makeStringAndClear();
-return true;
+return !rStrExpValue.isEmpty();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 offapi/type_reference/offapi.idl |4 
 1 file changed, 4 insertions(+)

New commits:
commit 76683829204103446476443b099492c402929004
Author: Stephan Bergmann 
Date:   Mon Nov 21 18:21:04 2016 +0100

Update the reference rdbs to libreoffice-5-2

(This deliberately leaves out the published
css.mozilla.XRemoteServiceManagerProvider originally manually removed from
offapi/type_reference/offapi.idl with 
4c18af27bf95b332ee2006cfc0bbf469fb1a84d4
"tdf#96398 kill remaining NPAPI support for plugins _inside_ LO" and now 
fully
removed with b5589970125ae4b8c0a091cfc12d058ca42ce2ab "[API CHANGE] Remove
tdf#96398 leftover XRemoteServiceManagerProvider".)

Change-Id: I75d4cd82ba306099e2563a44739bfb3867a265e9

diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index e955541..04d89e8 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -1481,6 +1481,7 @@ module com {
  [property] ::com::sun::star::util::Color TextColor;
  [property] ::com::sun::star::util::Color TextLineColor;
  [property, optional] ::com::sun::star::style::VerticalAlignment 
VerticalAlign;
+ [property, optional] boolean NoLabel;
 };
 published service UnoControlFormattedField {
  service ::com::sun::star::awt::UnoControlEdit;
@@ -11897,6 +11898,7 @@ module com {
  [property, optional, readonly] ::com::sun::star::awt::XDevice 
ReferenceDevice;
  [property, optional] boolean RecordChanges;
  [property, optional, readonly] boolean IsRecordChangesProtected;
+ [property, optional] boolean Wildcards;
 };
 published interface XFunctionAccess {
  interface ::com::sun::star::uno::XInterface;
@@ -17195,6 +17197,7 @@ module com {
  [property] short SearchSimilarityRemove;
  [property] short SearchSimilarityAdd;
  [property] short SearchSimilarityExchange;
+ [property, optional] boolean SearchWildcard;
 };
 published interface XReplaceDescriptor {
  interface ::com::sun::star::util::XSearchDescriptor;
@@ -17219,6 +17222,7 @@ module com {
  /** @deprecated */ const long REG_NOSUB = 512;
  const long REG_NOT_BEGINOFLINE = 2048;
  const long REG_NOT_ENDOFLINE = 4096;
+ const long WILD_MATCH_SELECTION = 1048576;
 };
 published struct SearchOptions {
  ::com::sun::star::util::SearchAlgorithms algorithmType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Wastack]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |   13 
 connectivity/source/drivers/firebird/PreparedStatement.hxx |1 
 connectivity/source/drivers/firebird/ResultSet.cxx |7 
 connectivity/source/drivers/firebird/ResultSet.hxx |6 
 connectivity/source/drivers/firebird/ResultSetMetaData.cxx |8 
 connectivity/source/drivers/firebird/ResultSetMetaData.hxx |5 
 connectivity/source/drivers/firebird/Statement.cxx |9 
 connectivity/source/drivers/firebird/Util.cxx  |  218 -
 connectivity/source/drivers/firebird/Util.hxx  |4 
 9 files changed, 12 insertions(+), 259 deletions(-)

New commits:
commit 3ec084d61e9c8aa0199b52de43fe288001f47e6d
Author: Wastack 
Date:   Thu Nov 17 14:00:06 2016 +0100

get table name from resultset simply

There is a much simpler way to access table name in ResultSetMetadata
in Firebird sdbc which I didn't notice before.

Change-Id: Ib306c04acf38ec86475d8d1a22a67012fe48539e
Reviewed-on: https://gerrit.libreoffice.org/30931
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 35da8ff..7af0976 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -57,7 +57,6 @@ OPreparedStatement::OPreparedStatement( Connection* 
_pConnection,
 ,m_sSqlStatement(sql)
 ,m_pOutSqlda(nullptr)
 ,m_pInSqlda(nullptr)
-,m_sTableName()
 {
 SAL_INFO("connectivity.firebird", "OPreparedStatement(). "
  "sql: " << sql);
@@ -85,12 +84,6 @@ void OPreparedStatement::ensurePrepared()
m_pOutSqlda,
m_pInSqlda);
 
-OStringVector vec;
-tokenizeSQL( OUStringToOString(m_sSqlStatement, RTL_TEXTENCODING_UTF8), 
vec );
-m_sTableName =
-OStringToOUString(
-extractSingleTableFromSelect( vec ), RTL_TEXTENCODING_UTF8);
-
 aErr = isc_dsql_describe_bind(m_statusVector,
   &m_aStatementHandle,
   1,
@@ -159,8 +152,7 @@ Reference< XResultSetMetaData > SAL_CALL 
OPreparedStatement::getMetaData()
 
 if(!m_xMetaData.is())
 m_xMetaData = new OResultSetMetaData(m_pConnection.get()
-   , m_pOutSqlda
-   , m_sTableName);
+   , m_pOutSqlda);
 
 return m_xMetaData;
 }
@@ -294,8 +286,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
   m_aMutex,
   uno::Reference< XInterface >(*this),
   m_aStatementHandle,
-  m_pOutSqlda,
-  m_sTableName);
+  m_pOutSqlda);
 
 if (getStatementChangeCount() > 0)
 m_pConnection->notifyDatabaseModified();
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx 
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index d98e46d..21f1d3b 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -53,7 +53,6 @@ namespace connectivity
 
 XSQLDA* m_pOutSqlda;
 XSQLDA* m_pInSqlda;
-::rtl::OUString   m_sTableName;
 void checkParameterIndex(sal_Int32 nParameterIndex)
 throw(css::sdbc::SQLException,
   css::uno::RuntimeException);
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 4449d5e..f480465 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -57,8 +57,7 @@ OResultSet::OResultSet(Connection* pConnection,
::osl::Mutex& rMutex,
const uno::Reference< XInterface >& xStatement,
isc_stmt_handle& aStatementHandle,
-   XSQLDA* pSqlda,
-   const OUString& rTableName)
+   XSQLDA* pSqlda )
 : OResultSet_BASE(rMutex)
 , OPropertyContainer(OResultSet_BASE::rBHelper)
 , m_bIsBookmarkable(false)
@@ -76,7 +75,6 @@ OResultSet::OResultSet(Connection* pConnection,
 , m_currentRow(0)
 , m_bIsAfterLastRow(false)
 , m_fieldCount(pSqlda? pSqlda->sqld : 0)
-, m_sTableName(rTableName)
 {
 SAL_INFO("connectivity.firebird", "OResultSet().");
 
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
@@ -725,8 +723,7 @@ uno::Reference< XResultSetMetaData > SAL_CALL 
OResult

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

[Stephan Bergmann]

 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl |   49 --
 2 files changed, 50 deletions(-)

New commits:
commit b5589970125ae4b8c0a091cfc12d058ca42ce2ab
Author: Stephan Bergmann 
Date:   Mon Nov 21 18:04:59 2016 +0100

[API CHANGE] Remove tdf#96398 leftover XRemoteServiceManagerProvider

4c18af27bf95b332ee2006cfc0bbf469fb1a84d4 "tdf#96398 kill remaining NPAPI 
support
for plugins _inside_ LO" had removed various other (also published)
offapi/com/sun/star/mozilla/*.idl files, and had included removal of
css.mozilla.XRemoteServiceManagerProvider from 
offapi/type_reference/offapi.idl,
but had forgotten to actually remove this .idl file---apparently an 
oversight.

Change-Id: I1a8f0c594829a5dd6025ff6c2b6a6fa9a109ca36

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index a14aff6..8251c35 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2904,7 +2904,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/mozilla,\
XProfileDiscover \
XProfileManager \
XProxyRunner \
-   XRemoteServiceManagerProvider \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/office,\
XAnnotation \
diff --git a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl 
b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
deleted file mode 100644
index 95496c4..000
--- a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
-#define __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
-
-#include 
-
-
-module com { module sun { module star { module mozilla {
-
-
-/** Allows creation of the remote service manager for given session.
-This interface is oriented for communication with browsers plugins.
-
-@deprecated
-*/
-published interface XRemoteServiceManagerProvider: 
com::sun::star::uno::XInterface
-{
-/** Returns the remote service manager for the given session
-
-@param sessionData  [in]: contains the sessiondata (host, user, ticket)
-*/
-com::sun::star::lang::XMultiServiceFactory getServiceManager( [in] any 
sessionData );
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/source/filter/inc/viewsettings.hxx|3 -
 sc/source/filter/inc/worksheethelper.hxx |6 --
 sc/source/filter/oox/viewsettings.cxx|   11 ++-
 sc/source/filter/oox/workbookhelper.cxx  |4 -
 sc/source/filter/oox/worksheethelper.cxx |   93 +++
 5 files changed, 59 insertions(+), 58 deletions(-)

New commits:
commit 597f7b1f02be79f2443230c963b6d1bb594cffa0
Author: Bartosz Kosiorek 
Date:   Sun Nov 20 02:21:56 2016 +0100

tdf#48140 Replace uno call from worksheethelper.cxx

Change-Id: Ibf738d67af6536e9300e11f8d4fa3fe79ab7099b
Reviewed-on: https://gerrit.libreoffice.org/31006
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/filter/inc/viewsettings.hxx 
b/sc/source/filter/inc/viewsettings.hxx
index c7d3ec5..c7f343a 100644
--- a/sc/source/filter/inc/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -163,8 +163,7 @@ public:
 const SheetViewModelRef& rxSheetView,
 const css::uno::Any& rProperties );
 /** Stores the used area for a specific worksheet. */
-voidsetSheetUsedArea(
-const css::table::CellRangeAddress& rUsedArea );
+voidsetSheetUsedArea( const ScRange& rUsedArea );
 
 /** Converts all imported document view settings. */
 voidfinalizeImport();
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index 9623059..6111a60 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -33,13 +33,10 @@ namespace com { namespace sun { namespace star {
 namespace awt { struct Rectangle; }
 namespace awt { struct Size; }
 namespace drawing { class XDrawPage; }
-namespace sheet { class XSheetCellRanges; }
 namespace sheet { class XSpreadsheet; }
 namespace table { class XCell; }
 namespace table { class XCell2; }
 namespace table { class XCellRange; }
-namespace table { class XTableColumns; }
-namespace table { class XTableRows; }
 } } }
 
 namespace oox {
@@ -191,7 +188,7 @@ public:
 /** Returns the type of this sheet. */
 WorksheetType   getSheetType() const;
 /** Returns the index of the current sheet. */
-sal_Int32   getSheetIndex() const;
+SCTAB   getSheetIndex() const;
 /** Returns the XSpreadsheet interface of the current sheet. */
 const css::uno::Reference< css::sheet::XSpreadsheet >&
 getSheet() const;
@@ -252,6 +249,7 @@ public:
 /** Extends the used area of this sheet by the passed cell position. */
 voidextendUsedArea( const ScAddress& rAddress );
 /** Extends the used area of this sheet by the passed cell range. */
+voidextendUsedArea( const ScRange& rRange );
 voidextendUsedArea( const css::table::CellRangeAddress& 
rRange );
 /** Extends the shape bounding box by the position and size of the passed 
rectangle (in 1/100 mm). */
 voidextendShapeBoundingBox( const css::awt::Rectangle& 
rShapeRect );
diff --git a/sc/source/filter/oox/viewsettings.cxx 
b/sc/source/filter/oox/viewsettings.cxx
index 8a4dcaa..99f7c4a 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -533,9 +533,14 @@ void ViewSettings::setSheetViewSettings( sal_Int16 nSheet, 
const SheetViewModelR
 maSheetProps[ nSheet ] = rProperties;
 }
 
-void ViewSettings::setSheetUsedArea( const CellRangeAddress& rUsedArea )
-{
-maSheetUsedAreas[ rUsedArea.Sheet ] = rUsedArea;
+void ViewSettings::setSheetUsedArea( const ScRange& rUsedArea )
+{
+assert( rUsedArea.IsValid() );
+assert( rUsedArea.aStart.Col() <= MAXCOLCOUNT );
+assert( rUsedArea.aStart.Row() <= MAXROWCOUNT );
+maSheetUsedAreas[ rUsedArea.aStart.Tab() ] = CellRangeAddress( 
rUsedArea.aStart.Tab(),
+   
rUsedArea.aStart.Col(), rUsedArea.aStart.Row(),
+   
rUsedArea.aEnd.Col(), rUsedArea.aEnd.Row() );
 }
 
 void ViewSettings::finalizeImport()
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 8cd46ed..73cc67c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -133,7 +133,7 @@ public:
 /** Sets the VBA project storage used to import VBA source code and forms. 
*/
 inline void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) 
{ mxVbaPrjStrg = rxVbaPrjStrg; }
 /** Sets the index of the current Calc sheet, if filter currently 
processes a sheet. */
-inline void setCurrentSheetIndex( sal_Int16 nSheet ) { mnCurrSheet 
= nSheet; }
+inline void setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = 
nShee

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

[Bartosz Kosiorek]

 sc/source/filter/inc/drawingbase.hxx   |2 --
 sc/source/filter/inc/drawingfragment.hxx   |1 -
 sc/source/filter/inc/formulabuffer.hxx |3 ---
 sc/source/filter/inc/ooxformulaparser.hxx  |1 -
 sc/source/filter/inc/pivotcachebuffer.hxx  |1 -
 sc/source/filter/inc/scenariobuffer.hxx|1 -
 sc/source/filter/inc/stylesbuffer.hxx  |1 -
 sc/source/filter/inc/viewsettings.hxx  |1 -
 sc/source/filter/inc/xlstyle.hxx   |1 -
 sc/source/filter/xml/XMLCalculationSettingsContext.cxx |1 -
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx   |4 
 sc/source/filter/xml/XMLTableShapeResizer.cxx  |2 --
 sc/source/filter/xml/XMLTableShapesContext.cxx |1 -
 sc/source/filter/xml/xmlbodyi.cxx  |1 -
 sc/source/filter/xml/xmlcoli.cxx   |1 -
 sc/source/filter/xml/xmldrani.cxx  |6 --
 sc/source/filter/xml/xmlexprt.cxx  |9 -
 sc/source/filter/xml/xmlimprt.cxx  |5 -
 sc/source/filter/xml/xmlstyle.cxx  |1 -
 sc/source/filter/xml/xmlsubti.cxx  |7 ---
 sc/source/filter/xml/xmlwrap.cxx   |8 
 21 files changed, 58 deletions(-)

New commits:
commit 069445f9cdf4d3f48cbfcf7cb4bf02d16f74956e
Author: Bartosz Kosiorek 
Date:   Mon Nov 21 15:44:20 2016 +0100

tdf#42949 Remove not needed uno headers from filters/xml

Change-Id: I5be5150a41906aa550e1fe00aa1647d79315172d
Reviewed-on: https://gerrit.libreoffice.org/31043
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/filter/inc/drawingbase.hxx 
b/sc/source/filter/inc/drawingbase.hxx
index 16e258f..c0682da 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -23,8 +23,6 @@
 #include 
 #include "worksheethelper.hxx"
 
-#include 
-#include 
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/drawingfragment.hxx 
b/sc/source/filter/inc/drawingfragment.hxx
index 6c52a4e..e9a29d2 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGFRAGMENT_HXX
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/filter/inc/formulabuffer.hxx 
b/sc/source/filter/inc/formulabuffer.hxx
index d52f2d6..1d1bc77 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -18,9 +18,6 @@
 #include "workbookhelper.hxx"
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include "worksheethelper.hxx"
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx 
b/sc/source/filter/inc/ooxformulaparser.hxx
index c5b1d31..eaf1a11 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx 
b/sc/source/filter/inc/pivotcachebuffer.hxx
index a45e09c..2add88c 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_PIVOTCACHEBUFFER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_PIVOTCACHEBUFFER_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/filter/inc/scenariobuffer.hxx 
b/sc/source/filter/inc/scenariobuffer.hxx
index d0c117f..cfe18f7 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_SCENARIOBUFFER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_SCENARIOBUFFER_HXX
 
-#include 
 #include 
 #include 
 #include "workbookhelper.hxx"
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index d284fbc..2bc7598 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/filter/inc/viewsettings.hxx 
b/sc/source/filter/inc/viewsettings.hxx
index 951e0e2..c7d3ec5 100644
--- a/sc/source/filter/inc/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_VIEWSETTINGS_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_VIEWSETTINGS_HXX
 
-#include 
 #include 
 #include "addressconverter.hxx"
 #include "stylesbuffer.hxx"
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index b83a646..339002d 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #includ

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

[Wastack]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit a2686cc717187637c47f9c748b115a46bf16eced
Author: Wastack 
Date:   Thu Nov 17 14:41:35 2016 +0100

tdf#74172 ensure prepared while setting numeric

Change-Id: I727a0af5c3aa1b2e1f6c251b2dcb32feb46041d6
Reviewed-on: https://gerrit.libreoffice.org/30933
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 2885193..35da8ff 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -599,6 +599,10 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( 
sal_Int32 parameterIndex, c
 {
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 ::osl::MutexGuard aGuard( m_aMutex );
+ensurePrepared();
+
+checkParameterIndex(parameterIndex);
+setParameterNull(parameterIndex, false);
 
 XSQLVAR* pVar = m_pInSqlda->sqlvar + (parameterIndex - 1);
 int dType = (pVar->sqltype & ~1); // drop null flag
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/inc/cmdid.h  |1 -
 sw/inc/viewopt.hxx  |   11 +--
 sw/qa/extras/uiwriter/uiwriter.cxx  |8 +++-
 sw/source/core/crsr/crsrsh.cxx  |2 +-
 sw/source/ui/config/optpage.cxx |   13 -
 sw/source/uibase/app/appopt.cxx |7 +--
 sw/source/uibase/config/usrpref.cxx |   15 ++-
 sw/source/uibase/config/viewopt.cxx |   17 +
 sw/source/uibase/inc/optpage.hxx|1 -
 sw/uiconfig/swriter/ui/optformataidspage.ui |   14 --
 10 files changed, 29 insertions(+), 60 deletions(-)

New commits:
commit efbf399e773c6fc04496331b6ff1efde54bd4f9e
Author: Mike Kaganski 
Date:   Fri Nov 18 22:41:13 2016 +0300

related: tdf#90362: remove option from Formatting Aids

The option to ignore protection breaks expected functionality
(protection, including sections protected with password), and may
cause problems mentioned in original bug. This only should be used
in specific recovery situations.

Moving it from user-visible page to Expert Configuration.
(Previously, changing it in Expert Configuration hadn't effect.)

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

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b3451c9..cf15543 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -786,7 +786,6 @@
 #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R   (FN_PARAM2+26)
 #define FN_PARAM_PAM(FN_PARAM2+27) /* Point and Mark */
 #define FN_TEXT_BOX (FN_PARAM2+28) /* TextBox Property*/
-#define FN_PARAM_IGNORE_PROTECTED   (FN_PARAM2+29) /* Ignore protected 
areas */
 
 // Status: not more than 19!
 #define FN_STAT_PAGE(FN_STAT + 1)
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 63ba55c..39e30fd 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -74,7 +74,6 @@ enum class ViewOptCoreFlags2 {
 CursorInProt  = 0x0008,
 PdfExport = 0x0010,
 Printing  = 0x0020,
-IgnoreProt= 0x0040
 };
 namespace o3tl {
 template<> struct typed_flags : 
is_typed_flags {};
@@ -358,15 +357,7 @@ public:
 inline void SetCursorInProtectedArea(bool b)
 { b ? (m_nCore2Options |= ViewOptCoreFlags2::CursorInProt) : 
(m_nCore2Options &= ~ViewOptCoreFlags2::CursorInProt);}
 
-bool IsIgnoreProtectedArea() const
-{
-return bool(m_nCore2Options & ViewOptCoreFlags2::IgnoreProt);
-}
-
-void SetIgnoreProtectedArea(bool bSet)
-{
-bSet ? (m_nCore2Options |= ViewOptCoreFlags2::IgnoreProt) : 
(m_nCore2Options &= ~ViewOptCoreFlags2::IgnoreProt);
-}
+static bool IsIgnoreProtectedArea();
 
 inline bool IsPDFExport() const
 {return bool(m_nCore2Options & ViewOptCoreFlags2::PdfExport); }
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 4c12fc3..46fd478 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -95,6 +95,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
@@ -3017,11 +3018,8 @@ void SwUiWriterTest::testTdf90362()
 CPPUNIT_ASSERT_EQUAL(true, pWrtShell->HasReadonlySel());
 
 // Then enable ignoring of protected areas and make sure that this time 
the cursor is read-write.
-pWrtShell->Up(/*bSelect=*/false);
-SwViewOption aViewOptions(*pWrtShell->GetViewOptions());
-aViewOptions.SetIgnoreProtectedArea(true);
-pWrtShell->ApplyViewOptions(aViewOptions);
-pWrtShell->Down(/*bSelect=*/false);
+uno::Reference 
xComponentContext(comphelper::getProcessComponentContext());
+comphelper::ConfigurationHelper::writeDirectKey(xComponentContext, 
"org.openoffice.Office.Writer/", "Cursor/Option", "IgnoreProtectedArea", 
css::uno::Any(true), comphelper::EConfigurationModes::Standard);
 CPPUNIT_ASSERT_EQUAL(false, pWrtShell->HasReadonlySel());
 }
 
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 480c80e..69ca21f 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3060,7 +3060,7 @@ bool SwCursorShell::HasReadonlySel(bool bAnnotationMode) 
const
 // If protected area is to be ignored, then selections are never read-only.
 if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView() ||
 GetDoc()->GetDocumentSettingManager().get( 
DocumentSettingId::PROTECT_FORM )) &&
-!GetViewOptions()->IsIgnoreProtectedArea())
+!SwViewOption::IsIgnoreProtectedArea())
 {
 if ( m_pTableCursor != nullptr )
 {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e4c17d0..7a24b7d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui

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

[Eike Rathke]

Hi Tamás,

On Monday, 2016-11-21 13:43:18 +, Tamás Zolnai wrote:

>  offapi/com/sun/star/sheet/GeneralFunction.idl |   14 ++
>  offapi/type_reference/offapi.idl  |   18 +-

This is a no-go, already the previous commit
eb27a63a38ee7d15292dc40520b0605e4c2228e2 was.. if you have to modify
offapi/type_reference/offapi.idl then obviously you're introducing an
incompatible change, and the type_reference should *never* be modified,
as it exactly checks API against incompatibilites with existing API.

In this case extending an enum with a new value, even if appended, may
cause problems with existing Java programs, if it receives an unknown
enum value it will bail out.

Because css::sheet::GeneralFunction is used as readable property, as
return value and also as a member in css::sheet::SubTotalColumn that can
be returned these changes are not acceptable. Please revert:

commit eabfd1b60f8e181e0ef2721e716210390528f4ce
Author: Tamás Zolnai 
Date:   Mon Nov 21 13:57:29 2016 +

commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
Author: Tamás Zolnai 
Date:   Sat Nov 19 22:27:20 2016 +0100


To introduce new values one has to create a new type, best constant as
constant values can be extended, add a new optional property using that
type, overriding the old enum, derive a new interface using the type for
all interfaces that use GeneralFunction and derive a new struct for
SubTotalColumn to also use GeneralFunction. Yes this is painful.. and
a reason to never introduce enum types again.

For an example see commit 4c4976f717b3ddce68a872dffc2079ae49c41616

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: officecfg/registry

[Caolán McNamara]

 officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 
   6 +++---
 officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu| 
   6 +++---
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu   | 
   6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 6f8f053a22a9010b50e6142443909bd31d5501df
Author: Caolán McNamara 
Date:   Mon Nov 21 14:33:31 2016 +

set the search toolbar so it doesn't move around wrt table/numbering 
toolbars

- in Writer
- Ctrl+F
=> search field/toolbox appears at the bottom
- enter some search term and click on the "Find Next" arrow
- if the searched term appears in in a list or a table, the
corresponding contextual toolbox appears _below_ the search toolbox,
pushing it one row above.
=> as user searchs repeatedly by clicking on the "Find Next" arrow, user 
tends
to click on the appeared toolbox, triggering unwanted actions (like 
re-starting
numbering of lists).

As a user, I'd like to have:
- the search toolbox remaining fixed on the screen and not moving around

Change-Id: I809f1ff4479c31917323a39e15079205553e8b22

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 7d1baa4..4a22d51 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -105,7 +105,7 @@
   
   
 
-  0,3
+  0,1
 
 
   true
@@ -159,7 +159,7 @@
   
   
 
-  0,0
+  0,2
 
 
   1
@@ -179,7 +179,7 @@
   
   
 
-  0,0
+  0,3
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index ccbc3ca..87c4c86 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -95,7 +95,7 @@
   
   
 
-  0,3
+  0,1
 
 
   true
@@ -172,7 +172,7 @@
   
   
 
-  0,0
+  0,2
 
 
   1
@@ -482,7 +482,7 @@
   
   
 
-  0,0
+  0,3
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 00fc15e..f1eb33d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -105,7 +105,7 @@
   
   
 
-  0,3
+  0,1
 
 
   true
@@ -221,7 +221,7 @@
   
   
 
-  0,1
+  0,2
 
 
   1
@@ -241,7 +241,7 @@
   
   
 
-  0,2
+  0,3
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 forms/source/component/ListBox.cxx |   26 +-
 forms/source/component/ListBox.hxx |2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 66ccfcd2908445b8194c364c89778056374b02af
Author: Jochen Nitschke 
Date:   Fri Oct 21 09:36:10 2016 +0200

remove use of tryPropertyValue Any specialisation

change return value of getCurrentMultiValue from Any >
to Sequence.
return value of getCurrentSingleValue (Any of connectivity::ORowSetValue)
can't be changed to use tryPropertyValue.
inline functionality

Change-Id: I3180cf5b9e63a3da9257b03ba02967a2d5402ec3
Reviewed-on: https://gerrit.libreoffice.org/30091
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/forms/source/component/ListBox.cxx 
b/forms/source/component/ListBox.cxx
index 840d2a4..00e1e7a 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -271,7 +271,7 @@ namespace frm
 break;
 
 case PROPERTY_ID_SELECT_VALUE_SEQ:
-_rValue = getCurrentMultiValue();
+_rValue <<= getCurrentMultiValue();
 break;
 
 case PROPERTY_ID_SELECT_VALUE:
@@ -416,9 +416,17 @@ namespace frm
 break;
 
 case PROPERTY_ID_SELECT_VALUE :
-bModified = tryPropertyValue(_rConvertedValue, _rOldValue, 
_rValue, getCurrentSingleValue());
+{
+// Any from connectivity::ORowSetValue
+Any _rCurrentValue = getCurrentSingleValue();
+if (_rCurrentValue != _rValue)
+{
+_rOldValue = _rValue;
+_rConvertedValue = _rCurrentValue;
+bModified = true;
+}
 break;
-
+}
 case PROPERTY_ID_DEFAULT_SELECT_SEQ :
 bModified = tryPropertyValue(_rConvertedValue, _rOldValue, 
_rValue, m_aDefaultSelectSeq);
 break;
@@ -1517,7 +1525,7 @@ namespace frm
 }
 
 
-Any lcl_getMultiSelectedEntriesAny( const Sequence< sal_Int16 >& 
_rSelectSequence, const ValueList& _rStringList )
+Sequence< Any > lcl_getMultiSelectedEntriesAny( const Sequence< 
sal_Int16 >& _rSelectSequence, const ValueList& _rStringList )
 {
 Sequence< Any > aSelectedEntriesValues( 
_rSelectSequence.getLength() );
 ::std::transform(
@@ -1526,7 +1534,7 @@ namespace frm
 aSelectedEntriesValues.getArray(),
 ExtractAnyFromValueList_Safe( _rStringList )
 );
-return makeAny( aSelectedEntriesValues );
+return aSelectedEntriesValues;
 }
 }
 
@@ -1542,7 +1550,7 @@ namespace frm
 switch ( lcl_getCurrentExchangeType( getExternalValueType() ) )
 {
 case eValueList:
-aReturn = getCurrentMultiValue();
+aReturn <<= getCurrentMultiValue();
 break;
 
 case eValue:
@@ -1613,9 +1621,9 @@ namespace frm
 return aCurrentValue;
 }
 
-Any OListBoxModel::getCurrentMultiValue() const
+Sequence< Any > OListBoxModel::getCurrentMultiValue() const
 {
-Any aCurrentValue;
+Sequence< Any > aCurrentValue;
 
 try
 {
@@ -1648,7 +1656,7 @@ namespace frm
 OSL_VERIFY( const_cast< OListBoxModel* >( this 
)->getPropertyValue( PROPERTY_MULTISELECTION ) >>= bMultiSelection );
 
 if ( bMultiSelection )
-aCurrentValue = getCurrentMultiValue();
+aCurrentValue <<= getCurrentMultiValue();
 else
 aCurrentValue = getCurrentSingleValue();
 }
diff --git a/forms/source/component/ListBox.hxx 
b/forms/source/component/ListBox.hxx
index e1977fe..3946d33 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -209,7 +209,7 @@ protected:
 
 void init();
 css::uno::Any getCurrentSingleValue() const;
-css::uno::Any getCurrentMultiValue() const;
+css::uno::Sequence getCurrentMultiValue() const;
 css::uno::Sequence< sal_Int16 > translateBindingValuesToControlValue(
 const css::uno::Sequence< const css::uno::Any > &i_aValues)
 const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 extras/source/palettes/librecolour.soc | 1039 -
 1 file changed, 1039 deletions(-)

New commits:
commit 728c9a0d47b83910c5a9e38ac5c80f34fe3dfe54
Author: Jan Holesovsky 
Date:   Mon Nov 21 13:46:43 2016 +

Revert "tdf#104052 - Add LibreColor palette"

Unfortunately contributed under Creative Commons Attribution-NoDerivatives 
4.0; let's revert for now to prevent confusion, hopefully the author will 
re-license.

This reverts commit 100dfb680d068e9c7e45b2147888a6c30f31276c.

Change-Id: I1c8fc09abfd1acaef185bbe0e87e593d8d2a0352
Reviewed-on: https://gerrit.libreoffice.org/31042
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/extras/source/palettes/librecolour.soc 
b/extras/source/palettes/librecolour.soc
deleted file mode 100644
index e87cfaa..000
--- a/extras/source/palettes/librecolour.soc
+++ /dev/null
@@ -1,1039 +0,0 @@
-
-
-
-
-http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg";
-xmlns:ooo="http://openoffice.org/2004/office";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
- 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac

[Andras Timar]

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

New commits:
commit 15345b65c9d69f9cd652800d7192884d6fac815d
Author: Andras Timar 
Date:   Mon Nov 21 14:50:42 2016 +0100

Bump version to 5.0-13

Change-Id: I5869d82f89fe5be7e8c6e7350647090526435ed3

diff --git a/configure.ac b/configure.ac
index 3b5426b..ed4177e 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([Collabora Office],[5.1.10.12],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.13],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 6 commits - offapi/com offapi/type_reference sc/inc sc/qa sc/source

[Stephan Bergmann]

On 11/21/2016 01:56 PM, Zolnai Tamás wrote:

But anyway I added a new functionality to Calc and for doing that I
needed to extend API too. I hope it's an acceptable reason. Can we
agree on that?


No idea myself.  But I'd hope some Calc expert would raise their hand if 
this isn't a good solution.



OK. Then I'll move median to the end of this GeneralFunction enum, to
avoid broke those 3rd party code which uses enums on such way it leads
to problem.


Thanks.

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

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

[Tamás Zolnai]

 offapi/com/sun/star/sheet/GeneralFunction.idl |   14 ++
 offapi/type_reference/offapi.idl  |   18 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit eabfd1b60f8e181e0ef2721e716210390528f4ce
Author: Tamás Zolnai 
Date:   Mon Nov 21 13:57:29 2016 +

[API Change]: Move recently added median function to the end of enum

Change-Id: Ie6f2c6f53b354552b855264faea1ae9f5cb2b76d
Reviewed-on: https://gerrit.libreoffice.org/31041
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/offapi/com/sun/star/sheet/GeneralFunction.idl 
b/offapi/com/sun/star/sheet/GeneralFunction.idl
index 726ae9d..a7d3416 100644
--- a/offapi/com/sun/star/sheet/GeneralFunction.idl
+++ b/offapi/com/sun/star/sheet/GeneralFunction.idl
@@ -56,13 +56,6 @@ published enum GeneralFunction
 AVERAGE,
 
 
-/**
-*   median of all numerical values is calculated.
-*   @since LibreOffice 5.3
-*/
-MEDIAN,
-
-
 /** maximum value of all numerical values is calculated.
  */
 MAX,
@@ -100,8 +93,13 @@ published enum GeneralFunction
 
 /** variance is calculated based on the entire population.
  */
-VARP
+VARP,
 
+/**
+*   median of all numerical values is calculated.
+*   @since LibreOffice 5.3
+*/
+MEDIAN
 };
 
 
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index b939b24..e955541 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -11484,15 +11484,15 @@ module com {
  SUM = 2,
  COUNT = 3,
  AVERAGE = 4,
- MEDIAN = 5,
- MAX = 6,
- MIN = 7,
- PRODUCT = 8,
- COUNTNUMS = 9,
- STDEV = 10,
- STDEVP = 11,
- VAR = 12,
- VARP = 13
+ MAX = 5,
+ MIN = 6,
+ PRODUCT = 7,
+ COUNTNUMS = 8,
+ STDEV = 9,
+ STDEVP = 10,
+ VAR = 11,
+ VARP = 12,
+ MEDIAN = 13
 };
 /** @deprecated */ published interface XConsolidationDescriptor {
  interface ::com::sun::star::uno::XInterface;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sdr/properties/textproperties.cxx |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 796ace6f14a1d2676b11609b624fea43675486fe
Author: Caolán McNamara 
Date:   Mon Nov 21 13:03:12 2016 +

use same post-decrement symbol throughout

rather than have half and half

Change-Id: I388b2abdcaceec1bf770d581dd5a8174158871ac

diff --git a/svx/source/sdr/properties/textproperties.cxx 
b/svx/source/sdr/properties/textproperties.cxx
index d2ba014..e87d525 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -82,13 +82,13 @@ namespace sdr
 void TextProperties::ItemSetChanged(const SfxItemSet& rSet)
 {
 SdrTextObj& rObj = static_cast(GetSdrObject());
-const svx::ITextProvider& rTextProvider(getTextProvider());
-sal_Int32 nText = rTextProvider.getTextCount();
 
 // #i101556# ItemSet has changed -> new version
 maVersion++;
 
-while( --nText >= 0 )
+const svx::ITextProvider& rTextProvider(getTextProvider());
+sal_Int32 nText = rTextProvider.getTextCount();
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -173,7 +173,7 @@ namespace sdr
 
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nCount = rTextProvider.getTextCount();
-while( nCount-- )
+while (nCount--)
 {
 SdrText* pText = rTextProvider.getText( nCount );
 OutlinerParaObject* pParaObj = 
pText->GetOutlinerParaObject();
@@ -246,8 +246,7 @@ namespace sdr
 
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nText = rTextProvider.getTextCount();
-
-while( --nText >= 0 )
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -408,8 +407,7 @@ namespace sdr
 Outliner* pOutliner = 
SdrMakeOutliner(OutlinerMode::OutlineObject, *rObj.GetModel());
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nText = rTextProvider.getTextCount();
-
-while( --nText >= 0 )
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -563,7 +561,7 @@ namespace sdr
 rObj.SetPortionInfoChecked(false);
 
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText >= 0 )
+while (nText--)
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
@@ -586,7 +584,7 @@ namespace sdr
 {
 rObj.SetPortionInfoChecked(false);
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText >= 0 )
+while (nText--)
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
@@ -608,7 +606,7 @@ namespace sdr
 if(aOldName != aNewName)
 {
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText >= 0 )
+while (nText--)
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
commit 8e89a8af9246da45d78f8d03468cd8eba2369076
Author: Caolán McNamara 
Date:   Mon Nov 21 13:00:38 2016 +

these are surely wrong as well

Change-Id: Ib223781621985c3bcf8144a6e0b9d2df8c083f42

diff --git a/svx/source/sdr/properties/textproperties.cxx 
b/svx/source/sdr/properties/textproperties.cxx
index fa8762a..d2ba014 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -563,7 +563,7 @@ namespace sdr
 rObj.SetPortionInfoChecked(false);
 
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText > 0 )
+while( --nText >= 0 )
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
@@ -586,7 +586,7 @@ namespace sdr
 {
 rObj.SetPortionInfoChecked(false);
 sal_Int32 nText = rTextProv

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

[Jochen Nitschke]

 include/comphelper/sequenceashashmap.hxx |   24 
 sw/source/core/unocore/unocrsrhelper.cxx |   44 +++
 sw/source/core/unocore/unotbl.cxx|   16 ++-
 3 files changed, 43 insertions(+), 41 deletions(-)

New commits:
commit 783b93978d49ccdbc30b4afdd95a94980f99100e
Author: Jochen Nitschke 
Date:   Fri Oct 21 17:23:10 2016 +0200

introduce getValue(sKey) for SequenceAsHashMap

returns the plain value (Any) if it exists, else return an empty Any
replaces some getUnpackedValueOrDefault calls in sw
where is was not clear if the unpacked value exsisted or was default

needed for removal of Any-to-Any template specialisations

Change-Id: I618da7a7174143f5edef48e47e7aa1b6a52845e1
Reviewed-on: https://gerrit.libreoffice.org/30114
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/comphelper/sequenceashashmap.hxx 
b/include/comphelper/sequenceashashmap.hxx
index cea5493..fdec8cc 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -237,6 +237,30 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public 
SequenceAsHashMapBase
 return aValue;
 }
 
+/** @short  check if the specified item exists
+and return its value or it returns
+an empty css::uno::Any.
+
+@descr  If a value should be extracted only in case
+the requested property exists really (without creating
+of new items as the index operator of a
+hash map does!) this method can be used.
+
+@param  sKey
+key name of the item.
+
+@return The value of the specified property or
+an empty css::uno::Any.
+ */
+inline css::uno::Any getValue(const OUString& sKey) const
+{
+const_iterator pIt = find(sKey);
+if (pIt == end())
+return css::uno::Any();
+
+return pIt->second;
+}
+
 
 /** @short  creates a new item with the specified
 name and value only in case such item name
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index 8de8c1e..6ee2bb8 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1172,25 +1172,18 @@ void makeRedline( SwPaM& rPaM,
 
 //todo: what about REDLINE_FMTCOLL?
 comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
-uno::Any aAuthorValue;
-aAuthorValue = aPropMap.getUnpackedValueOrDefault("RedlineAuthor", 
aAuthorValue);
 sal_uInt16 nAuthor = 0;
 OUString sAuthor;
-if( aAuthorValue >>= sAuthor )
+if( aPropMap.getValue("RedlineAuthor") >>= sAuthor )
 nAuthor = pRedlineAccess->InsertRedlineAuthor(sAuthor);
 
 OUString sComment;
-uno::Any aCommentValue;
-aCommentValue = aPropMap.getUnpackedValueOrDefault("RedlineComment", 
aCommentValue);
-
 SwRedlineData aRedlineData( eType, nAuthor );
-if( aCommentValue >>= sComment )
+if( aPropMap.getValue("RedlineComment") >>= sComment )
 aRedlineData.SetComment( sComment );
 
 ::util::DateTime aStamp;
-uno::Any aDateTimeValue;
-aDateTimeValue = aPropMap.getUnpackedValueOrDefault("RedlineDateTime", 
aDateTimeValue);
-if( aDateTimeValue >>= aStamp )
+if( aPropMap.getValue("RedlineDateTime") >>= aStamp )
 {
 aRedlineData.SetTimeStamp( DateTime( aStamp));
 }
@@ -1199,11 +1192,8 @@ void makeRedline( SwPaM& rPaM,
 
 // Read the 'Redline Revert Properties' from the parameters
 uno::Sequence< beans::PropertyValue > aRevertProperties;
-uno::Any aRevertPropertiesValue;
-aRevertPropertiesValue = 
aPropMap.getUnpackedValueOrDefault("RedlineRevertProperties", 
aRevertPropertiesValue);
-
 // Check if the value exists
-if ( aRevertPropertiesValue >>= aRevertProperties )
+if ( aPropMap.getValue("RedlineRevertProperties") >>= aRevertProperties )
 {
 int nMap = 0;
 // Make sure that paragraph format gets its own map, otherwise e.g. 
fill attributes are not preserved.
@@ -1297,25 +1287,18 @@ void makeTableRowRedline( SwTableLine& rTableLine,
 }
 
 comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
-uno::Any aAuthorValue;
-aAuthorValue = aPropMap.getUnpackedValueOrDefault("RedlineAuthor", 
aAuthorValue);
 sal_uInt16 nAuthor = 0;
 OUString sAuthor;
-if( aAuthorValue >>= sAuthor )
+if( aPropMap.getValue("RedlineAuthor") >>= sAuthor )
 nAuthor = pRedlineAccess->InsertRedlineAuthor(sAuthor);
 
 OUString sComment;
-uno::Any aCommentValue;
-aCommentValue = aPropMap.getUnpackedValueOrDefault("RedlineComment", 
aCommentValue);
-
 SwRedlineData aRedlineData( eType, nAuthor );
-if( aCommentValue >>= sComment )
+if( aPropMap.

Re: LibreOffice for FreeBSD on PowerPC

[Michael Stahl]

On 19.11.2016 00:19, Curtis Hamilton wrote:
> 
> 
> On 11/18/2016 05:26, Michael Stahl wrote:
>> On 17.11.2016 17:54, Curtis Hamilton wrote:

>> My build environment:
>>
>> OS: FreeBSD 10.2-STABLE powerpc (64-bit)
>> Compiler: GCC version 4.8.5
>> Java Version:  OpenJDK Runtime Environment (build 1.8.0_102-b14)
>>  OpenJDK 64-Bit Server VM (build 25.102-b14, mixed mode)
>>
>> I’m hoping that someone with knowledge of the workings of the user
>> interface can provide some insight on what to look at.  I’m not sure if
>> this is a LibreOffice issue or FreeBSD on PowerPC issue.
>> it could be either, in particular if it's big-endian PPC there might be
>> an endian issue in some image handling code, of which there is quite a
>> lot for various different formats.
>>
> that was my initial assumption, but could not figure out how
> OSL_BIGENDIAN was being defined, since "osl/endian.h" is not being
> included in all files that tests for OSL_BIGENDIAN.

urgh, really? ... yes that is clearly the case ... i hope it should be
fixed with these commits

https://gerrit.libreoffice.org/#/c/31039/
https://gerrit.libreoffice.org/#/c/31040/


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

Re: [Libreoffice-commits] core.git: 6 commits - offapi/com offapi/type_reference sc/inc sc/qa sc/source

[Stephan Bergmann]

On 11/21/2016 12:53 PM, Zolnai Tamás wrote:

2016-11-21 10:52 GMT+01:00 Stephan Bergmann :

On 11/20/2016 12:43 AM, Tamás Zolnai wrote:


commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
Author: Tamás Zolnai 
Date:   Sat Nov 19 22:27:20 2016 +0100

[API Change] PivotMedian: Add median to pivot table function type



Are you sure that this incompatible change is acceptable?  Can you give some
rationale why that would be so (e.g., this functionality might be known to
be hardly useful for 3rd party code anyway).


Yes. Calc code uses UNO API, that's why I needed to make this
modification. The 3rd party code here is Calc.


No, 3rd party code is always code that's not shipped as part of LO (so 
we can't adapt it when doing changes like this, so need to rationalize 
whether doing a change like this is acceptable).



Why did you add the new member in the middle, changing the values of many
existing members?  Adding it to the end would at least reduce the risk of
breaking things.


I thought we can change API on an incompatible way in main versions
like 5.3. Was I wrong here?


We want to minimize impact on 3rd party code, so every such incompatible 
change needs to be done carefully, weighing the pros and cons.



I added to the middle because I tried to add it to a reasonable place
in this list. Median can be in a group with Average, Maximum and
Minimum in meaning, but of course I can take it down to the end if
that's your main problem.


My main concern is breaking the API.  A subordinate concern is breaking 
it in a more dangerous way than necessary.



In general I don't agree with that idea to fear to change anything in
the API, because it ties the development of it. API actually should
follow the changes of the internal code. Of course, I accept that it
should be done a reasonable way, along a reasonable policy. So my
question is, when I can change API in an incompatible way? What is the
policy here?


The general approach is to avoid incompatible changes as much as 
possible.  And if there is compelling reason and consensus to do such a 
change nevertheless, to do it in the least disruptive way.

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

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

[Noel Grandin]

 include/sot/stg.hxx   |   22 ++
 include/sot/storage.hxx   |2 +-
 include/svl/cintitem.hxx  |8 
 include/svl/custritm.hxx  |2 +-
 include/svl/gridprinter.hxx   |2 +-
 include/svl/int64item.hxx |2 +-
 include/svl/itempool.hxx  |4 ++--
 include/svl/metitem.hxx   |2 +-
 include/svl/visitem.hxx   |2 +-
 include/svl/zformat.hxx   |2 +-
 sot/source/sdstor/storage.cxx |6 +++---
 11 files changed, 30 insertions(+), 24 deletions(-)

New commits:
commit 1617eef124e01ca3b3286e0ad5985c34dde7fadb
Author: Noel Grandin 
Date:   Mon Nov 21 13:05:56 2016 +0200

loplugin:countusersofdefaultparams in include/sot..svl

Change-Id: Idb022a4a6fb950f1b259abbba57daed9401732d9
Reviewed-on: https://gerrit.libreoffice.org/31038
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 29a7d12..3a11b4e 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -128,7 +128,7 @@ protected:
 StgDirEntry*pEntry;   // the dir entry
 OLEStorageBase( StgIo*, StgDirEntry*, StreamMode& );
 ~OLEStorageBase();
-boolValidate_Impl( bool=false ) const;
+boolValidate_Impl( bool ) const;
 static bool ValidateMode_Impl( StreamMode, StgDirEntry* p = nullptr );
 };
 
@@ -165,9 +165,9 @@ class SOT_DLLPUBLIC Storage : public BaseStorage, public 
OLEStorageBase
 protected:
 virtual ~Storage() override;
 public:
-Storage( const OUString &, StreamMode = 
StreamMode::STD_READWRITE, bool bDirect = true );
-Storage( SvStream& rStrm, bool bDirect = true 
);
-Storage( UCBStorageStream& rStrm, bool bDirect 
= true );
+Storage( const OUString &, StreamMode, bool 
bDirect );
+Storage( SvStream& rStrm, bool bDirect );
+Storage( UCBStorageStream& rStrm, bool bDirect 
);
 
 static bool IsStorageFile( const OUString & rFileName );
 static bool IsStorageFile( SvStream* );
@@ -258,11 +258,16 @@ public:
 static bool IsStorageFile( SvStream* );
 static OUString GetLinkedFile( SvStream& );
 
-UCBStorage( const ::ucbhelper::Content& 
rContent, const OUString& rName, StreamMode nMode, bool bDirect = true, bool 
bIsRoot = true );
+UCBStorage( const ::ucbhelper::Content& 
rContent,
+const OUString& rName,
+StreamMode nMode,
+bool bDirect,
+bool bIsRoot );
+
 UCBStorage( const OUString& rName,
 StreamMode nMode,
-bool bDirect = true,
-bool bIsRoot = true );
+bool bDirect,
+bool bIsRoot );
 
 UCBStorage( const OUString& rName,
 StreamMode nMode,
@@ -273,7 +278,8 @@ public:
 xProgressHandler );
 
 UCBStorage( UCBStorage_Impl* );
-UCBStorage( SvStream& rStrm, bool bDirect = 
true );
+
+UCBStorage( SvStream& rStrm, bool bDirect );
 
 virtual const OUString& GetName() const override;
 virtual boolIsRoot() const override;
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index fc0d424..2365f13 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -112,7 +112,7 @@ public:
 m_nError = nErrorCode;
 }
 
-voidSignAsRoot( bool b = true ) { m_bIsRoot = b; }
+voidSignAsRoot( bool b ) { m_bIsRoot = b; }
 
 // own data sector
 voidSetClass( const SvGlobalName & rClass,
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index 2c8afc8..e6b404c 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -30,7 +30,7 @@ class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem
 
 public:
 
-CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0):
+CntByteItem(sal_uInt16 which, sal_uInt8 nTheValue):
 SfxPoolItem(which), m_nValue(nTheValue) {}
 
 CntByteItem(const CntByteItem & rItem):
@@ -76,7 +76,7 @@ class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem
 
 public:
 
-CntUInt16Item(sal_u

[Libreoffice-commits] core.git: basctl/source cui/source editeng/source filter/source include/filter include/svx reportdesign/inc reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/in

[Noel Grandin]

 basctl/source/dlged/dlged.cxx   |2 
 basctl/source/dlged/dlgedfac.cxx|2 
 basctl/source/dlged/dlgedobj.cxx|4 -
 basctl/source/inc/dlgeddef.hxx  |5 --
 basctl/source/inc/dlgedobj.hxx  |2 
 cui/source/tabpages/swpossizetabpage.cxx|2 
 cui/source/tabpages/tabline.cxx |2 
 cui/source/tabpages/transfrm.cxx|2 
 editeng/source/uno/unoforou.cxx |2 
 filter/source/msfilter/msdffimp.cxx |4 -
 filter/source/msfilter/svdfppt.cxx  |2 
 include/filter/msfilter/svdfppt.hxx |6 --
 include/svx/fmglob.hxx  |5 --
 include/svx/fmview.hxx  |2 
 include/svx/galmisc.hxx |5 --
 include/svx/globl3d.hxx |5 --
 include/svx/obj3d.hxx   |4 -
 include/svx/sidebar/SelectionAnalyzer.hxx   |4 -
 include/svx/svdcrtv.hxx |   12 ++---
 include/svx/svdedxv.hxx |2 
 include/svx/svdobj.hxx  |   38 +++-
 include/svx/svdovirt.hxx|2 
 include/svx/svdtypes.hxx|8 ---
 include/svx/unoapi.hxx  |3 -
 include/svx/unopage.hxx |5 +-
 reportdesign/inc/RptDef.hxx |5 --
 reportdesign/inc/RptObject.hxx  |6 +-
 reportdesign/source/core/sdr/RptObject.cxx  |   12 ++---
 reportdesign/source/ui/report/ReportController.cxx  |8 +--
 reportdesign/source/ui/report/ViewsWindow.cxx   |2 
 reportdesign/source/ui/report/dlgedfac.cxx  |2 
 sc/inc/userdat.hxx  |2 
 sc/source/core/data/drwlayer.cxx|6 +-
 sc/source/core/data/userdat.cxx |   10 ++--
 sc/source/ui/app/drwtrans.cxx   |2 
 sc/source/ui/app/seltrans.cxx   |2 
 sc/source/ui/drawfunc/drawsh5.cxx   |4 -
 sc/source/ui/drawfunc/fuconuno.cxx  |4 -
 sc/source/ui/inc/fuconuno.hxx   |6 +-
 sc/source/ui/view/tabvwshg.cxx  |2 
 sd/inc/glob.hxx |6 --
 sd/inc/imapinfo.hxx |6 +-
 sd/source/core/EffectMigration.cxx  |2 
 sd/source/core/anminfo.cxx  |2 
 sd/source/core/drawdoc.cxx  |2 
 sd/source/core/drawdoc2.cxx |   10 ++--
 sd/source/core/drawdoc3.cxx |2 
 sd/source/core/drawdoc4.cxx |6 +-
 sd/source/core/sdobjfac.cxx |2 
 sd/source/core/sdpage.cxx   |8 +--
 sd/source/core/sdpage2.cxx  |4 -
 sd/source/filter/html/htmlex.cxx|6 +-
 sd/source/filter/xml/sdtransform.cxx|2 
 sd/source/ui/app/sdxfer.cxx |4 -
 sd/source/ui/dlg/animobjs.cxx   |6 +-
 sd/source/ui/dlg/dlgolbul.cxx   |2 
 sd/source/ui/dlg/sdtreelb.cxx   |8 +--
 sd/source/ui/dlg/tpaction.cxx   |8 +--
 sd/source/ui/func/fuconstr.cxx  |2 
 sd/source/ui/func/fuconuno.cxx  |4 -
 sd/source/ui/func/fudraw.cxx|   10 ++--
 sd/source/ui/func/fuformatpaintbrush.cxx|2 
 sd/source/ui/func/fuinsert.cxx  |2 
 sd/source/ui/func/fuinsfil.cxx  |2 
 sd/source/ui/func/fulinend.cxx  |2 
 sd/source/ui/func/fuoaprms.cxx  |8 +--
 sd/source/ui/func/fuolbull.cxx  |2 
 sd/source/ui/func/fupoor.cxx|8 +--
 sd/source/ui/func/fusel.cxx |6 +-
 sd/source/ui/func/futext.cxx|   12 ++---
 sd/source/ui/func/futransf.cxx  |2 
 sd/source/ui/inc/fuconuno.hxx   |6 +-
 sd/source/ui/inc/fuformatpaintbrush.hxx |2 
 sd/source/ui/tools/PreviewRenderer.cxx  |2 
 sd/source/ui/unoidl/unomodel.cxx|   12 ++---
 sd/source/ui/unoidl/unoobj.cxx  |2 
 sd/source/ui/unoidl/unopage.cxx |4 -
 sd/source/ui/view/DocumentRenderer.cxx  |4 -
 sd/source/ui/view/drawview.cxx  |   10 ++--
 sd/source/ui/view/drviews1.cxx  |   12 +

[Libreoffice-commits] core.git: 2 commits - connectivity/source cppcanvas/source include/oox sc/qa sw/source vcl/inc

[Michael Stahl]

 connectivity/source/drivers/odbc/OTools.cxx |1 +
 cppcanvas/source/inc/implrenderer.hxx   |2 ++
 include/oox/helper/helper.hxx   |1 +
 sc/qa/unit/screenshots/screenshots.cxx  |1 +
 sw/source/filter/ww8/ww8scan.hxx|1 +
 vcl/inc/headless/svpgdi.hxx |1 +
 6 files changed, 7 insertions(+)

New commits:
commit 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8
Author: Michael Stahl 
Date:   Mon Nov 21 12:16:37 2016 +0100

cppcanvas, oox: add missing #include 

These files use the macro OSL_BIGENDIAN but did not include the header
that defines it.

Found via:

git grep -l OSL_.*ENDIAN | grep -E '\.h(xx)?$' | while read f; do grep -L 
endian\\.h $f ; done

Change-Id: Iffb36336026e49a9c3d8fcf125a54ec857c7552e

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index ba18b76..b9babf1 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 1d274b1..2dc9243 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 6364c47..3587a9f 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include "sortedarray.hxx"
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 4373d10..1ef0f32 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
+#include 
 #include 
 #include 
 #include 
commit e2f08f9def0869460ad38a1c2adb450778290f6e
Author: Michael Stahl 
Date:   Mon Nov 21 12:05:05 2016 +0100

connectivity, sc: add missing #include 

These files use the macro OSL_BIGENDIAN but did not include the header
that defines it.

Found via:

git grep -l OSL_.*ENDIAN | grep -v -E '\.h(xx)?$' | while read f; do case 
$f in *cxx) grep -L endian\\.h workdir/Dep/CxxObject/${f%.cxx}.d ;; *) grep -L 
endian\\.h workdir/Dep/CObject/${f%.c}.d ;; esac ; done

Change-Id: Iaf589a8235dbc8062840d2716ab843e64b5cb7a2

diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index 228cc90..fafc3b8 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -21,6 +21,7 @@
 #include "odbc/OFunctions.hxx"
 #include 
 #include 
+#include 
 #include "odbc/OConnection.hxx"
 #include 
 
diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index 0f1e5a2..8271561 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/editobj.cxx  |   14 +++---
 editeng/source/editeng/editobj2.hxx |7 ---
 editeng/source/editeng/impedit4.cxx |4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit a57300a5fcabe38a0d8bb4e7218a3d1be9616bbd
Author: Caolán McNamara 
Date:   Mon Nov 21 10:50:39 2016 +

make this just every so slightly less awful

Change-Id: Iddc39359d426f345eff0abf9fc9616e19597a0a4

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 06e20d9..5a37083 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1027,8 +1027,8 @@ void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, 
const OUString& rName, c
 return;
 
 ContentInfo& rC = *aContents[nPara].get();
-rC.GetStyle() = rName;
-rC.GetFamily() = rFamily;
+rC.SetStyle(rName);
+rC.SetFamily(rFamily);
 }
 
 bool EditTextObjectImpl::ImpChangeStyleSheets(
@@ -1045,8 +1045,8 @@ bool EditTextObjectImpl::ImpChangeStyleSheets(
 {
 if ( rC.GetStyle() == rOldName )
 {
-rC.GetStyle() = rNewName;
-rC.GetFamily() = eNewFamily;
+rC.SetStyle(rNewName);
+rC.SetFamily(eNewFamily);
 bChanges = true;
 }
 }
@@ -1307,10 +1307,10 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream 
)
 pC->SetText(OStringToOUString(aByteString, eSrcEncoding));
 
 // StyleName and Family...
-pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding);
+pC->SetStyle(rIStream.ReadUniOrByteString(eSrcEncoding));
 sal_uInt16 nStyleFamily(0);
 rIStream.ReadUInt16( nStyleFamily );
-pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
+pC->SetFamily((SfxStyleFamily)nStyleFamily);
 
 // Paragraph attributes ...
 pC->GetParaAttribs().Load( rIStream );
@@ -1530,7 +1530,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
 
 rtl_uString *pStr = rtl_uString_alloc(nL);
 rIStream.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode) );
-rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE);
+rC.SetStyle(OUString(pStr, SAL_NO_ACQUIRE));
 }
 }
 }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 736e7cd7..9aaef1d 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -142,12 +142,13 @@ public:
 XEditAttributesType& GetCharAttribs() { return maCharAttribs; }
 
 const OUString& GetStyle()  const   { return aStyle; }
-const SfxItemSet&   GetParaAttribs()const   { return aParaAttribs; }
 SfxStyleFamily  GetFamily() const   { return eFamily; }
 
-OUString&   GetStyle()  { return aStyle; }
+voidSetStyle(const OUString& rStyle) { aStyle = rStyle; }
+voidSetFamily(const SfxStyleFamily& rFamily) { eFamily  = 
rFamily; }
+
+const SfxItemSet&   GetParaAttribs()const   { return aParaAttribs; }
 SfxItemSet& GetParaAttribs(){ return aParaAttribs; }
-SfxStyleFamily& GetFamily() { return eFamily; }
 
 const WrongList* GetWrongList() const;
 void SetWrongList( WrongList* p );
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index 7e6bc3ad..dde54ad 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1078,8 +1078,8 @@ EditTextObject* ImpEditEngine::CreateTextObject( 
EditSelection aSel, SfxItemPool
 // The StyleSheet...
 if ( pNode->GetStyleSheet() )
 {
-pC->GetStyle() = pNode->GetStyleSheet()->GetName();
-pC->GetFamily() = pNode->GetStyleSheet()->GetFamily();
+pC->SetStyle(pNode->GetStyleSheet()->GetName());
+pC->SetFamily(pNode->GetStyleSheet()->GetFamily());
 }
 
 // The Text...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Common.hpp loolwsd/LOOLWebSocket.hpp loolwsd/README.vars

[Pranav Kant]

 loolwsd/Common.hpp|2 ++
 loolwsd/LOOLWebSocket.hpp |   28 
 loolwsd/README.vars   |7 +++
 3 files changed, 37 insertions(+)

New commits:
commit 3c2337cfc5ea2f4f11ea3b8bc8d93051fdf55705
Author: Pranav Kant 
Date:   Mon Nov 21 15:36:05 2016 +0530

loolwsd: Random latency simulator - delay, jitter in websockets

Only enabled in debug build. Default values for base delay is
10ms and jitter 5ms.

Override using LOOL_WS_DELAY, LOOL_WS_JITTER env. variables

Change-Id: I50502613075d6f73365623b93eb17748fe96fcc3

diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index 814ab59..0223be8 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -22,6 +22,8 @@ constexpr long CHILD_TIMEOUT_MS = COMMAND_TIMEOUT_MS;
 constexpr int CHILD_REBALANCE_INTERVAL_MS = CHILD_TIMEOUT_MS / 10;
 constexpr int POLL_TIMEOUT_MS = COMMAND_TIMEOUT_MS / 10;
 constexpr int WS_SEND_TIMEOUT_MS = 1000;
+constexpr int WS_DELAY_MS = 10;
+constexpr int WS_JITTER_MS = 5;
 
 /// Pipe and Socket read buffer size.
 /// Should be large enough for ethernet packets
diff --git a/loolwsd/LOOLWebSocket.hpp b/loolwsd/LOOLWebSocket.hpp
index b4956ce..d78f625 100644
--- a/loolwsd/LOOLWebSocket.hpp
+++ b/loolwsd/LOOLWebSocket.hpp
@@ -10,7 +10,9 @@
 #ifndef INCLUDED_LOOLWEBSOCKET_HPP
 #define INCLUDED_LOOLWEBSOCKET_HPP
 
+#include 
 #include 
+#include 
 
 #include 
 
@@ -29,6 +31,24 @@ class LOOLWebSocket : public Poco::Net::WebSocket
 private:
 std::mutex _mutex;
 
+#ifdef ENABLE_DEBUG
+std::chrono::milliseconds getWebSocketDelay()
+{
+unsigned long baseDelay = WS_DELAY_MS;
+unsigned long jitter = WS_JITTER_MS;
+if (std::getenv("LOOL_WS_DELAY"))
+{
+baseDelay = std::stoul(std::getenv("LOOL_WS_DELAY"));
+}
+if (std::getenv("LOOL_WS_JITTER"))
+{
+jitter = std::stoul(std::getenv("LOOL_WS_JITTER"));
+}
+
+return std::chrono::milliseconds(baseDelay + (std::rand() % jitter));
+}
+#endif
+
 public:
 LOOLWebSocket(const Socket& socket) :
 Poco::Net::WebSocket(socket)
@@ -61,6 +81,10 @@ public:
 /// Should we also factor out the handling of non-final and continuation 
frames into this?
 int receiveFrame(char* buffer, const int length, int& flags)
 {
+#ifdef ENABLE_DEBUG
+// Delay receiving the frame
+std::this_thread::sleep_for(getWebSocketDelay());
+#endif
 // Timeout given is in microseconds.
 static const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
 
@@ -87,6 +111,10 @@ public:
 /// Wrapper for Poco::Net::WebSocket::sendFrame() that handles large 
frames.
 int sendFrame(const char* buffer, const int length, const int flags = 
FRAME_TEXT)
 {
+#ifdef ENABLE_DEBUG
+// Delay sending the frame
+std::this_thread::sleep_for(getWebSocketDelay());
+#endif
 std::unique_lock lock(_mutex);
 
 // Size after which messages will be sent preceded with
diff --git a/loolwsd/README.vars b/loolwsd/README.vars
index 305b9ea..b55672a 100644
--- a/loolwsd/README.vars
+++ b/loolwsd/README.vars
@@ -24,3 +24,10 @@ SLEEPKITFORDEBUGGER 
 sleep  seconds in each kit process instance after forking,
 to allow a 'sudo gdb' session to attach and debug that
 process.
+
+LOOL_WS_DELAY  
+   sleep atleast  seconds when sending and receiving websocket frames
+
+LOOL_WS_JITTER 
+   Maximum Jitter in millseconds which is added to delay in
+   websocket communication.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uitest/uitest

[Markus Mohrhard]

 uitest/uitest/path.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16982944a1800963ee01f6e429f5330cc82b5710
Author: Markus Mohrhard 
Date:   Mon Nov 21 11:40:05 2016 +0100

uitest: fix path to url conversion on windows

Our windows path is stored e.g. as D:/libo1 which os.path.path2url converts 
to D://libo1.
UNO does not recognize the URL as a valid file URL.

Change-Id: Iad4c4a3944d26312bb79bfeefaf55f697c0afd1c

diff --git a/uitest/uitest/path.py b/uitest/uitest/path.py
index 488520d..5a3aeff 100644
--- a/uitest/uitest/path.py
+++ b/uitest/uitest/path.py
@@ -14,7 +14,7 @@ def get_src_dir_fallback():
 return os.path.abspath(os.path.join(current_dir, "../../"))
 
 def path2url(path):
-return urljoin('file:', pathname2url(path))
+return urljoin('file:', pathname2url(os.path.normpath(path)))
 
 def get_workdir_url():
 workdir_path = os.environ.get('WORKDIR', 
os.path.join(get_src_dir_fallback(), 'workdir'))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 351751557b0e50816866381904be907745d918c4
Author: Caolán McNamara 
Date:   Mon Nov 21 10:22:27 2016 +

Resolves: rhbz#1396827 update geom on mouse click as well as motion

Change-Id: Ia361aa316fe3f5ecdd672d42de9bea7fcf142554

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 196114c..82af6fb 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2595,10 +2595,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 case 3: aEvent.mnButton = MOUSE_RIGHT;  break;
 default: return false;
 }
-aEvent.mnTime   = pEvent->time;
-aEvent.mnX  = (long)pEvent->x_root - pThis->maGeometry.nX;
-aEvent.mnY  = (long)pEvent->y_root - pThis->maGeometry.nY;
-aEvent.mnCode   = GetMouseModCode( pEvent->state );
 
 vcl::DeletionListener aDel( pThis );
 
@@ -2609,12 +2605,31 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 pThis->closePopup();
 }
 
-// --- RTL --- (mirror mouse pos)
-if( AllSettings::GetLayoutRTL() )
-aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
+if (!aDel.isDeleted())
+{
+int frame_x = (int)(pEvent->x_root - pEvent->x);
+int frame_y = (int)(pEvent->y_root - pEvent->y);
+if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+{
+pThis->maGeometry.nX = frame_x;
+pThis->maGeometry.nY = frame_y;
+ImplSVData* pSVData = ImplGetSVData();
+if (pSVData->maNWFData.mbCanDetermineWindowPosition)
+pThis->CallCallbackExc(SalEvent::Move, nullptr);
+}
+}
 
 if (!aDel.isDeleted())
 {
+aEvent.mnTime   = pEvent->time;
+aEvent.mnX  = (long)pEvent->x_root - pThis->maGeometry.nX;
+aEvent.mnY  = (long)pEvent->y_root - pThis->maGeometry.nY;
+aEvent.mnCode   = GetMouseModCode( pEvent->state );
+
+// --- RTL --- (mirror mouse pos)
+if( AllSettings::GetLayoutRTL() )
+aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
+
 pThis->CallCallbackExc( nEventType, &aEvent );
 }
 
@@ -2778,7 +2793,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, 
GdkEventMotion* pEvent, gpointer
 pThis->CallCallbackExc(SalEvent::Move, nullptr);
 }
 
-if( ! aDel.isDeleted() )
+if (!aDel.isDeleted())
 {
 SalMouseEvent aEvent;
 aEvent.mnTime   = pEvent->time;
@@ -2794,7 +2809,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, 
GdkEventMotion* pEvent, gpointer
 pThis->CallCallbackExc( SalEvent::MouseMove, &aEvent );
 }
 
-if( ! aDel.isDeleted() )
+if (!aDel.isDeleted())
 {
 // ask for the next hint
 gint x, y;
___
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' - editeng/source include/editeng

[Noel Grandin]

 editeng/source/editeng/editeng.cxx  |4 ++--
 editeng/source/editeng/editundo.cxx |2 +-
 editeng/source/editeng/impedit.hxx  |2 +-
 editeng/source/editeng/impedit3.cxx |6 +-
 include/editeng/editeng.hxx |2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 4e29dfdd4f95101a1ceff36f735bb0d2eef4d919
Author: Noel Grandin 
Date:   Mon Oct 24 14:12:12 2016 +0200

tdf#103334 - EDITING: Undo on bullet point style

I have checked the normal model and the editing model after UNDO, and
all seems to be well, this is purely a rendering/lack-of-invalidation
issue.

The extra invalidation I add here is restricted to the UNDO case to
prevent tripping up a LOK unit test
(SdTiledRenderingTest::testCursorViews).

I confess to not having followed the invalidation logic all the way to
see why exactly it makes the bug go away.

Reviewed-on: https://gerrit.libreoffice.org/30225
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit ee33745ced5ae12f9ae7735fac16a7298ccae474)

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index c3bb938..1715212 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -740,9 +740,9 @@ void EditEngine::SetUndoMode(bool b)
 pImpEditEngine->SetUndoMode(b);
 }
 
-void EditEngine::FormatAndUpdate(EditView* pCurView)
+void EditEngine::FormatAndUpdate(EditView* pCurView, bool bCalledFromUndo)
 {
-pImpEditEngine->FormatAndUpdate(pCurView);
+pImpEditEngine->FormatAndUpdate(pCurView, bCalledFromUndo);
 }
 
 void EditEngine::Undo(EditView* pView)
diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index faea53b..f900867 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -77,7 +77,7 @@ bool EditUndoManager::Undo()
 
 aNewSel.Min() = aNewSel.Max();
 mpEditEngine->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel 
);
-mpEditEngine->FormatAndUpdate( mpEditEngine->GetActiveView() );
+mpEditEngine->FormatAndUpdate( mpEditEngine->GetActiveView(), true );
 
 return bDone;
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 15a4339..6cea107 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -853,7 +853,7 @@ public:
 voidSetNotifyHdl( const Link& rLink ) { 
aNotifyHdl = rLink; }
 const Link&   GetNotifyHdl() const{ return 
aNotifyHdl; }
 
-voidFormatAndUpdate( EditView* pCurView = nullptr );
+voidFormatAndUpdate( EditView* pCurView = nullptr, bool 
bCalledFromUndo = false );
 inline void IdleFormatAndUpdate( EditView* pCurView = nullptr );
 
 svtools::ColorConfig& GetColorConfig();
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 4d8f674..1e748c4 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4026,7 +4026,7 @@ EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 
nPara )
 return pSel;
 }
 
-void ImpEditEngine::FormatAndUpdate( EditView* pCurView )
+void ImpEditEngine::FormatAndUpdate( EditView* pCurView, bool bCalledFromUndo )
 {
 if ( bDowning )
 return ;
@@ -4035,6 +4035,10 @@ void ImpEditEngine::FormatAndUpdate( EditView* pCurView )
 IdleFormatAndUpdate( pCurView );
 else
 {
+if (bCalledFromUndo)
+// in order to make bullet points that have had their styles 
changed, redraw themselves
+for ( sal_Int32 nPortion = 0; nPortion < 
GetParaPortions().Count(); nPortion++ )
+GetParaPortions()[nPortion]->MarkInvalid( 0, 0 );
 FormatDoc();
 UpdateViews( pCurView );
 }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index e5b5e94..382d3d4 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -599,7 +599,7 @@ public:
 const ViewsType& GetEditViews() const;
 
 void SetUndoMode(bool b);
-void FormatAndUpdate(EditView* pCurView = nullptr);
+void FormatAndUpdate(EditView* pCurView = nullptr, bool bCalledFromUndo = 
false);
 
 void Undo(EditView* pView);
 void Redo(EditView* pView);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-report.py

[jan Iversen]

 esc-reporting/esc-analyze.py |   64 +++
 esc-reporting/esc-report.py  |   23 +++
 2 files changed, 46 insertions(+), 41 deletions(-)

New commits:
commit 62425ccd11ee74ab36e9d020022a5b6c2a5d8e22
Author: jan Iversen 
Date:   Mon Nov 21 10:53:47 2016 +0100

esc-reporting update on request from Heiko

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index aaf8b7a..fd4b4fc 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -82,8 +82,9 @@ def util_dump_file(fileName, rawList):
 def util_build_period_stat(cfg, statList, xDate, email, status, pstatus, base 
= 'gerrit'):
 for i in '1year', '3month', '1month', '1week':
   if xDate > cfg[i + 'Date']:
-statList['people'][email][base][i][pstatus] += 1
-statList['people'][email][base][i]['total'] += 1
+if not email is None:
+  statList['people'][email][base][i][pstatus] += 1
+  statList['people'][email][base][i]['total'] += 1
 if not base == 'gerrit' :
   statList['data'][base][i][status] += 1
   statList['data'][base][i]['total'] += 1
@@ -164,12 +165,11 @@ def util_create_statList():
  '3month': {'1-5': 0, '6-25': 0, '26-50': 0, 
'51-100': 0, '100+': 0, 'total': 0},
  '1month': {'1-5': 0, '6-25': 0, '26-50': 0, 
'51-100': 0, '100+': 0, 'total': 0},
  '1week':  {'1-5': 0, '6-25': 0, '26-50': 0, 
'51-100': 0, '100+': 0, 'total': 0}},
- 'ui': {'1year':  {'added': 0, 'removed': 0, 'commented': 
0, 'total': 0},
-'3month': {'added': 0, 'removed': 0, 'commented': 
0, 'total': 0},
-'1month': {'added': 0, 'removed': 0, 'commented': 
0, 'total': 0},
-'1week':  {'added': 0, 'removed': 0, 'commented': 
0, 'total': 0},
+ 'ui': {'1year':  {'added': 0, 'removed': 0, 'commented': 
0, 'resolved': 0, 'total': 0},
+'3month': {'added': 0, 'removed': 0, 'commented': 
0, 'resolved': 0, 'total': 0},
+'1month': {'added': 0, 'removed': 0, 'commented': 
0, 'resolved': 0, 'total': 0},
+'1week':  {'added': 0, 'removed': 0, 'commented': 
0, 'resolved': 0, 'total': 0},
 'needsUXEval' : 0,
-'closed' : 0,
 'topicUI': 0},
  'qa': {'1year':  {'UNCONFIRMED': 0, 'NEW': 0, 'ASSIGNED': 
0, 'REOPENED': 0, 'RESOLVED': 0,
'VERIFIED': 0, 'CLOSED': 0, 'NEEDINFO': 
0, 'PLEASETEST': 0, 'commented': 0, 'total': 0},
@@ -350,8 +350,7 @@ def analyze_ui(statList, openhubData, gerritData, gitData, 
bugzillaData, cfg):
 continue
 
   if row['status'] == 'RESOLVED' or row['status'] == 'CLOSED' or 
row['status'] == 'VERIFIED':
-if xDate > cfg['1weekDate']:
-  statList['data']['ui']['closed'] += 1
+util_build_period_stat(cfg, statList, xDate, None, 'resolved', 
'reviewer', base='ui')
 continue
 
   if 'needsUXEval' in row['keywords']:
@@ -369,11 +368,14 @@ def analyze_ui(statList, openhubData, gerritData, 
gitData, bugzillaData, cfg):
 email = util_check_mail('*UNKNOWN*', change['who'], statList, 
cfg['contributor']['combine-email'])
 xDate = datetime.datetime.strptime(change['when'], 
"%Y-%m-%dT%H:%M:%SZ")
 for entry in change['changes']:
-  if entry['added'] != '':
+  if entry['added'] != 'needsUXEval':
 st = 'added'
-  else:
+  elif entry['removed'] != 'needsUXEval':
 st = 'removed'
-  util_build_period_stat(cfg, statList, xDate, email, st, 'reviewer', 
base='ui')
+  else:
+st = None
+  if not st is None:
+util_build_period_stat(cfg, statList, xDate, email, st, 
'reviewer', base='ui')
 
 
 def analyze_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
@@ -527,25 +529,29 @@ def runBackLoad(cfg):
 
 
 def runUpgrade(cfg, fileList):
-openhubData = util_load_data_file(cfg['homedir'] + 
'dump/openhub_dump.json')
-bugzillaData = util_load_data_file(cfg['homedir'] + 
'dump/bugzilla_dump.json')
-gerritData = util_load_data_file(cfg['homedir'] + 'dump/gerrit_dump.json')
-gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
+#openhubData = util_load_data_file(cfg['homedir'] + 
'dump/openhub_dump.json')
+#bugzillaData = util_load_data_file(cfg['homedir'] + 
'dump/bugzilla_dump.json')
+#gerritData = util_load_data_file(cfg['homedir'] + 'dump/gerrit_dump.json')
+#gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
 
-statList = util_load_data_file(cfg['homedir'] + 'weeks/week_2016_44.json')
-cfg['nowDate'] = datetime.datetime(year=2016, month=11, day=9)

Re: [Libreoffice-commits] core.git: 6 commits - offapi/com offapi/type_reference sc/inc sc/qa sc/source

[Stephan Bergmann]

On 11/20/2016 12:43 AM, Tamás Zolnai wrote:

commit eb27a63a38ee7d15292dc40520b0605e4c2228e2
Author: Tamás Zolnai 
Date:   Sat Nov 19 22:27:20 2016 +0100

[API Change] PivotMedian: Add median to pivot table function type


Are you sure that this incompatible change is acceptable?  Can you give 
some rationale why that would be so (e.g., this functionality might be 
known to be hardly useful for 3rd party code anyway).


Why did you add the new member in the middle, changing the values of 
many existing members?  Adding it to the end would at least reduce the 
risk of breaking things.



Change-Id: I675e81b5c13832ac0ff893a6e080241e6f1c8fd5

diff --git a/offapi/com/sun/star/sheet/GeneralFunction.idl 
b/offapi/com/sun/star/sheet/GeneralFunction.idl
index ff9615c..726ae9d 100644
--- a/offapi/com/sun/star/sheet/GeneralFunction.idl
+++ b/offapi/com/sun/star/sheet/GeneralFunction.idl
@@ -56,6 +56,13 @@ published enum GeneralFunction
 AVERAGE,


+/**
+*   median of all numerical values is calculated.
+*   @since LibreOffice 5.3
+*/
+MEDIAN,
+
+
 /** maximum value of all numerical values is calculated.
  */
 MAX,
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 1785f24..b939b24 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -11484,14 +11484,15 @@ module com {
  SUM = 2,
  COUNT = 3,
  AVERAGE = 4,
- MAX = 5,
- MIN = 6,
- PRODUCT = 7,
- COUNTNUMS = 8,
- STDEV = 9,
- STDEVP = 10,
- VAR = 11,
- VARP = 12
+ MEDIAN = 5,
+ MAX = 6,
+ MIN = 7,
+ PRODUCT = 8,
+ COUNTNUMS = 9,
+ STDEV = 10,
+ STDEVP = 11,
+ VAR = 12,
+ VARP = 13
 };
 /** @deprecated */ published interface XConsolidationDescriptor {
  interface ::com::sun::star::uno::XInterface;

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

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/n.fods |  971 --
 1 file changed, 591 insertions(+), 380 deletions(-)

New commits:
commit c7a9c704892b9db0a3de65d5d20c02f2ed2215d0
Author: Zdeněk Crhonek 
Date:   Tue Nov 15 18:29:02 2016 +0100

update N() test case / test for bug tdf#102215

Change-Id: If266f50522a06c3b464135c3f416278b394badbf
Reviewed-on: https://gerrit.libreoffice.org/30878
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/n.fods 
b/sc/qa/unit/data/functions/fods/n.fods
index bd41148..f37abd2 100644
--- a/sc/qa/unit/data/functions/fods/n.fods
+++ b/sc/qa/unit/data/functions/fods/n.fods
@@ -1,13 +1,13 @@
 
 
 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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
- 
2016-06-10T20:02:06.652576343P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/131e604073f89e6c1dd54be88b94b7befd881f2e
+ 
2016-06-10T20:02:06.652576343P0D1LibreOfficeDev/5.3.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/5d39c2013374727b1c8f147b8b99d54402a7ff02
  
   
0
0
-   26699
-   4967
+   39107
+   8593

 
  view1
@@ -28,10 +28,11 @@
100
60
true
+   false
   
   
4
-   13
+   12
0
0
0
@@ -45,6 +46,7 @@
100
60
true
+   false
   
  
  Sheet2
@@ -69,6 +71,7 @@
  1
  1
  true
+ false
 

   
@@ -108,7 +111,7 @@
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
false
0
   
@@ -136,785 +139,783 @@
  
  
   
-   
+   

   
   

   
-  
+  

 
Kč
   
-  
+  

-

 
Kč
-   
+   
   
-  
+  
£

   
-  
+  
-
£

-   
+   
   
-  
+  
£

   
-  
+  
-
£

-   
+   
   
-  
+  
£

   
-  
+  

-
£

-   
+   
   
-  
+  
£

   
-  
+  

-
£

-   
+   
   
-  
+  
£

   
-  
+  

-
£

-   
+   
   
-  
+  

 
   
-  
+  
(

)
-   
+   
   

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/rot13.fods | 1251 ++
 1 file changed, 1251 insertions(+)

New commits:
commit a3ac99ba15d713c7c00ade8c8b1a78474aa22728
Author: Zdeněk Crhonek 
Date:   Sun Nov 20 19:02:57 2016 +0100

add ROT13 test case

Change-Id: If153b62ccb411213ccea77f9231d6dd612a1cbab
Reviewed-on: https://gerrit.libreoffice.org/31028
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/rot13.fods 
b/sc/qa/unit/data/functions/fods/rot13.fods
new file mode 100644
index 000..fec7784
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/rot13.fods
@@ -0,0 +1,1251 @@
+
+
+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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
+ 
2016-05-23T19:52:21.032366237P0D1LibreOfficeDev/5.3.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/8d613870b2cd2e3e4396b4fa97dbd8080fda8f52
+ 
+  
+   0
+   0
+   26356
+   3938
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+  
+   3
+   7
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+ 
+ Sheet1
+ 1241
+ 0
+ 85
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ en
+ US
+ 
+ 
+ 
+
+
+ zh
+ CN
+ 
+ :!),.:;?]}¢'"、。〉》」』】〕〗〞︰︱︳﹐､﹒﹔﹕﹖﹗﹚﹜﹞！），．：；？｜｝︴︶︸︺︼︾﹀﹂﹄﹏､～ï¿
 ã€…‖•·ˇˉ―--′’”
+ ([{£¥'"‵〈《「『【〔〖（［｛￡￥〝︵︷︹︻︽︿﹁﹃﹙﹛﹝（｛“‘
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   
+  

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

[osnola]

 filter/source/config/fragments/filters/StarOffice_Writer.xcu |2 +-
 filter/source/config/fragments/types/StarOffice_Writer.xcu   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf1fd4c1e924832b9675fe26fb962e5cb2ff3649
Author: osnola 
Date:   Mon Nov 21 10:39:09 2016 +0100

correct UIName of legacy StarOffice Text Document

Change-Id: I2f4a67ce439d913648c17d4770b94c5b4e7968f9

diff --git a/filter/source/config/fragments/filters/StarOffice_Writer.xcu 
b/filter/source/config/fragments/filters/StarOffice_Writer.xcu
index 537a410..9522d73 100644
--- a/filter/source/config/fragments/filters/StarOffice_Writer.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_Writer.xcu
@@ -15,7 +15,7 @@
 org.libreoffice.comp.Writer.StarOfficeWriterImportFilter
 
 
-Legacy StarOffice Writer
+Legacy StarOffice Text Document
 
 
 0
diff --git a/filter/source/config/fragments/types/StarOffice_Writer.xcu 
b/filter/source/config/fragments/types/StarOffice_Writer.xcu
index 6f6944e..ca10b93 100644
--- a/filter/source/config/fragments/types/StarOffice_Writer.xcu
+++ b/filter/source/config/fragments/types/StarOffice_Writer.xcu
@@ -22,6 +22,6 @@
 StarOffice_Writer
 
 
-Legacy StarOffice Writer
+Legacy StarOffice Text Document
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: #defined(LINUX) in file ../sdk/include(sal/config.h

[Stephan Bergmann]

On 11/20/2016 11:41 AM, mencacci wrote:

Hello there, I was trying to compile a prg and I get "unknow platform" error,
if I change on line 56 in the file config.h to defined(linux) or
defined(__linux__) all works fine.


I assume what you are trying to do is build a program against the 
LibreOffice SDK?  For one, you should do that from a shell set up with 
the SDK configuration, see the "configuration step" details of 
.  For another, the C/C++ 
include files available in the SDK's include/ tree require some 
predefined macros that are normally set up in the SDK's settings/*.mk 
makefiles.  There was a thread about that here recently, see 
 
"Re: Need help with installing/setting SDK on Linux".


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

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

[Miklos Vajna]

 sw/source/filter/ww8/ww8scan.cxx |  332 +++
 sw/source/filter/ww8/ww8scan.hxx |   56 +++---
 2 files changed, 194 insertions(+), 194 deletions(-)

New commits:
commit a4dff37ad217ba09892cf80e9908727cc6c0237b
Author: Miklos Vajna 
Date:   Mon Nov 21 09:26:34 2016 +0100

sw: prefix members of WW8PLCFMan

Change-Id: I806fc0bc9e09b5624dd91d7047eb0388026a6648

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 70baffd..b2a1fe3 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4485,7 +4485,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 // but its definitely the case for paragraphs that EndPos > StartPos
 // for a well formed paragraph as those always have a paragraph
 //  in them
-if (&rDesc == pPap && rDesc.bRealLineEnd)
+if (&rDesc == m_pPap && rDesc.bRealLineEnd)
 {
 if (rDesc.nStartPos == rDesc.nEndPos && rDesc.nEndPos != WW8_CP_MAX)
 {
@@ -4509,23 +4509,23 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 if (GetDoingDrawTextBox())
 return;
 
-if ( (&rDesc == pPap) && rDesc.bRealLineEnd )
+if ( (&rDesc == m_pPap) && rDesc.bRealLineEnd )
 {
-if ( pPap->nEndPos != WW8_CP_MAX )// Para adjust
+if ( m_pPap->nEndPos != WW8_CP_MAX )// Para adjust
 {
-nLineEnd = pPap->nEndPos;// nLineEnd points *after* the 
-pPap->nEndPos--;// shorten paragraph end by one character
+m_nLineEnd = m_pPap->nEndPos;// nLineEnd points *after* the 
+m_pPap->nEndPos--;// shorten paragraph end by one character
 
 // Is there already a sep end, which points to the current 
paragraph end?
 // Then we also must shorten by one character
-if( pSep->nEndPos == nLineEnd )
-pSep->nEndPos--;
+if( m_pSep->nEndPos == m_nLineEnd )
+m_pSep->nEndPos--;
 }
 }
-else if (&rDesc == pSep)
+else if (&rDesc == m_pSep)
 {
 // Sep Adjust if end Char-Attr == paragraph end ...
-if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) )
+if( (rDesc.nEndPos == m_nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) 
)
 rDesc.nEndPos--;// ... then shorten by one character
 }
 }
@@ -4588,13 +4588,13 @@ sal_uInt16 WW8PLCFMan::GetId(const WW8PLCFxDesc* p) 
const
 {
 sal_uInt16 nId = 0;// Id = 0 for empty attributes
 
-if (p == pField)
+if (p == m_pField)
 nId = eFLD;
-else if (p == pFootnote)
+else if (p == m_pFootnote)
 nId = eFTN;
-else if (p == pEdn)
+else if (p == m_pEdn)
 nId = eEDN;
-else if (p == pAnd)
+else if (p == m_pAnd)
 nId = eAND;
 else if (p->nSprmsLen >= maSprmParser.MinSprmLen())
 nId = maSprmParser.GetSprmId(p->pMemPos);
@@ -4607,125 +4607,125 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, 
ManTypes nType, long nStartCp,
 : maSprmParser(*pBase->m_pWw8Fib),
 mbDoingDrawTextBox(bDoingDrawTextBox)
 {
-pWwFib = pBase->m_pWw8Fib;
+m_pWwFib = pBase->m_pWw8Fib;
 
-memset( aD, 0, sizeof( aD ) );
-nLineEnd = WW8_CP_MAX;
-nManType = nType;
+memset( m_aD, 0, sizeof( m_aD ) );
+m_nLineEnd = WW8_CP_MAX;
+m_nManType = nType;
 
 if( MAN_MAINTEXT == nType )
 {
 // search order of the attributes
-nPLCF = MAN_PLCF_COUNT;
-pField = &aD[0];
-pBkm = &aD[1];
-pEdn = &aD[2];
-pFootnote = &aD[3];
-pAnd = &aD[4];
-
-pPcd = ( pBase->m_pPLCFx_PCD ) ? &aD[5] : nullptr;
+m_nPLCF = MAN_PLCF_COUNT;
+m_pField = &m_aD[0];
+m_pBkm = &m_aD[1];
+m_pEdn = &m_aD[2];
+m_pFootnote = &m_aD[3];
+m_pAnd = &m_aD[4];
+
+m_pPcd = ( pBase->m_pPLCFx_PCD ) ? &m_aD[5] : nullptr;
 //pPcdA index == pPcd index + 1
-pPcdA = ( pBase->m_pPLCFx_PCDAttrs ) ? &aD[6] : nullptr;
+m_pPcdA = ( pBase->m_pPLCFx_PCDAttrs ) ? &m_aD[6] : nullptr;
 
-pChp = &aD[7];
-pPap = &aD[8];
-pSep = &aD[9];
-pAtnBkm = &aD[10];
-pFactoidBkm = &aD[11];
+m_pChp = &m_aD[7];
+m_pPap = &m_aD[8];
+m_pSep = &m_aD[9];
+m_pAtnBkm = &m_aD[10];
+m_pFactoidBkm = &m_aD[11];
 
-pSep->pPLCFx = pBase->m_pSepPLCF;
-pFootnote->pPLCFx = pBase->m_pFootnotePLCF;
-pEdn->pPLCFx = pBase->m_pEdnPLCF;
-pBkm->pPLCFx = pBase->m_pBook;
-pAnd->pPLCFx = pBase->m_pAndPLCF;
-pAtnBkm->pPLCFx = pBase->m_pAtnBook;
-pFactoidBkm->pPLCFx = pBase->m_pFactoidBook;
+m_pSep->pPLCFx = pBase->m_pSepPLCF;
+m_pFootnote->pPLCFx = pBase->m_pFootnotePLCF;
+m_pEdn->pPLCFx = pBase->m_pEdnPLCF;
+m_pBkm->pPLCFx = pBase->m_pBook;
+m_pAnd->pPLCFx = pBase->m_pAndPLCF;
+m_pAtnBkm-

[Libreoffice-commits] core.git: desktop/source desktop/uiconfig

[Muhammet Kara]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |  131 ---
 desktop/source/deployment/gui/dp_gui_dialog2.hxx |8 +
 desktop/uiconfig/ui/extensionmanager.ui  |3 
 3 files changed, 58 insertions(+), 84 deletions(-)

New commits:
commit 3aec456ba8a0d1f9aef2fc1735d1861fe9d3a98c
Author: Muhammet Kara 
Date:   Fri Nov 18 17:42:18 2016 +0300

tdf#103146 Revamp Extension Manager Dialog, Part 3

Move the "Enable"/"Disable" button which was customly
implemented from the ExtBoxWithBtns_Impl to the new row.
This should also solve some accessibility issues.

Also remove some unnecessary code pieces for clean-up.

Change-Id: Iec7820779110eea3411a774de8277ef238f562e7
Reviewed-on: https://gerrit.libreoffice.org/30973
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 06c34411..2b257a3 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -81,8 +81,6 @@ using namespace ::com::sun::star::system;
 
 namespace dp_gui {
 
-#define TOP_OFFSET   5
-
 #define USER_PACKAGE_MANAGER"user"
 #define SHARED_PACKAGE_MANAGER  "shared"
 #define BUNDLED_PACKAGE_MANAGER "bundled"
@@ -116,19 +114,11 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
 {
 boolm_bInterfaceLocked;
 
-VclPtr m_pEnableBtn;
-
 VclPtr   m_pParent;
 
-voidSetButtonPos( const Rectangle& rRect );
 voidSetButtonStatus( const TEntry_Impl& rEntry );
 MENU_COMMANDShowPopupMenu( const Point &rPos, const long nPos );
 
-
-DECL_LINK( ScrollHdl, ScrollBar*, void );
-
-DECL_LINK( HandleEnableBtn, Button*, void );
-
 public:
 explicit ExtBoxWithBtns_Impl(vcl::Window* pParent);
 virtual ~ExtBoxWithBtns_Impl() override;
@@ -147,7 +137,6 @@ public:
 ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(vcl::Window* pParent)
 : ExtensionBox_Impl(pParent)
 , m_bInterfaceLocked(false)
-, m_pEnableBtn(nullptr)
 , m_pParent(nullptr)
 {
 }
@@ -158,22 +147,7 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog 
*pParentDialog)
 
 m_pParent = pParentDialog;
 
-m_pEnableBtn = VclPtr::Create( this, WB_TABSTOP );
-
 SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
-m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE );
-
-m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, 
HandleEnableBtn ) );
-
-m_pEnableBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_DISABLE ) );
-
-Size aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ),
-   MapMode( MapUnit::MapAppFont ) );
-m_pEnableBtn->SetSizePixel( aSize );
-
-SetExtraSize( aSize.Height() + 2 * TOP_OFFSET );
-
-SetScrollHdl( LINK( this, ExtBoxWithBtns_Impl, ScrollHdl ) );
 }
 
 VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns)
@@ -189,7 +163,6 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 
 void ExtBoxWithBtns_Impl::dispose()
 {
-m_pEnableBtn.disposeAndClear();
 m_pParent.clear();
 ExtensionBox_Impl::dispose();
 }
@@ -207,14 +180,10 @@ void ExtBoxWithBtns_Impl::RecalcAll()
 {
 m_pParent->enableOptionsButton( false );
 m_pParent->enableRemoveButton( false );
-m_pEnableBtn->Disable();
-m_pEnableBtn->Hide();
+m_pParent->enableEnableButton( false );
 }
 
 ExtensionBox_Impl::RecalcAll();
-
-if ( nActive != svt::IExtensionListBox::ENTRY_NOTFOUND )
-SetButtonPos( GetEntryRect( nActive ) );
 }
 
 
@@ -227,17 +196,6 @@ void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
 ExtensionBox_Impl::selectEntry( nPos );
 }
 
-
-void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect )
-{
-Size  aBtnSize( m_pEnableBtn->GetSizePixel() );
-Point aBtnPos( rRect.Left() + ICON_OFFSET,
-   rRect.Bottom() - TOP_OFFSET - aBtnSize.Height() );
-
-m_pEnableBtn->SetPosPixel( aBtnPos );
-}
-
-
 void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry)
 {
 bool bShowOptionBtn = true;
@@ -245,26 +203,22 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const 
TEntry_Impl& rEntry)
 rEntry->m_bHasButtons = false;
 if ( ( rEntry->m_eState == REGISTERED ) || ( rEntry->m_eState == 
NOT_AVAILABLE ) )
 {
-m_pEnableBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_DISABLE ) );
-m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE );
+m_pParent->enableButtontoEnable( false );
 }
 else
 {
-m_pEnableBtn->SetText( DialogHelper::getResourceString( 
RID_CTX_ITEM_ENABLE ) );
-m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE );
+m_pParent->enableButtontoEnable( true );
 bShowOptionBtn = false;
 }
 
 if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) |

Weekly QA Report (W46-2016)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 156 have been created, of which, 57 are still unconfirmed.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=104009%2C104030%2C104051%2C104018%2C104050%2C103962%2C104048%2C103934%2C104069%2C103938%2C103956%2C104032%2C103997%2C104006%2C103971%2C104043%2C103952%2C103953%2C104042%2C104000%2C104019%2C103993%2C103932%2C103985%2C104033%2C103926%2C104034%2C104041%2C104073%2C104047%2C103966%2C104001%2C104037%2C104010%2C104068%2C104057%2C104025%2C103989%2C104053%2C103959%2C104031%2C103949%2C104029%2C104014%2C104072%2C104003%2C103991%2C104055%2C104067%2C103935%2C104066%2C103955%2C103919%2C104022%2C104052%2C103918%2C104004


  * 1041 comments have been written.

== STATUS CHANGED ==
  * 7 bugs have been changed to 'ASSIGNED'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=100836%2C48140%2C102784%2C103662%2C103982%2C88351%2C99327
Done by: Miklos Vajna ( 2 ), Julien Nabet ( 1 ), Samuel Mehrbrodt 
(CIB) ( 1 ), tagezi ( 1 ), jan iversen ( 1 ), Bartosz ( 1 )


  * 18 bugs have been changed to 'NEEDINFO'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=100419%2C101195%2C101139%2C89491%2C80389%2C83108%2C103592%2C103625%2C92766%2C103655%2C100210%2C94700%2C98904%2C103560%2C103794%2C103970%2C103619%2C104007
Done by: Buovjaga ( 8 ), Aron Budea ( 2 ), Xisco Faulí ( 1 ), V 
Stuart Foote ( 1 ), Julien Nabet ( 1 ), Tomaz Vajngerl ( 1 ), m.a.riosv 
( 1 ), Khaled Hosny ( 1 ), Timur ( 1 ), Cor Nouws ( 1 )


  * 62 bugs have been changed to 'NEW'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=104015%2C100996%2C103920%2C103951%2C103925%2C99651%2C104036%2C103587%2C103907%2C104062%2C103679%2C104023%2C103455%2C103924%2C97748%2C103420%2C102023%2C103922%2C103927%2C103765%2C103533%2C104039%2C103903%2C103930%2C104008%2C99138%2C104013%2C101563%2C103961%2C103821%2C103929%2C93635%2C103975%2C103884%2C103643%2C104045%2C103548%2C103431%2C103541%2C103928%2C103968%2C103954%2C103967%2C103620%2C103937%2C103581%2C104056%2C103829%2C104012%2C103980%2C73873%2C104058%2C104011%2C104016%2C100493%2C104028%2C103892%2C103550%2C98484%2C93846%2C103682%2C103825
Done by: Buovjaga ( 17 ), Xisco Faulí ( 12 ), Aron Budea ( 10 ), A 
(Andy) ( 3 ), MM ( 3 ), robert ( 2 ), m.a.riosv ( 2 ), Michael Meeks ( 2 
), Alex Thurgood ( 2 ), V Stuart Foote ( 1 ), Andras Timar ( 1 ), Heiko 
Tietze ( 1 ), Telesto ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Olivier 
Hallot ( 1 ), Khaled Hosny ( 1 ), jan iversen ( 1 ), tommy27 ( 1 )


  * 5 bugs have been changed to 'REOPENED'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=72830%2C100986%2C103874%2C77525%2C103641
Done by: V Stuart Foote ( 1 ), Norbert X ( 1 ), Aleksander Machniak 
( 1 ), jlbraga ( 1 ), Timur ( 1 )


  * 22 bugs have been changed to 'RESOLVED DUPLICATE'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=103646%2C100428%2C103700%2C75373%2C102271%2C103059%2C103933%2C103998%2C97709%2C99727%2C96219%2C103584%2C103939%2C74686%2C103912%2C103912%2C103912%2C95475%2C104021%2C103850%2C104054%2C90094
Done by: V Stuart Foote ( 6 ), Alex Thurgood ( 3 ), Timur ( 3 ), 
Xisco Faulí ( 2 ), Telesto ( 1 ), General Kutuzov ( 1 ), Stephan 
Bergmann ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Maxim Monastirsky ( 1 ), 
steve -_- ( 1 ), Juergen ( 1 ), Aron Budea ( 1 )


  * 25 bugs have been changed to 'RESOLVED FIXED'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=103784%2C103915%2C103969%2C103969%2C103942%2C103891%2C103870%2C100617%2C96475%2C100150%2C103965%2C94721%2C103785%2C92776%2C103881%2C82824%2C91916%2C68118%2C103038%2C103819%2C92076%2C101832%2C103994%2C103944%2C103914
Done by: Khaled Hosny ( 7 ), V Stuart Foote ( 4 ), Caolán McNamara 
( 4 ), Thorsten Behrens (CIB) ( 2 ), Mike Kaganski ( 2 ), Eike Rathke ( 
2 ), Miklos Vajna ( 1 ), Luke ( 1 ), Jean-Baptiste Faure ( 1 ), tommy27 
( 1 )


  * 4 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=99252%2C94151%2C103687%2C103628

Done by: Alex Thurgood ( 2 ), V Stuart Foote ( 1 ), Buovjaga ( 1 )

  * 2 bugs have been changed to 'RESOLVED INVALID'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=103807%2C103921

Done by: V Stuart Foote ( 1 ), Elie Roux ( 1 )

  * 3 bugs have been changed to 'RESOLVED NOTABUG'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=103958%2C103943%2C103904

Done by: Markus Mohrhard ( 2 ), Aron Budea ( 1 )

  * 5 bugs have been changed to 'RESOLVED NOTOURBUG'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=64633%2C60534%2C103750%2C103594%2C100318
Done by: Khaled Hosny ( 3 ), Xisco Faulí ( 1 ), 
keesklooster...@icloud.com ( 1 )


  * 5 bugs have been changed to 'RESOLVED WONTFIX'.
Link: 
https://bugs.documentfoundation.org/buglist.cgi?bug_id=103755%2C103877%2C48063%2C103947%2C103972
Done by: Buovjaga ( 2 ), V Stuart Foote ( 1 ), K

[Libreoffice-commits] core.git: 2 commits - dbaccess/CppunitTest_dbaccess_hsqldb_test.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk

[David Tardon]

 dbaccess/CppunitTest_dbaccess_RowSetClones.mk |1 -
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit d187057d2f6a2e6ab4a364af83891341a0aa3988
Author: David Tardon 
Date:   Mon Nov 21 10:15:39 2016 +0100

Revert "add missing component"

This reverts commit 7fe1b39e8abe68357c88536923b7058807b32119.

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 8eb24dd..c41c3fe 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -86,7 +86,6 @@ $(eval $(call 
gb_CppunitTest_use_components,dbaccess_RowSetClones,\
 filter/source/config/cache/filterconfig1 \
 forms/util/frm \
 framework/util/fwk \
-io/source/io \
 i18npool/util/i18npool \
 linguistic/source/lng \
 oox/util/oox \
commit 656e999b5b25386ce18064b8c7027f7784b66128
Author: David Tardon 
Date:   Mon Nov 21 10:13:38 2016 +0100

Revert "add missing component"

This reverts commit b55d17471f73b843943269c6cbd30f5d8354.

diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk 
b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 67f6905..5a83a4b 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -57,7 +57,6 @@ $(eval $(call 
gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
 dbaccess/util/dbu \
 filter/source/config/cache/filterconfig1 \
 framework/util/fwk \
-io/source/io \
 i18npool/util/i18npool \
 linguistic/source/lng \
 package/source/xstor/xstor \
___
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' - sw/qa sw/source

[Mike Kaganski]

 sw/qa/extras/uiwriter/data/tdf95699.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   20 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +++-
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 79e518039504496aa8ce1c6b2b36ede88de0fe1c
Author: Mike Kaganski 
Date:   Fri Nov 18 11:17:40 2016 +0300

tdf#95699: allow copy FORMCHECKBOX and FORMDROPDOWN ...

... when they are selected alone (no adjacent text selected).
Unit test included.

Change-Id: Ia278ae2ea86a3e6d83e1a628880f770f1eb11cd7
Reviewed-on: https://gerrit.libreoffice.org/30954
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-by: Miklos Vajna 
(cherry picked from commit de524d2051abd700f93da4e0e9f273504b12515a)

diff --git a/sw/qa/extras/uiwriter/data/tdf95699.odt 
b/sw/qa/extras/uiwriter/data/tdf95699.odt
new file mode 100644
index 000..79cf858
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf95699.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 531d15e..1a37476 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -198,6 +198,7 @@ public:
 void testRedlineTimestamp();
 void testCursorWindows();
 void testLandscape();
+void testTdf95699();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -297,6 +298,7 @@ public:
 CPPUNIT_TEST(testRedlineTimestamp);
 CPPUNIT_TEST(testCursorWindows);
 CPPUNIT_TEST(testLandscape);
+CPPUNIT_TEST(testTdf95699);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3464,6 +3466,24 @@ void SwUiWriterTest::testLandscape()
 CPPUNIT_ASSERT(pWrtShell->GetPageDesc(nPageDesc).GetLandscape());
 }
 
+void SwUiWriterTest::testTdf95699()
+{
+// Open the document with single FORMCHECKBOX field, select all and copy 
to clipboard
+// then check that clipboard contains the FORMCHECKBOX in text body.
+// Previously that failed.
+SwDoc* pDoc = createDoc("tdf95699.odt");
+IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+SwDoc aClipboard;
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->SelAll();
+pWrtShell->Copy(&aClipboard);
+pMarkAccess = aClipboard.getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+::sw::mark::IFieldmark* pFieldMark = 
pMarkAccess->getFieldmarkAfter(SwPosition(pDoc->GetNodes().GetEndOfExtras()));
+
CPPUNIT_ASSERT_EQUAL(OUString("vnd.oasis.opendocument.field.FORMCHECKBOX"), 
pFieldMark->GetFieldname());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 7aa3bdf..33533cf 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -233,14 +233,16 @@ namespace
 const SwPosition& rMarkStart = pMark->GetMarkStart();
 const SwPosition& rMarkEnd = pMark->GetMarkEnd();
 // only include marks that are in the range and not touching both 
start and end
-// - not for annotation marks.
+// - not for annotation or checkbox marks.
 const bool bIsNotOnBoundary =
 pMark->IsExpanded()
 ? (rMarkStart != rStt || rMarkEnd != rEnd)  // rMarkStart != 
rMarkEnd
 : (rMarkStart != rStt && rMarkEnd != rEnd); // rMarkStart == 
rMarkEnd
+const IDocumentMarkAccess::MarkType aMarkType = 
IDocumentMarkAccess::GetType(*pMark);
 if ( rMarkStart >= rStt && rMarkEnd <= rEnd
  && ( bIsNotOnBoundary
-  || IDocumentMarkAccess::GetType( *pMark ) == 
IDocumentMarkAccess::MarkType::ANNOTATIONMARK ) )
+  || aMarkType == 
IDocumentMarkAccess::MarkType::ANNOTATIONMARK
+  || aMarkType == 
IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK ) )
 {
 vMarksToCopy.push_back(pMark);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 loolwsd/DocumentBroker.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c989ead6b842e62ee6ad68e327bc930d2eae1933
Author: Miklos Vajna 
Date:   Mon Nov 21 10:02:27 2016 +0100

DocumentBroker: fix uninitialized getInfoCallDuration

It was written in one conditional branch and was read in an other
conditional branch. So make sure no uninitialized data is read.

Change-Id: I230c6a4d3b048ee9d7f96881baf00eb041204ff0

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 39702cc..74dada2 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -247,7 +247,7 @@ bool DocumentBroker::load(std::shared_ptr& 
session, const std::st
 
 // Call the storage specific file info functions
 std::string userid, username;
-std::chrono::duration getInfoCallDuration;
+std::chrono::duration getInfoCallDuration(0);
 if (dynamic_cast(_storage.get()) != nullptr)
 {
 const WopiStorage::WOPIFileInfo wopifileinfo = 
static_cast(_storage.get())->getWOPIFileInfo(uriPublic);
___
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' - sd/inc sd/qa sd/source

[Noel Grandin]

 sd/inc/glob.hrc|3 +++
 sd/qa/unit/misc-tests.cxx  |   22 ++
 sd/source/core/glob.src|9 +
 sd/source/ui/func/futext.cxx   |2 ++
 sd/source/ui/inc/DrawViewShell.hxx |2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

New commits:
commit be2de90a0f32fb6054691cdba4ef533f236a1072
Author: Noel Grandin 
Date:   Wed Nov 16 13:34:07 2016 +0200

tdf#103950 Undo does not revert bundled font size changes for table cells

Change-Id: Id41b739bfa93610f955e6c31f8bb979b8e2c
Reviewed-on: https://gerrit.libreoffice.org/30902
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 90646b4966c73637ddf592acd05b3091fb3fa41f)
Reviewed-on: https://gerrit.libreoffice.org/30956

diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index bec03c2..0ec289c 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -137,6 +137,9 @@
 #define RID_SLIDESORTER_ICONS   RID_GLOB_START+227
 #define STR_DEAUTHORISE_CLIENT  RID_GLOB_START+229
 
+#define STR_SHRINK_FONT_SIZERID_GLOB_START+232
+#define STR_GROW_FONT_SIZE  RID_GLOB_START+233
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index bc73b5f..0a436e7 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -16,6 +16,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -38,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -177,17 +179,16 @@ void SdMiscTest::testTdf99396TextEdit()
 sd::DrawDocShellRef xDocSh = 
Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf99396.odp"), ODP);
 sd::ViewShell* pViewShell = xDocSh->GetViewShell();
 SdPage* pPage = pViewShell->GetActualPage();
-SdrObject* pObject = pPage->GetObj(0);
-auto pTableObject = dynamic_cast(pObject);
+auto pTableObject = 
dynamic_cast(pPage->GetObj(0));
 CPPUNIT_ASSERT(pTableObject);
 SdrView* pView = pViewShell->GetView();
-pView->MarkObj(pObject, pView->GetSdrPageView());
+pView->MarkObj(pTableObject, pView->GetSdrPageView());
 
 // Make sure that the undo stack is empty.
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
xDocSh->GetDoc()->GetUndoManager()->GetUndoActionCount());
 
 // Set horizontal and vertical adjustment during text edit.
-pView->SdrBeginTextEdit(pObject);
+pView->SdrBeginTextEdit(pTableObject);
 CPPUNIT_ASSERT(pView->GetTextEditObject());
 {
 SfxRequest aRequest(pViewShell->GetViewFrame(), 
SID_ATTR_PARA_ADJUST_RIGHT);
@@ -239,6 +240,19 @@ void SdMiscTest::testTdf99396TextEdit()
 CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_CENTER, pAdjust->GetAdjust());
 }
 
+
+/*
+ * now test tdf#103950 - Undo does not revert bundled font size changes 
for table cells
+ */
+pTableObject = dynamic_cast(pPage->GetObj(0));
+pView->MarkObj(pTableObject, pView->GetSdrPageView()); // select table
+{
+SfxRequest aRequest(pViewShell->GetViewFrame(), SID_GROW_FONT_SIZE);
+static_cast(pViewShell)->ExecChar(aRequest);
+}
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
xDocSh->GetDoc()->GetUndoManager()->GetUndoActionCount());
+
+
 xDocSh->DoClose();
 }
 
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index d3b3a71..d158ccc 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -391,4 +391,13 @@ String STR_DEAUTHORISE_CLIENT
 Text [ en-US ] = "Remove client authorisation";
 };
 
+String STR_SHRINK_FONT_SIZE
+{
+Text [ en-US ] = "Shrink font size";
+};
+String STR_GROW_FONT_SIZE
+{
+Text [ en-US ] = "Grow font size";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index b2af1c8..3498c40 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1375,6 +1375,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* 
pOLV, const FontList* pFo
 else
 {
 
+pView->BegUndo(SD_RESSTR(bGrow ? STR_GROW_FONT_SIZE : 
STR_SHRINK_FONT_SIZE));
 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
 for( size_t nMark = 0; nMark < rMarkList.GetMarkCount(); ++nMark )
 {
@@ -1416,6 +1417,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* 
pOLV, const FontList* pFo
 }
 }
 }
+pView->EndUndo();
 }
 }
 
diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index b96a0e2..2f5acc4 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -220,7 +220,7 @@ public:
 voidExecGoToLastPage (SfxRequest& rReq);
 voidGetStateGoToLastPage (SfxItemSet& rSet);
 
-voidExecChar(SfxRequest& rReq);
+SD_DLLPUBLIC void ExecChar(Sf

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

[Mike Kaganski]

 sw/qa/extras/uiwriter/data/tdf95699.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   20 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +++-
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit de524d2051abd700f93da4e0e9f273504b12515a
Author: Mike Kaganski 
Date:   Fri Nov 18 11:17:40 2016 +0300

tdf#95699: allow copy FORMCHECKBOX and FORMDROPDOWN ...

... when they are selected alone (no adjacent text selected).
Unit test included.

Change-Id: Ia278ae2ea86a3e6d83e1a628880f770f1eb11cd7
Reviewed-on: https://gerrit.libreoffice.org/30954
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/data/tdf95699.odt 
b/sw/qa/extras/uiwriter/data/tdf95699.odt
new file mode 100644
index 000..79cf858
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf95699.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index f001fc6..4c12fc3 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -213,6 +213,7 @@ public:
 void testRedlineTimestamp();
 void testCursorWindows();
 void testLandscape();
+void testTdf95699();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -323,6 +324,7 @@ public:
 CPPUNIT_TEST(testRedlineTimestamp);
 CPPUNIT_TEST(testCursorWindows);
 CPPUNIT_TEST(testLandscape);
+CPPUNIT_TEST(testTdf95699);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -4049,6 +4051,24 @@ void SwUiWriterTest::testLandscape()
 CPPUNIT_ASSERT(pWrtShell->GetPageDesc(nPageDesc).GetLandscape());
 }
 
+void SwUiWriterTest::testTdf95699()
+{
+// Open the document with single FORMCHECKBOX field, select all and copy 
to clipboard
+// then check that clipboard contains the FORMCHECKBOX in text body.
+// Previously that failed.
+SwDoc* pDoc = createDoc("tdf95699.odt");
+IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+SwDoc aClipboard;
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->SelAll();
+pWrtShell->Copy(&aClipboard);
+pMarkAccess = aClipboard.getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+::sw::mark::IFieldmark* pFieldMark = 
pMarkAccess->getFieldmarkAfter(SwPosition(pDoc->GetNodes().GetEndOfExtras()));
+
CPPUNIT_ASSERT_EQUAL(OUString("vnd.oasis.opendocument.field.FORMCHECKBOX"), 
pFieldMark->GetFieldname());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index bdf8038..9e64e0a 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -234,14 +234,16 @@ namespace
 const SwPosition& rMarkStart = pMark->GetMarkStart();
 const SwPosition& rMarkEnd = pMark->GetMarkEnd();
 // only include marks that are in the range and not touching both 
start and end
-// - not for annotation marks.
+// - not for annotation or checkbox marks.
 const bool bIsNotOnBoundary =
 pMark->IsExpanded()
 ? (rMarkStart != rStt || rMarkEnd != rEnd)  // rMarkStart != 
rMarkEnd
 : (rMarkStart != rStt && rMarkEnd != rEnd); // rMarkStart == 
rMarkEnd
+const IDocumentMarkAccess::MarkType aMarkType = 
IDocumentMarkAccess::GetType(*pMark);
 if ( rMarkStart >= rStt && rMarkEnd <= rEnd
  && ( bIsNotOnBoundary
-  || IDocumentMarkAccess::GetType( *pMark ) == 
IDocumentMarkAccess::MarkType::ANNOTATIONMARK ) )
+  || aMarkType == 
IDocumentMarkAccess::MarkType::ANNOTATIONMARK
+  || aMarkType == 
IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK ) )
 {
 vMarksToCopy.push_back(pMark);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configmgr/qa include/sfx2 officecfg/registry sd/sdi sd/source sfx2/sdi sfx2/source

[Gabor Kelemen]

 configmgr/qa/unit/data.xcd   |5 --
 include/sfx2/sfxsids.hrc |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 --
 sd/sdi/app.sdi   |6 --
 sd/source/ui/app/sdmod1.cxx  |   25 
--
 sfx2/sdi/appslots.sdi|5 --
 sfx2/sdi/sfx.sdi |   18 
---
 sfx2/source/appl/appserv.cxx |3 -
 8 files changed, 68 deletions(-)

New commits:
commit 75346b4144b47d16d28f4c944199e366e97363ad
Author: Gabor Kelemen 
Date:   Sat Nov 19 19:44:10 2016 +0100

Kill the AutoPilotPresentations UNO command

The presentation wizard was removed in
bb8040595c9b6f0ccde39e6833f27a50abb891d8 but the
corresponding UNO command is still available.

Change-Id: I54e676672bb53d0283394a0ebffbe9f94f29d9c0
Reviewed-on: https://gerrit.libreoffice.org/30983
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index e3a3387..97da9e6 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3737,11 +3737,6 @@
   ~AutoCorrect...
 
   
-  
-
-  AutoPilot: Presentation
-
-  
   
 
   AutoPilot: Agenda
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 0685df6..aaa1988 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -555,7 +555,6 @@
 #define SID_ZOOM_PREV   (SID_SVX_START + 403)
 #define SID_INET_DLG(SID_SVX_START + 416)
 #define SID_AUTO_CORRECT_DLG(SID_SVX_START + 424)
-#define SID_SD_AUTOPILOT(SID_SVX_START + 425)
 #define SID_ATTR_CHAR_COLOR_EXT (SID_SVX_START + 488)
 #define SID_ATTR_CHAR_COLOR_BACKGROUND  (SID_SVX_START + 489)
 #define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT  (SID_SVX_START + 490)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c4f28d8..dd01901 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4448,11 +4448,6 @@
   ~AutoCorrect Options...
 
   
-  
-
-  AutoPilot: Presentation
-
-  
   
 
   AutoPilot: Agenda
diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi
index b2f6e16..e616b6e 100644
--- a/sd/sdi/app.sdi
+++ b/sd/sdi/app.sdi
@@ -32,12 +32,6 @@ interface StarImpress
 StateMethod = GetState;
 ]
 
-SID_SD_AUTOPILOT // ole : ?, status : ?
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-
 SID_NEWSD // ole : ?, status : ?
 [
 ExecMethod = Execute ;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 0fb7a27..7dc6dad 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -193,7 +193,6 @@ void SdModule::Execute(SfxRequest& rReq)
 }
 break;
 
-case SID_SD_AUTOPILOT:
 case SID_NEWSD:
 {
 SfxFrame* pFrame = ExecuteNewDocument( rReq );
@@ -314,30 +313,6 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest)
 
 void SdModule::GetState(SfxItemSet& rItemSet)
 {
-// disable Autopilot during presentation
-if (rItemSet.GetItemState(SID_SD_AUTOPILOT) != SfxItemState::UNKNOWN)
-{
-if (!SvtModuleOptions().IsImpress())
-{
-rItemSet.DisableItem(SID_SD_AUTOPILOT);
-}
-else
-{
-::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell 
*>( SfxObjectShell::Current() );
-if (pDocShell)
-{
-::sd::ViewShell* pViewShell = pDocShell->GetViewShell();
-if (pViewShell)
-{
-if( sd::SlideShow::IsRunning( 
pViewShell->GetViewShellBase() ) )
-{
-rItemSet.DisableItem(SID_SD_AUTOPILOT);
-}
-}
-}
-}
-}
-
 if( SfxItemState::DEFAULT == rItemSet.GetItemState( SID_ATTR_METRIC ) )
 {
 ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( 
SfxObjectShell::Current() );
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index bd03c12..6da1955 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -283,11 +283,6 @@ shell SfxApplication
 [
 ExecMethod = OfaExec_Impl;
 ]
-SID_SD_AUTOPILOT // status(final|play)
-[
-ExecMethod = OfaExec_Impl;
-StateMethod = OfaState_Impl;
-  

[Libreoffice-commits] core.git: 14 commits - basctl/CppunitTest_basctl_dialogs_test.mk chart2/CppunitTest_chart2_dialogs_test.mk connectivity/Library_ado.mk connectivity/Library_jdbc.mk cui/CppunitTes

[David Tardon]

 basctl/CppunitTest_basctl_dialogs_test.mk |4 +
 chart2/CppunitTest_chart2_dialogs_test.mk |9 +++
 connectivity/Library_ado.mk   |3 +
 connectivity/Library_jdbc.mk  |3 +
 cui/CppunitTest_cui_dialogs_test.mk   |4 +
 cui/Library_cui.mk|3 +
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk |1 
 dbaccess/CppunitTest_dbaccess_dialogs_test.mk |4 +
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk  |1 
 desktop/CppunitTest_desktop_dialogs_test.mk   |4 +
 filter/CppunitTest_filter_dialogs_test.mk |4 +
 filter/Module_filter.mk   |2 
 filter/UIConfig_filter.mk |   29 
 filter/UIConfig_xsltdlg.mk|   29 
 formula/CppunitTest_formula_dialogs_test.mk   |4 +
 fpicker/CppunitTest_fpicker_dialogs_test.mk   |4 +
 include/osl/test/uniquepipename.hxx   |   41 ++
 include/unotest/uniquepipename.hxx|   37 
 reportdesign/CppunitTest_reportdesign_dialogs_test.mk |4 +
 sal/CppunitTest_sal_osl_pipe.mk   |1 
 sal/qa/osl/pipe/osl_Pipe.cxx  |2 
 sc/CppunitTest_sc_bugfix_test.mk  |4 +
 sc/CppunitTest_sc_filters_test.mk |4 +
 sc/CppunitTest_sc_screenshots.mk  |5 ++
 sd/CppunitTest_sd_dialogs_test.mk |5 ++
 sd/Library_sd.mk  |3 +
 sfx2/CppunitTest_sfx2_classification.mk   |   10 +++-
 sfx2/CppunitTest_sfx2_dialogs_test.mk |4 +
 solenv/gbuild/CppunitTest.mk  |   10 
 starmath/CppunitTest_starmath_dialogs_test.mk |4 +
 svtools/CppunitTest_svtools_dialogs_test.mk   |4 +
 svx/CppunitTest_svx_dialogs_test.mk   |4 +
 sw/CppunitTest_sw_dialogs_test.mk |8 +++
 sw/CppunitTest_sw_docbookexport.mk|4 +
 sw/CppunitTest_sw_mailmerge.mk|4 +
 unotest/Library_unotest.mk|1 
 unotest/source/cpp/officeconnection.cxx   |4 -
 unotest/source/cpp/uniquepipename.cxx |   40 -
 uui/CppunitTest_uui_dialogs_test.mk   |4 +
 vcl/CppunitTest_vcl_dialogs_test.mk   |4 +
 xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk   |4 +
 41 files changed, 210 insertions(+), 113 deletions(-)

New commits:
commit 04f49d0375788239d0c636470d4c971e3bbc73f7
Author: David Tardon 
Date:   Mon Nov 21 00:20:41 2016 +0100

add missing dep

Change-Id: I932f1383f37a45c56dc3ae6d0b5485d80f3325ad

diff --git a/sw/CppunitTest_sw_docbookexport.mk 
b/sw/CppunitTest_sw_docbookexport.mk
index f8e080a..d0c9472 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -52,4 +52,8 @@ $(eval $(call 
gb_CppunitTest_use_rdb,sw_docbookexport,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_docbookexport))
 
+$(eval $(call gb_CppunitTest_use_packages,sw_docbookexport,\
+   filter_docbook \
+))
+
 # vim: set noet sw=4 ts=4:
commit c80c6b5694bd14367e898f659e82013167fc7d97
Author: David Tardon 
Date:   Sun Nov 20 20:24:35 2016 +0100

add missing dep

Change-Id: I0d2a2c32d99ee11e63a2363f8a17bd4efd72cc22

diff --git a/sfx2/CppunitTest_sfx2_classification.mk 
b/sfx2/CppunitTest_sfx2_classification.mk
index 2e691cc..1bdc56c 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -42,4 +42,8 @@ $(eval $(call 
gb_CppunitTest_use_uiconfigs,sfx2_classification,\
svx \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,sfx2_classification,\
+   sfx2_classification \
+))
+
 # vim: set noet sw=4 ts=4:
commit 6750aa27e5d94a7d372fec9dc346b1c5940a0bfe
Author: David Tardon 
Date:   Sun Nov 20 20:18:08 2016 +0100

use the right config dep

Change-Id: I1d387ac566008efd5b0fe7e5e4a4f1bc8462107f

diff --git a/sfx2/CppunitTest_sfx2_classification.mk 
b/sfx2/CppunitTest_sfx2_classification.mk
index f7b5f7e..2e691cc 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_rdb,sfx2_classification,services))
 
-$(eval $(call gb_CppunitTest_use_configuration,sfx2_classification))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\
svx \
commit 22b53e93f36a14ae04d93121cf90cc8f9de6f284
Author: David Tardon 
Date:   Sun Nov 20 17:14:00 2016 +0100

add m

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

[Stephan Bergmann]

 connectivity/source/drivers/evoab2/NCatalog.cxx |1 -
 connectivity/source/drivers/evoab2/NCatalog.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit d015317f36e0160cd76a421eb2060e8539748eb2
Author: Stephan Bergmann 
Date:   Mon Nov 21 09:34:40 2016 +0100

loplugin:datamembershadow

shadowed OCatalog::m_xMetaData can be used here directly

Change-Id: I5d4436e1aa6f8f74ef6f9af816625044492cbf58

diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx 
b/connectivity/source/drivers/evoab2/NCatalog.cxx
index a978254..acc455a 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang;
 OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) :
 connectivity::sdbcx::OCatalog(_pCon)
 ,m_pConnection(_pCon)
-,m_xMetaData(m_pConnection->getMetaData())
 {
 }
 void OEvoabCatalog::refreshTables()
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx 
b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 27297e65..05afef5 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -30,7 +30,6 @@ namespace connectivity
 class OEvoabCatalog : public connectivity::sdbcx::OCatalog
 {
 OEvoabConnection *m_pConnection;
-css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
 public:
 explicit OEvoabCatalog(OEvoabConnection *_pCon);
 inline OEvoabConnection* getConnection() const { return 
m_pConnection; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/kde4/KDEXLib.cxx |8 
 vcl/unx/kde4/KDEXLib.hxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 64e238bc304e60e685acbf4f52b606fb2e92b686
Author: Stephan Bergmann 
Date:   Mon Nov 21 09:22:17 2016 +0100

loplugin:datamembershadow: KDEXLib::blockIdleTimeout shadows SalXLib member

This smells like there's some sort of needless duplicationg among KDEXLib 
and
its base calss SalXLib, but this duplication of blockIdleTimeout members had
been like that ever since those members' introduction in
06d731428ef6cf93c7333e8228bfb6088853b52f "make idle timers actually activate
only when idle".

Change-Id: Ic3eec821b2433745e83fc23d65d3c5f8e1fcf663

diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 510c5c9..cdf1489 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -51,7 +51,7 @@ KDEXLib::KDEXLib() :
 SalXLib(),  m_bStartupDone(false),
 m_pFreeCmdLineArgs(nullptr), m_pAppCmdLineArgs(nullptr), 
m_nFakeCmdLineArgs( 0 ),
 m_frameWidth( -1 ), m_isGlibEventLoopType(false),
-m_allowKdeDialogs(false), blockIdleTimeout(false)
+m_allowKdeDialogs(false), m_blockIdleTimeout(false)
 {
 // the timers created here means they belong to the main thread.
 // As the timeoutTimer runs the LO event queue, which may block on a 
dialog,
@@ -306,7 +306,7 @@ SalYieldResult KDEXLib::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
 
 SalYieldResult KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents 
)
 {
-blockIdleTimeout = !bWait;
+m_blockIdleTimeout = !bWait;
 QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance( 
qApp->thread());
 bool wasEvent = false;
 for( int cnt = bHandleAllCurrentEvents ? 100 : 1;
@@ -319,7 +319,7 @@ SalYieldResult KDEXLib::processYield( bool bWait, bool 
bHandleAllCurrentEvents )
 }
 if( bWait && !wasEvent )
 dispatcher->processEvents( QEventLoop::WaitForMoreEvents );
-blockIdleTimeout = false;
+m_blockIdleTimeout = false;
 return wasEvent ? SalYieldResult::EVENT
 : SalYieldResult::TIMEOUT;
 }
@@ -362,7 +362,7 @@ void KDEXLib::timeoutActivated()
 
 // QGuiEventDispatcherGlib makes glib watch also X11 fd, but its 
hasPendingEvents()
 // doesn't check X11, so explicitly check XPending() here.
-bool idle = QApplication::hasPendingEvents() && !blockIdleTimeout && 
!XPending( QX11Info::display());
+bool idle = QApplication::hasPendingEvents() && !m_blockIdleTimeout && 
!XPending( QX11Info::display());
 X11SalData::Timeout( idle );
 // QTimer is not single shot, so will be restarted immediately
 }
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index c4e18f9..3383ce8 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -56,7 +56,7 @@ class KDEXLib : public QObject, public SalXLib
 int m_frameWidth;
 bool m_isGlibEventLoopType;
 bool m_allowKdeDialogs;
-bool blockIdleTimeout;
+bool m_blockIdleTimeout;
 
 private:
 void setupEventLoop();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze]

 extras/source/palettes/librecolour.soc | 1039 +
 1 file changed, 1039 insertions(+)

New commits:
commit e92f098ae50c6de5f1ca4714cd77eb29e2b591cd
Author: heiko tietze 
Date:   Sun Nov 20 16:25:41 2016 +0100

tdf#104052 - Add LibreColor palette

Artwork by Christoph Schaefer, dtp studio oldenburg

Change-Id: Ibb512b4de154bdc2bb25dcbd60bdb77d0203ffe8
Reviewed-on: https://gerrit.libreoffice.org/31025
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/extras/source/palettes/librecolour.soc 
b/extras/source/palettes/librecolour.soc
new file mode 100644
index 000..e87cfaa
--- /dev/null
+++ b/extras/source/palettes/librecolour.soc
@@ -0,0 +1,1039 @@
+
+
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg";
+xmlns:ooo="http://openoffice.org/2004/office";>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
__