date:20141124

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

2014-11-24 Thread Stephan Bergmann

 svx/source/table/tablemodel.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f0332a4a77880a04697b93cec8f1c2b913f60d1a
Author: Stephan Bergmann 
Date:   Tue Nov 25 08:58:32 2014 +0100

-Werror,-Wuninitialized

(in TableModel ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')

Change-Id: I2a54a1123384bdeaee917ad9f1f0047f13c3860f

diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index df13cd1..8ad480e 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -52,8 +52,8 @@ protected:
 
 typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable, 
::com::sun::star::util::XBroadcaster > TableModelBase;
 
-class TableModel : public TableModelBase,
-   public ::comphelper::OBaseMutex,
+class TableModel : public ::comphelper::OBaseMutex,
+   public TableModelBase,
public ICellRange
 {
 friend class InsertRowUndo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 include/canvas/base/cachedprimitivebase.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f94761288ad5bb1319bb32f845586bbc8c6d1b9
Author: Stephan Bergmann 
Date:   Tue Nov 25 08:27:10 2014 +0100

-Werror,-Wuninitialized

(in CachedPrimitiveBase ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')

Change-Id: I30855a80ad9dbc3fa90e45d51d2a02794033f2f1

diff --git a/include/canvas/base/cachedprimitivebase.hxx 
b/include/canvas/base/cachedprimitivebase.hxx
index 99b9b91..14b4273 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -40,8 +40,8 @@ namespace canvas
 /** Base class, providing common functionality for implementers of
 the XCachedPrimitive interface.
  */
-class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public 
CachedPrimitiveBase_Base,
-public ::comphelper::OBaseMutex
+class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase:
+public comphelper::OBaseMutex, public CachedPrimitiveBase_Base
 {
 public:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 sw/inc/cellatr.hxx  |2 +-
 sw/inc/doc.hxx  |4 ++--
 sw/inc/docsh.hxx|2 +-
 sw/inc/editsh.hxx   |4 ++--
 sw/inc/fldbas.hxx   |2 +-
 sw/inc/frmfmt.hxx   |6 +++---
 sw/inc/node.hxx |6 +++---
 sw/inc/swddetbl.hxx |2 +-
 sw/inc/swtable.hxx  |2 +-
 sw/inc/viewsh.hxx   |4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 7ca3303aaadd20dcc1d6e08bdeba38021cbec4bb
Author: Noel Grandin 
Date:   Tue Nov 25 06:46:49 2014 +0200

loplugin: cstylecast

Change-Id: Idc6c34d8b3cfab35c7dc841a9ff70c218e0282df

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index b343a8b..70cfbcc 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -71,7 +71,7 @@ public:
 
   SwTableBox* GetTableBox();
 const SwTableBox* GetTableBox() const
-{ return ((SwTblBoxFormula*)this)->GetTableBox(); }
+{ return const_cast(this)->GetTableBox(); }
 
 void ChangeState( const SfxPoolItem* pItem );
 void Calc( SwTblCalcPara& rCalcPara, double& rValue );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a7b8829..ffb23e6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1691,7 +1691,7 @@ void ClrContourCache();
 
 inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
 {
-return ((SwDoc*)this)->IsIdxInTbl( rIdx );
+return static_cast(this)->IsIdxInTbl( rIdx );
 }
 
 inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
@@ -1703,7 +1703,7 @@ inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool 
bCreate )
 
 inline const SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) const
 {
-return ((SwDoc*)this)->GetNumberFormatter( bCreate );
+return static_cast(this)->GetNumberFormatter( bCreate );
 }
 
 inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 53a801c2..2473d5e 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -222,7 +222,7 @@ public:
 /// For Core - it knows the DocShell but not the WrtShell!
   SwFEShell *GetFEShell();
 const SwFEShell *GetFEShell() const
-{ return ((SwDocShell*)this)->GetFEShell(); }
+{ return const_cast(this)->GetFEShell(); }
 
 /// For inserting document.
 Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b59cc50..d0b7817 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -869,7 +869,7 @@ public:
 /// Query NumberFormater from document.
   SvNumberFormatter* GetNumberFormatter();
 const SvNumberFormatter* GetNumberFormatter() const
-{   return ((SwEditShell*)this)->GetNumberFormatter();  }
+{   return const_cast(this)->GetNumberFormatter();  }
 
 /// Interfaces for GlobalDocument.
 bool IsGlobalDoc() const;
@@ -955,7 +955,7 @@ private:
 };
 
 inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
-{   return ((SwEditShell*)this)->GetLinkManager();  }
+{   return const_cast(this)->GetLinkManager();  }
 
  /// Class for automated call of Start- and EndAction().
 class SwActContext {
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 57780e9..da578a7 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -272,7 +272,7 @@ public:
 
 inline void SwFieldType::UpdateFlds() const
 {
-((SwFieldType*)this)->ModifyNotification( 0, 0 );
+const_cast(this)->ModifyNotification( 0, 0 );
 }
 
 /** Base class of all fields.
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index e73f6bd..0650f44 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -97,7 +97,7 @@ public:
The UserCall knows its SdrObject. */
   SwContact *FindContactObj();
 const SwContact *FindContactObj() const
-{ return ((SwFrmFmt*)this)->FindContactObj(); }
+{ return const_cast(this)->FindContactObj(); }
 
 /** @return the SdrObject, that is connected to the ContactObject.
Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts
@@ -105,11 +105,11 @@ public:
"Real SdrObject" has position and a Z-order. */
   SdrObject *FindSdrObject();
 const SdrObject *FindSdrObject() const
-{ return ((SwFrmFmt*)this)->FindSdrObject(); }
+{ return const_cast(this)->FindSdrObject(); }
 
   SdrObject *FindRealSdrObject();
 const SdrObject *FindRealSdrObject() const
-{ return ((SwFrmFmt*)this)->FindRealSdrObject(); }
+{ return const_cast(this)->FindRealSdrObject(); }
 
 bool IsLowerOf( const SwFrmFmt& rFmt ) const;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a8c7f29..4cf51e2 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -665,15 +665,15 @@ inline bool SwNode::IsGrfNode() const
 
 inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) 
const
 {
-return ((SwNode*)this)->FindSttNodeByType( eTyp );
+return const_cast(this)->FindSttNodeByType( eTyp );
 }
 inline const S

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

2014-11-24 Thread Takeshi Abe

 sw/source/core/access/accfrmobjmap.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 643283d4b3b8581fa5aa9b47cda90583b4aed3e7
Author: Takeshi Abe 
Date:   Tue Nov 25 15:08:07 2014 +0900

Drop noexcept

VS2012 does not support the noexcept feature:


Change-Id: If7c076ffe2ca263117654862f68cb7c4c142849f

diff --git a/sw/source/core/access/accfrmobjmap.hxx 
b/sw/source/core/access/accfrmobjmap.hxx
index 2ace69d..fedc573 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -119,11 +119,11 @@ public:
 static bool IsSortingRequired( const SwFrm& rFrm );
 
 iterator begin() { return maMap.begin(); }
-const_iterator cbegin() const noexcept { return maMap.cbegin(); }
+const_iterator cbegin() const { return maMap.cbegin(); }
 iterator end() { return maMap.end(); }
-const_iterator cend() const noexcept { return maMap.cend(); }
-const_reverse_iterator crbegin() const noexcept { return maMap.crbegin(); }
-const_reverse_iterator crend() const noexcept { return maMap.crend(); }
+const_iterator cend() const { return maMap.cend(); }
+const_reverse_iterator crbegin() const { return maMap.crbegin(); }
+const_reverse_iterator crend() const { return maMap.crend(); }
 
 std::pair insert(const value_type& value) { return 
maMap.insert(value); }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 wizards/com/sun/star/wizards/ui/ImageList.java  |   12 ---
 wizards/com/sun/star/wizards/ui/WizardDialog.java   |   11 ---
 wizards/com/sun/star/wizards/ui/event/CommonListener.java   |   12 +++
 wizards/com/sun/star/wizards/ui/event/MethodInvocation.java |   44 
 4 files changed, 30 insertions(+), 49 deletions(-)

New commits:
commit 41d3adbe47610efc1e7bc848c129024a2ec19f9a
Author: Noel Grandin 
Date:   Wed Nov 19 09:41:16 2014 +0200

java: simplify the CommonListener stuff

by moving the MethodInvocation to be purely an internal detail

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

diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java 
b/wizards/com/sun/star/wizards/ui/ImageList.java
index 0ae99b7..342f264 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -80,7 +80,6 @@ public class ImageList implements XItemEventBroadcaster, 
ListDataListener
 private final static Short HIDE_PAGE = Short.valueOf((short) 99);
 private final static Integer TRANSPARENT = Integer.valueOf(-1);
 private final static int LINE_HEIGHT = 8;
-private MethodInvocation METHOD_MOUSE_PRESSED;
 
 /** Getter for property imageSize.
  * @return Value of property imageSize.
@@ -272,15 +271,6 @@ public class ImageList implements XItemEventBroadcaster, 
ListDataListener
 
 m_aImages = new XControl[rows * cols];
 
-try
-{
-METHOD_MOUSE_PRESSED = new MethodInvocation("mousePressed", this, 
Object.class);
-}
-catch (NoSuchMethodException e)
-{
-e.printStackTrace();
-}
-
 m_imageHeight = Integer.valueOf(imageSize.Height);
 m_imageWidth = Integer.valueOf(imageSize.Width);
 
@@ -337,7 +327,7 @@ public class ImageList implements XItemEventBroadcaster, 
ListDataListener
 XWindow win = UnoRuntime.queryInterface(XWindow.class, image);
 win.addMouseListener(uiEventListener);
 win.addKeyListener(imageKeyListener);
-uiEventListener.add(imageName, EventNames.MOUSE_PRESSED, 
METHOD_MOUSE_PRESSED);
+uiEventListener.add(imageName, EventNames.MOUSE_PRESSED, 
"mousePressed", this, Object.class);
 
 return image;
 }
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java 
b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 8b8e079..dd64b92 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -20,7 +20,6 @@ package com.sun.star.wizards.ui;
 import java.beans.*;
 
 import com.sun.star.wizards.ui.event.EventNames;
-import com.sun.star.wizards.ui.event.MethodInvocation;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.*;
 import com.sun.star.uno.AnyConverter;
@@ -241,18 +240,13 @@ public abstract class WizardDialog extends UnoDialog2 
implements VetoableChangeL
 xSSFRoadmap = 
UnoRuntime.queryInterface(XSingleServiceFactory.class, oRoadmap);
 xIndexContRoadmap = 
UnoRuntime.queryInterface(XIndexContainer.class, oRoadmap);
 
-MethodInvocation mi = new MethodInvocation("itemStateChanged", 
this, com.sun.star.awt.ItemEvent.class);
-guiEventListener.add("rdmNavi", EventNames.ITEM_CHANGED, mi);
+guiEventListener.add("rdmNavi", EventNames.ITEM_CHANGED, 
"itemStateChanged", this, com.sun.star.awt.ItemEvent.class);
 xRoadmapControl = this.xDlgContainer.getControl("rdmNavi");
 xRoadmapBroadcaster = 
UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl);
 xRoadmapBroadcaster.addItemListener(guiEventListener);
 
 Helper.setUnoPropertyValue(oRoadmap, "Text", 
oWizardResource.getResText(UIConsts.RID_COMMON + 16));
 }
-catch (NoSuchMethodException ex)
-{
-Resource.showCommonResourceError(xMSF);
-}
 catch (java.lang.Exception jexception)
 {
 jexception.printStackTrace(System.err);
@@ -481,10 +475,9 @@ public abstract class WizardDialog extends UnoDialog2 
implements VetoableChangeL
 // add a window listener, to know
 // if the user used "escape" key to
 // close the dialog.
-MethodInvocation windowHidden = new 
MethodInvocation("windowHidden", this);
 xWindow.addWindowListener(guiEventListener);
 String dialogName = (String) 
Helper.getUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_NAME);
-guiEventListener.add(dialogName, EventNames.ACTION_PERFORMED, 
windowHidden);
+guiEventListener.add(dialogName, EventNames.ACTION_PERFORMED, 
"windowHidden", this);
 
 }
 catch (java.lang.Exception jexception)
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.jav

[Libreoffice-commits] core.git: framework/qa javaunohelper/com nlpsolver/ThirdParty odk/examples qadevOOo/runner qadevOOo/tests sc/qa scripting/java sw/qa vcl/qa wizards/com

2014-11-24 Thread Noel Grandin

 framework/qa/complex/desktop/DesktopTerminate.java 
 |2 -
 
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java 
|2 -
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 |2 -
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java
 |2 -
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java
 |   12 +++
 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java   
 |4 +-
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
|2 -
 odk/examples/DevelopersGuide/Text/TextDocuments.java   
 |2 -
 odk/examples/java/ConverterServlet/ConverterServlet.java   
 |4 +-
 qadevOOo/runner/graphical/ParameterHelper.java 
 |2 -
 qadevOOo/runner/lib/TestParameters.java
 |2 -
 qadevOOo/runner/util/ShapeDsc.java 
 |2 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java   
 |2 -
 qadevOOo/tests/java/ifc/frame/_XLayoutManager.java 
 |2 -
 qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java  
 |2 -
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java   
 |2 -
 qadevOOo/tests/java/ifc/sdbc/_XRow.java
 |2 -
 qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java   
 |4 +-
 qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java   
 |2 -
 qadevOOo/tests/java/ifc/util/_XReplaceable.java
 |2 -
 qadevOOo/tests/java/mod/_remotebridge/uno/various.java 
 |2 -
 qadevOOo/tests/java/mod/_remotebridge/various.java 
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java  
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java  
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java 
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java   
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
 |2 -
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java   
 |2 -
 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java  
 |2 -
 sc/qa/complex/dataPilot/CheckDataPilot.java
 |2 -
 sc/qa/complex/dataPilot/_XDataPilotDescriptor.java 
 |2 -
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
 |2 -
 sw/qa/complex/writer/LoadSaveTest.java 
 |6 +--
 vcl/qa/complex/memCheck/CheckMemoryUsage.java  
 |2 -
 wizards/com/sun/star/wizards/common/NumberFormatter.java   
 |2 -
 wizards/com/sun/star/wizards/db/RelationController.java
 |   16 +-
 wizards/com/sun/star/wizards/report/ReportLayouter.java
 |6 +--
 wizards/com/sun/star/wizards/table/ScenarioSelector.java   
 |2 -
 wizards/com/sun/star/wizards/ui/ButtonList.java
 |4 +-
 wizards/com/sun/star/wizards/ui/CommandFieldSelection.java 
 |2 -
 wizards/com/sun/star/wizards/ui/FilterComponent.java   
 |2 -
 wizards/com/sun/star/wizards/ui/ImageList.java 
 |4 +-
 wizards/com/sun/star/wizards/ui/WizardDialog.java  
 |2 -
 43 files changed, 64 insertions(+), 64 deletions(-)

New commits:
commit 58eab57648e222e5a3e488087afd44eea6efd591
Author: Noel Grandin 
Date:   Tue Nov 18 15:20:11 2014 +0200

java: final fields that can be static

found by PMD

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

diff --git a/framework/qa/complex/desktop/DesktopTerminate.java 
b/framework/qa/complex/desktop/DesktopTerminate.java
index

LibreOffice Gerrit News for core on 2014-11-25

2014-11-24 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ gbuild: introduce add_objcxxflags_exception_object/objects
  in https://gerrit.libreoffice.org/11815 from Douglas Mencken
  about module sal, solenv
+ prefer `if (s)' to `if (nil != s)' for objective-c
  in https://gerrit.libreoffice.org/11891 from Douglas Mencken
  about module vcl
+ fdo#82969 add global shortcut for autospellcheck
  in https://gerrit.libreoffice.org/13088 from Yousuf Philips
  about module officecfg
 End of freshness 

+ java: final fields that can be static
  in https://gerrit.libreoffice.org/13099 from Noel Grandin
  about module framework, javaunohelper, nlpsolver, odk, qadevOOo, sc, 
scripting, sw, vcl, wizards
+ Use parameters instead of static access when possible
  in https://gerrit.libreoffice.org/13103 from Michaël Lefèvre
  about module sw
+ add Excel 2013 function ERROR.TYPE to Calc
  in https://gerrit.libreoffice.org/13101 from Winfried Donkers
  about module formula, include, sc
+ java: simplify the CommonListener stuff
  in https://gerrit.libreoffice.org/13100 from Noel Grandin
  about module wizards
+ fdo#86169 fix completion of function name crash
  in https://gerrit.libreoffice.org/12380 from Winfried Donkers
  about module sc
+ scp2: move numbertext to AutoInstall
  in https://gerrit.libreoffice.org/13047 from David Ostrovsky
  about module build, scp2
+ fdo#83672 , fdo#67776 : Fixed shape rotation angle in xlsx import.
  in https://gerrit.libreoffice.org/13090 from sushil_shinde
  about module sc
+ Fix Python build in debug mode for x64 Windows
  in https://gerrit.libreoffice.org/13089 from David Ostrovsky
  about module external


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

+ java,framework: remove unused vars and parameters
  in https://gerrit.libreoffice.org/13098 from Noel Grandin
+ fdo#75757: remove inheritance to std::map
  in https://gerrit.libreoffice.org/12513 from Juan Picca
+ coverity#1255909 Uninitialized scalar field
  in https://gerrit.libreoffice.org/13104 from Caolán McNamara
+ java,qadev: remove unused parameters and local vars
  in https://gerrit.libreoffice.org/13097 from Noel Grandin
+ fdo#84909 move zoom to object and added/hid/unhid some other buttons
  in https://gerrit.libreoffice.org/13063 from Yousuf Philips
+ fdo#86476 add icons to sheet management menu and context menu entries
  in https://gerrit.libreoffice.org/13087 from Yousuf Philips
+ improvements to iwyudummy target
  in https://gerrit.libreoffice.org/12980 from Noel Grandin
+ convert EventNames to an enum
  in https://gerrit.libreoffice.org/13095 from Noel Grandin
+ java: unused local vars
  in https://gerrit.libreoffice.org/13096 from Noel Grandin
+ scp2: move ct2n to AutoInstall
  in https://gerrit.libreoffice.org/13020 from David Ostrovsky
+ the UnoDialog constructor parameters can be simplified
  in https://gerrit.libreoffice.org/13092 from Noel Grandin
+ merge AbstractListener into CommonListener
  in https://gerrit.libreoffice.org/13094 from Noel Grandin
+ the getGuiEventListener method is unnecessary
  in https://gerrit.libreoffice.org/13093 from Noel Grandin
+ createListener() is never overriden
  in https://gerrit.libreoffice.org/13091 from Noel Grandin
+ fdo#84904 Don’t stretch icons horizontally
  in https://gerrit.libreoffice.org/13083 from Adolfo Jayme Barrientos
+ added the missing '5' next to 'KDE Plasma'
  in https://gerrit.libreoffice.org/13066 from Yousuf Philips
+ fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
  in https://gerrit.libreoffice.org/13029 from Ioan Radu
+ timers: callback useless, remove timer completely.
  in https://gerrit.libreoffice.org/13062 from Tobias Madl


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

None

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

+ Don’t Save --> Don't Save.
  in https://gerrit.libreoffice.org/12399 from Kevin Suo
+ fdo#77569 - Add Choose Theme to Format Menu
  in https://gerrit.libreoffice.org/12275 from Joel Madero
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ android: Show document browser back in the menu
  in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez
+ coverity#1242459 Identical code for different branches
  in https://gerrit.libreoffice.org/11772 from Caolán McNamara
+ jvmfwk: Apple & Oracle's JRE detection for OS X 10.8+
  in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ WIP: fdo#43090: Add an option to disable autoclose brackets
  in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#58194 - export DOCX Automatic inden

[Libreoffice-commits] core.git: forms/qa framework/qa

2014-11-24 Thread Noel Grandin

 forms/qa/integration/forms/CellBinding.java  | 
   3 -
 framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 
   3 -
 framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java   | 
   2 -
 framework/qa/complex/framework/recovery/KlickButtonThread.java   | 
   7 +---
 framework/qa/complex/framework/recovery/RecoveryTest.java| 
   6 +--
 framework/qa/complex/framework/recovery/RecoveryTools.java   | 
   4 +-
 framework/qa/complex/loadAllDocuments/InteractionHandler.java| 
  16 +-
 framework/qa/complex/path_settings/PathSettingsTest.java | 
   2 -
 8 files changed, 13 insertions(+), 30 deletions(-)

New commits:
commit 1658c017a27ac2cccb2af89f88a4cde8ffdbe531
Author: Noel Grandin 
Date:   Tue Nov 18 14:13:55 2014 +0200

java,framework: remove unused vars and parameters

Change-Id: I7df5ff730436b95cb93af9f813d7bc572da2b951
Reviewed-on: https://gerrit.libreoffice.org/13098
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Noel Grandin 

diff --git a/forms/qa/integration/forms/CellBinding.java 
b/forms/qa/integration/forms/CellBinding.java
index 3a981f1..e71975a 100644
--- a/forms/qa/integration/forms/CellBinding.java
+++ b/forms/qa/integration/forms/CellBinding.java
@@ -539,8 +539,7 @@ public class CellBinding extends complexlib.ComplexTestCase
 XAccessible accessible = UnoRuntime.queryInterface(
 XAccessible.class, m_document.getCurrentView().getControl( 
controlModel ) );
 
-XAccessibleContext context = accessible.getAccessibleContext();
-XServiceInfo si = UnoRuntime.queryInterface( XServiceInfo.class,
+UnoRuntime.queryInterface( XServiceInfo.class,
 accessible.getAccessibleContext() );
 
 XAccessibleEditableText textAccess = UnoRuntime.queryInterface(
diff --git 
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java 
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 2f96fe7..2b361cd 100644
--- 
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ 
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -275,8 +275,7 @@ public class CheckContextMenuInterceptor
 try
 {
 System.out.println("try to get first children of Help context...");
-XAccessible xHelpChild = xHelpCont.getAccessibleChild(0);
-
+xHelpCont.getAccessibleChild(0);
 }
 catch (IndexOutOfBoundsException e)
 {
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java 
b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index 8600c02..418e229 100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -56,7 +56,7 @@ public class GetServiceWhileDisposingOffice
 xDesktop.terminate();
 for (; step < 1; step++)
 {
-Object o = xMSF.createInstance("com.sun.star.frame.Desktop");
+xMSF.createInstance("com.sun.star.frame.Desktop");
 }
 }
 catch (com.sun.star.lang.DisposedException e)
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java 
b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index d2dceb4..90ecf68 100644
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
@@ -19,21 +19,18 @@
 package complex.framework.recovery;
 
 import com.sun.star.awt.XWindow;
-import com.sun.star.lang.XMultiServiceFactory;
 import util.UITools;
 
 /**
  * Thread to crash the office. This thread dies after the office process
- * is nopt longer available.
+ * is no longer available.
  */
 public class KlickButtonThread extends Thread {
 private final XWindow xWindow;
-private final XMultiServiceFactory xMSF;
 private final String buttonName;
 
-public KlickButtonThread(XMultiServiceFactory xMSF, XWindow xWindow, 
String buttonName) {
+public KlickButtonThread(XWindow xWindow, String buttonName) {
 this.xWindow = xWindow;
-this.xMSF = xMSF;
 this.buttonName = buttonName;
 }
 
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java 
b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 746ff82..187b336 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -280,7 +280,7 @@ public class RecoveryTest extends ComplexTestCase {
 if (cancel) {
 log.println("clicking 'Cancel' button...");
 
-rt.clickThreadButton(xMSF, xWindow, "Cancel");
+rt.clickThreadButton(xWindow, "Cancel");

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

2014-11-24 Thread bugzilla-daemon

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

--- Comment #48 from Commit Notification 
 ---
Juan Picca committed a patch related to this issue.
It has been pushed to "master":

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

fdo#75757: remove inheritance to std::map

It will be available in 4.5.0.

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

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

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

2014-11-24 Thread bugzilla-daemon

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   |target:4.4.0|target:4.4.0 target:4.5.0

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

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

2014-11-24 Thread Juan Picca

 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |   15 +-
 sw/inc/unocrsrhelper.hxx   |   10 ++-
 sw/source/core/access/accframe.cxx |   16 +--
 sw/source/core/access/accfrmobjmap.cxx |4 +-
 sw/source/core/access/accfrmobjmap.hxx |   24 ++---
 sw/source/core/access/acchypertextdata.cxx |2 -
 sw/source/core/access/acchypertextdata.hxx |   17 ++--
 sw/source/core/unocore/unocrsrhelper.cxx   |   22 +++
 8 files changed, 69 insertions(+), 41 deletions(-)

New commits:
commit ee42495de1279f9966dd2305966ab96711403463
Author: Juan Picca 
Date:   Mon Nov 17 10:48:32 2014 -0200

fdo#75757: remove inheritance to std::map

Change-Id: I9dfabddf4b51994c1ae078582dec3f385e7d1a5c
Reviewed-on: https://gerrit.libreoffice.org/12513
Reviewed-by: Takeshi Abe 
Tested-by: Takeshi Abe 

diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx 
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 23abe79..feb4f02 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -135,10 +135,21 @@ public:
 /** The recently used caches are stored in one queue for each document.
 */
 class PageCacheManager::RecentlyUsedPageCaches
-: public ::std::map
 {
 public:
-RecentlyUsedPageCaches (void) {};
+typedef DocumentKey key_type;
+typedef RecentlyUsedQueue   mapped_type;
+typedef std::pair   value_type;
+typedef std::map::iteratoriterator;
+private:
+std::map maMap;
+public:
+RecentlyUsedPageCaches () {};
+
+iterator end() { return maMap.end(); }
+void clear() { maMap.clear(); }
+iterator find(const key_type& key) { return maMap.find(key); }
+std::pair insert(const value_type& value) { return 
maMap.insert(value); }
 };
 
 class PageCacheManager::Deleter
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index ade29a1..f5949dd 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_UNOCRSRHELPER_HXX
 #define INCLUDED_SW_INC_UNOCRSRHELPER_HXX
 
-#include 
+#include 
 
 #include 
 #include 
@@ -66,13 +66,11 @@ enum SwGetPropertyStatesCaller
 
 namespace SwUnoCursorHelper
 {
-//  keep Any's mapped by (WhichId << 16 ) + (MemberId)
-typedef std::map< sal_uInt32, com::sun::star::uno::Any *> AnyMapHelper_t;
-class SwAnyMapHelper : public AnyMapHelper_t
+class SwAnyMapHelper
 {
+//  keep Any's mapped by (WhichId << 16 ) + (MemberId)
+boost::ptr_map maMap;
 public:
-~SwAnyMapHelper();
-
 voidSetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const 
com::sun::star::uno::Any& rAny );
 boolFillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, 
const com::sun::star::uno::Any*& pAny );
 };
diff --git a/sw/source/core/access/accframe.cxx 
b/sw/source/core/access/accframe.cxx
index e292df9..9a34ec7 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -89,8 +89,8 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
 {
 // We need a sorted list here
 const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
-SwAccessibleChildMap::const_iterator aIter( aVisMap.begin() );
-while( aIter != aVisMap.end() && !aRet.IsValid() )
+SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
+while( aIter != aVisMap.cend() && !aRet.IsValid() )
 {
 const SwAccessibleChild& rLower = (*aIter).second;
 if( rLower.IsAccessible( bInPagePreview ) )
@@ -155,8 +155,8 @@ bool SwAccessibleFrame::GetChildIndex(
 {
 // We need a sorted list here
 const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
-SwAccessibleChildMap::const_iterator aIter( aVisMap.begin() );
-while( aIter != aVisMap.end() && !bFound )
+SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
+while( aIter != aVisMap.cend() && !bFound )
 {
 const SwAccessibleChild& rLower = (*aIter).second;
 if( rLower.IsAccessible( bInPagePreview ) )
@@ -220,8 +220,8 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const 
SwRect& rVisArea,
 // We need a sorted list here, and we have to reverse iterate,
 // because objects in front should be returned.
 const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
-SwAccessibleChildMap::const_reverse_iterator aRIter( aVisMap.rbegin() 
);
-while( aRIter != aVisMap.rend() && !aRet.IsValid() )
+SwAccessibleChildMap::const_reverse_iterator aRIter( aVisMap.crbegin() 
);
+while( aRIter

[Bug 66822] refactor HTML export of image bullet list

2014-11-24 Thread bugzilla-daemon

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

--- Comment #6 from Renato Ferreira  ---
Created attachment 109974
  --> https://bugs.freedesktop.org/attachment.cgi?id=109974&action=edit
Testcase?

I have tried to replicate this on Mac OS X, LibreOffice Version:
4.4.0.0.alpha2+.

I don't know if I'm doing something wrong, but for me the HTML export has no
image at all for the bullets; not only was I unable to replicate the bug, but
also encountered another one?

I'm attaching a test case, which is really just a document with a bulleted list
where the bullets were formatted to one of the offered images.

If I choose regular bullets, the following HTML excerpt is generated:

•HeyMan •LookAtMeRockingOut 

Whereas the image one exports as:

HeyMan LookAtMeRockingOut 

This one does not have the Bullet_20_Symbols class or the hard-coded bullet,
but neither does it have any style for the images as reported here.

Can anyone replicate this behaviour in the current development build? Is this
another bug, or did I run a wrong test...?

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

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

2014-11-24 Thread Eike Rathke

 sc/inc/tokenarray.hxx   |6 +
 sc/qa/unit/filters-test.cxx |   47 
 sc/qa/unit/ucalc.hxx|1 
 sc/qa/unit/ucalc_sort.cxx   |   13 ++-
 sc/source/core/data/column4.cxx |2 +
 sc/source/core/data/table3.cxx  |4 +++
 sc/source/core/tool/token.cxx   |   43 
 7 files changed, 106 insertions(+), 10 deletions(-)

New commits:
commit 985a2a6606a20abd4aeaf997f63eb434d0a884ba
Author: Eike Rathke 
Date:   Tue Nov 25 03:07:00 2014 +0100

check internal and external sheet references in both modes

Actually fdo#77018 is not "fixed", but is a case for
UpdateReferenceOnSort=true now.

Change-Id: Ibc92c0a95749089c79787e38898bfe77fe30fb0f
(cherry picked from commit 46e6f78f2b7595e7009975a2365395a74ca2df83)

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 1592241..db2ea40 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -80,7 +80,8 @@ public:
 void testEnhancedProtectionXLSX();
 void testSortWithSharedFormulasODS();
 void testSortWithSheetExternalReferencesODS();
-void testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef xDocShRef, 
SCROW nRow1, SCROW nRow2 );
+void testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef xDocShRef, 
SCROW nRow1, SCROW nRow2,
+bool bCheckRelativeInSheet );
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testCVEs);
@@ -619,20 +620,44 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS()
 sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
 rDoc.CalcAll();
 
-// The relative test only works with UpdateReferenceOnSort == true, set it
-// now. We reset the value back to the original in tearDown()
+// We reset the SortRefUpdate value back to the original in tearDown().
 ScInputOptions aInputOption = SC_MOD()->GetInputOptions();
+
+// The complete relative test only works with UpdateReferenceOnSort==true,
+// but the internal and external sheet references have to work in both
+// modes.
+
 aInputOption.SetSortRefUpdate(true);
 SC_MOD()->SetInputOptions(aInputOption);
 
-// Sort A15:D20 with relative row references.
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19);
+// Sort A15:D20 with relative row references. UpdateReferenceOnSort==true
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19, true);
+
+// Undo sort with relative references to perform same sort.
+rDoc.GetUndoManager()->Undo();
+rDoc.CalcAll();
+
+aInputOption.SetSortRefUpdate(false);
+SC_MOD()->SetInputOptions(aInputOption);
+
+// Sort A15:D20 with relative row references. UpdateReferenceOnSort==false
+// Without in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19, false);
+
+// Undo sort with relative references to perform new sort.
+rDoc.GetUndoManager()->Undo();
+rDoc.CalcAll();
 
 // Sort with absolute references has to work in both UpdateReferenceOnSort
 // modes.
 
+aInputOption.SetSortRefUpdate(true);
+SC_MOD()->SetInputOptions(aInputOption);
+
 // Sort A23:D28 with absolute row references. UpdateReferenceOnSort==true
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27, true);
 
 // Undo sort with absolute references to perform same sort.
 rDoc.GetUndoManager()->Undo();
@@ -642,12 +667,14 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS()
 SC_MOD()->SetInputOptions(aInputOption);
 
 // Sort A23:D28 with absolute row references. UpdateReferenceOnSort==false
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27, true);
 
 xDocSh->DoClose();
 }
 
-void ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef 
xDocSh, SCROW nRow1, SCROW nRow2 )
+void ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef 
xDocSh, SCROW nRow1, SCROW nRow2,
+bool bCheckRelativeInSheet )
 {
 ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -694,9 +721,11 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef x
 double aCheck[] = { 5, 4, 3, 2, 1 };
 CPPUNIT_ASSERT_EQUAL( aCheck[nRow-nRow1-1], rDoc.GetValue( 
ScAddress(0,nRow,0)));
 }
+// The last column (D) are in-sheet relative references.
+SCCOL nEndCol = (bCheckRelativeInSheet ? 3 : 2);
 for (SCROW nRow=nRow1+1; nRow <= nRow2; ++nRow)
 {
-for (SCCOL nCol=1; nCol <= 3; ++nCol)
+for (SCCOL nCol=1; nCol <= nEndCol; ++nCol)
 {
 double aCheck[] = { 12345, 1234, 123, 12, 1 };

Formatting of README files

2014-11-24 Thread Chris Sherlock

Hi all,

I noticed that there is some minor formatting capabilities on the
docs.libreoffice.org website for readmes.

e.g. http://docs.libreoffice.org/vcl.html shows headings, which uses
Wikimedia style double-equals signs before and after the heading text.

Are there any other formatting marks? If there are, are they documented
anywhere?

Also, what would the feasibility of using Markdown syntax, ala github.io?

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

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

2014-11-24 Thread Eike Rathke

 sc/inc/tokenarray.hxx   |6 +
 sc/qa/unit/filters-test.cxx |   47 
 sc/qa/unit/ucalc.hxx|1 
 sc/qa/unit/ucalc_sort.cxx   |   13 ++-
 sc/source/core/data/column4.cxx |2 +
 sc/source/core/data/table3.cxx  |4 +++
 sc/source/core/tool/token.cxx   |   43 
 7 files changed, 106 insertions(+), 10 deletions(-)

New commits:
commit 46e6f78f2b7595e7009975a2365395a74ca2df83
Author: Eike Rathke 
Date:   Tue Nov 25 03:07:00 2014 +0100

check internal and external sheet references in both modes

Actually fdo#77018 is not "fixed", but is a case for
UpdateReferenceOnSort=true now.

Change-Id: Ibc92c0a95749089c79787e38898bfe77fe30fb0f

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 1592241..db2ea40 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -80,7 +80,8 @@ public:
 void testEnhancedProtectionXLSX();
 void testSortWithSharedFormulasODS();
 void testSortWithSheetExternalReferencesODS();
-void testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef xDocShRef, 
SCROW nRow1, SCROW nRow2 );
+void testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef xDocShRef, 
SCROW nRow1, SCROW nRow2,
+bool bCheckRelativeInSheet );
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testCVEs);
@@ -619,20 +620,44 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS()
 sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
 rDoc.CalcAll();
 
-// The relative test only works with UpdateReferenceOnSort == true, set it
-// now. We reset the value back to the original in tearDown()
+// We reset the SortRefUpdate value back to the original in tearDown().
 ScInputOptions aInputOption = SC_MOD()->GetInputOptions();
+
+// The complete relative test only works with UpdateReferenceOnSort==true,
+// but the internal and external sheet references have to work in both
+// modes.
+
 aInputOption.SetSortRefUpdate(true);
 SC_MOD()->SetInputOptions(aInputOption);
 
-// Sort A15:D20 with relative row references.
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19);
+// Sort A15:D20 with relative row references. UpdateReferenceOnSort==true
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19, true);
+
+// Undo sort with relative references to perform same sort.
+rDoc.GetUndoManager()->Undo();
+rDoc.CalcAll();
+
+aInputOption.SetSortRefUpdate(false);
+SC_MOD()->SetInputOptions(aInputOption);
+
+// Sort A15:D20 with relative row references. UpdateReferenceOnSort==false
+// Without in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19, false);
+
+// Undo sort with relative references to perform new sort.
+rDoc.GetUndoManager()->Undo();
+rDoc.CalcAll();
 
 // Sort with absolute references has to work in both UpdateReferenceOnSort
 // modes.
 
+aInputOption.SetSortRefUpdate(true);
+SC_MOD()->SetInputOptions(aInputOption);
+
 // Sort A23:D28 with absolute row references. UpdateReferenceOnSort==true
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27, true);
 
 // Undo sort with absolute references to perform same sort.
 rDoc.GetUndoManager()->Undo();
@@ -642,12 +667,14 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS()
 SC_MOD()->SetInputOptions(aInputOption);
 
 // Sort A23:D28 with absolute row references. UpdateReferenceOnSort==false
-testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+// With in-sheet relative references.
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27, true);
 
 xDocSh->DoClose();
 }
 
-void ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef 
xDocSh, SCROW nRow1, SCROW nRow2 )
+void ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef 
xDocSh, SCROW nRow1, SCROW nRow2,
+bool bCheckRelativeInSheet )
 {
 ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -694,9 +721,11 @@ void 
ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef x
 double aCheck[] = { 5, 4, 3, 2, 1 };
 CPPUNIT_ASSERT_EQUAL( aCheck[nRow-nRow1-1], rDoc.GetValue( 
ScAddress(0,nRow,0)));
 }
+// The last column (D) are in-sheet relative references.
+SCCOL nEndCol = (bCheckRelativeInSheet ? 3 : 2);
 for (SCROW nRow=nRow1+1; nRow <= nRow2; ++nRow)
 {
-for (SCCOL nCol=1; nCol <= 3; ++nCol)
+for (SCCOL nCol=1; nCol <= nEndCol; ++nCol)
 {
 double aCheck[] = { 12345, 1234, 123, 12, 1 };
 CPPUNIT_ASSERT_EQUAL( aCheck[nRow-nRow1-1], rDoc.GetValue( 
ScAdd

[Libreoffice-commits] core.git: 4 commits - connectivity/source forms/inc forms/source include/svl include/unotools Library_merged.mk sfx2/inc sfx2/source svl/source unotools/source

2014-11-24 Thread Matúš Kukan

 Library_merged.mk |6 
 connectivity/source/drivers/file/FTable.cxx   |3 
 forms/inc/pch/precompiled_frm.hxx |1 
 forms/source/component/DatabaseForm.cxx   |2 
 forms/source/component/ImageControl.cxx   |1 
 include/svl/strmadpt.hxx  |  127 
 include/unotools/ucblockbytes.hxx |  196 --
 sfx2/inc/pch/precompiled_sfx.hxx  |1 
 sfx2/source/doc/docfile.cxx   |2 
 svl/source/inc/strmadpt.hxx   |   67 
 svl/source/misc/strmadpt.cxx  |  182 
 svl/source/numbers/supservs.cxx   |2 
 unotools/source/ucbhelper/ucblockbytes.cxx|3 
 unotools/source/ucbhelper/ucblockbytes.hxx|  195 +
 unotools/source/ucbhelper/ucbstreamhelper.cxx |2 
 15 files changed, 277 insertions(+), 513 deletions(-)

New commits:
commit b144f0ac8695dd62a2053b4e88212d0b109c9a41
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 24 23:13:43 2014 +0100

fix libmerged build: missing glxtest

Change-Id: Id40d5d21e4e315a605bd41eac01de5cfa04837d4

diff --git a/Library_merged.mk b/Library_merged.mk
index 533acb0a..b38c4be 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
-ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_use_static_libraries,merged,\
-   headless \
+   glxtest \
+   $(if $(filter unx,$(GUIBASE)),headless) \
 ))
-endif
+
 
 $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
commit 7f6770f90e1c255d83bf75a97b10ccd2b1f984e9
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 24 14:44:28 2014 +0100

svl: Internalize strmadpt.hxx header

Change-Id: Ia69463f1466349af879da02a23b58702732011c6

diff --git a/include/svl/strmadpt.hxx b/svl/source/inc/strmadpt.hxx
similarity index 95%
rename from include/svl/strmadpt.hxx
rename to svl/source/inc/strmadpt.hxx
index 3d9acaf..c5e9908 100644
--- a/include/svl/strmadpt.hxx
+++ b/svl/source/inc/strmadpt.hxx
@@ -20,12 +20,13 @@
 #ifndef INCLUDED_SVL_STRMADPT_HXX
 #define INCLUDED_SVL_STRMADPT_HXX
 
-#include 
+#include 
+
 #include 
 #include 
 
 
-class SVL_DLLPUBLIC SvOutputStreamOpenLockBytes: public SvOpenLockBytes
+class SvOutputStreamOpenLockBytes: public SvOpenLockBytes
 {
 com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >
 m_xOutputStream;
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index a651eaa..fce0de4 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -33,7 +33,8 @@
 #include 
 #include 
 #include 
-#include 
+
+#include 
 
 using namespace com::sun::star;
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index edc0048..58be033 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -27,10 +27,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
commit 79c1b05591a66fb3c7cec60bc3ad91382095a936
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 24 14:36:20 2014 +0100

Remove not used SvLockBytesInputStream

Change-Id: Id4e0852f6d204b3a1d2a7f5ce281730f5fcad8fd

diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx
index 9d1645b..3d9acaf 100644
--- a/include/svl/strmadpt.hxx
+++ b/include/svl/strmadpt.hxx
@@ -21,10 +21,7 @@
 #define INCLUDED_SVL_STRMADPT_HXX
 
 #include 
-#include 
 #include 
-#include 
-#include 
 #include 
 
 
@@ -64,64 +61,6 @@ public:
 virtual void Terminate() SAL_OVERRIDE;
 };
 
-
-class SVL_DLLPUBLIC SvLockBytesInputStream: public cppu::OWeakObject,
-  public com::sun::star::io::XInputStream,
-  public com::sun::star::io::XSeekable
-{
-SvLockBytesRef m_xLockBytes;
-sal_Int64 m_nPosition;
-
-public:
-SvLockBytesInputStream(SvLockBytes * pTheLockBytes):
-m_xLockBytes(pTheLockBytes), m_nPosition(0) {}
-
-virtual com::sun::star::uno::Any SAL_CALL
-queryInterface(const com::sun::star::uno::Type & rType)
-throw (com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
-
-virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
-
-virtual void SAL_CALL release() throw() SAL_OVERRIDE;
-
-virtual sal_Int32 SAL_CALL
-readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData,
-  sal_Int32 nBytesToRead)
-throw (com::sun::star::io::IOException,
-   com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
-
-virtual sal_Int32 SAL_CALL
-readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData,
-  sal_Int32 nMaxBytesToRead)
-throw (com::sun::star::io::IOException,
-   com::sun::star::uno::R

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

2014-11-24 Thread Matúš Kukan

 vcl/headless/svpbmp.cxx|   10 ++
 vcl/inc/headless/svpbmp.hxx|2 ++
 vcl/inc/impbmp.hxx |3 ++-
 vcl/inc/opengl/salbmp.hxx  |2 ++
 vcl/inc/quartz/salbmp.h|2 ++
 vcl/inc/salbmp.hxx |3 +++
 vcl/inc/unx/salbmp.h   |2 ++
 vcl/inc/win/salbmp.h   |2 ++
 vcl/opengl/salbmp.cxx  |   10 ++
 vcl/quartz/salbmp.cxx  |   10 ++
 vcl/source/gdi/impbmp.cxx  |   10 ++
 vcl/unx/generic/gdi/salbmp.cxx |   10 ++
 vcl/win/source/gdi/salbmp.cxx  |   10 ++
 13 files changed, 75 insertions(+), 1 deletion(-)

New commits:
commit 566d46034fcaf22cf943cf6e1ab3d9be92a81400
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 24 22:18:56 2014 +0100

Add dummy Erase to SalBitmap implementations

Change-Id: I5790deb9ab5af6f8678c964af5321264d3bce733

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index d5a1e79..e4080da 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -344,6 +344,11 @@ bool SvpSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
 return false;
 }
 
+bool SvpSalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+return false;
+}
+
 bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& 
/*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
 {
 return false;
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 0de0d78..eda1be4 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -59,6 +59,7 @@ public:
 virtual boolGetSystemData( BitmapSystemData& rData ) 
SAL_OVERRIDE;
 
 virtual boolCrop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+virtual boolErase( const Color& rFillColor ) SAL_OVERRIDE;
 virtual boolScale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
 
 static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat );
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 8f373c5..3b2abea 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -69,6 +69,7 @@ public:
 inline sal_uLongImplGetChecksum() const { return mnChecksum; }
 
 boolImplCrop( const Rectangle& rRectPixel );
+boolImplErase( const Color& rFillColor );
 boolImplScale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nScaleFlag );
 };
 
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 20b0e61..449c1b6 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -79,6 +79,7 @@ public:
 boolGetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 
 boolCrop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+boolErase( const Color& rFillColor ) SAL_OVERRIDE;
 boolScale( const double& rScaleX, const double& rScaleY, 
sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
 
 public:
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index c98cf2f..9ece5a3 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -80,6 +80,7 @@ public:
 boolGetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 
 boolCrop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+boolErase( const Color& rFillColor ) SAL_OVERRIDE;
 boolScale( const double& rScaleX, const double& rScaleY, 
sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
 
 private:
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 5eb977d..12e7954 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -26,6 +26,7 @@
 #include 
 
 struct BitmapBuffer;
+class Color;
 class SalGraphics;
 class BitmapPalette;
 struct BitmapSystemData;
@@ -56,6 +57,7 @@ public:
 virtual boolGetSystemData( BitmapSystemData& rData ) = 0;
 
 virtual boolCrop( const Rectangle& rRectPixel ) = 0;
+virtual boolErase( const Color& rFillColor ) = 0;
 virtual boolScale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nScaleFlag ) = 0;
 };
 
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 5975f66..56f3b85 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -147,6 +147,7 @@ public:
 virtual boolGetSystemData( BitmapSystemData& rData ) 
SAL_OVERRIDE;
 
 virtual boolCrop( const Rectangle& rRectPixel ) 
SAL_OVERRIDE;
+virtual boolErase( const Color& rFillColor ) SAL_OVERRIDE;
 virtual boolScale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
 };
 
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index b74ba73..7329449 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -98,6 +98,7 @@ public:
 virtual boolGetSystemData( BitmapSystemData& rData );
 
 virtual boolCrop( const Rect

[Bug 43514] UI: Need an easy way to get from current position in a document to the corresponding position in the Navigatior dialog's header tree

2014-11-24 Thread bugzilla-daemon

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

--- Comment #9 from Rishabh  ---
If this bug is still open, I would like to take it up as my first bug. Any
suggestions on where to start from?

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

[Libreoffice-commits] dev-tools.git: 3 commits - ciabot/libreoffice-bugzilla2.py

2014-11-24 Thread Markus Mohrhard

 ciabot/libreoffice-bugzilla2.py |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 36abe826de9149e0cbdffb67a624e3d790bda023
Author: Markus Mohrhard 
Date:   Mon Nov 24 21:15:24 2014 +

fix handling of bugs during RC and beta phase

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index d8a01c2..448b8b2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -115,15 +115,18 @@ def find_target_version(repo, branch):
 micro_list = [m.group(1) for m in [re.search(search_string, branch) 
for branch in branch_names] if m is not None]
 if len(micro_list) == 0:
 # first search if we are at an RC already
-search_string = "libreoffice-" + base + ".0." + "(\d+)"
+search_string = "libreoffice-" + base + ".0." + "(\d+)$"
+tags = repo.tags
+print(tags)
 rc_list = [m.group(1) for m in [re.search(search_string, str(tag)) 
for tag in tags] if m is not None]
 print(rc_list)
 if len(rc_list) > 0:
-return base + ".0." + str(max(rc_list) + 1)
+return base + ".0." + str(int(max(rc_list)) + 1)
 
 # we have not yet tagged an RC, check which betas have been tagged
 search_string = "libreoffice-" + base + ".0.0.beta(\d+)" 
 beta_list = [m.group(1) for m in [re.search(search_string, 
str(tag)) for tag in tags] if m is not None]
+print(beta_list)
 if len(beta_list) == 0:
 # no beta yet
 return base + ".0.0.beta0"
@@ -132,7 +135,7 @@ def find_target_version(repo, branch):
 return base + ".0.1"
 
 # normal beta
-return base + ".0.0.beta" + str(max(beta_list) + 1)
+return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
 print(micro_list)
 # the next release from libreoffice-x-y is max existing z-branch + 1
 return base + "." + str(max(micro_list) + 1)
commit 6f7732d221539aead37639675f83b3c1f9791620
Author: Markus Mohrhard 
Date:   Mon Nov 10 16:39:05 2014 +

fix bug in script

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 1f764ba..d8a01c2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -113,7 +113,7 @@ def find_target_version(repo, branch):
 search_string = "libreoffice-"+"-".join(map(str, match.groups())) + 
"-(\d+)"
 print(search_string)
 micro_list = [m.group(1) for m in [re.search(search_string, branch) 
for branch in branch_names] if m is not None]
-if micro_list.count() == 0:
+if len(micro_list) == 0:
 # first search if we are at an RC already
 search_string = "libreoffice-" + base + ".0." + "(\d+)"
 rc_list = [m.group(1) for m in [re.search(search_string, str(tag)) 
for tag in tags] if m is not None]
commit 1dc1c58348129500ea9e04c66a9c101495f751de
Author: Markus Mohrhard 
Date:   Mon Nov 10 16:38:21 2014 +

use the locations on the server

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index e072f69..1f764ba 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -43,7 +43,7 @@ class FreedesktopBZ:
 
 def connect(self):
 config = ConfigParser.ConfigParser()
-config.read('config.cfg')
+config.read('/home/ciabot/prod/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
 password = config.get('bugzilla', 'password')
@@ -155,7 +155,7 @@ def find_bugid(repo, commit_id):
 
 def read_repo(repo_name):
 config = ConfigParser.ConfigParser()
-config.read('config.cfg')
+config.read('/home/ciabot/prod/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
 return repo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: io/CppunitTest_io_textinputstream.mk io/Module_io.mk io/qa

2014-11-24 Thread Stephan Bergmann

 io/CppunitTest_io_textinputstream.mk |   27 ++
 io/Module_io.mk  |4 
 io/qa/textinputstream.cxx|  148 +++
 3 files changed, 179 insertions(+)

New commits:
commit ed30f63364883ffa7e0f496aa626ebd3e291965a
Author: Stephan Bergmann 
Date:   Mon Nov 24 22:04:35 2014 +0100

Unit test for fdo#79941 (handle short reads)

...done as a subsequentcheck as doing it as a BootstrapFixtureBase (which 
is the
easiest way) makes it depend on later modules in the dependency chain.

Change-Id: I9588bae409b38aa373ccfa855042f598b6e2bb2b

diff --git a/io/CppunitTest_io_textinputstream.mk 
b/io/CppunitTest_io_textinputstream.mk
new file mode 100644
index 000..a18e643
--- /dev/null
+++ b/io/CppunitTest_io_textinputstream.mk
@@ -0,0 +1,27 @@
+# -*- 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,io_textinputstream))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,io_textinputstream, \
+io/qa/textinputstream \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,io_textinputstream, \
+cppu \
+cppuhelper \
+sal \
+unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_udk_api,io_textinputstream))
+
+$(eval $(call gb_CppunitTest_use_ure,io_textinputstream))
+
+# vim: set noet sw=4 ts=4:
diff --git a/io/Module_io.mk b/io/Module_io.mk
index 29709982..c9751d9 100644
--- a/io/Module_io.mk
+++ b/io/Module_io.mk
@@ -13,4 +13,8 @@ $(eval $(call gb_Module_add_targets,io,\
 Library_io \
 ))
 
+$(eval $(call gb_Module_add_subsequentcheck_targets,io,\
+CppunitTest_io_textinputstream \
+))
+
 # vim:set noet sw=4 ts=4:
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
new file mode 100644
index 000..efba8ac
--- /dev/null
+++ b/io/qa/textinputstream.cxx
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include "com/sun/star/io/BufferSizeExceededException.hdl"
+#include "com/sun/star/io/IOException.hdl"
+#include "com/sun/star/io/NotConnectedException.hdl"
+#include 
+#include 
+#include 
+#include "com/sun/star/uno/Sequence.hxx"
+#include 
+#include "com/sun/star/uno/RuntimeException.hdl"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace {
+
+class Input: public cppu::WeakImplHelper1 {
+public:
+Input(): open_(true), index_(0) {}
+
+private:
+virtual ~Input() {}
+
+sal_Int32 SAL_CALL readBytes(css::uno::Sequence &, sal_Int32)
+throw (
+css::io::NotConnectedException,
+css::io::BufferSizeExceededException, css::io::IOException,
+css::uno::RuntimeException, std::exception)
+SAL_OVERRIDE
+{ CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead"); }
+
+sal_Int32 SAL_CALL readSomeBytes(
+css::uno::Sequence & aData, sal_Int32 nMaxBytesToRead)
+throw (
+css::io::NotConnectedException,
+css::io::BufferSizeExceededException, css::io::IOException,
+css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE
+{
+assert(nMaxBytesToRead >= 0);
+osl::MutexGuard g(mutex_);
+checkClosed();
+assert(index_ >= 0 && index_ <= SIZE);
+sal_Int32 n = std::min(
+std::min(nMaxBytesToRead, 2), SIZE - index_);
+assert(n >= 0 && n <= SIZE - index_);
+aData.realloc(n);
+std::memcpy(aData.getArray(), data + index_, n);
+index_ += n;
+assert(index_ >= 0 && index_ <= SIZE);
+return n;
+}
+
+void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
+throw (
+css::io::NotConnectedException,
+css::io::BufferSizeExceededException, css::io::IOException,
+css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+{
+assert(nBytesToSkip >= 0);
+osl::MutexGuard g(mutex_);
+checkClosed();
+assert(index_ >= 0 && index_ <= SIZE);
+index_ += std::min(nBytesToSkip, SIZE - index_);
+assert(index_ >= 0 && index_ <= SIZE);
+}
+
+sal_Int32 SAL_CALL available()
+throw (
+css::io::NotConnectedException, css::io::IOException,
+css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+{
+osl::MutexGuard g(mutex_);
+checkClosed();
+

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

2014-11-24 Thread Caolán McNamara

 vcl/opengl/x11/gdiimpl.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 48138a1d60fafa0bf3412aa6b518a9c0a4f6d492
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 20:47:05 2014 +

WaE: might be used unintialized

Change-Id: I036a5a1c8c8cca09bb6bddef2e0c8f172fe22e77

diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 221c1ef..80db3a9 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -156,9 +156,6 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( 
X11Pixmap* pPixmap, X11Pixm
 None
 };
 Display* pDisplay = mrParent.GetXDisplay();
-GLXFBConfig pFbConfig;
-GLXPixmap pGlxPixmap;
-GLXPixmap pGlxMask;
 bool bInverted;
 
 SAL_INFO( "vcl.opengl", "RenderPixmapToScreen (" << nX << " " << nY << ")" 
);
@@ -171,10 +168,13 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( 
X11Pixmap* pPixmap, X11Pixm
 //glClear( GL_COLOR_BUFFER_BIT );
 
 XSync( pDisplay, 0 );
-pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, bInverted );
-pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, pPixmap->GetPixmap(), 
aAttribs);
+GLXFBConfig pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, 
bInverted );
+GLXPixmap pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, 
pPixmap->GetPixmap(), aAttribs);
+GLXPixmap pGlxMask;
 if( pMask != NULL )
 pGlxMask = glXCreatePixmap( pDisplay, pFbConfig, pMask->GetPixmap(), 
aAttribs);
+else
+pGlxMask = 0;
 XSync( pDisplay, 0 );
 
 if( !pGlxPixmap )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Yousuf Philips

 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml |4 +++-
 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml |2 +-
 sd/uiconfig/simpress/toolbar/standardbar.xml  |1 +
 sd/uiconfig/simpress/toolbar/tableobjectbar.xml   |6 +++---
 sd/uiconfig/simpress/toolbar/toolbar.xml  |2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 68c1cc33810e14c2e45e7da9f7a60429c8a942a6
Author: Yousuf Philips 
Date:   Sun Nov 23 14:50:11 2014 +0400

fdo#84909 move zoom to object and added/hid/unhid some other buttons

Change-Id: I5235c790f7e9b755ef57a9e6643b049ea802ec30
Reviewed-on: https://gerrit.libreoffice.org/13063
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml 
b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 79a037f..33a37ee 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -46,5 +46,7 @@
  
  
  
- 
+ 
+ 
+ 
 
diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml 
b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
index ab39430..7b34fac 100644
--- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
@@ -33,7 +33,7 @@
  
  
  
- 
+ 
  
  
  
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml 
b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 3f71ac7..b3bb795 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -44,6 +44,7 @@
  
  
  
+ 
  
  
  
diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml 
b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
index 156447c..280d57ae 100644
--- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
@@ -18,12 +18,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
+ 
  
+ 
  
  
  
- 
  
  
  
@@ -43,6 +43,6 @@
  
  
  
- 
+ 
  
 
diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml 
b/sd/uiconfig/simpress/toolbar/toolbar.xml
index 2e08ab4..aaba0b0 100644
--- a/sd/uiconfig/simpress/toolbar/toolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/toolbar.xml
@@ -46,7 +46,7 @@
  
  
  
- 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 dbaccess/qa/complex/dbaccess/CopyTableWizard.java  |2 
 framework/qa/complex/framework/recovery/KlickButtonThread.java |2 
 framework/qa/complex/framework/recovery/RecoveryTest.java  |8 
 framework/qa/complex/framework/recovery/RecoveryTools.java |2 
 qadevOOo/runner/convwatch/ConvWatch.java   |5 
 qadevOOo/runner/convwatch/ConvWatchStarter.java|2 
 qadevOOo/runner/convwatch/GraphicalTestArguments.java  |2 
 qadevOOo/runner/convwatch/HTMLOutputter.java   |  294 
--
 qadevOOo/runner/convwatch/INIOutputter.java|4 
 qadevOOo/runner/convwatch/IniFile.java |1 
 qadevOOo/runner/util/DBTools.java  |   35 -
 qadevOOo/runner/util/SysUtils.java |   12 
 qadevOOo/runner/util/UITools.java  |   28 
 qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java |4 
 qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java   |1 
 qadevOOo/tests/java/ifc/task/_XInteractionHandler.java |4 
 qadevOOo/tests/java/mod/_remotebridge/various.java |2 
 qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java  |2 
 qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java |2 
 qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java |2 
 qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java |2 
 qadevOOo/tests/java/mod/_sw/SwXCell.java   |2 
 qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java  |2 
 qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java|2 
 qadevOOo/tests/java/mod/_sw/SwXTableRows.java  |2 
 qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java  |2 
 qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java|2 
 qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java   |2 
 qadevOOo/tests/java/mod/_sw/SwXTextTables.java |2 
 sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java   |2 
 30 files changed, 155 insertions(+), 279 deletions(-)

New commits:
commit fe095dada4e83129d49c8cc50501aa224d61e0f9
Author: Noel Grandin 
Date:   Tue Nov 18 13:32:37 2014 +0200

java,qadev: remove unused parameters and local vars

Change-Id: Ifb9f9374051fe88dc4cd5a7a28b2c8c992ced873
Reviewed-on: https://gerrit.libreoffice.org/13097
Tested-by: LibreOffice gerrit bot 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java 
b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 7b7e2fd..3a0f013 100644
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -172,7 +172,7 @@ public class CopyTableWizard extends CRMBasedTestCase
 try
 {
 final XWindow dialog = getActiveWindow();
-final UITools uiTools = new UITools(getMSF(), dialog);
+final UITools uiTools = new UITools(dialog);
 final XAccessible root = uiTools.getRoot();
 final XAccessibleContext accContext = root.getAccessibleContext();
 final int count = accContext.getAccessibleChildCount();
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java 
b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index 0b7e2ce..d2dceb4 100644
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
@@ -40,7 +40,7 @@ public class KlickButtonThread extends Thread {
 @Override
 public void run() {
 try{
-UITools oUITools = new UITools(xMSF, xWindow);
+UITools oUITools = new UITools(xWindow);
 
 oUITools.clickButton(buttonName);
 
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java 
b/framework/qa/complex/framework/recovery/RecoveryTest.java
index b85f519..746ff82 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -236,7 +236,7 @@ public class RecoveryTest extends ComplexTestCase {
 
 XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, 
oDialog);
 
-UITools oUITools = new UITools(xMSF, xWindow);
+UITools oUITools = new UITools(xWindow);
 
 oUITools.printAccessibleTree((PrintWriter) log, 
param.getBool(PropertyName.DEBUG_IS_ACTIVE));
 
@@ -275,7 +275,7 @@ public class RecoveryTest extends ComplexTestCase {
 
 log.println(oDialog.getTitle());
 
-UITools oUITools = new UITools(xMSF, xWindow);
+UITools oUITools = new UITools(xWindow);
 
 if (cancel) {
 log.println("clicking 'Cancel' button...");
@@ -328,7 +328,7 @@ public cl

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry

2014-11-24 Thread Yousuf Philips

 icon-themes/galaxy/cmd/sc_hide.png|binary
 icon-themes/galaxy/cmd/sc_insert.png  |binary
 icon-themes/galaxy/cmd/sc_move.png|binary
 icon-themes/galaxy/cmd/sc_protect.png |binary
 icon-themes/galaxy/cmd/sc_remove.png  |binary
 icon-themes/tango/cmd/sc_hide.png |binary
 icon-themes/tango/cmd/sc_insert.png   |binary
 icon-themes/tango/cmd/sc_move.png |binary
 icon-themes/tango/cmd/sc_protect.png  |binary
 icon-themes/tango/cmd/sc_remove.png   |binary
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   15 
++
 11 files changed, 15 insertions(+)

New commits:
commit df633ac5487fd566fbf526808bb015112bd38e77
Author: Yousuf Philips 
Date:   Mon Nov 24 10:09:17 2014 +0400

fdo#86476 add icons to sheet management menu and context menu entries

Change-Id: I3d286487a8b81d440f480a528298c815f295fc92
Reviewed-on: https://gerrit.libreoffice.org/13087
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/icon-themes/galaxy/cmd/sc_hide.png 
b/icon-themes/galaxy/cmd/sc_hide.png
new file mode 100644
index 000..1fad058
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_hide.png differ
diff --git a/icon-themes/galaxy/cmd/sc_insert.png 
b/icon-themes/galaxy/cmd/sc_insert.png
new file mode 100644
index 000..fba8fb1
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_insert.png differ
diff --git a/icon-themes/galaxy/cmd/sc_move.png 
b/icon-themes/galaxy/cmd/sc_move.png
new file mode 100644
index 000..1d27feb
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_move.png differ
diff --git a/icon-themes/galaxy/cmd/sc_protect.png 
b/icon-themes/galaxy/cmd/sc_protect.png
new file mode 100644
index 000..ef47f54
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_protect.png differ
diff --git a/icon-themes/galaxy/cmd/sc_remove.png 
b/icon-themes/galaxy/cmd/sc_remove.png
new file mode 100644
index 000..54da4ad
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_remove.png differ
diff --git a/icon-themes/tango/cmd/sc_hide.png 
b/icon-themes/tango/cmd/sc_hide.png
new file mode 100644
index 000..1fad058
Binary files /dev/null and b/icon-themes/tango/cmd/sc_hide.png differ
diff --git a/icon-themes/tango/cmd/sc_insert.png 
b/icon-themes/tango/cmd/sc_insert.png
new file mode 100644
index 000..fba8fb1
Binary files /dev/null and b/icon-themes/tango/cmd/sc_insert.png differ
diff --git a/icon-themes/tango/cmd/sc_move.png 
b/icon-themes/tango/cmd/sc_move.png
new file mode 100644
index 000..1d27feb
Binary files /dev/null and b/icon-themes/tango/cmd/sc_move.png differ
diff --git a/icon-themes/tango/cmd/sc_protect.png 
b/icon-themes/tango/cmd/sc_protect.png
new file mode 100644
index 000..ef47f54
Binary files /dev/null and b/icon-themes/tango/cmd/sc_protect.png differ
diff --git a/icon-themes/tango/cmd/sc_remove.png 
b/icon-themes/tango/cmd/sc_remove.png
new file mode 100644
index 000..54da4ad
Binary files /dev/null and b/icon-themes/tango/cmd/sc_remove.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 2a1da27e..c3a2eaf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -605,6 +605,9 @@
 
   ~Delete...
 
+
+  1
+
   
   
 
@@ -1060,6 +1063,9 @@
 
   ~Sheet...
 
+
+  1
+
   
   
 
@@ -1210,6 +1216,9 @@
 
   ~Hide
 
+
+  1
+
   
   
 
@@ -1286,6 +1295,9 @@
 
   ~Sheet...
 
+
+  1
+
   
   
 
@@ -1495,6 +1507,9 @@
 
   ~Move/Copy...
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Caolán McNamara

 include/sfx2/module.hxx |1 -
 include/sfx2/objface.hxx|2 --
 include/sfx2/shell.hxx  |6 --
 sfx2/source/control/shell.cxx   |5 -
 sfx2/source/dialog/templdlg.cxx |   10 ++
 5 files changed, 2 insertions(+), 22 deletions(-)

New commits:
commit c98c650ac4235cebc019e9c80fdc22cab6e077cd
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 20:43:02 2014 +

SfxModule has GetResMgr so SfxShell and SfxInterface don't need GetResMgr

Change-Id: I6160f8b396ac5e5fb799ee03c5b0181fb088cb54

diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 7e0e037..7595a2b 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -75,7 +75,6 @@ public:
 SfxObjectFactory* pFactoryP, ... );
 virtual ~SfxModule();
 
-ResMgr* GetResMgr() const { return 
SfxShell::GetResMgr(); }
 virtual ResMgr* GetResMgr();
 SfxSlotPool*GetSlotPool() const;
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index e6a9a92..a667c15 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -65,8 +65,6 @@ public:
 boolHasName() const { return 0 != aNameResId.GetId(); }
 OUStringGetName() const
 { return HasName() ? aNameResId.toString() : 
OUString(); }
-ResMgr* GetResMgr() const
-{ return aNameResId.GetResMgr(); }
 
 const SfxInterface* GetGenoType() const { return pGenoType; }
 
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 7615858..6e4ef36 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -431,12 +431,6 @@ public:
 */
 SfxViewFrame*   GetFrame() const;
 
-/**
-This method provides the ResMgr of the  that are used by
-the SfxShell instance. If this is a NULL-pointer, then the current
-resource manager is to be used.
-*/
-ResMgr* GetResMgr() const;
 virtual boolHasUIFeature( sal_uInt32 nFeature );
 voidUIFeatureChanged();
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 9ad1b8a..1365b54 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -395,11 +395,6 @@ void SfxShell::ParentDeactivate
 {
 }
 
-ResMgr* SfxShell::GetResMgr() const
-{
-return GetInterface()->GetResMgr();
-}
-
 bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 {
 // Get Slot status
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0aaf37b..aa9bac7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -714,7 +714,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
 
 SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
 pCurObjShell = pViewFrame->GetObjectShell();
-ResMgr* pMgr = pCurObjShell ? pCurObjShell->GetResMgr() : NULL;
+pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL;
+ResMgr* pMgr = pModule ? pModule->GetResMgr() : NULL;
 ResId aFamId( DLG_STYLE_DESIGNER, *pMgr );
 aFamId.SetRT(RSC_SFX_STYLE_FAMILIES);
 m_pStyleFamiliesId = new ResId( aFamId.GetId(), *pMgr );
@@ -800,12 +801,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
 
 for ( i = nStart; i <= nEnd; i++ )
 pBindings->Update(i);
-
-pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::ClearResource()
 {
 ClearFamilyList();
@@ -834,7 +831,6 @@ SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(
 return pRet;
 }
 
-
 void SfxCommonTemplateDialog_Impl::Initialize()
 {
 // Read global user resource
@@ -855,8 +851,6 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 aFmtLb.Show();
 }
 
-
-
 SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 {
 OUString aEmpty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

2014-11-24 Thread Caolán McNamara

 include/vcl/salgtype.hxx |8 +--
 vcl/inc/unx/salbmp.h |2 
 vcl/opengl/gdiimpl.cxx   |   24 ++---
 vcl/opengl/x11/gdiimpl.cxx   |   10 +--
 vcl/quartz/salbmp.cxx|6 --
 vcl/source/gdi/virdev.cxx|   11 
 vcl/source/outdev/bitmap.cxx |   58 ++-
 vcl/source/outdev/mask.cxx   |   14 +
 vcl/source/outdev/outdev.cxx |   54 +
 vcl/source/window/window.cxx |   11 
 vcl/unx/generic/gdi/gdiimpl.cxx  |   15 -
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |   31 
 vcl/unx/generic/gdi/salbmp.cxx   |8 ---
 vcl/unx/generic/gdi/salgdi2.cxx  |9 ---
 vcl/unx/generic/window/salframe.cxx  |9 ---
 vcl/win/source/gdi/salbmp.cxx|   20 +--
 16 files changed, 85 insertions(+), 205 deletions(-)

New commits:
commit 8ccf559473f185bdb7640e438e131f17ddc1861c
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 10:10:11 2014 +

coverity#1255909 Uninitialized scalar field

Change-Id: I162199233c9d3feb03e7ab33b777174b2a03035a
Reviewed-on: https://gerrit.libreoffice.org/13104
Tested-by: LibreOffice gerrit bot 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index 23b8977..de8a555 100644
--- a/include/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
@@ -47,10 +47,10 @@ struct SalTwoRect
 longmnDestWidth;
 longmnDestHeight;
 
-SalTwoRect() {}
-
-SalTwoRect(long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, long 
nDestX, long nDestY, long nDestWidth, long nDestHeight)
-: mnSrcX(nSrcX), mnSrcY(nSrcY), mnSrcWidth(nSrcWidth), 
mnSrcHeight(nSrcHeight), mnDestX(nDestX), mnDestY(nDestY), 
mnDestWidth(nDestWidth), mnDestHeight(nDestHeight)
+SalTwoRect(long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight,
+   long nDestX, long nDestY, long nDestWidth, long nDestHeight)
+: mnSrcX(nSrcX), mnSrcY(nSrcY), mnSrcWidth(nSrcWidth), 
mnSrcHeight(nSrcHeight)
+, mnDestX(nDestX), mnDestY(nDestY), mnDestWidth(nDestWidth), 
mnDestHeight(nDestHeight)
 {
 }
 };
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 5975f66..df6e8bd 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -161,8 +161,6 @@ private:
 longmnDepth;
 SalX11ScreenmnXScreen;
 
-ImplSalDDB() : mnXScreen(0) {}
-
 static void ImplDraw(
 Drawable aSrcDrawable,
 long nSrcDrawableDepth,
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d6bf6ab..a794d15 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -389,11 +389,9 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
 return true;
 }
 
-SalTwoRect aPosAry;
-aPosAry.mnSrcX = aPosAry.mnDestX = 0;
-aPosAry.mnSrcY = aPosAry.mnDestY = 0;
-aPosAry.mnSrcWidth = aPosAry.mnDestWidth = GetWidth();
-aPosAry.mnSrcHeight = aPosAry.mnDestHeight = GetHeight();
+GLfloat fWidth = GetWidth();
+GLfloat fHeight = GetHeight();
+SalTwoRect aPosAry(0, 0, fWidth, fHeight, 0,0, fWidth, fHeight);
 
 // TODO: lfrb: User GL_ARB_copy_image?
 OpenGLTexture aNewTex = OpenGLTexture( GetWidth(), GetHeight() );
@@ -896,7 +894,6 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
 0, (float) nTexHeight, 0, 0,
 (float) nTexWidth, 0, (float) nTexWidth, (float) nTexHeight };
 GLfloat aTexCoord[8];
-SalTwoRect aPosAry;
 
 if( rMask )
 {
@@ -934,9 +931,9 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
 rTexture.SetFilter( GL_LINEAR );
 CHECK_GL_ERROR();
 
-aPosAry.mnSrcX = aPosAry.mnSrcY = 0;
-aPosAry.mnSrcWidth = rTexture.GetWidth();
-aPosAry.mnSrcHeight = rTexture.GetHeight();
+GLfloat fWidth = rTexture.GetWidth();
+GLfloat fHeight = rTexture.GetHeight();
+SalTwoRect aPosAry(0, 0, fWidth, fHeight, 0, 0, fWidth, fHeight);
 rTexture.GetCoord( aTexCoord, aPosAry );
 glEnableVertexAttribArray( GL_ATTRIB_TEX );
 glVertexAttribPointer( GL_ATTRIB_TEX, 2, GL_FLOAT, GL_FALSE, 0, aTexCoord 
);
@@ -1528,14 +1525,7 @@ void OpenGLSalGraphicsImpl::copyArea(
 {
 SAL_INFO( "vcl.opengl", "::copyArea " << nSrcX << "," << nSrcY << " >> " 
<< nDestX << "," << nDestY << " (" << nSrcWidth << "," << nSrcHeight << ")" );
 OpenGLTexture aTexture;
-SalTwoRect aPosAry;
-
-aPosAry.mnSrcX = 0;
-aPosAry.mnSrcY = 0;
-aPosAry.mnDestX = nDestX;
-aPosAry.mnDestY = nDestY;
-aPosAry.mnSrcWidth = aPosAry.mnDestWidth = nSrcWidth;
-aPosAry.mnSrcHeight = aPosAry.mnDestHeight = nSrcHeight;
+SalTwoRect aPosAry

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

2014-11-24 Thread Andras Timar

 sw/qa/extras/rtfimport/data/fdo85889-mac.rtf   |3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pc.rtf|3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pca.rtf   |3 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   26 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 +++
 5 files changed, 47 insertions(+)

New commits:
commit d74f3f2a1b98fbcba9e5490b6d790fa40d8b863d
Author: Andras Timar 
Date:   Mon Nov 24 11:33:17 2014 +0100

fdo#85889 handle pc, pca and mac rtf keywords in writerfilter

(cherry picked from commit 7839633fb356285652ed96f4bf3f85bcd5b561a4)

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

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

diff --git a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
new file mode 100644
index 000..8056d47
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
@@ -0,0 +1,3 @@
+{\rtf1\mac \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
new file mode 100644
index 000..a3b9d27
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pc \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
new file mode 100644
index 000..34eeb18
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pca \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 9a274fd..bf4b176 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2023,6 +2023,32 @@ DECLARE_RTFIMPORT_TEST(testFdo83204, "fdo83204.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"), 
getProperty(getParagraph(1), "ParaStyleName"));
 }
 
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc2\xb1\xe2\x89\xa5\xe2\x89\xa4", 8, 
RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc2\xb1\xe2\x80\x97\xc2\xbe", 7, 
RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc3\x92\xc3\x9a\xc3\x9b", 6, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a8d88f3..27e0ab2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2830,6 +2830,18 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_ANSI:
 m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252;
 break;
+case RTF_MAC:
+m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
+case RTF_PC:
+m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
+case RTF_PCA:
+m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
 case RTF_PLAIN:
 {
 m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2014-11-24 Thread bugzilla-daemon

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

Timur  changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=86627

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

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

2014-11-24 Thread Michael Stahl

 sfx2/source/dialog/tabdlg.cxx  |3 +-
 sfx2/source/sidebar/ControllerItem.cxx |4 +++
 svx/source/items/customshapeitem.cxx   |   31 -
 sw/source/ui/chrdlg/pardlg.cxx |2 +
 sw/source/uibase/app/swdll.cxx |   11 ++
 sw/source/uibase/app/swmodule.cxx  |   10 -
 sw/source/uibase/inc/conttree.hxx  |   10 -
 sw/source/uibase/utlui/content.cxx |   35 +++--
 8 files changed, 91 insertions(+), 15 deletions(-)

New commits:
commit 39d853f29dc6787d74921ee9c111e6afef19
Author: Michael Stahl 
Date:   Mon Nov 24 17:53:08 2014 +0100

sfx2: add missing locks to FrameActionListener

Change-Id: I67db5c42d1aea39cbf650de7854be853fc78e8a9
(cherry picked from commit 4950c30e633ac2d1a12a9e4b086478ac7d4f790c)

diff --git a/sfx2/source/sidebar/ControllerItem.cxx 
b/sfx2/source/sidebar/ControllerItem.cxx
index a0de0e3..b2cdc72 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -62,6 +62,7 @@ namespace
 }
 virtual void SAL_CALL disposing (void) SAL_OVERRIDE
 {
+SolarMutexGuard g;
 if (mxFrame.is())
 mxFrame->removeFrameActionListener(this);
 }
@@ -69,12 +70,15 @@ namespace
 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
 (void)rEvent;
+
+SolarMutexGuard g;
 mrControllerItem.ResetFrame();
 mxFrame = NULL;
 }
 virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& 
rEvent)
 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
+SolarMutexGuard g;
 if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
 mrControllerItem.NotifyFrameContextChange();
 }
commit f509e2ec91b138114c43134dd2df3e0b99adcc31
Author: Michael Stahl 
Date:   Mon Nov 24 17:40:26 2014 +0100

fdo#86633: sw: remove bad tab pages from SwParaDlg for drawing objects

"Area" and "Transparence" only supported by Writer paragraphs.

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: I732e8d40fdeafaebf219fc7c5ddd53b850d8eca6
(cherry picked from commit 5c31a1b5474f5284cf694d04de5734921891915c)

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1481fbd..d533f35 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -551,7 +551,8 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
 
 void SfxTabDialog::Start_Impl()
 {
-DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all 
pages registered" );
+assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount()
+&& "not all pages registered");
 sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
 
 // load old settings, when exists
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 58b4a43..3b007ca 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -129,6 +129,8 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent,
 RemoveTabPage("labelTP_DROPCAPS");
 RemoveTabPage("labelTP_BACKGROUND");
 RemoveTabPage("labelTP_BORDER");
+RemoveTabPage("area");
+RemoveTabPage("transparence");
 }
 else
 {
commit b0f40d0252f94f01965035313f0f91bf2a3775e6
Author: Stephan Bergmann 
Date:   Sun Nov 23 18:10:35 2014 +0100

loplugin:literaltoboolconversion

Change-Id: Ibecd561c1d27e129ad1f481bdb7f8a7bb4d0f8d8
(cherry picked from commit 40833b49ebdef2e5ab9ece33fc558fd0929f4e8d)

diff --git a/svx/source/items/customshapeitem.cxx 
b/svx/source/items/customshapeitem.cxx
index cb6e1fa..d543fea 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -336,7 +336,7 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& 
rVal, sal_uInt8 /*nMe
 {
 if (aPropSeq[i].Name == aPropSeq[j].Name)
 {
-assert(0); // serious bug: duplicate xml attribute exported
+assert(false); // serious bug: duplicate xml attribute 
exported
 OUString const name(aPropSeq[i].Name);
 aPropSeq.realloc(0);
 throw uno::RuntimeException(
commit 6d923577482be0cc629ca5de42b8c14e2af1b195
Author: Michael Stahl 
Date:   Sat Nov 22 00:21:19 2014 +0100

svx: punish evil-doers who put duplicate properties into custom shapes

LO 4.3.2.2 is evidently able to export an ODF document that violates
XML Well-formedness constraint: Unique Att Spec.



Not sure how to reproduce this, but the attributes there are apparently a
serialization of SdrCustomShapeGeometryItem's aPropSeq,
retrieved from a "CustomShapeGeometry" property, so add some input
valid

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

2014-11-24 Thread Tor Lillqvist

 sc/source/ui/inc/docfunc.hxx   |2 
 sc/source/ui/optdlg/calcoptionsdlg.cxx |  529 -
 2 files changed, 398 insertions(+), 133 deletions(-)

New commits:
commit 884da2ffaceb467a0949c175ed9c56dce58056a0
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:14:54 2014 +0200

Reduce the amount of data by an order of magnitude

Change-Id: I4a1deb2c1a0cfe67faef6a0d2e3d355b475eb9f0

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index c800726..0b0d160 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1038,7 +1038,7 @@ struct Op : Area
const OUString& rOp,
double nRangeLo, double nRangeHi,
double nEpsilon) :
-Area(rTitle, 1000),
+Area(rTitle, 200),
 msOp(rOp),
 mnRangeLo(nRangeLo),
 mnRangeHi(nRangeHi),
@@ -1355,31 +1355,31 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
 return (nArg == 0);
 }));
 
-pTestDocument->addTest(Reduction("Sum", "SUM", 500, 0, -1000, 1000, 3e-10,
+pTestDocument->addTest(Reduction("Sum", "SUM", 100, 0, -1000, 1000, 3e-10,
  [] (double nAccum, double nArg)
  {
  return (nAccum + nArg);
  }));
 
-pTestDocument->addTest(Reduction("Average", "AVERAGE", 500, 0, -1000, 
1000, 3e-10,
+pTestDocument->addTest(Reduction("Average", "AVERAGE", 100, 0, -1000, 
1000, 3e-10,
  [] (double nAccum, double nArg)
  {
- return (nAccum + nArg / 
static_cast(500));
+ return (nAccum + nArg/100.);
  }));
 
-pTestDocument->addTest(Reduction("Product", "PRODUCT", 500, 1, 0.1, 2.5, 
3e-10,
+pTestDocument->addTest(Reduction("Product", "PRODUCT", 100, 1, 0.1, 2.5, 
3e-10,
  [] (double nAccum, double nArg)
  {
  return (nAccum * nArg);
  }));
 
-pTestDocument->addTest(Reduction("Min", "MIN", 500, DBL_MAX, -1000, 1000, 
0,
+pTestDocument->addTest(Reduction("Min", "MIN", 100, DBL_MAX, -1000, 1000, 
0,
  [] (double nAccum, double nArg)
  {
  return std::min(nAccum, nArg);
  }));
 
-pTestDocument->addTest(Reduction("Max", "MAX", 500, -DBL_MAX, -1000, 1000, 
0,
+pTestDocument->addTest(Reduction("Max", "MAX", 100, -DBL_MAX, -1000, 1000, 
0,
  [] (double nAccum, double nArg)
  {
  return std::max(nAccum, nArg);
commit 840f45193b798d75c7b72204178504b331c11f83
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:08:01 2014 +0200

Add AVERAGE test

Change-Id: I144858631f229685284622eb9975a168e61ff6c5

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index ebaf2ed..c800726 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1361,6 +1361,12 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
  return (nAccum + nArg);
  }));
 
+pTestDocument->addTest(Reduction("Average", "AVERAGE", 500, 0, -1000, 
1000, 3e-10,
+ [] (double nAccum, double nArg)
+ {
+ return (nAccum + nArg / 
static_cast(500));
+ }));
+
 pTestDocument->addTest(Reduction("Product", "PRODUCT", 500, 1, 0.1, 2.5, 
3e-10,
  [] (double nAccum, double nArg)
  {
commit 78ab2b4fb997add2ffdf4a5310008d51aef51da0
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:03:52 2014 +0200

Add MIN and MAX tests

Change-Id: Ia8d5fdeb1e03009035136edeab991442b7d91c4b

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 1d7c6f1..ebaf2ed 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1367,6 +1367,18 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
  return (nAccum * nArg);
  }));
 
+pTestDocument->addTest(Reduction("Min", "MIN", 500, DBL_MAX, -1000, 1000, 
0,
+ [] (double nAccum, double nArg)

[Libreoffice-commits] core.git: cui/source cui/uiconfig officecfg/registry sc/inc sc/source sc/uiconfig

2014-11-24 Thread Tor Lillqvist

 cui/source/options/optgdlg.cxx |   10 ++
 cui/source/options/optgdlg.hxx |2 
 cui/uiconfig/ui/optgeneralpage.ui  |   41 ++
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs   |7 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
 sc/inc/calcconfig.hxx  |1 
 sc/source/core/data/formulacell.cxx|7 +
 sc/source/core/tool/calcconfig.cxx |3 
 sc/source/core/tool/formulagroup.cxx   |   14 ++-
 sc/source/core/tool/formulaopt.cxx |   37 ++---
 sc/source/core/tool/interpr5.cxx   |3 
 sc/source/ui/optdlg/calcoptionsdlg.cxx |   28 ---
 sc/source/ui/optdlg/calcoptionsdlg.hxx |3 
 sc/source/ui/unoobj/docuno.cxx |8 +-
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui  |   49 ++---
 15 files changed, 98 insertions(+), 122 deletions(-)

New commits:
commit 3a58704459a8e60ecca337a247331ac55b7672d3
Author: Tor Lillqvist 
Date:   Mon Nov 24 18:08:55 2014 +0200

Make whether to use OpenCL or not a global option

Add a toggle to the "General" page.

Change-Id: If35b1472032706b09a3bc3499c55cbd3ac2e13ac

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e68743d..c449eb0 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -209,6 +209,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pYearValueField, "year");
 get(m_pToYearFT, "toyear");
 get(m_pCollectUsageInfo, "collectusageinfo");
+get(m_pUseOpenCL, "useopencl");
 
 if (m_pFileDlgCB->IsVisible() && 
SvtMiscOptions().IsUseSystemFileDialogReadOnly())
 {
@@ -301,6 +302,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 bModified = true;
 }
 
+if (m_pUseOpenCL->IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::UseOpenCL::set(m_pUseOpenCL->IsChecked(), 
batch);
+bModified = true;
+}
+
 batch->commit();
 
 return bModified;
@@ -342,6 +349,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 
 
m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
 m_pCollectUsageInfo->SaveValue();
+
+m_pUseOpenCL->Check(officecfg::Office::Common::Misc::UseOpenCL::get());
+m_pUseOpenCL->SaveValue();
 }
 
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 3353457..a6a7dac 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -57,6 +57,8 @@ private:
 
 CheckBox* m_pCollectUsageInfo;
 
+CheckBox* m_pUseOpenCL;
+
 DECL_LINK( TwoFigureHdl, NumericField* );
 DECL_LINK( TwoFigureConfigHdl, NumericField* );
 DECL_LINK(HelpCheckHdl_Impl, void *);
diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index b1447c5..d3e8015 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -370,5 +370,46 @@
 5
   
 
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+Allow use of 
OpenCL
+True
+True
+False
+True
+0
+True
+  
+
+  
+
+
+  
+True
+False
+OpenCL
+
+  
+
+  
+
+  
+  
+0
+6
+  
+
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index c7aac17..001654a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1344,13 +1344,6 @@
to those assigned in setOpenCLConfigToDefault() in
sc/source/core/tool/calcconfig.cxx
-->
-
-  
-  
-Whether to use OpenCL for formula computation, if 
available.
-  
-  true
-
 
   
   
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index edede77..74a25aa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5553,6 +5553,13 @@
 
 false
   
+  
+
+  Determines whether OpenCL can be used, when available, to 
speed up
+  some operations.
+
+

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

2014-11-24 Thread Michael Stahl

 sfx2/source/dialog/tabdlg.cxx  |3 ++-
 sfx2/source/sidebar/ControllerItem.cxx |4 
 sw/source/ui/chrdlg/pardlg.cxx |2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 4950c30e633ac2d1a12a9e4b086478ac7d4f790c
Author: Michael Stahl 
Date:   Mon Nov 24 17:53:08 2014 +0100

sfx2: add missing locks to FrameActionListener

Change-Id: I67db5c42d1aea39cbf650de7854be853fc78e8a9

diff --git a/sfx2/source/sidebar/ControllerItem.cxx 
b/sfx2/source/sidebar/ControllerItem.cxx
index a0de0e3..b2cdc72 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -62,6 +62,7 @@ namespace
 }
 virtual void SAL_CALL disposing (void) SAL_OVERRIDE
 {
+SolarMutexGuard g;
 if (mxFrame.is())
 mxFrame->removeFrameActionListener(this);
 }
@@ -69,12 +70,15 @@ namespace
 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
 (void)rEvent;
+
+SolarMutexGuard g;
 mrControllerItem.ResetFrame();
 mxFrame = NULL;
 }
 virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& 
rEvent)
 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
+SolarMutexGuard g;
 if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
 mrControllerItem.NotifyFrameContextChange();
 }
commit 5c31a1b5474f5284cf694d04de5734921891915c
Author: Michael Stahl 
Date:   Mon Nov 24 17:40:26 2014 +0100

fdo#86633: sw: remove bad tab pages from SwParaDlg for drawing objects

"Area" and "Transparence" only supported by Writer paragraphs.

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: I732e8d40fdeafaebf219fc7c5ddd53b850d8eca6

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1481fbd..d533f35 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -551,7 +551,8 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
 
 void SfxTabDialog::Start_Impl()
 {
-DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all 
pages registered" );
+assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount()
+&& "not all pages registered");
 sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
 
 // load old settings, when exists
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 58b4a43..3b007ca 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -129,6 +129,8 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent,
 RemoveTabPage("labelTP_DROPCAPS");
 RemoveTabPage("labelTP_BACKGROUND");
 RemoveTabPage("labelTP_BORDER");
+RemoveTabPage("area");
+RemoveTabPage("transparence");
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 scp2/source/ooo/ure.scp |8 
 1 file changed, 8 deletions(-)

New commits:
commit b94c9e0d82c7430ad7c2f3b10b60651a141100a2
Author: Stephan Bergmann 
Date:   Mon Nov 24 17:49:27 2014 +0100

These are inside an !defined MACOSX block

Change-Id: I09e2db009801c046cf8dd331c7e07cb83f9e3f20

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 18a15d7..6dd8e7e 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -45,22 +45,14 @@ End
 
 #if !defined WNT
 Directory gid_Dir_Ure_Lib
-#if defined MACOSX
-ParentID = gid_Dir_UreLink;
-#else
 ParentID = gid_Dir_Common_Ure;
-#endif
 DosName = "lib";
 End
 #endif
 
 #if !defined WNT
 Directory gid_Dir_Ure_Share
-#if defined MACOSX
-ParentID = gid_Dir_UreLink;
-#else
 ParentID = gid_Dir_Common_Ure;
-#endif
 DosName = "share";
 End
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Caolán McNamara

 sfx2/source/control/objface.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 0c0b5c12ef2c867a07d24832cfe1fac47d6a4c09
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 16:44:25 2014 +

SfxObjectUI_Impl's pName is now unused

Change-Id: Id9c0878a06c4d8f12c67bc7270669c5ff9a503e8

diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 448fdfe..706258f 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -59,7 +59,6 @@ struct SfxObjectUI_Impl
 sal_uInt32  nResId;
 boolbVisible;
 boolbContext;
-OUString*   pName;
 sal_uInt32  nFeature;
 
 SfxObjectUI_Impl(sal_uInt16 n, sal_uInt32 nId, bool bVis, sal_uInt32 
nFeat) :
@@ -67,15 +66,9 @@ struct SfxObjectUI_Impl
 nResId(nId),
 bVisible(bVis),
 bContext(false),
-pName(0),
 nFeature(nFeat)
 {
 }
-
-~SfxObjectUI_Impl()
-{
-delete pName;
-}
 };
 
 typedef std::vector SfxObjectUIArr_Impl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45618] Implement 3d slideshow transition framework also for windows

2014-11-24 Thread bugzilla-daemon

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

--- Comment #11 from pieter kristensen  ---
I really wanted to test this new functionality. But in the Windows version of
LibreOffice 4.4 beta 1 there is no trace of it.
It simply is not yet implemented.

At the top of this bug I read: "resolved/fixed" and in comment 10 I even read
that is implemented and seems to work correctly. That is strange.

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

[Libreoffice-commits] core.git: 25 commits - desktop/source filter/source include/sfx2 sc/inc sc/source sd/inc sd/source sfx2/source solenv/bin starmath/source svx/AllLangResTarget_ofa.mk svx/source s

2014-11-24 Thread Caolán McNamara

 desktop/source/app/app.cxx  |3 
 desktop/source/app/desktop.hrc  |2 
 desktop/source/app/desktop.src  |5 +
 filter/source/graphicfilter/ipict/ipict.cxx |5 +
 include/sfx2/app.hxx|1 
 include/sfx2/imgmgr.hxx |6 -
 include/sfx2/msgpool.hxx|5 -
 include/sfx2/objface.hxx|   11 +-
 include/sfx2/sfx.hrc|2 
 sc/inc/sc.hrc   |3 
 sc/source/ui/app/inputwin.cxx   |   10 +-
 sc/source/ui/app/scmod.cxx  |4 -
 sc/source/ui/drawfunc/chartsh.cxx   |2 
 sc/source/ui/drawfunc/drawsh.cxx|2 
 sc/source/ui/drawfunc/drformsh.cxx  |2 
 sc/source/ui/drawfunc/drtxtob.cxx   |2 
 sc/source/ui/drawfunc/graphsh.cxx   |2 
 sc/source/ui/drawfunc/mediash.cxx   |2 
 sc/source/ui/drawfunc/objdraw.src   |   21 -
 sc/source/ui/drawfunc/oleobjsh.cxx  |2 
 sc/source/ui/optdlg/calcoptionsdlg.cxx  |   34 
 sc/source/ui/src/sc.src |2 
 sc/source/ui/view/cellsh.cxx|2 
 sc/source/ui/view/formatsh.cxx  |2 
 sc/source/ui/view/prevwsh.cxx   |2 
 sc/source/ui/view/tabvwsh.cxx   |2 
 sd/inc/glob.hrc |2 
 sd/source/core/glob.src |4 -
 sd/source/ui/app/sdmod.cxx  |2 
 sd/source/ui/app/strings.src|4 -
 sd/source/ui/view/outlnvsh.cxx  |4 -
 sd/source/ui/view/presvish.cxx  |8 +-
 sfx2/source/appl/appdata.cxx|1 
 sfx2/source/appl/appquit.cxx|1 
 sfx2/source/appl/appserv.cxx|7 -
 sfx2/source/appl/module.cxx |2 
 sfx2/source/appl/workwin.cxx|   14 ---
 sfx2/source/control/dispatch.cxx|   15 +--
 sfx2/source/control/msgpool.cxx |7 -
 sfx2/source/control/objface.cxx |   95 
 sfx2/source/inc/appdata.hxx |1 
 sfx2/source/inc/workwin.hxx |6 -
 sfx2/source/toolbox/imgmgr.cxx  |  107 +---
 sfx2/source/view/viewfrm.cxx|4 -
 solenv/bin/concat-deps.c|   11 +-
 starmath/source/smres.src   |5 -
 starmath/source/view.cxx|2 
 svx/AllLangResTarget_ofa.mk |1 
 svx/source/form/fmshell.cxx |   12 +--
 svx/source/src/app.hrc  |   95 
 svx/source/src/app.src  |   62 
 svx/source/toolbars/extrusionbar.cxx|2 
 svx/source/toolbars/fontworkbar.cxx |2 
 sw/inc/helpid.h |1 
 sw/inc/swtypes.hxx  |2 
 sw/source/ui/app/app.src|   84 -
 sw/source/ui/config/mailconfigpage.cxx  |2 
 sw/source/ui/shells/shells.src  |   36 -
 sw/source/ui/web/web.src|   12 ---
 sw/source/uibase/app/apphdl.cxx |2 
 sw/source/uibase/ribbar/inputwin.cxx|6 -
 sw/source/uibase/shells/annotsh.cxx |2 
 sw/source/uibase/shells/beziersh.cxx|2 
 sw/source/uibase/shells/drawsh.cxx  |2 
 sw/source/uibase/shells/drformsh.cxx|2 
 sw/source/uibase/shells/drwtxtsh.cxx|2 
 sw/source/uibase/shells/frmsh.cxx   |2 
 sw/source/uibase/shells/grfsh.cxx   |2 
 sw/source/uibase/shells/listsh.cxx  |2 
 sw/source/uibase/shells/mediash.cxx |2 
 sw/source/uibase/shells/olesh.cxx   |2 
 sw/source/uibase/shells/tabsh.cxx   |2 
 sw/source/uibase/shells/textsh.cxx  |2 
 sw/source/uibase/uiview/pview.cxx   |2 
 sw/source/uibase/uiview/srcview.cxx |2 
 sw/source/uibase/uiview/view0.cxx   |2 
 sw/source/uibase/utlui/navipi.cxx   |4 -
 sw/source/uibase/web/wformsh.cxx|2 
 sw/source/uibase/web/wfrmsh.cxx |2 
 sw/source/uibase/web/wgrfsh.cxx |2 
 sw/source/uibase/web/wlistsh.cxx|2 
 sw/source/uibase/web/wolesh.cxx |2 
 sw/source/uibase/web/wtabsh.cxx |2 
 sw/source/uibase/web/wtextsh.cxx|2 
 sw/source/uibase/web/wview.cxx  |2 
 vcl/opengl/gdiimpl.cxx  |   12 +--
 vcl/source/window/builder.cxx   |2 
 87 files changed, 177 insertions(+), 644 deletions(-)

New commits:
commit d163c42f6bb95480b7c28770dbcc54ddc7efe1f1
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 16:07:57 2014 +

now unused helpid

C

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

2014-11-24 Thread Andras Timar

 sc/source/filter/lotus/lotform.cxx |   46 +++--
 sw/qa/extras/rtfimport/data/fdo85889-mac.rtf   |3 +
 sw/qa/extras/rtfimport/data/fdo85889-pc.rtf|3 +
 sw/qa/extras/rtfimport/data/fdo85889-pca.rtf   |3 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   26 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 ++
 6 files changed, 82 insertions(+), 11 deletions(-)

New commits:
commit ff56b125ecf8c7781fe38047cf8cfbf3e52c37d0
Author: Andras Timar 
Date:   Mon Nov 24 16:04:20 2014 +0100

import @TERM and @CTERM functions from Lotus 1-2-3 files (related: 
fdo#86241)

Change-Id: I864ad87aa0455c323a5235fa1230d3f2ac3ffbb4
(cherry picked from commit 70ae5bb4182a99c17da8eb32b36baec3e7a48723)

diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index 3e1fe49..7c6fc45 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -137,6 +137,30 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, 
const sal_Char* pExtStri
 eParam[ 2 ] = n0Token;  //-> 2. as Default
 }
 break;
+case ocZZR:
+{
+OSL_ENSURE( nAnz == 3,
+"*LotusToSc::DoFunc(): TERM() or CTERM() need 3 parameters!" );
+nAnz = 4;
+if ( OString(pExtString) == "TERM" )
+{
+// @TERM(pmt,int,fv) -> NPER(int,-pmt,pv=0,fv)
+NegToken( eParam[ 2 ] );
+eParam[ 3 ] = eParam[ 1 ];
+eParam[ 1 ] = aPool.Store( 0.0 );
+}
+else //CTERM()
+{
+// @CTERM(int,fv,pv) -> NPER(int,pmt=0,-pv,fv)
+NegToken( eParam[ 0 ] );
+nMerk0 = eParam[ 1 ];
+eParam[ 1 ] = eParam[ 0 ];
+eParam[ 0 ] = nMerk0;
+eParam[ 3 ] = eParam[ 2 ];
+eParam[ 2 ] = aPool.Store( 0.0 );
+}
+}
+break;
 default:;
 }
 
@@ -393,7 +417,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, 
sal_Int32& rRest,
 
 eType = ( pIndexToType )( nOc );
 eOc = ( pIndexToToken)( nOc );
-if( eOc == ocNoName )
+if( eOc == ocNoName || eOc == ocZZR )
 pExtName = GetAddInName( nOc );
 
 switch( eType )
@@ -742,8 +766,8 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
 FT_NotImpl, //  114 Call()
 FT_FuncFix1,//  115 @@()
 FT_FuncFix3,//  116 Rate()
-FT_FuncFix1,//  117 Term()
-FT_FuncFix1,//  118 Cterm()
+FT_FuncFix3,//  117 Term()
+FT_FuncFix3,//  118 Cterm()
 FT_FuncFix3,//  119 Sln()
 FT_FuncFix4,//  120 Syd(), Soy()
 FT_FuncFix4,//  121 Ddb()
@@ -1006,8 +1030,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
 ocNoName,   //  114 Call()
 ocIndirect, //  115 @@()
 ocZins, //  116 Rate()
-ocNoName,   //  117 Term()
-ocNoName,   //  118 Cterm()
+ocZZR,  //  117 Term()
+ocZZR,  //  118 Cterm()
 ocLIA,  //  119 Sln()
 ocDIA,  //  120 Syd(), Soy()
 ocGDA,  //  121 Ddb()
@@ -1271,8 +1295,8 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
 FT_NotImpl, //  114 App  <- change in name
 FT_FuncFix1,//  115 @@() <- new
 FT_FuncFix3,//  116 Rate()   <- new
-FT_FuncFix3,//  117 Term()   <- change in quantity
-FT_FuncFix3,//  118 Cterm()  <- change in quantity
+FT_FuncFix3,//  117 Term()
+FT_FuncFix3,//  118 Cterm()
 FT_FuncFix3,//  119 Sln()<- new
 FT_FuncFix4,//  120 Syd()<- new
 FT_FuncFix4,//  121 Ddb()<- new
@@ -1535,8 +1559,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex 
)
 ocNoName,   //  114 Call()
 ocIndirect, //  115 @@()
 ocZins, //  116 Rate()
-ocNoName,   //  117 Term()
-ocNoName,   //  118 Cterm()
+ocZZR,  //  117 Term()
+ocZZR,  //  118 Cterm()
 ocLIA,  //  119 Sln()
 ocDIA,  //  120 Syd(), Soy()
 ocGDA,  //  121 Ddb()
@@ -1800,8 +1824,8 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
 NULL,   //  114 Call()
 NULL,   //  115 @@()
 NULL,   //  116 Rate()
-"ANN",  //  117 Term()
-NULL,

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

2014-11-24 Thread Stephan Bergmann

 vcl/unx/generic/dtrans/X11_clipboard.cxx |   15 +++
 vcl/unx/generic/dtrans/X11_clipboard.hxx |6 +-
 vcl/unx/generic/dtrans/X11_service.cxx   |4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 493ecf8f17185bbd9ffe1ac9c58791da6d23b0d9
Author: Stephan Bergmann 
Date:   Mon Nov 24 14:00:30 2014 +0100

rhbz#1167250: Avoid X11Clipboard already being destroyed in constructor

...via SelectionManager::run's aKeep acquring and releasing getReference()

Change-Id: I18696d30c41ca9ae101261668cbf54cb0a6c45fc
(cherry picked from commit 94d2de0ba1f010be7acf0d00ce5b2ed4ed2b895b)
Reviewed-on: https://gerrit.libreoffice.org/13102
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx 
b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 4e6b953..95d44a5 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #if OSL_DEBUG_LEVEL > 1
@@ -57,16 +58,22 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, 
Atom aSelection ) :
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "creating instance of X11Clipboard (this=%p)\n", this );
 #endif
+}
 
-if( m_aSelection != None )
+css::uno::Reference
+X11Clipboard::create( SelectionManager& rManager, Atom aSelection )
+{
+rtl::Reference cb(new X11Clipboard(rManager, aSelection));
+if( aSelection != None )
 {
-m_rSelectionManager.registerHandler( m_aSelection, *this );
+rManager.registerHandler( aSelection, *cb.get() );
 }
 else
 {
-m_rSelectionManager.registerHandler( XA_PRIMARY, *this );
-m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( 
OUString("CLIPBOARD") ), *this );
+rManager.registerHandler( XA_PRIMARY, *cb.get() );
+rManager.registerHandler( rManager.getAtom( OUString("CLIPBOARD") ), 
*cb.get() );
 }
+return cb.get();
 }
 
 X11Clipboard::~X11Clipboard()
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx 
b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 6269927..ba83636 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -46,6 +46,8 @@ namespace x11 {
 ::std::list< css::uno::Reference< 
css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
 Atomm_aSelection;
 
+X11Clipboard( SelectionManager& rManager, Atom aSelection );
+
 protected:
 
 friend class SelectionManager;
@@ -55,7 +57,9 @@ namespace x11 {
 
 public:
 
-X11Clipboard( SelectionManager& rManager, Atom aSelection );
+static css::uno::Reference
+create( SelectionManager& rManager, Atom aSelection );
+
 virtual ~X11Clipboard();
 
 static X11Clipboard* get( const OUString& rDisplayName, Atom 
aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx 
b/vcl/unx/generic/dtrans/X11_service.cxx
index 6d5a8fb..4ec02c1 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -77,10 +77,10 @@ css::uno::Reference< XInterface > 
X11SalInstance::CreateClipboard( const Sequenc
 if( it != m_aInstances.end() )
 return it->second;
 
-X11Clipboard* pClipboard = new X11Clipboard( rManager, nSelection );
+css::uno::Reference pClipboard = 
X11Clipboard::create( rManager, nSelection );
 m_aInstances[ nSelection ] = pClipboard;
 
-return static_cast(pClipboard);
+return pClipboard;
 }
 
 css::uno::Reference< XInterface > X11SalInstance::CreateDragSource()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - odk/docs

2014-11-24 Thread Stephan Bergmann

 odk/docs/install.html |  948 +++---
 1 file changed, 525 insertions(+), 423 deletions(-)

New commits:
commit d395093aecb9da67d0e38d9b3776d166647fde18
Author: Stephan Bergmann 
Date:   Mon Nov 24 17:14:14 2014 +0100

Adapt documentation to reality

...that both OFFICE_HOME and OO_SDK_URE_HOME are always set

Change-Id: I74f3a19cd7020fbefc30b08e122ca20e292f1830

diff --git a/odk/docs/install.html b/odk/docs/install.html
index ef50895..64e2017 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -68,8 +68,8 @@
   LibreOffice %PRODUCT_RELEASE%
   installation
   The SDK works on top of an
-existing office installation and uses the same
-libraries as the office installation.
+existing LibreOffice installation and uses the same
+libraries as the LibreOffice installation.
 
 
   
@@ -228,12 +228,9 @@
   
 OFFICE_HOME
 Path to an existing
-  LibreOffice base installation, e.g.
+  LibreOffice installation, e.g.
   "/opt/libreoffice8". Be sure that 
it
-  is not a user installation only. Exactly one
-  of OFFICE_HOME and OO_SDK_URE_HOME must be
-  set. The other should be either unset or set
-  to an empty value.
+  is not a user installation only.
   
   
 OO_SDK_NAME
@@ -251,10 +248,7 @@
 OO_SDK_URE_HOME
 Path to an existing UNO
   Runtime Environment installation, e.g.
-  "/opt/libreoffice/ure". Exactly one
-  of OFFICE_HOME and OO_SDK_URE_HOME must be
-  set. The other should be either unset or set
-  to an empty value.
+  "/opt/libreoffice/ure".
   
   
 OO_SDK_HOME
@@ -321,11 +315,10 @@
 SDK_AUTO_DEPLOYMENT
 If this variable is set, the
   component examples are automatically deployed
-  into the Office installation referenced by
-  OFFICE_HOME. See also chapter
+  into the LibreOffice installation referenced
+  by OFFICE_HOME. See also chapter
   http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; 
title="link to the "Extension Manager - unopkg" chapter in the 
Developer's Guide">"Extension Manager - unopkg"
-  from the Developer's Guide. This variable is
-  only relevant when OFFICE_HOME is set.
+  from the Developer's Guide.
   
 
 You must run the setsdkenv_XXX script
@@ -358,30 +351,24 @@
   
 OO_SDK_URE_BIN_DIR
 The path within the chosen
-  office or URE installation where binary
-  executables are located (e.g.,
-  $OFFICE_HOME/program for an office
-  installation, or $OO_SDK_URE_HOME/bin
-  for a Unix URE installation).
+  URE installation where binary executables are
+  located (e.g., $OO_SDK_URE_HOME/bin
+  for a Unix installation).
   
   
 OO_SDK_URE_LIB_DIR
 The path within the chosen
-  office or URE installation where dynamic
-  libraries are located (e.g.,
-  $OFFICE_HOME/program for an office
-  installation, or $OO_SDK_URE_HOME/lib
-  for a Unix URE installation).
+  URE installation where dynami

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 621 commits - animations/source apple_remote/source avmedia/Module_avmedia.mk avmedia/source basctl/source basctl/uiconfig basic/sour

2014-11-24 Thread Douglas Mencken

Rebased ref, commits from common ancestor:
commit 94eb256ceffc05504c2ad0ad296cf330b3303b02
Author: Douglas Mencken 
Date:   Sat Oct 25 11:03:56 2014 -0400

vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5

(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)

plus, move conditional includes in salframe.cxx down a bit

Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6a67101..077e40c 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
 #include "osx/a11yfactory.h"
 #include "quartz/utils.h"
 
-#if MACOSX_SDK_VERSION < 1060
-#include "vcl/timer.hxx"
-#include "osx/saltimer.h"
-#endif
-
 #include "salwtype.hxx"
 
 #include "premac.h"
@@ -54,6 +49,11 @@
 #include 
 #include "postmac.h"
 
+#if MACOSX_SDK_VERSION < 1060
+#include "vcl/timer.hxx"
+#include "osx/saltimer.h"
+#endif
+
 using namespace std;
 
 AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
 [mpNSWindow setAcceptsMouseMovedEvents: YES];
 [mpNSWindow setHasShadow: YES];
 
-#if MACOSX_SDK_VERSION < 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION >= 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
 [mpNSWindow setDelegate: static_cast >(mpNSWindow)];
-#endif
 
 if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
 {
 objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
 }
+#endif
+
 const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, 
maGeometry.nHeight )};
 mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView 
userData: nil assumeInside: NO];
 
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
 if( ! mbMenuBar )
 {
 mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION < 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION >= 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
 [mpMenu setDelegate: (id)mpMenu];
 #endif
 }
commit 680744570922b4cbc8a05bd23d8414fcafaa7203
Author: Douglas Mencken 
Date:   Sun Oct 26 06:38:10 2014 -0400

vcl: fix some "cannot convert 'objc_object*' to..." issues

Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index aca05cb..cb44280 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint 
point) {
 // (getter with parameter)attributeNameHereAttributeForParameter:
 // (setter)   setAttributeNameHereAttributeForElement:to:
 -(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter 
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
 NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
 @try {
 // step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint 
point) {
 // step 2: create selector
 selector = NSSelectorFromString ( methodName );
 } @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
 }
 [ pool release ];
 return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8e0d58b..ecbda95 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
 mpFrame = pFrame;
 mMarkedRange = NSMakeRange(NSNotFound, 0);
 mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
 mpMouseEventListener = nil;
 mpLastSuperEvent = nil;
 }
@@ -1788,7 +1788,7 @@ private:
 // some frames never become visible ..
 ::vcl::Window *pWindow = mpFrame -> GetWindow();
 if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
 
 mpReferenceWrapper = new ReferenceWrapper;
 mpReferenceWrapper -> rAccessibleContext =  pWindow -> 
/*GetAccessibleChildWindow( 0 ) ->*/ GetAccessible() -> getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 [NSNumber numberWithBool:NO], 
@"kCUIWindowFrameDrawTitleSeparatorKey",
 [NSNumber numberWithBool:YES], @"is.fli

[Libreoffice-commits] core.git: Changes to 'private/moggi/windows-blacklist'

2014-11-24 Thread Markus Mohrhard

New branch 'private/moggi/windows-blacklist' available with the following 
commits:
commit 94d91cd2400fcbbd840c07a866aa2ee6ca570270
Author: Markus Mohrhard 
Date:   Mon Nov 24 16:46:15 2014 +0100

WIP: implement windows OpenGL blacklist, first step

Change-Id: I408b76855693c64473dba3bb3fa94374fff01fae

commit bbed8bb7dc735539be2dc782f2fe23dead0901d1
Author: Markus Mohrhard 
Date:   Mon Nov 24 00:24:44 2014 +0100

Revert "Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, 
icontest go to instdir

This reverts commit bf9435bce063da95deb8a52371bce04e7435c966.

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

[Libreoffice-commits] core.git: odk/config

2014-11-24 Thread Stephan Bergmann

 odk/config/setsdkenv_unix.sh.in |   63 
 1 file changed, 19 insertions(+), 44 deletions(-)

New commits:
commit 2052ea7439790d9bb5ae5b08fda3874f74700594
Author: Stephan Bergmann 
Date:   Mon Nov 24 16:37:37 2014 +0100

Both OFFICE_HOME and OO_SDK_URE_HOME are always set

...via setsdkenv_unix -> configure.pl

Change-Id: I5b5e8e99736ce6d12ad7796d73cb1cf6871ad7f4

diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 4dcd81d..c1b96fb 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -80,14 +80,6 @@ fi
 
 export OO_SDK_HOME
 
-# Check installation path for the office.
-if [ -z "${OFFICE_HOME}" ] && [ -z "${OO_SDK_URE_HOME}" ]
-then
-echo 'Error: Please set either the environment variable OFFICE_HOME or the'
-echo 'environment variable OO_SDK_URE_HOME.'
-exit 0
-fi
-
 # Get the operating system.
 sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
 
@@ -104,41 +96,27 @@ case ${sdk_platform} in
 esac
 
 # Set office program path (only set when using an Office).
-if [ "${OFFICE_HOME}" ]
-then
-OFFICE_PROGRAM_PATH=${OFFICE_HOME}/${programdir}
-export OFFICE_PROGRAM_PATH
-fi
-
+OFFICE_PROGRAM_PATH=${OFFICE_HOME}/${programdir}
+export OFFICE_PROGRAM_PATH
 
 # Set UNO path, necessary to ensure that the cpp examples using the
 # new UNO bootstrap mechanism use the configured office installation (only set
 # when using an Office).
-if [ "${OFFICE_HOME}" ]
-then
-UNO_PATH=${OFFICE_PROGRAM_PATH}
-export UNO_PATH
-fi
+UNO_PATH=${OFFICE_PROGRAM_PATH}
+export UNO_PATH
 
-if [ "${OO_SDK_URE_HOME}" ]
-then
-case ${sdk_platform} in
-  darwin*)
+case ${sdk_platform} in
+darwin*)
 OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/MacOS
 OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/Frameworks
 OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java
 ;;
-  *)
+*)
 OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
 OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
 OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
 ;;
-esac
-else
-OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
-OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
-OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
-fi
+esac
 export OO_SDK_URE_BIN_DIR
 export OO_SDK_URE_LIB_DIR
 export OO_SDK_URE_JAVA_DIR
@@ -294,20 +272,17 @@ then

"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 #prepare links
-if [ "${OO_SDK_URE_HOME}" ]
-then
-   mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-   ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
-   "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-   ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
-   
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-   ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
-   "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-   ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
-   
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-   ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
-   
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
-fi
+mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+   "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+   "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+   "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+   "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+   
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 fi
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libmspub.git: 2 commits - configure.ac .gitignore inc/libmspub

2014-11-24 Thread David Tardon

 .gitignore   |1 +
 configure.ac |   19 +++
 inc/libmspub/MSPUBDocument.h |4 
 3 files changed, 24 insertions(+)

New commits:
commit 616f5070061e28c54cbb513859141e02f4fd5dc6
Author: David Tardon 
Date:   Mon Nov 24 16:20:24 2014 +0100

add compile script to .gitignore

Change-Id: I543c0db6c0d00e5c68fac05031a99204dd716d4b

diff --git a/.gitignore b/.gitignore
index 612cbb4..19907e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ Makefile.in
 ar-lib
 aclocal.m4
 autom4te.cache
+compile
 config.guess
 config.h
 config.h.in
commit c5c20a694baa5629ddb65ea37f19da89411887fe
Author: David Tardon 
Date:   Fri Aug 29 13:31:09 2014 +0200

only export public symbols

diff --git a/configure.ac b/configure.ac
index d3384f2..aa171e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,25 @@ AS_CASE([$host],
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL([PLATFORM_WIN32], [test "x$platform_win32" = "xyes"])
 
+AS_IF([test $platform_win32 == yes],
+[],
+[
+AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
+saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+AC_TRY_COMPILE([], [],
+[
+AC_MSG_RESULT([yes])
+CXXFLAGS="$CXXFLAGS -DLIBMSPUB_VISIBILITY"
+],
+[
+AC_MSG_RESULT([no])
+CXXFLAGS="$saved_CXXFLAGS"
+]
+)
+]
+)
+
 # 
 # Check for cflags
 # 
diff --git a/inc/libmspub/MSPUBDocument.h b/inc/libmspub/MSPUBDocument.h
index 5d4de33..be0cfbc 100644
--- a/inc/libmspub/MSPUBDocument.h
+++ b/inc/libmspub/MSPUBDocument.h
@@ -18,9 +18,13 @@
 #else
 #define PUBAPI __declspec(dllimport)
 #endif
+#else // !DLL_EXPORT
+#ifdef LIBMSPUB_VISIBILITY
+#define PUBAPI __attribute__((visibility("default")))
 #else
 #define PUBAPI
 #endif
+#endif
 
 namespace libmspub
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/uiconfig

2014-11-24 Thread Maxim Monastirsky

 svx/uiconfig/ui/sidebargraphic.ui |   74 +++---
 1 file changed, 23 insertions(+), 51 deletions(-)

New commits:
commit bc24a8514b4b7301c2100ff4d938392e270d908f
Author: Maxim Monastirsky 
Date:   Mon Nov 24 17:13:39 2014 +0200

fdo#86622 sidebar: Distorted icons in Graphic section

Similar to:
36f275cb0f19d11151abf85f3c191a2736bd73da
92a0793265c66d289828c0193097b14b7e7e2d0f

Regression of:
eaa89db886ba49472e22d77cea957a08c1113cd0

Change-Id: I98893989fff9f9893f6b3b52b24a43676fe7c6f7
(cherry picked from commit da48602018deb15d6beeb682430942799dfa2c8c)

diff --git a/svx/uiconfig/ui/sidebargraphic.ui 
b/svx/uiconfig/ui/sidebargraphic.ui
index 1403d30..e894a6f 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -1,11 +1,25 @@
 
+
 
-  
+  
   
 100
 1
 10
   
+  
+0.01
+10
+1
+0.10001
+1
+  
+  
+-100
+100
+1
+10
+  
   
 True
 False
@@ -37,8 +51,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -49,15 +61,12 @@
 Specify the 
luminance of the graphic.
 Specify the 
luminance of the graphic.
 â¢
-True
 plusminus100adjustment
 1
   
   
 0
 1
-1
-1
   
 
 
@@ -72,8 +81,6 @@
   
 1
 0
-1
-1
   
 
 
@@ -84,15 +91,12 @@
 Specify the 
degree of difference between the lightest and darkest parts of the 
graphic.
 Specify the 
degree of difference between the lightest and darkest parts of the 
graphic.
 â¢
-True
 plusminus100adjustment
 1
   
   
 1
 1
-1
-1
   
 
 
@@ -107,24 +111,16 @@
   
 0
 2
-1
-1
   
 
 
   
 True
 False
-1
-0
-0
-1
   
   
 0
 3
-1
-1
   
 
 
@@ -139,8 +135,6 @@
   
 1
 2
-1
-1
   
 
 
@@ -151,15 +145,12 @@
 Specify the 
percentage of transparency; 0% is fully opaque and 100% is fully 
transparent.
 Specify the 
percentage of transparency; 0% is fully opaque and 100% is fully 
transparent.
 â¢
-True
 0to100adjustment
 1
   
   
 1
 3
-1
-1
   
 
 
@@ -171,6 +162,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorRed_16x16.png
   
   
@@ -187,7 +180,6 @@
 Red
 Red
 â¢
-True
 plusminus100adjustment
 1
   
@@ -201,8 +193,6 @@
   
 0
 4
-1
-1
   
 
 
@@ -214,6 +204,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorGreen_16x16.png
   
   
@@ -230,7 +222,6 @@
 Green
 Green
 â¢
-True
 plusminus100adjustment
 1
   
@@ -245,8 +236,6 @@
   
 1
 4
-1
-1
   
 
 
@@ -258,6 +247,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorBlue_16x16.png
   
   
@@ -274,7 +265,6 @@
 Blue
 Blue
 â¢
-True
 plusminus100adjustment
 1

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

2014-11-24 Thread Maxim Monastirsky

 svx/uiconfig/ui/sidebargraphic.ui |   74 +++---
 1 file changed, 23 insertions(+), 51 deletions(-)

New commits:
commit da48602018deb15d6beeb682430942799dfa2c8c
Author: Maxim Monastirsky 
Date:   Mon Nov 24 17:13:39 2014 +0200

fdo#86622 sidebar: Distorted icons in Graphic section

Similar to:
36f275cb0f19d11151abf85f3c191a2736bd73da
92a0793265c66d289828c0193097b14b7e7e2d0f

Regression of:
eaa89db886ba49472e22d77cea957a08c1113cd0

Change-Id: I98893989fff9f9893f6b3b52b24a43676fe7c6f7

diff --git a/svx/uiconfig/ui/sidebargraphic.ui 
b/svx/uiconfig/ui/sidebargraphic.ui
index 1403d30..e894a6f 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -1,11 +1,25 @@
 
+
 
-  
+  
   
 100
 1
 10
   
+  
+0.01
+10
+1
+0.10001
+1
+  
+  
+-100
+100
+1
+10
+  
   
 True
 False
@@ -37,8 +51,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -49,15 +61,12 @@
 Specify the 
luminance of the graphic.
 Specify the 
luminance of the graphic.
 â¢
-True
 plusminus100adjustment
 1
   
   
 0
 1
-1
-1
   
 
 
@@ -72,8 +81,6 @@
   
 1
 0
-1
-1
   
 
 
@@ -84,15 +91,12 @@
 Specify the 
degree of difference between the lightest and darkest parts of the 
graphic.
 Specify the 
degree of difference between the lightest and darkest parts of the 
graphic.
 â¢
-True
 plusminus100adjustment
 1
   
   
 1
 1
-1
-1
   
 
 
@@ -107,24 +111,16 @@
   
 0
 2
-1
-1
   
 
 
   
 True
 False
-1
-0
-0
-1
   
   
 0
 3
-1
-1
   
 
 
@@ -139,8 +135,6 @@
   
 1
 2
-1
-1
   
 
 
@@ -151,15 +145,12 @@
 Specify the 
percentage of transparency; 0% is fully opaque and 100% is fully 
transparent.
 Specify the 
percentage of transparency; 0% is fully opaque and 100% is fully 
transparent.
 â¢
-True
 0to100adjustment
 1
   
   
 1
 3
-1
-1
   
 
 
@@ -171,6 +162,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorRed_16x16.png
   
   
@@ -187,7 +180,6 @@
 Red
 Red
 â¢
-True
 plusminus100adjustment
 1
   
@@ -201,8 +193,6 @@
   
 0
 4
-1
-1
   
 
 
@@ -214,6 +204,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorGreen_16x16.png
   
   
@@ -230,7 +222,6 @@
 Green
 Green
 â¢
-True
 plusminus100adjustment
 1
   
@@ -245,8 +236,6 @@
   
 1
 4
-1
-1
   
 
 
@@ -258,6 +247,8 @@
   
 True
 False
+center
+center
 svx/res/symphony/AdjustColorBlue_16x16.png
   
   
@@ -274,7 +265,6 @@
 Blue
 Blue
 â¢
-True
 plusminus100adjustment
 1
   
@@ -288,8 +278,6 @@
   
 0
 5

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

2014-11-24 Thread Andras Timar

 sc/source/filter/lotus/lotform.cxx |   46 -
 1 file changed, 35 insertions(+), 11 deletions(-)

New commits:
commit 70ae5bb4182a99c17da8eb32b36baec3e7a48723
Author: Andras Timar 
Date:   Mon Nov 24 16:04:20 2014 +0100

import @TERM and @CTERM functions from Lotus 1-2-3 files (related: 
fdo#86241)

Change-Id: I864ad87aa0455c323a5235fa1230d3f2ac3ffbb4

diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index 3e1fe49..7c6fc45 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -137,6 +137,30 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, 
const sal_Char* pExtStri
 eParam[ 2 ] = n0Token;  //-> 2. as Default
 }
 break;
+case ocZZR:
+{
+OSL_ENSURE( nAnz == 3,
+"*LotusToSc::DoFunc(): TERM() or CTERM() need 3 parameters!" );
+nAnz = 4;
+if ( OString(pExtString) == "TERM" )
+{
+// @TERM(pmt,int,fv) -> NPER(int,-pmt,pv=0,fv)
+NegToken( eParam[ 2 ] );
+eParam[ 3 ] = eParam[ 1 ];
+eParam[ 1 ] = aPool.Store( 0.0 );
+}
+else //CTERM()
+{
+// @CTERM(int,fv,pv) -> NPER(int,pmt=0,-pv,fv)
+NegToken( eParam[ 0 ] );
+nMerk0 = eParam[ 1 ];
+eParam[ 1 ] = eParam[ 0 ];
+eParam[ 0 ] = nMerk0;
+eParam[ 3 ] = eParam[ 2 ];
+eParam[ 2 ] = aPool.Store( 0.0 );
+}
+}
+break;
 default:;
 }
 
@@ -393,7 +417,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, 
sal_Int32& rRest,
 
 eType = ( pIndexToType )( nOc );
 eOc = ( pIndexToToken)( nOc );
-if( eOc == ocNoName )
+if( eOc == ocNoName || eOc == ocZZR )
 pExtName = GetAddInName( nOc );
 
 switch( eType )
@@ -742,8 +766,8 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
 FT_NotImpl, //  114 Call()
 FT_FuncFix1,//  115 @@()
 FT_FuncFix3,//  116 Rate()
-FT_FuncFix1,//  117 Term()
-FT_FuncFix1,//  118 Cterm()
+FT_FuncFix3,//  117 Term()
+FT_FuncFix3,//  118 Cterm()
 FT_FuncFix3,//  119 Sln()
 FT_FuncFix4,//  120 Syd(), Soy()
 FT_FuncFix4,//  121 Ddb()
@@ -1006,8 +1030,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
 ocNoName,   //  114 Call()
 ocIndirect, //  115 @@()
 ocZins, //  116 Rate()
-ocNoName,   //  117 Term()
-ocNoName,   //  118 Cterm()
+ocZZR,  //  117 Term()
+ocZZR,  //  118 Cterm()
 ocLIA,  //  119 Sln()
 ocDIA,  //  120 Syd(), Soy()
 ocGDA,  //  121 Ddb()
@@ -1271,8 +1295,8 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
 FT_NotImpl, //  114 App  <- change in name
 FT_FuncFix1,//  115 @@() <- new
 FT_FuncFix3,//  116 Rate()   <- new
-FT_FuncFix3,//  117 Term()   <- change in quantity
-FT_FuncFix3,//  118 Cterm()  <- change in quantity
+FT_FuncFix3,//  117 Term()
+FT_FuncFix3,//  118 Cterm()
 FT_FuncFix3,//  119 Sln()<- new
 FT_FuncFix4,//  120 Syd()<- new
 FT_FuncFix4,//  121 Ddb()<- new
@@ -1535,8 +1559,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex 
)
 ocNoName,   //  114 Call()
 ocIndirect, //  115 @@()
 ocZins, //  116 Rate()
-ocNoName,   //  117 Term()
-ocNoName,   //  118 Cterm()
+ocZZR,  //  117 Term()
+ocZZR,  //  118 Cterm()
 ocLIA,  //  119 Sln()
 ocDIA,  //  120 Syd(), Soy()
 ocGDA,  //  121 Ddb()
@@ -1800,8 +1824,8 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
 NULL,   //  114 Call()
 NULL,   //  115 @@()
 NULL,   //  116 Rate()
-"ANN",  //  117 Term()
-NULL,   //  118 Cterm()
+"TERM", //  117 Term()
+"CTERM",//  118 Cterm()
 NULL,   //  119 Sln()
 NULL,   //  120 Syd(), Soy()
 NULL,   //  121 Ddb()
___
Libreoffice-commits mailing list
libreof

[Libreoffice-commits] libvisio.git: 2 commits - configure.ac .gitignore inc/libvisio

2014-11-24 Thread David Tardon

 .gitignore   |1 +
 configure.ac |   19 +++
 inc/libvisio/VisioDocument.h |4 
 3 files changed, 24 insertions(+)

New commits:
commit 6033e13300a7beff58a953241c0da6d760082827
Author: David Tardon 
Date:   Mon Nov 24 16:04:08 2014 +0100

add compile script to .gitignore

Change-Id: Ic14123f7f5e9048074f51d84c073ad79c4ac816f

diff --git a/.gitignore b/.gitignore
index f3bab2c..9e03dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ Makefile.in
 aclocal.m4
 ar-lib
 autom4te.cache
+compile
 config.guess
 config.h
 config.h.in
commit 5bd7231abf5e138d6b31faeb4cf2466e6a53f716
Author: David Tardon 
Date:   Fri Aug 29 13:31:09 2014 +0200

only export public symbols

diff --git a/configure.ac b/configure.ac
index 9e4df06..d279ec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,25 @@ AS_CASE([$host],
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL([PLATFORM_WIN32], [test "x$platform_win32" = "xyes"])
 
+AS_IF([test $platform_win32 == yes],
+[],
+[
+AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
+saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+AC_TRY_COMPILE([], [],
+[
+AC_MSG_RESULT([yes])
+CXXFLAGS="$CXXFLAGS -DLIBVISIO_VISIBILITY"
+],
+[
+AC_MSG_RESULT([no])
+CXXFLAGS="$saved_CXXFLAGS"
+]
+)
+]
+)
+
 # 
 # Check for cflags
 # 
diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
index 1354ed2..c44528d 100644
--- a/inc/libvisio/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
@@ -18,9 +18,13 @@
 #else
 #define VSDAPI __declspec(dllimport)
 #endif
+#else // !DLL_EXPORT
+#ifdef LIBVISIO_VISIBILITY
+#define VSDAPI __attribute__((visibility("default")))
 #else
 #define VSDAPI
 #endif
+#endif
 
 namespace libvisio
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 ure/source/README |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a55d4f6a60c0e59162f20ff3e7c220ac0042d65a
Author: Stephan Bergmann 
Date:   Mon Nov 24 15:45:47 2014 +0100

...so startup.sh is gone now

Change-Id: I667cd9db8a6f5511218d482fb97025480ddc2488

diff --git a/ure/source/README b/ure/source/README
index 1a1c247..81bb696 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -40,7 +40,6 @@ ELF platforms (Linux, Solaris, *BSD):
 /opt/openoffice.org/ure/share/misc/types.rdb
 /opt/openoffice.org/ure/share/misc/services.rdb
 /opt/openoffice.org/ure/lib/libxml2.so.2  [external]
-/opt/openoffice.org/ure/bin/startup.sh  [private]
 /opt/openoffice.org/ure/bin/uno.bin  [private]
 /opt/openoffice.org/ure/lib/unorc  [private]
 /opt/openoffice.org/ure/lib/libreglo.so  [private]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ure/Package_install.mk ure/source

2014-11-24 Thread Stephan Bergmann

 ure/Package_install.mk |3 +--
 ure/source/startup.sh  |   47 ---
 ure/source/uno |   47 +++
 3 files changed, 48 insertions(+), 49 deletions(-)

New commits:
commit b7a81e33bc960409dd1ca7ce8b02650bccabaf1d
Author: Stephan Bergmann 
Date:   Mon Nov 24 15:43:45 2014 +0100

uno is the only remaining user of startup.sh

Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664

diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 13106f1..7250777 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -10,8 +10,7 @@
 $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
 
 ifneq (,$(filter-out MACOSX WNT,$(OS)))
-$(eval $(call 
gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh))
-$(eval $(call 
gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,startup.sh))
+$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
 endif
 
 ifeq (MACOSX,$(OS))
diff --git a/ure/source/startup.sh b/ure/source/uno
similarity index 100%
rename from ure/source/startup.sh
rename to ure/source/uno
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - download.lst

2014-11-24 Thread David Tardon

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d263a465b50f3555a5b2dc8f2dabba7ed23941ea
Author: David Tardon 
Date:   Mon Nov 24 15:32:36 2014 +0100

upload libcdr 0.1.1

Change-Id: Iabca04edf87d512fd16cf36b1503d516a8d7cfdc
(cherry picked from commit 44454fc9f99f4a7fd4ae2c202434d92ff725ce87)

diff --git a/download.lst b/download.lst
index 09d8a5f..cf66c2b 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz
 export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
-export CDR_MD5SUM := 0e2f56934c8872ec4a254cd4bb1d7cf6
-export CDR_TARBALL := libcdr-0.1.0.tar.bz2
+export CDR_MD5SUM := b33fd0be3befdd1b3e08ce058bd9
+export CDR_TARBALL := libcdr-0.1.1.tar.bz2
 export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

2014-11-24 Thread David Tardon

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 44454fc9f99f4a7fd4ae2c202434d92ff725ce87
Author: David Tardon 
Date:   Mon Nov 24 15:32:36 2014 +0100

upload libcdr 0.1.1

Change-Id: Iabca04edf87d512fd16cf36b1503d516a8d7cfdc

diff --git a/download.lst b/download.lst
index 09d8a5f..cf66c2b 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz
 export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
-export CDR_MD5SUM := 0e2f56934c8872ec4a254cd4bb1d7cf6
-export CDR_TARBALL := libcdr-0.1.0.tar.bz2
+export CDR_MD5SUM := b33fd0be3befdd1b3e08ce058bd9
+export CDR_TARBALL := libcdr-0.1.1.tar.bz2
 export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] libcdr 0.1.1 has been released

2014-11-24 Thread David Tardon

List of changes:

* Fix several problems found by Coverity.
* Fix crash when NULL is passed as input stream.
* Fix various crashes and hangs when reading broken files found with the
  help of american-fuzzy-lop.
* Only export public symbols on Linux.

Home page: https://wiki.documentfoundation.org/DLP/Libraries/libcdr
Download from: http://dev-www.libreoffice.org/src/libcdr/

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

[Libreoffice-commits] core.git: Makefile.in

2014-11-24 Thread Michael Stahl

 Makefile.in |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fea3ca373873b1b6e5d319a8452491d2b38dbdaa
Author: Michael Stahl 
Date:   Mon Nov 24 15:17:26 2014 +0100

Makefile: provide a hint when "make iwyudummy" fails

Change-Id: I5d37478e1dfdd9bf96ceb302fe51fc5c2b4ed838

diff --git a/Makefile.in b/Makefile.in
index 6c2957f..fa3ffd3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,10 @@ PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j 
$(PARALLELISM),)
 
 IWYU_OPTION := $(if $(IWYU_PATH),-k CC=$(IWYU_PATH) CXX=$(IWYU_PATH),)
 
+# don't want to have a dependency to iwyudummy.generate because it's
+# useful to manually edit the generated StaticLibrary_iwyudummy.mk
 iwyudummy: bootstrap fetch
+   $(if $(wildcard $(BUILDDIR)/iwyudummy),,$(error first call "make 
iwyudummy.generate"))
cd $(BUILDDIR)/iwyudummy && $(MAKE) $(IWYU_OPTION) $(GMAKE_OPTIONS)
 
 iwyudummy.generate:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread David Ostrovsky

 Repository.mk|6 ++
 scp2/AutoInstall.mk  |1 +
 scp2/source/extensions/file_extensions.scp   |   13 -
 scp2/source/extensions/module_extensions.scp |6 --
 4 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 715aafa6d9dbc23be738597b4fa15af102f1f98f
Author: David Ostrovsky 
Date:   Fri Nov 21 15:03:13 2014 +0100

scp2: move ct2n to AutoInstall

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

diff --git a/Repository.mk b/Repository.mk
index e5fa7eb..0e0dffc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -771,6 +771,12 @@ $(eval $(call 
gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 ))
 endif
 
+ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE)))
+$(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\
+   ct2n \
+))
+endif
+
 $(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 9ab563b..62f043c 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,extensions_ct2n))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index 507128f..fec3835 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -48,19 +48,6 @@ End
 
 #endif
 
-/* ** ConvertTextToNumber ** */
-
-#ifdef WITH_EXTENSION_CT2N
-
-File gid_File_Oxt_CT2N
-   TXT_FILE_BODY;
-   Styles = (PACKED, FILELIST);
-   Dir = FILELIST_DIR;
-   Name = "ct2n.filelist";
-End
-
-#endif
-
 /* ** Hungarian Cross-reference Toolbar** */
 
 #ifdef WITH_EXTENSION_HUNART
diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index ce72b5f..5dfb7c1 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -95,12 +95,14 @@ End
 /* ** ConvertTextToNumber ** */
 
 #ifdef WITH_EXTENSION_CT2N
+
+#include "AutoInstall/extensions_ct2n"
+
 Module gid_Module_Optional_Extensions_CT2N
 PackageInfo = "packinfo_extensions.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
 ParentID = gid_Module_Optional_Extensions;
-Files = (
-gid_File_Oxt_CT2N );
+Files = (auto_extensions_ct2n_ALL);
 Minimal = NO;
 Default = YES;
 Styles = ( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib bin/gen-iwyu-dummy-lib.awk Makefile.in

2014-11-24 Thread Noel Grandin

 Makefile.in|4 +++-
 bin/gen-iwyu-dummy-lib |   15 ---
 bin/gen-iwyu-dummy-lib.awk |   34 ++
 3 files changed, 49 insertions(+), 4 deletions(-)

New commits:
commit 460debad7968961084546e02eb2ac0750a63a7f4
Author: Noel Grandin 
Date:   Thu Nov 20 09:47:17 2014 +0200

improvements to iwyudummy target

- split awk script into separate file
- make awk work on older awk version
- create new target in main Makefile.in to generate
  iwyudummy Makefile so we don't have to manually uncomment
  stuff
- exclude /usr includes from the generated makefile
- disable unused macros warnings to reduce noise
- add some sanity checking - prevent using the generated
  makefile with compiler-plugins enabled
- add new target for generating iwyu Makefile so we don't
  need to edit the Makefile when using it

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

diff --git a/Makefile.in b/Makefile.in
index 2f8de5d..6c2957f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,9 +63,11 @@ PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j 
$(PARALLELISM),)
 IWYU_OPTION := $(if $(IWYU_PATH),-k CC=$(IWYU_PATH) CXX=$(IWYU_PATH),)
 
 iwyudummy: bootstrap fetch
-   # $(SRCDIR)/bin/gen-iwyu-dummy-lib
cd $(BUILDDIR)/iwyudummy && $(MAKE) $(IWYU_OPTION) $(GMAKE_OPTIONS)
 
+iwyudummy.generate:
+   $(SRCDIR)/bin/gen-iwyu-dummy-lib
+
 #
 # Partial Build
 #
diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index ac117fe..62e7c7b 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -16,11 +16,15 @@
 
 set -e
 
-iwyu_INCLUDES=$(grep -h -r ":$" ${BUILDDIR}/workdir/Dep/*Object* | grep -v 
'workdir\|config_host' | sed -e "s,^${SRCDIR}/,," | sed -e "s/:$//"  | sort -u)
+iwyu_INCLUDES=$(grep -h -r ":$" ${BUILDDIR}/workdir/Dep/*Object* \
+| grep -v 'workdir\|config_host' | grep -v "^/usr" \
+| sed -e "s,^${SRCDIR}/,," | sed -e "s/:$//"  | sort -u)
 
 iwyu_INCLUDEDIRS=$(echo "${iwyu_INCLUDES}" | sed -e "s,/[^/]*$,," | grep -v 
"^include" | sort -u)
 
-iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk | xargs 
awk 'BEGIN {domatch=0;} /))/ {domatch=0;} domatch { if (!($1 in exts)) 
{exts[$1]; print $1;} } /use_external(s)?,/ { if (index($0, "))")) { 
gsub(/.*,/, ""); gsub(/)+/, ""); if (!($0 in exts)) {exts[$0]; print $0; } } 
else { domatch=1;} }' | grep -v 
'$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
+iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \
+| xargs awk -f bin/gen-iwyu-dummy-lib.awk \
+| grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
 
 mkdir -p ${BUILDDIR}/iwyudummy
 iwyu_MOD=${BUILDDIR}/iwyudummy/Module_iwyudummy.mk
@@ -31,9 +35,14 @@ echo "include ${SRCDIR}/solenv/gbuild/partial_build.mk" >> 
${BUILDDIR}/iwyudummy
 echo '$(eval $(call gb_Module_Module,iwyudummy))' > ${iwyu_MOD}
 echo '$(eval $(call gb_Module_add_targets,iwyudummy,StaticLibrary_iwyudummy))' 
>> ${iwyu_MOD}
 
+# prevent some common configuration errors
+echo 'ifneq ($(COMPILER_PLUGINS),)' > ${iwyu_LIB}
+echo '$(call gb_Output_error,--enable-compiler-plugins does not work well 
with this: bailing out)' > ${iwyu_LIB}
+echo 'endif' > ${iwyu_LIB}
+
 echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))' > ${iwyu_LIB}
 # clang will "compile" headers to .gch by default
-echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++))' >> 
${iwyu_LIB}
+echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros))' >> ${iwyu_LIB}
 echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))' >> 
${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))' >> ${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\' >> ${iwyu_LIB}
diff --git a/bin/gen-iwyu-dummy-lib.awk b/bin/gen-iwyu-dummy-lib.awk
new file mode 100644
index 000..464d951
--- /dev/null
+++ b/bin/gen-iwyu-dummy-lib.awk
@@ -0,0 +1,34 @@
+BEGIN  { domatch = 0; }
+
+{
+if ($0 ~ /use_external(s)?,/ )
+{
+if (index($0, "))"))
+{
+gsub(/.*,/, "");
+gsub(/\)+/, ""); 
+if (!($0 in exts))
+{
+exts[$0];
+print $0;
+}
+}
+else
+{
+   domatch = 1;
+}
+}
+else if ($0 ~ /\)\)/ )
+{
+domatch = 0;
+}
+else if (domatch == 1)
+{
+if (!($1 in exts))
+{
+exts[$1];
+print $1;
+}
+}
+}
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: 2 commits - configure.ac inc/libcdr NEWS

2014-11-24 Thread David Tardon

 NEWS|8 
 configure.ac|   21 -
 inc/libcdr/libcdr_api.h |4 
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 06f9844bd62f718bed85ca74d3769f73b5b9b2ab
Author: David Tardon 
Date:   Mon Nov 24 15:02:54 2014 +0100

prepare for a release

Change-Id: I4d02133381c7cad26f2fabb25eb1abb6d1b10992

diff --git a/NEWS b/NEWS
index 6392822..61152a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+libcdr 0.1.1
+
+* Fix several problems found by Coverity.
+* Fix crash when NULL is passed as input stream.
+* Fix various crashes and hangs when reading broken files found with the
+  help of american-fuzzy-lop.
+* Only export public symbols on Linux.
+
 libcdr 0.1.0
 
 * switch to librevenge
diff --git a/configure.ac b/configure.ac
index af456c3..e5f51aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[0])
+m4_define([libcdr_version_micro],[1])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
commit d8f9b82f345e3f22b440e17e58adfc23a40ee6a0
Author: David Tardon 
Date:   Fri Aug 29 13:31:09 2014 +0200

only export public symbols

Change-Id: I0688bcb1742b0459db599517ebe50e45495a1bad

diff --git a/configure.ac b/configure.ac
index a216684..af456c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,25 @@ AS_CASE([$host],
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL([PLATFORM_WIN32], [test "x$platform_win32" = "xyes"])
 
+AS_IF([test $platform_win32 == yes],
+[],
+[
+AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
+saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+AC_TRY_COMPILE([], [],
+[
+AC_MSG_RESULT([yes])
+CXXFLAGS="$CXXFLAGS -DLIBCDR_VISIBILITY"
+],
+[
+AC_MSG_RESULT([no])
+CXXFLAGS="$saved_CXXFLAGS"
+]
+)
+]
+)
+
 # 
 # Check for cflags
 # 
diff --git a/inc/libcdr/libcdr_api.h b/inc/libcdr/libcdr_api.h
index c3da491..81d68af 100644
--- a/inc/libcdr/libcdr_api.h
+++ b/inc/libcdr/libcdr_api.h
@@ -16,9 +16,13 @@
 #else
 #define CDRAPI __declspec(dllimport)
 #endif
+#else // !DLL_EXPORT
+#ifdef LIBCDR_VISIBILITY
+#define CDRAPI __attribute__((visibility("default")))
 #else
 #define CDRAPI
 #endif
+#endif
 
 #endif
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.1.1'

2014-11-24 Thread David Tardon

Tag 'libcdr-0.1.1' created by David Tardon  at 2014-11-24 
14:05 -0800

codename "Revenge of the fuzzers"

Changes since libcdr-0.1.0-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 vcl/unx/generic/dtrans/X11_clipboard.cxx |   15 +++
 vcl/unx/generic/dtrans/X11_clipboard.hxx |6 +-
 vcl/unx/generic/dtrans/X11_service.cxx   |4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit b017effb945fc6c22d0e3bf2e13d94d7ed9a3bb5
Author: Stephan Bergmann 
Date:   Mon Nov 24 14:00:30 2014 +0100

rhbz#1167250: Avoid X11Clipboard already being destroyed in constructor

...via SelectionManager::run's aKeep acquring and releasing getReference()

Change-Id: I18696d30c41ca9ae101261668cbf54cb0a6c45fc
(cherry picked from commit 94d2de0ba1f010be7acf0d00ce5b2ed4ed2b895b)

diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx 
b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 4e6b953..95d44a5 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #if OSL_DEBUG_LEVEL > 1
@@ -57,16 +58,22 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, 
Atom aSelection ) :
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "creating instance of X11Clipboard (this=%p)\n", this );
 #endif
+}
 
-if( m_aSelection != None )
+css::uno::Reference
+X11Clipboard::create( SelectionManager& rManager, Atom aSelection )
+{
+rtl::Reference cb(new X11Clipboard(rManager, aSelection));
+if( aSelection != None )
 {
-m_rSelectionManager.registerHandler( m_aSelection, *this );
+rManager.registerHandler( aSelection, *cb.get() );
 }
 else
 {
-m_rSelectionManager.registerHandler( XA_PRIMARY, *this );
-m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( 
OUString("CLIPBOARD") ), *this );
+rManager.registerHandler( XA_PRIMARY, *cb.get() );
+rManager.registerHandler( rManager.getAtom( OUString("CLIPBOARD") ), 
*cb.get() );
 }
+return cb.get();
 }
 
 X11Clipboard::~X11Clipboard()
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx 
b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 6269927..ba83636 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -46,6 +46,8 @@ namespace x11 {
 ::std::list< css::uno::Reference< 
css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
 Atomm_aSelection;
 
+X11Clipboard( SelectionManager& rManager, Atom aSelection );
+
 protected:
 
 friend class SelectionManager;
@@ -55,7 +57,9 @@ namespace x11 {
 
 public:
 
-X11Clipboard( SelectionManager& rManager, Atom aSelection );
+static css::uno::Reference
+create( SelectionManager& rManager, Atom aSelection );
+
 virtual ~X11Clipboard();
 
 static X11Clipboard* get( const OUString& rDisplayName, Atom 
aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx 
b/vcl/unx/generic/dtrans/X11_service.cxx
index 6d5a8fb..4ec02c1 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -77,10 +77,10 @@ css::uno::Reference< XInterface > 
X11SalInstance::CreateClipboard( const Sequenc
 if( it != m_aInstances.end() )
 return it->second;
 
-X11Clipboard* pClipboard = new X11Clipboard( rManager, nSelection );
+css::uno::Reference pClipboard = 
X11Clipboard::create( rManager, nSelection );
 m_aInstances[ nSelection ] = pClipboard;
 
-return static_cast(pClipboard);
+return pClipboard;
 }
 
 css::uno::Reference< XInterface > X11SalInstance::CreateDragSource()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Michael Stahl

 include/svl/itempool.hxx  |2 --
 svl/source/items/itempool.cxx |4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6796db4cc6c1b8d32a655de5343b9883b07d0aa8
Author: Michael Stahl 
Date:   Mon Nov 24 14:09:54 2014 +0100

svl: just make SfxItemPool::GetMasterPool() always available

Change-Id: Id2e35c19bf2efb73e6a0939cccf37c92ca30c0aa

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index a52a0b2..0f1c4f3 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -185,9 +185,7 @@ public:
 voidSetStoringRange( sal_uInt16 nFrom, 
sal_uInt16 nTo );
 voidSetSecondaryPool( SfxItemPool *pPool );
 SfxItemPool*GetSecondaryPool() const;
-#ifdef DBG_UTIL
 SfxItemPool*GetMasterPool() const;
-#endif
 voidFreezeIdRanges();
 
 voidDelete();
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 5a56912..8550543 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -441,7 +441,7 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
 
 // Set Master of new Secondary Pools
 DBG_ASSERT( !pPool || pPool->pImp->mpMaster == pPool, "Secondary is 
present in two Pools" );
-SfxItemPool *pNewMaster = pImp->mpMaster ? pImp->mpMaster : this;
+SfxItemPool *pNewMaster = GetMasterPool() ? pImp->mpMaster : this;
 for ( SfxItemPool *p = pPool; p; p = p->pImp->mpSecondary )
 p->pImp->mpMaster = pNewMaster;
 
@@ -894,12 +894,10 @@ SfxItemPool* SfxItemPool::GetSecondaryPool() const
 return pImp->mpSecondary;
 }
 
-#ifdef DBG_UTIL
 SfxItemPool* SfxItemPool::GetMasterPool() const
 {
 return pImp->mpMaster;
 }
-#endif
 
 /**
  * This method should be called at the master pool, when all secondary
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 vcl/unx/generic/dtrans/X11_clipboard.cxx |   15 +++
 vcl/unx/generic/dtrans/X11_clipboard.hxx |6 +-
 vcl/unx/generic/dtrans/X11_service.cxx   |4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 94d2de0ba1f010be7acf0d00ce5b2ed4ed2b895b
Author: Stephan Bergmann 
Date:   Mon Nov 24 14:00:30 2014 +0100

rhbz#1167250: Avoid X11Clipboard already being destroyed in constructor

...via SelectionManager::run's aKeep acquring and releasing getReference()

Change-Id: I18696d30c41ca9ae101261668cbf54cb0a6c45fc

diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx 
b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 4e6b953..95d44a5 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #if OSL_DEBUG_LEVEL > 1
@@ -57,16 +58,22 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, 
Atom aSelection ) :
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "creating instance of X11Clipboard (this=%p)\n", this );
 #endif
+}
 
-if( m_aSelection != None )
+css::uno::Reference
+X11Clipboard::create( SelectionManager& rManager, Atom aSelection )
+{
+rtl::Reference cb(new X11Clipboard(rManager, aSelection));
+if( aSelection != None )
 {
-m_rSelectionManager.registerHandler( m_aSelection, *this );
+rManager.registerHandler( aSelection, *cb.get() );
 }
 else
 {
-m_rSelectionManager.registerHandler( XA_PRIMARY, *this );
-m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( 
OUString("CLIPBOARD") ), *this );
+rManager.registerHandler( XA_PRIMARY, *cb.get() );
+rManager.registerHandler( rManager.getAtom( OUString("CLIPBOARD") ), 
*cb.get() );
 }
+return cb.get();
 }
 
 X11Clipboard::~X11Clipboard()
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx 
b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 6269927..ba83636 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -46,6 +46,8 @@ namespace x11 {
 ::std::list< css::uno::Reference< 
css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
 Atomm_aSelection;
 
+X11Clipboard( SelectionManager& rManager, Atom aSelection );
+
 protected:
 
 friend class SelectionManager;
@@ -55,7 +57,9 @@ namespace x11 {
 
 public:
 
-X11Clipboard( SelectionManager& rManager, Atom aSelection );
+static css::uno::Reference
+create( SelectionManager& rManager, Atom aSelection );
+
 virtual ~X11Clipboard();
 
 static X11Clipboard* get( const OUString& rDisplayName, Atom 
aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx 
b/vcl/unx/generic/dtrans/X11_service.cxx
index 6d5a8fb..4ec02c1 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -77,10 +77,10 @@ css::uno::Reference< XInterface > 
X11SalInstance::CreateClipboard( const Sequenc
 if( it != m_aInstances.end() )
 return it->second;
 
-X11Clipboard* pClipboard = new X11Clipboard( rManager, nSelection );
+css::uno::Reference pClipboard = 
X11Clipboard::create( rManager, nSelection );
 m_aInstances[ nSelection ] = pClipboard;
 
-return static_cast(pClipboard);
+return pClipboard;
 }
 
 css::uno::Reference< XInterface > X11SalInstance::CreateDragSource()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - cui/uiconfig sd/source svx/sdi svx/source sw/source

2014-11-24 Thread Adolfo Jayme Barrientos

 cui/uiconfig/ui/distributionpage.ui  |   62 +--
 sd/source/ui/func/fuolbull.cxx   |5 ++
 sd/source/ui/view/drviews2.cxx   |5 ++
 svx/sdi/svx.sdi  |2 -
 svx/source/tbxctrls/bulletsnumbering.cxx |   26 +++--
 sw/source/uibase/shells/txtnum.cxx   |3 +
 6 files changed, 52 insertions(+), 51 deletions(-)

New commits:
commit 8bb5328562ef32c39ca408c8cb506bb5bb081864
Author: Adolfo Jayme Barrientos 
Date:   Sun Nov 23 16:54:47 2014 -0600

fdo#84904 Donât stretch icons horizontally

Seems you need this, see also 36f275cb0f19d11151abf85f3c191a2736bd73da

Change-Id: I06970401d73bf8f73170bb1fc6bf001eac9947cf
Reviewed-on: https://gerrit.libreoffice.org/13083
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 
(cherry picked from commit 92a0793265c66d289828c0193097b14b7e7e2d0f)

diff --git a/cui/uiconfig/ui/distributionpage.ui 
b/cui/uiconfig/ui/distributionpage.ui
index 455bcb1..9d29749 100644
--- a/cui/uiconfig/ui/distributionpage.ui
+++ b/cui/uiconfig/ui/distributionpage.ui
@@ -1,7 +1,7 @@
 
-
+
 
-  
+  
   
 True
 False
@@ -46,8 +46,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -64,8 +62,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -82,8 +78,6 @@
   
 2
 1
-1
-1
   
 
 
@@ -100,34 +94,32 @@
   
 4
 1
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_low.png
   
   
 1
 0
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_cen.png
   
   
 2
 0
-1
-1
   
 
 
@@ -144,34 +136,32 @@
   
 3
 1
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_cen.png
   
   
 3
 0
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_hig.png
   
   
 4
 0
-1
-1
   
 
 
@@ -195,8 +185,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -232,8 +220,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -250,8 +236,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -269,8 +253,6 @@
   
 2
 1
-1
-1
   
 
 
@@ -287,8 +269,6 @@
   
 3
 1
-1
-1
   
 
 
@@ -305,60 +285,58 @@

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

2014-11-24 Thread Andras Timar

 sw/qa/extras/rtfimport/data/fdo85889-mac.rtf   |3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pc.rtf|3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pca.rtf   |3 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   26 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 +++
 5 files changed, 47 insertions(+)

New commits:
commit 7839633fb356285652ed96f4bf3f85bcd5b561a4
Author: Andras Timar 
Date:   Mon Nov 24 11:33:17 2014 +0100

fdo#85889 handle pc, pca and mac rtf keywords in writerfilter

Change-Id: Ic54f2233a37562bdc516e440af0b4b7973f56342

diff --git a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
new file mode 100644
index 000..8056d47
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
@@ -0,0 +1,3 @@
+{\rtf1\mac \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
new file mode 100644
index 000..a3b9d27
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pc \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
new file mode 100644
index 000..34eeb18
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
@@ -0,0 +1,3 @@
+{\rtf1\pca \deff0{\fonttbl{\f0\fmodern Helvetica;}}
+\pard\f0\fs20 \'f1\'f2\'f3\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b89472a..7dc67c3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2181,6 +2181,32 @@ DECLARE_RTFIMPORT_TEST(testChtOutlineNumberingRtf, 
"chtoutline.rtf")
 
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedPrefix,SAL_N_ELEMENTS(aExpectedPrefix)), 
aPrefix);
 
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedSuffix,SAL_N_ELEMENTS(aExpectedSuffix)), 
aSuffix);
 }
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc2\xb1\xe2\x89\xa5\xe2\x89\xa4", 8, 
RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc2\xb1\xe2\x80\x97\xc2\xbe", 7, 
RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+DECLARE_RTFIMPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf")
+{
+uno::Reference xTextRange = getRun(getParagraph(1), 1);
+
+OUString aExpected("\xc3\x92\xc3\x9a\xc3\x9b", 6, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
+}
+
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a998351..fe4c870 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2913,6 +2913,18 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_ANSI:
 m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252;
 break;
+case RTF_MAC:
+m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
+case RTF_PC:
+m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
+case RTF_PCA:
+m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850;
+m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
+break;
 case RTF_PLAIN:
 {
 m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 10 commits - include/sal svl/source sw/source

2014-11-24 Thread Michael Stahl

 include/sal/log-areas.dox  |1 
 svl/source/config/cjkoptions.cxx   |   25 +---
 svl/source/config/ctloptions.cxx   |   34 +++-
 svl/source/items/itemiter.cxx  |8 ---
 svl/source/items/itemset.cxx   |   67 +
 svl/source/notify/lstner.cxx   |   17 ++--
 svl/source/undo/undo.cxx   |   60 ++---
 sw/source/core/access/acccell.cxx  |   19 -
 sw/source/core/access/accframebase.cxx |   24 +--
 sw/source/core/access/accpara.cxx  |   28 +
 sw/source/core/access/acctextframe.cxx |   12 ++---
 sw/source/core/inc/drawfont.hxx|1 
 12 files changed, 130 insertions(+), 166 deletions(-)

New commits:
commit 8dc475380a19bb707274491788abfe61d491f0e7
Author: Michael Stahl 
Date:   Mon Nov 24 13:22:16 2014 +0100

sw: remove last include of tools/debug.hxx

Change-Id: Ic8bcb8b6f5f4d46af33ddf4e493ffd21329dcc08

diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 948a620..033d490 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
 
 #include 
-#include 
 #include 
 
 class SwTxtFrm;
commit 1397e7dd3061c8995c9c042c59c4f2982bdf5e63
Author: Michael Stahl 
Date:   Mon Nov 24 13:20:35 2014 +0100

sw: convert DBG_ASSERTs in SwAccessibleParagraph

... and fix a copy-paste error and remove some pointlessly defensive
code.

Change-Id: I08e74a6bc843b307d1c8a7157c2a67f471c00522

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 2a0a67a..5978f87 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1154,9 +1154,7 @@ uno::Sequence< OUString > getAttributeNames()
 pStrings[i++] = UNO_NAME_CHAR_UNDERLINE;
 pStrings[i++] = UNO_NAME_CHAR_UNDERLINE_COLOR;
 pStrings[i++] = UNO_NAME_CHAR_WEIGHT;
-DBG_ASSERT( i == pSeq->getLength(), "Please adjust length" );
-if( i != pSeq->getLength() )
-pSeq->realloc( i );
+assert(i == pSeq->getLength());
 pNames = pSeq;
 }
 return *pNames;
@@ -1184,9 +1182,7 @@ uno::Sequence< OUString > getSupplementalAttributeNames()
 pStrings[i++] = UNO_NAME_PARA_LINE_SPACING;
 pStrings[i++] = UNO_NAME_PARA_RIGHT_MARGIN;
 pStrings[i++] = UNO_NAME_TABSTOPS;
-DBG_ASSERT( i == pSeq->getLength(), "Please adjust length" );
-if( i != pSeq->getLength() )
-pSeq->realloc( i );
+assert(i == pSeq->getLength());
 pNames = pSeq;
 }
 return *pNames;
@@ -3755,8 +3751,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
 }
 else
 {
-DBG_ASSERT( nHere == nStartIndex,
-"miscalculated index" );
+assert(nHere == nStartIndex);
 
 // selection starts in this node:
 // then check whether it's before or inside our 
part of
@@ -3770,10 +3765,11 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
 else if( nCoreStart <=
  
GetPortionData().GetLastValidCorePosition() )
 {
-DBG_ASSERT(
+SAL_WARN_IF(
 GetPortionData().IsValidCorePosition(
-  
nCoreStart ),
- "problem determining valid core position" 
);
+  nCoreStart),
+"sw.core",
+"problem determining valid core position");
 
 nLocalStart =
 GetPortionData().GetAccessiblePosition(
@@ -3792,8 +3788,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
 }
 else
 {
-DBG_ASSERT( nHere == nStartIndex,
-"miscalculated index" );
+assert(nHere == nEndIndex);
 
 // selection ends in this node: then select 
everything
 // before our part of the node
@@ -3809,10 +3804,11 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
  
GetPortionData().GetFirstValidCorePosition() )
 {
 // selection is inside our part of this para
-DBG_ASSERT(
+SAL_WARN_IF(

Crash test update

2014-11-24 Thread Crashtest VM

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

Re: Repair corrupted odt

2014-11-24 Thread Maxim Monastirsky

On Monday 24 November 2014 12:00:45 Piet van Oostrum wrote:
> Well, the zip man page says about the -F and -FF flags:
> 
>   Neither option will recover archives that have been
> incorrectly  transferred in  ascii  mode  instead of binary.
Right, it can't recover already damaged files from the ZIP, but it can extract 
other non damaged files to a new correct zip. And keep in mind that Olivier was 
successful in repairing the files with 7zip and with LO, and I doubt 7zip is 
doing something that zip is not able to do. (And BTW - who said that ASCII 
mode was indeed the cause of the corruption in this case?)

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

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

2014-11-24 Thread Andras Timar

 sw/qa/extras/rtfimport/data/fdo85889-mac.rtf   |3 --
 sw/qa/extras/rtfimport/data/fdo85889-pc.rtf|3 --
 sw/qa/extras/rtfimport/data/fdo85889-pca.rtf   |3 --
 sw/qa/extras/rtfimport/rtfimport.cxx   |   26 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 ---
 5 files changed, 47 deletions(-)

New commits:
commit 10d94280e7d23615f1bfe952fd0cf3be861f3618
Author: Andras Timar 
Date:   Mon Nov 24 13:27:13 2014 +0100

Revert "fdo#85889 handle pc, pca and mac rtf keywords in writerfilter"

This reverts commit 31ef2b6396e2ebec10f84f21dfdee645690f5e62.

diff --git a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
deleted file mode 100644
index 8056d47..000
--- a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf
+++ /dev/null
@@ -1,3 +0,0 @@
-{\rtf1\mac \deff0{\fonttbl{\f0\fmodern Helvetica;}}
-\pard\f0\fs20 \'f1\'f2\'f3\par
-}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
deleted file mode 100644
index a3b9d27..000
--- a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf
+++ /dev/null
@@ -1,3 +0,0 @@
-{\rtf1\pc \deff0{\fonttbl{\f0\fmodern Helvetica;}}
-\pard\f0\fs20 \'f1\'f2\'f3\par
-}
diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf 
b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
deleted file mode 100644
index 34eeb18..000
--- a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf
+++ /dev/null
@@ -1,3 +0,0 @@
-{\rtf1\pca \deff0{\fonttbl{\f0\fmodern Helvetica;}}
-\pard\f0\fs20 \'f1\'f2\'f3\par
-}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index e07e6aa..b89472a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2181,32 +2181,6 @@ DECLARE_RTFIMPORT_TEST(testChtOutlineNumberingRtf, 
"chtoutline.rtf")
 
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedPrefix,SAL_N_ELEMENTS(aExpectedPrefix)), 
aPrefix);
 
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedSuffix,SAL_N_ELEMENTS(aExpectedSuffix)), 
aSuffix);
 }
-
-DECLARE_RTFIMPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf")
-{
-uno::Reference xTextRange = getRun(getParagraph(1), 1);
-
-OUString aExpected("\xc2\xb1\xe2\x89\xa5\xe2\x89\xa4", 8, 
RTL_TEXTENCODING_UTF8);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
-}
-
-DECLARE_RTFIMPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf")
-{
-uno::Reference xTextRange = getRun(getParagraph(1), 1);
-
-OUString aExpected("\xc2\xb1\xe2\x80\xc2\xbe", 6, RTL_TEXTENCODING_UTF8);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
-}
-
-DECLARE_RTFIMPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf")
-{
-uno::Reference xTextRange = getRun(getParagraph(1), 1);
-
-OUString aExpected("\xc3\x92\xc3\x9a\xc3\x9b", 6, RTL_TEXTENCODING_UTF8);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
-}
-
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fe4c870..a998351 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2913,18 +2913,6 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_ANSI:
 m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252;
 break;
-case RTF_MAC:
-m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN;
-m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
-break;
-case RTF_PC:
-m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437;
-m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
-break;
-case RTF_PCA:
-m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850;
-m_aStates.top().nCurrentEncoding = m_nCurrentEncoding;
-break;
 case RTF_PLAIN:
 {
 m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 sw/source/core/inc/blink.hxx|4 
 sw/source/core/layout/fly.cxx   |   12 
 sw/source/core/layout/flycnt.cxx|   24 -
 sw/source/core/layout/flyincnt.cxx  |   10 
 sw/source/core/layout/flylay.cxx|   44 +-
 sw/source/core/layout/frmtool.cxx   |  186 +-
 sw/source/core/layout/ftnfrm.cxx|  218 ++--
 sw/source/core/layout/hffrm.cxx |   32 -
 sw/source/core/layout/layact.cxx|  144 +++
 sw/source/core/layout/laycache.cxx  |   70 +--
 sw/source/core/layout/layouter.cxx  |6 
 sw/source/core/layout/newfrm.cxx|   14 
 sw/source/core/layout/pagechg.cxx   |  148 
 sw/source/core/layout/pagedesc.cxx  |   24 -
 sw/source/core/layout/paintfrm.cxx  |   30 -
 sw/source/core/layout/sectfrm.cxx   |  172 -
 sw/source/core/layout/ssfrm.cxx |   24 -
 sw/source/core/layout/tabfrm.cxx|  218 ++--
 sw/source/core/layout/trvlfrm.cxx   |  120 +++---
 sw/source/core/layout/wsfrm.cxx |  212 +--
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |4 
 sw/source/core/ole/ndole.cxx|2 
 sw/source/core/para/paratr.cxx  |   14 
 sw/source/core/sw3io/swacorr.cxx|2 
 sw/source/core/swg/SwXMLTextBlocks.cxx  |   10 
 sw/source/core/table/swnewtable.cxx |6 
 sw/source/core/table/swtable.cxx|   60 +--
 sw/source/core/text/EnhancedPDFExportHelper.cxx |4 
 sw/source/core/text/SwGrammarMarkUp.cxx |4 
 sw/source/core/text/atrstck.cxx |  124 +++---
 sw/source/core/text/blink.cxx   |2 
 sw/source/core/text/frmcrsr.cxx |   32 -
 sw/source/core/text/frmform.cxx |   16 
 sw/source/core/text/guess.cxx   |2 
 sw/source/core/text/inftxt.cxx  |   28 -
 sw/source/core/text/inftxt.hxx  |2 
 sw/source/core/text/itradj.cxx  |   40 +-
 sw/source/core/text/itrcrsr.cxx |  132 +++
 sw/source/core/text/itrform2.cxx|   60 +--
 sw/source/core/text/itrform2.hxx|4 
 sw/source/core/text/itrpaint.cxx|   10 
 sw/source/core/text/itrpaint.hxx|4 
 sw/source/core/text/itrtxt.cxx  |4 
 sw/source/core/text/itrtxt.hxx  |4 
 sw/source/core/text/porfld.cxx  |   10 
 sw/source/core/text/porglue.cxx |6 
 sw/source/core/text/porlay.cxx  |   18 
 sw/source/core/text/porlin.cxx  |2 
 sw/source/core/text/pormulti.cxx|  120 +++---
 sw/source/core/text/pormulti.hxx|2 
 sw/source/core/text/porrst.cxx  |4 
 sw/source/core/text/portxt.cxx  |8 
 sw/source/core/text/txtcache.cxx|   23 -
 sw/source/core/text/txtcache.hxx|2 
 sw/source/core/text/txtdrop.cxx |6 
 sw/source/core/text/txtfld.cxx  |   32 -
 sw/source/core/text/txtfly.cxx  |   12 
 sw/source/core/text/txtfrm.cxx  |   48 +-
 sw/source/core/text/txtftn.cxx  |   50 +-
 sw/source/core/text/txthyph.cxx |4 
 sw/source/core/text/txttab.cxx  |6 
 sw/source/core/text/widorp.cxx  |2 
 sw/source/core/text/xmldump.cxx |8 
 sw/source/core/tox/ToxTabStopTokenHandler.cxx   |4 
 sw/source/core/tox/tox.cxx  |2 
 sw/source/core/tox/txmsrt.cxx   |   40 +-
 sw/source/core/txtnode/SwGrammarContact.cxx |6 
 sw/source/core/txtnode/atrfld.cxx   |   30 -
 68 files changed, 1364 insertions(+), 1363 deletions(-)

New commits:
commit 0df9e5e46b0df4a8cc9e7dc39b56b10f922a31e5
Author: Noel Grandin 
Date:   Fri Nov 21 14:36:31 2014 +0200

[Libreoffice-commits] core.git: 2 commits - editeng/source registry/tools sc/source sw/source

2014-11-24 Thread Tor Lillqvist

 editeng/source/editeng/editeng.cxx  |2 --
 registry/tools/regcompare.cxx   |2 --
 sc/source/core/data/conditio.cxx|1 -
 sc/source/core/data/formulacell.cxx |1 -
 sc/source/core/tool/interpr1.cxx|2 --
 sc/source/core/tool/parclass.cxx|2 --
 sc/source/filter/excel/xeview.cxx   |8 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   14 +++---
 sc/source/ui/docshell/impex.cxx |1 -
 sc/source/ui/view/editsh.cxx|1 -
 sc/source/ui/view/formatsh.cxx  |7 ---
 sc/source/ui/view/viewfun2.cxx  |1 -
 sw/source/filter/html/swhtml.cxx|8 
 13 files changed, 11 insertions(+), 39 deletions(-)

New commits:
commit d92e8b5ede388bd05a28e7f7a27d3758567481ed
Author: Tor Lillqvist 
Date:   Mon Nov 24 14:18:39 2014 +0200

Remove superfluous and inconsistent whitespace

Change-Id: I90fdf94aa01912e86015f7263b1dc81d20e53e8d

diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 7dfb4f9..d7c33a8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1025,7 +1025,7 @@ CreateTabPage 
ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
 {
 case RID_SCPAGE_OPREDLINE :
 return ScRedlineOptionsTabPage::Create;
-caseRID_SCPAGE_CALC :
+case RID_SCPAGE_CALC :
 return ScTpCalcOptions::Create;
 case RID_SCPAGE_FORMULA:
 return ScTpFormulaOptions::Create;
@@ -1033,9 +1033,9 @@ CreateTabPage 
ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
 return ScTpCompatOptions::Create;
 case RID_SCPAGE_DEFAULTS:
 return ScTpDefaultsOptions::Create;
-caseRID_SCPAGE_PRINT :
+case RID_SCPAGE_PRINT :
 return ScTpPrintOptions::Create;
-caseRID_SCPAGE_STAT :
+case RID_SCPAGE_STAT :
 return ScDocStatPage::Create;
 case RID_SCPAGE_USERLISTS :
  return ScTpUserLists::Create;
commit 766f7388dd3d33cfc9efcbec86bcf15a51be8c73
Author: Tor Lillqvist 
Date:   Mon Nov 24 14:12:36 2014 +0200

Bin commented-out unreachable 'break' statements

Change-Id: If0f47a78bbffec5c2ebd33c552d0d8a300b48eb1

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 4635136..1208536 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -984,14 +984,12 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, 
EditView* pEditView, v
 pEditView->Undo();
 return true;
 }
-// break;
 case KeyFuncType::REDO:
 {
 if ( !bReadOnly )
 pEditView->Redo();
 return true;
 }
-// break;
 
 default:// is then possible edited below.
 eFunc = KeyFuncType::DONTKNOW;
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 4dae9e6..191aa18 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -242,12 +242,10 @@ bool Options_Impl::initOptions_Impl (std::vector< 
std::string > & rArgs)
 return badOption("invalid", (*first).c_str());
 }
 return printUsage();
-// break; // Unreachable
 }
 default:
 {
 return badOption("unknown", (*first).c_str());
-// break; // Unreachable
 }
 }
 }
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 794fb56..4395096 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -122,7 +122,6 @@ static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* 
pFormula, sal_uInt16
 case ocTable:   // SHEET() returns own sheet index
 case ocCell:// CELL() may return own cell address
 return true;
-//break;
 default:
 {
 // added to avoid warnings
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index dfeda72..667be87 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2504,7 +2504,6 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& 
rOrgPos ) const
 }
 #endif
 return nEdges;
-//break;
 }
 default:
 return 0;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 327b5ed..552770e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3000,7 +3000,6 @@ void ScInterpreter::ScValue()
 return;
 case svDouble:
 return;

SIETE ALLA RICERCA DI NUONI CLIENTI ?

2014-11-24 Thread Verzeri


Il tuo client di posta elettronica non riesce a leggere questa email.
Per vedere la versione web, per favore vai qui:
http://www.mailem.it/display.php?M=10818838&C=e5cc5fd6a564cf700ce6f882eaa6ef16&S=2362&L=960&N=1070


Per non ricevere ulteriori
email:http://www.mailem.it/unsubscribe.php?M=10818838&C=e5cc5fd6a564cf700ce6f882eaa6ef16&L=960&N=2362
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-24 Thread Noel Grandin

 unotools/qa/complex/tempfile/Test01.java |3 +--
 unotools/qa/complex/tempfile/Test02.java |3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 211990642306d08a388682b4ac84a5776b3afbd7
Author: Noel Grandin 
Date:   Tue Nov 18 13:18:34 2014 +0200

java: unused local vars

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

diff --git a/unotools/qa/complex/tempfile/Test01.java 
b/unotools/qa/complex/tempfile/Test01.java
index 6f52100..ae4d80d 100644
--- a/unotools/qa/complex/tempfile/Test01.java
+++ b/unotools/qa/complex/tempfile/Test01.java
@@ -39,7 +39,6 @@ public class Test01 implements TempFileTest {
 
 public boolean test() {
 XTempFile xTempFile = null;
-XTruncate xTruncate = null;
 String sFileURL = null;
 String sFileName = null;
 //create a temporary file.
@@ -47,7 +46,7 @@ public class Test01 implements TempFileTest {
 Object oTempFile = m_xMSF.createInstance( 
"com.sun.star.io.TempFile" );
 xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile);
 m_aTestHelper.Message( "Tempfile created." );
-xTruncate = UnoRuntime.queryInterface(XTruncate.class, oTempFile);
+UnoRuntime.queryInterface(XTruncate.class, oTempFile);
 } catch( Exception e ) {
 m_aTestHelper.Error( "Cannot create TempFile. exception: " + e );
 return false;
diff --git a/unotools/qa/complex/tempfile/Test02.java 
b/unotools/qa/complex/tempfile/Test02.java
index 17d5577..b1c0f70 100644
--- a/unotools/qa/complex/tempfile/Test02.java
+++ b/unotools/qa/complex/tempfile/Test02.java
@@ -40,14 +40,13 @@ public class Test02 implements TempFileTest {
 public boolean test() {
 Object oTempFile = null;
 XTempFile xTempFile = null;
-XTruncate xTruncate = null;
 String sFileURL = null;
 //create a temporary file.
 try {
 oTempFile = m_xMSF.createInstance( "com.sun.star.io.TempFile" );
 xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile);
 m_aTestHelper.Message( "Tempfile created." );
-xTruncate = UnoRuntime.queryInterface(XTruncate.class, oTempFile);
+UnoRuntime.queryInterface(XTruncate.class, oTempFile);
 } catch(Exception e) {
 m_aTestHelper.Error( "Cannot create TempFile. exception: " + e );
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 wizards/com/sun/star/wizards/ui/ImageList.java|2 
 wizards/com/sun/star/wizards/ui/UnoDialog.java|2 
 wizards/com/sun/star/wizards/ui/UnoDialog2.java   |   34 ---
 wizards/com/sun/star/wizards/ui/WizardDialog.java |4 -
 wizards/com/sun/star/wizards/ui/event/CommonListener.java |   40 +++---
 wizards/com/sun/star/wizards/ui/event/EventNames.java |   32 +--
 6 files changed, 64 insertions(+), 50 deletions(-)

New commits:
commit 8b0aa5210a36c14bb9c3038870b83a6769dde601
Author: Noel Grandin 
Date:   Tue Nov 18 13:16:58 2014 +0200

convert EventNames to an enum

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

diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java 
b/wizards/com/sun/star/wizards/ui/ImageList.java
index 9b3bfd3..3a0ec88 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -337,7 +337,7 @@ public class ImageList implements XItemEventBroadcaster, 
ListDataListener
 XWindow win = UnoRuntime.queryInterface(XWindow.class, image);
 win.addMouseListener(uiEventListener);
 win.addKeyListener(imageKeyListener);
-uiEventListener.add(imageName, EventNames.EVENT_MOUSE_PRESSED, 
METHOD_MOUSE_PRESSED);
+uiEventListener.add(imageName, EventNames.MOUSE_PRESSED, 
METHOD_MOUSE_PRESSED);
 
 return image;
 }
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 115f727..5b4eefe 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -34,7 +34,7 @@ import com.sun.star.wizards.ui.event.*;
 
 import java.util.HashMap;
 
-public class UnoDialog implements EventNames
+public class UnoDialog
 {
 
 public XMultiServiceFactory xMSF;
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index 0268474..20a81c2 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -17,7 +17,20 @@
  */
 package com.sun.star.wizards.ui;
 
-import com.sun.star.awt.*;
+import com.sun.star.awt.XButton;
+import com.sun.star.awt.XCheckBox;
+import com.sun.star.awt.XComboBox;
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XCurrencyField;
+import com.sun.star.awt.XDateField;
+import com.sun.star.awt.XListBox;
+import com.sun.star.awt.XNumericField;
+import com.sun.star.awt.XPatternField;
+import com.sun.star.awt.XProgressBar;
+import com.sun.star.awt.XRadioButton;
+import com.sun.star.awt.XScrollBar;
+import com.sun.star.awt.XTextComponent;
+import com.sun.star.awt.XTimeField;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
@@ -25,6 +38,7 @@ import com.sun.star.wizards.common.Desktop;
 import com.sun.star.wizards.common.Helper;
 import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
+import com.sun.star.wizards.ui.event.EventNames;
 
 /**
  * This class contains convenience methods for inserting components to a 
dialog.
@@ -50,7 +64,7 @@ public class UnoDialog2 extends UnoDialog
 if (actionPerformed != null)
 {
 xButton.addActionListener(guiEventListener);
-guiEventListener.add(sName, EVENT_ACTION_PERFORMED, 
actionPerformed, eventTarget);
+guiEventListener.add(sName, EventNames.ACTION_PERFORMED, 
actionPerformed, eventTarget);
 }
 return xButton;
 }
@@ -85,7 +99,7 @@ public class UnoDialog2 extends UnoDialog
 if (itemChanged != null)
 {
 xCheckBox.addItemListener(guiEventListener);
-guiEventListener.add(sName, EVENT_ITEM_CHANGED, itemChanged, 
eventTarget);
+guiEventListener.add(sName, EventNames.ITEM_CHANGED, itemChanged, 
eventTarget);
 }
 return xCheckBox;
 }
@@ -101,18 +115,18 @@ public class UnoDialog2 extends UnoDialog
 if (actionPerformed != null)
 {
 xComboBox.addActionListener(guiEventListener);
-guiEventListener.add(sName, EVENT_ACTION_PERFORMED, 
actionPerformed, eventTarget);
+guiEventListener.add(sName, EventNames.ACTION_PERFORMED, 
actionPerformed, eventTarget);
 }
 if (itemChanged != null)
 {
 xComboBox.addItemListener(guiEventListener);
-guiEventListener.add(sName, EVENT_ITEM_CHANGED, itemChanged, 
eventTarget);
+guiEventListener.add(sName, EventNames.ITEM_CHANGED, itemChanged, 
eventTarget);
 }
 if (textChanged != null)
 {
 XTextComponent xTextComponent = 
UnoRuntime.queryInterface(XTextComponent.class, xComboBox);
 xTextComponent.addTe

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

2014-11-24 Thread Noel Grandin

 wizards/Jar_commonwizards.mk|1 
 wizards/com/sun/star/wizards/ui/UnoDialog.java  |2 
 wizards/com/sun/star/wizards/ui/UnoDialog2.java |   21 +-
 wizards/com/sun/star/wizards/ui/WizardDialog.java   |5 
 wizards/com/sun/star/wizards/ui/event/AbstractListener.java |  119 
 wizards/com/sun/star/wizards/ui/event/CommonListener.java   |   97 +
 6 files changed, 108 insertions(+), 137 deletions(-)

New commits:
commit 926744de7a9bb9375f41972f977bfa25fc837c15
Author: Noel Grandin 
Date:   Tue Nov 18 13:07:45 2014 +0200

merge AbstractListener into CommonListener

since CommonListener is the only subclass

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

diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index a13a114..f0945e3 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/db/TableDescriptor 
\
wizards/com/sun/star/wizards/db/SQLQueryComposer
\
wizards/com/sun/star/wizards/db/DatabaseObjectWizard
\
-   wizards/com/sun/star/wizards/ui/event/AbstractListener  
\
wizards/com/sun/star/wizards/ui/event/CommonListener
\
wizards/com/sun/star/wizards/ui/event/DataAware 
\
wizards/com/sun/star/wizards/ui/event/DataAwareFields   
\
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index d5a0d8e..115f727 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -55,7 +55,7 @@ public class UnoDialog implements EventNames
 public Resource m_oResource;
 public XWindowPeer xWindowPeer = null;
 private PeerConfig m_oPeerConfig;
-protected final AbstractListener guiEventListener = new CommonListener();
+protected final CommonListener guiEventListener = new CommonListener();
 
 public UnoDialog(XMultiServiceFactory xMSF)
 {
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index ab41e0e..0268474 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -25,7 +25,6 @@ import com.sun.star.wizards.common.Desktop;
 import com.sun.star.wizards.common.Helper;
 import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
-import com.sun.star.wizards.ui.event.*;
 
 /**
  * This class contains convenience methods for inserting components to a 
dialog.
@@ -33,7 +32,7 @@ import com.sun.star.wizards.ui.event.*;
  * description files to a Java class which builds the same dialog through the 
UNO API.
  * It uses an Event-Listener method, which calls a method through reflection
  * when an event on a component is triggered.
- * see the classes AbstractListener, CommonListener, MethodInvocation for 
details.
+ * see the classes CommonListener, MethodInvocation for details.
  */
 public class UnoDialog2 extends UnoDialog
 {
@@ -50,7 +49,7 @@ public class UnoDialog2 extends UnoDialog
 
 if (actionPerformed != null)
 {
-xButton.addActionListener((XActionListener) guiEventListener);
+xButton.addActionListener(guiEventListener);
 guiEventListener.add(sName, EVENT_ACTION_PERFORMED, 
actionPerformed, eventTarget);
 }
 return xButton;
@@ -85,7 +84,7 @@ public class UnoDialog2 extends UnoDialog
 
 if (itemChanged != null)
 {
-xCheckBox.addItemListener((XItemListener) guiEventListener);
+xCheckBox.addItemListener(guiEventListener);
 guiEventListener.add(sName, EVENT_ITEM_CHANGED, itemChanged, 
eventTarget);
 }
 return xCheckBox;
@@ -101,18 +100,18 @@ public class UnoDialog2 extends UnoDialog
 XComboBox xComboBox = (XComboBox) 
insertControlModel2("com.sun.star.awt.UnoControlComboBoxModel", sName, 
sPropNames, oPropValues, XComboBox.class);
 if (actionPerformed != null)
 {
-xComboBox.addActionListener((XActionListener) guiEventListener);
+xComboBox.addActionListener(guiEventListener);
 guiEventListener.add(sName, EVENT_ACTION_PERFORMED, 
actionPerformed, eventTarget);
 }
 if (itemChanged != null)
 {
-xComboBox.addItemListener((XItemListener) guiEventListener);
+xComboBox.addItemListener(guiEventListener);
 guiEventListener.add(sName, EVENT_ITEM_CHANGED, itemChanged, 
eventTarget);
 }

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

2014-11-24 Thread Noel Grandin

 wizards/com/sun/star/wizards/ui/UnoDialog.java  |4 ++--
 wizards/com/sun/star/wizards/ui/UnoDialog2.java |6 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 53135b2a6ea0222cc9bece9e96ff6c7b833d5490
Author: Noel Grandin 
Date:   Tue Nov 18 12:59:57 2014 +0200

the UnoDialog constructor parameters can be simplified

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

diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index ef66537..f23eda9 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -62,7 +62,7 @@ public class UnoDialog implements EventNames
 return guiEventListener;
 }
 
-public UnoDialog(XMultiServiceFactory xMSF, String[] PropertyNames, 
Object[] PropertyValues)
+public UnoDialog(XMultiServiceFactory xMSF)
 {
 try
 {
@@ -70,7 +70,7 @@ public class UnoDialog implements EventNames
 ControlList = new HashMap();
 xDialogModel = (XInterface) 
xMSF.createInstance("com.sun.star.awt.UnoControlDialogModel");
 XMultiPropertySet xMultiPSetDlg = 
UnoRuntime.queryInterface(XMultiPropertySet.class, xDialogModel);
-xMultiPSetDlg.setPropertyValues(PropertyNames, PropertyValues);
+xMultiPSetDlg.setPropertyValues(new String[0], new Object[0]);
 MSFDialogModel = 
UnoRuntime.queryInterface(XMultiServiceFactory.class, xDialogModel);
 xUnoDialog = (XInterface) 
xMSF.createInstance("com.sun.star.awt.UnoControlDialog");
 xControl = UnoRuntime.queryInterface(XControl.class, xUnoDialog);
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index 9a09ba0..ab41e0e 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -40,11 +40,7 @@ public class UnoDialog2 extends UnoDialog
 
 public UnoDialog2(XMultiServiceFactory xmsf)
 {
-super(xmsf, new String[]
-{
-}, new Object[]
-{
-});
+super(xmsf);
 }
 
 public XButton insertButton(String sName, String actionPerformed, Object 
eventTarget, String[] sPropNames, Object[] oPropValues)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 wizards/com/sun/star/wizards/ui/UnoDialog.java|5 -
 wizards/com/sun/star/wizards/ui/WizardDialog.java |8 
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit b7f67f24bbe9ced0dfefda674d96fa1d41cdf062
Author: Noel Grandin 
Date:   Tue Nov 18 13:01:29 2014 +0200

the getGuiEventListener method is unnecessary

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

diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index f23eda9..d5a0d8e 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -57,11 +57,6 @@ public class UnoDialog implements EventNames
 private PeerConfig m_oPeerConfig;
 protected final AbstractListener guiEventListener = new CommonListener();
 
-public AbstractListener getGuiEventListener()
-{
-return guiEventListener;
-}
-
 public UnoDialog(XMultiServiceFactory xMSF)
 {
 try
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java 
b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index abc1522..3b8d74f 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -243,10 +243,10 @@ public abstract class WizardDialog extends UnoDialog2 
implements VetoableChangeL
 xIndexContRoadmap = 
UnoRuntime.queryInterface(XIndexContainer.class, oRoadmap);
 
 MethodInvocation mi = new MethodInvocation("itemStateChanged", 
this, com.sun.star.awt.ItemEvent.class);
-getGuiEventListener().add("rdmNavi", 
EventNames.EVENT_ITEM_CHANGED, mi);
+guiEventListener.add("rdmNavi", EventNames.EVENT_ITEM_CHANGED, mi);
 xRoadmapControl = this.xDlgContainer.getControl("rdmNavi");
 xRoadmapBroadcaster = 
UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl);
-xRoadmapBroadcaster.addItemListener((XItemListener) 
getGuiEventListener());
+xRoadmapBroadcaster.addItemListener((XItemListener) 
guiEventListener);
 
 Helper.setUnoPropertyValue(oRoadmap, "Text", 
oWizardResource.getResText(UIConsts.RID_COMMON + 16));
 }
@@ -483,9 +483,9 @@ public abstract class WizardDialog extends UnoDialog2 
implements VetoableChangeL
 // if the user used "escape" key to
 // close the dialog.
 MethodInvocation windowHidden = new 
MethodInvocation("windowHidden", this);
-xWindow.addWindowListener((CommonListener) getGuiEventListener());
+xWindow.addWindowListener((CommonListener) guiEventListener);
 String dialogName = (String) 
Helper.getUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_NAME);
-getGuiEventListener().add(dialogName, EVENT_ACTION_PERFORMED, 
windowHidden);
+guiEventListener.add(dialogName, EVENT_ACTION_PERFORMED, 
windowHidden);
 
 }
 catch (java.lang.Exception jexception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 wizards/com/sun/star/wizards/ui/UnoDialog.java  |2 +-
 wizards/com/sun/star/wizards/ui/UnoDialog2.java |   10 --
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit f136502dd357c2faa5fde494f89ca833c733c9a4
Author: Noel Grandin 
Date:   Tue Nov 18 12:58:10 2014 +0200

createListener() is never overriden

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

diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 6ba5822..ef66537 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -55,7 +55,7 @@ public class UnoDialog implements EventNames
 public Resource m_oResource;
 public XWindowPeer xWindowPeer = null;
 private PeerConfig m_oPeerConfig;
-protected AbstractListener guiEventListener;
+protected final AbstractListener guiEventListener = new CommonListener();
 
 public AbstractListener getGuiEventListener()
 {
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java 
b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index eaf929f..9a09ba0 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -38,15 +38,6 @@ import com.sun.star.wizards.ui.event.*;
 public class UnoDialog2 extends UnoDialog
 {
 
-/**
- * Override this method to return another listener.
- * @return
- */
-protected AbstractListener createListener()
-{
-return new CommonListener();
-}
-
 public UnoDialog2(XMultiServiceFactory xmsf)
 {
 super(xmsf, new String[]
@@ -54,7 +45,6 @@ public class UnoDialog2 extends UnoDialog
 }, new Object[]
 {
 });
-guiEventListener = createListener();
 }
 
 public XButton insertButton(String sName, String actionPerformed, Object 
eventTarget, String[] sPropNames, Object[] oPropValues)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - embeddedobj/test filter/source framework/source sal/qa setup_native/scripts solenv/bin sw/qa sw/source vcl/source writerfilter/source

2014-11-24 Thread Andras Timar

 embeddedobj/test/Container1/EmbedContApp.java  |2 -
 filter/source/msfilter/msdffimp.cxx|2 -
 framework/source/inc/loadenv/loadenv.hxx   |4 +--
 sal/qa/rtl/process/rtl_Process.cxx |2 -
 setup_native/scripts/admin.pl  |2 -
 solenv/bin/modules/installer/ziplist.pm|2 -
 sw/qa/extras/rtfimport/data/fdo85889-mac.rtf   |3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pc.rtf|3 ++
 sw/qa/extras/rtfimport/data/fdo85889-pca.rtf   |3 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   26 +
 sw/source/uibase/app/docstyle.cxx  |2 -
 vcl/source/fontsubset/ttcr.cxx |2 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 +++
 13 files changed, 56 insertions(+), 9 deletions(-)

New commits:
commit 4730af6a2435dfe35f598f12a4b3884bba40c006
Author: Andras Timar 
Date:   Mon Nov 24 12:48:08 2014 +0100

typo: unknown

Change-Id: If89443c1668ca01c826c8fc353b20097c7da7bf4

diff --git a/embeddedobj/test/Container1/EmbedContApp.java 
b/embeddedobj/test/Container1/EmbedContApp.java
index b2a7d04..157296d 100644
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
@@ -755,7 +755,7 @@ public class EmbedContApp extends Applet
 }
 else
 {
-System.out.println( "Unknoun action is requested: " + 
aAction.m_nID + "\n" );
+System.out.println( "Unknown action is requested: " + 
aAction.m_nID + "\n" );
 }
 }
 }
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 679c40a..0defb0a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2221,7 +2221,7 @@ void 
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
 case 0x0:
 {
 //It is msopathEscapeExtension which is 
transformed into LINETO.
-//If issue happens, I think this part can 
be comment so that it will be taken as unknow command.
+//If issue happens, I think this part can 
be comment so that it will be taken as unknown command.
 //When export, origin data will be export 
without any change.
 nCommand = 
EnhancedCustomShapeSegmentCommand::LINETO;
 if ( !nCnt )
diff --git a/framework/source/inc/loadenv/loadenv.hxx 
b/framework/source/inc/loadenv/loadenv.hxx
index 3bf66fff..a65134c 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -256,14 +256,14 @@ public:
 
 @param  eContentType
 classify the given content.
-This value is set to a default value "UNKNWON_CONTENT", which 
force
+This value is set to a default value "UNKNOWN_CONTENT", which 
force
 an internal check, if this content is loadable or not.
 But may this check was already made by the caller of this 
method and
 passing this information to this LoadEnv instance can suppress 
this
 might expensive check.
 That can be useful in case this information is needed outside 
too,
 to decide if its necessary to create some resources for this 
load
-request ... or to reject the request imidiatly if it seems to 
be not
+request ... or to reject the request immediately if it seems 
to be not
 loadable in general.
 
 @throw  A LoadEnvException e.g. if another load operation is till in 
progress
diff --git a/sal/qa/rtl/process/rtl_Process.cxx 
b/sal/qa/rtl/process/rtl_Process.cxx
index 0bd9c70..6640eed 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -132,7 +132,7 @@ public:
 // );
 oslProcessInfo* pInfo = new oslProcessInfo;
 //please pay attention to initial the Size to sizeof(oslProcessInfo), or 
else
-//you will get unknow error when call osl_getProcessInfo
+//you will get unknown error when call osl_getProcessInfo
 pInfo->Size = sizeof(oslProcessInfo);
 osl_error = osl_getProcessInfo( hProcess, osl_Process_EXITCODE, pInfo );
 CPPUNIT_ASSERT_MESSAGE
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 2003f6b..351c28f 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -87,7 +87,7 @@ sub getparameter
 else
 {
 print "\n**\n";
-print "Error: Unknows parameter: $param";
+print "Error: Unknown parameter: $param";
 print "\n

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

2014-11-24 Thread Tor Lillqvist

 sc/source/ui/optdlg/calcoptionsdlg.cxx |   56 +++--
 1 file changed, 40 insertions(+), 16 deletions(-)

New commits:
commit 634a69019189389cc8a7154c846454807fce96a3
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:14:54 2014 +0200

Reduce the amount of data by an order of magnitude

Change-Id: I4a1deb2c1a0cfe67faef6a0d2e3d355b475eb9f0

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index c800726..0b0d160 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1038,7 +1038,7 @@ struct Op : Area
const OUString& rOp,
double nRangeLo, double nRangeHi,
double nEpsilon) :
-Area(rTitle, 1000),
+Area(rTitle, 200),
 msOp(rOp),
 mnRangeLo(nRangeLo),
 mnRangeHi(nRangeHi),
@@ -1355,31 +1355,31 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
 return (nArg == 0);
 }));
 
-pTestDocument->addTest(Reduction("Sum", "SUM", 500, 0, -1000, 1000, 3e-10,
+pTestDocument->addTest(Reduction("Sum", "SUM", 100, 0, -1000, 1000, 3e-10,
  [] (double nAccum, double nArg)
  {
  return (nAccum + nArg);
  }));
 
-pTestDocument->addTest(Reduction("Average", "AVERAGE", 500, 0, -1000, 
1000, 3e-10,
+pTestDocument->addTest(Reduction("Average", "AVERAGE", 100, 0, -1000, 
1000, 3e-10,
  [] (double nAccum, double nArg)
  {
- return (nAccum + nArg / 
static_cast(500));
+ return (nAccum + nArg/100.);
  }));
 
-pTestDocument->addTest(Reduction("Product", "PRODUCT", 500, 1, 0.1, 2.5, 
3e-10,
+pTestDocument->addTest(Reduction("Product", "PRODUCT", 100, 1, 0.1, 2.5, 
3e-10,
  [] (double nAccum, double nArg)
  {
  return (nAccum * nArg);
  }));
 
-pTestDocument->addTest(Reduction("Min", "MIN", 500, DBL_MAX, -1000, 1000, 
0,
+pTestDocument->addTest(Reduction("Min", "MIN", 100, DBL_MAX, -1000, 1000, 
0,
  [] (double nAccum, double nArg)
  {
  return std::min(nAccum, nArg);
  }));
 
-pTestDocument->addTest(Reduction("Max", "MAX", 500, -DBL_MAX, -1000, 1000, 
0,
+pTestDocument->addTest(Reduction("Max", "MAX", 100, -DBL_MAX, -1000, 1000, 
0,
  [] (double nAccum, double nArg)
  {
  return std::max(nAccum, nArg);
commit c6f1f948178ab29ea190117376cb9365d8f4fd7b
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:08:01 2014 +0200

Add AVERAGE test

Change-Id: I144858631f229685284622eb9975a168e61ff6c5

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index ebaf2ed..c800726 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1361,6 +1361,12 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
  return (nAccum + nArg);
  }));
 
+pTestDocument->addTest(Reduction("Average", "AVERAGE", 500, 0, -1000, 
1000, 3e-10,
+ [] (double nAccum, double nArg)
+ {
+ return (nAccum + nArg / 
static_cast(500));
+ }));
+
 pTestDocument->addTest(Reduction("Product", "PRODUCT", 500, 1, 0.1, 2.5, 
3e-10,
  [] (double nAccum, double nArg)
  {
commit 62a06cd0a9ab053d6560f7395a4b0f339c2fbe58
Author: Tor Lillqvist 
Date:   Mon Nov 24 13:03:52 2014 +0200

Add MIN and MAX tests

Change-Id: Ia8d5fdeb1e03009035136edeab991442b7d91c4b

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 1d7c6f1..ebaf2ed 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1367,6 +1367,18 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, 
PushButton*, )
  return (nAccum * nArg);
  }));
 
+pTestDocument->addTest(Reduction("Min", "MIN", 500, DBL_MAX, -1000, 1000, 
0,
+ [] (double nAccum, double nArg)
+ {
+

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

2014-11-24 Thread Jan Holesovsky

Tag 'libreoffice-4-4-branch-point' created by Christian Lohmaier 
 at 2014-11-24 11:26 -0800

Tag libreoffice-4-4-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUcxXSAAoJEPQ0oe+v7q6jvRMQAISJO7IvwQe41HsqwtBY9coE
rTl8bcZQYiFkTC++8420afBhyh41iJaW3GYvVjHo/Xyw4EZng9hKKecGnsS6g8Dj
oHBvYUfEK9xRT2sEqy/+wvc7BJEaPaQb9kMOJ3Gpv8wUZ+h/p2BZEaB7LwLEa09Z
H4ZnWKkt9KINdX1DrTfa9ceRKTHZQ6L6EQBiUwikluGAOiz4/rkJnQMpkg7aRNyU
b7GlgpiuZzlRbNBRGE2yicQUFoHtmMbDSWHEjWJPHXhB7AmkyeYbVlcUx5/0fzEG
RKJANFzXouu6JP99HHHhEvhEfmHlAs67xMPbzZktKLMRB1UYMLKS4ttQK0XzYbbX
GxwsHKrsOWSROLVspX1Op1/ZFwzR0MLJdyt0yBo0PnfFfnOBZZHQ55e3wDTxodsR
lnISfVeoKHLNLbVD1TMwtSDDSTkYjP+AJgJK6/c1/jPNydFGZTVMdYMn51Dj1K7o
rfMQuY3YHlvOIlfa3wx9SgbMQLJFpFVN7qcgMnscBSRR3nKlb5YclpKVF2m/LqZT
wIbBg9hTi/G/C5UOTTRd3fPKGGySoO2kT6PRexY5bsQpW08m0GJptXL0NGo+MWiy
FUwFMTGQHX9IpnoonCOT8aLrzmpsNVBTi/MvnrukwBh9UONQO+cOhB9gadimaUcJ
2HNfm6rU6K/KymhdcU+R
=IUaq
-END PGP SIGNATURE-

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

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

2014-11-24 Thread Christian Lohmaier

Tag 'libreoffice-4-4-branch-point' created by Christian Lohmaier 
 at 2014-11-24 11:26 -0800

Tag libreoffice-4-4-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUcxXPAAoJEPQ0oe+v7q6j8ucQAI05SV5+c6qkAYWqX6vZQr8V
VLNbFnqTh7Zu8fhIQONXhibDyLLtLgESwbeWM4kAZhVj8UJbaoA0ENLxQ+Y7kS6V
OUCJDnyuTA7T+7h/QYyRYtUlrUH6Fqmi9i4sP//Oq2wdh61aAoR7d/YJxei5d+Zi
hMFH0gQbbNwUPyJeZLmtYp1wJcQ4QcSD3T/ANdeoHkUYrz547HgzHnxmFUBUdJx1
Uj8XguByG3gi/mXkL8KZpTUxUwTUQYlEBmxAPFvD8tVCTg+Zpq+xFo1F8+t2+vlx
ycjTSnxXbrlQB7XZ890CPHFKRthrht887YhggH9bo15WlL6AZ1JfmzG5YV3Ld1By
eOK0e2qt3T/C6pHnflcSf3BFszl7/ij9DLB3/Q62HLPsNxRUQYTRLvUu38gi6aSx
HbrnAbtcRBqGoL2QsNq8RlC2WEqVjFM7QCdxvzn88PynSnUhBCTQhczIlCAPCJE8
UWo4J2JWxaN8HG3AI7l3ZSNqXQmJaFwr1buP8Dgmzh6ANYORB9o9lzWfXeWh/rbC
NAt3x4AZvna660Wgd+SBWogalnjlGujE1W4HydMJOch8Z7DR0Xa+TOopvMQ8HDxN
WEmSTkPucgJw/FiwUnS8PcKXVBFgTSuwuYOqkI2Oq0p+5JHLbDflSdVSu0nA5YKY
f8XgG6tEHD9XqU1+enKu
=lBlt
-END PGP SIGNATURE-

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

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

2014-11-24 Thread Christian Lohmaier

Tag 'libreoffice-4-4-branch-point' created by Christian Lohmaier 
 at 2014-11-24 11:26 -0800

Tag libreoffice-4-4-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUcxXMAAoJEPQ0oe+v7q6jvxIQAK+l6kZ+wQsGZRYSLCur+zDX
4EI0ytvx2m6cdQi5+LszdB2Zjsh5S/W7Sgjcj/glm1ppnND/WKtvh4qnTZRzPiNT
pWIcy3W719WUhu//8oEGoIYTolVnCL/aAUGVq0srnF9ic7Q6hdNaTHqq0jrX5AP3
U4oIvBnTjvqrdHq7OrIP3IYahAHiYrP19DnAt43aeIpP/rGprZPEFq5pBzOt1tzW
bgaYLB+HeKG6A50rcTnCqhnMXlpnFGU7+D/ggXIQ/JG0sW9RdgeIkKQbbVoZy9iH
cui9fKKIIntgC5cDu3LOK4zAJT+bvvDqWrgpk5dM0eWI61S1TGEJeLma3i2+SlaF
hEnvTKwMq2d6wY8k14Jv78U65xt5AGy+hlLyV8sysbJEUBSEF8yLX0vVnQtDXbVe
NGAugJnnNfsT+8oMR5jMsJmb42wLc7KyBmcOqg7P2Ih4K0HY5R2eaHYV98KGNYkb
NMg+6ek/7L9wRVQmIdiKTgJkQD3nzUWZPr4Vz3Lymn14tTaOWu9huGcVXYc/oirI
ce4ytvVpxHs24kH2DcV4WudduomNS8jFncRTd8EpeswROXCZ6TxU001KYsVt01IU
l/4WeFm2ur07hlGPZCUaRY4oOVUwcVGUiBPvUY19ZVuBs4+FLjgOOIwoSSV/YPtr
ZLOnvmQlYE1iJaJQH6Z1
=c1SA
-END PGP SIGNATURE-

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

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

2014-11-24 Thread Christian Lohmaier

Tag 'libreoffice-4-4-branch-point' created by Christian Lohmaier 
 at 2014-11-24 11:26 -0800

Tag libreoffice-4-4-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUcxXJAAoJEPQ0oe+v7q6jRNgP/1kyMmGAqZIVFUTMhkhOi4yG
XT+M+o/skohz0XWupoh8zeMj2A9oDRkt7RrVqoVx8VY4PPffePtnfnRW5iUTlYyj
jnmQydOINhdVPeUyn1Af5GRRGNDBaAh7Sp33MXaV6CjxCb7QbLV7Alru17mgKcyM
FoshMVZD+DurIJPKxd1w658H8R3IZd7pzfIDUAt0a39YKDNjKNcdi1P9Nu/RF8EL
08DGrbdYtevtpXkPIVn0QJ9Gbo/4wouyz+MxZ0Go7x6aF5t83tP/N2PnUaoEH4pV
nrK9OJw73iIF++eqjCl3VeHHf4rY0SqkUVS9/m5RYSBFDIzevWNhRAx+vwV4Y8OZ
RT2iVsKCTRJGkM/eh6NFRsz4cU1cwjWeFAMMHtIZFoNQaD9cpPQBcSy5c9JmqQqd
8QCEvqj1WJ/dIyOvMatQcmK+DQtFvjjFmLn25bGt9dDTqYvIjPBg1on1DL8tgffr
NiYFq4mLZShPrej7Zjz3Q8LyanE1F2hr+E9SxCfB80M+yKEPwc5Eh24nw6zu8b6Y
4MuPuqNWsNzt7Tgk4O6aiyLJwrs/b3vM8oKW8gTo4ETjBizemQo783iKqojPltLy
fNQmsxPUTRRpOYOw60LsaNo7SO962IfaivbnYqnDH3PWFwDkq7aHQ11web2S903M
Eo50VIr2i3h1H108jZYW
=xuqG
-END PGP SIGNATURE-

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

Re: Repair corrupted odt

2014-11-24 Thread Piet van Oostrum

Maxim Monastirsky wrote:

 > The zip utility (of Info-ZIP) has the -F and -FF flags that should be able 
 > to 
 > recover your files. 

Well, the zip man page says about the -F and -FF flags:

  Neither option will recover archives that have been incorrectly  
transferred
  in  ascii  mode  instead of binary. 

-- 
Piet van Oostrum 
WWW: http://pietvanoostrum.com/
PGP key: [8DAE142BE17999C4]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-24 Thread Adolfo Jayme Barrientos

 cui/uiconfig/ui/distributionpage.ui |   62 ++--
 1 file changed, 18 insertions(+), 44 deletions(-)

New commits:
commit 92a0793265c66d289828c0193097b14b7e7e2d0f
Author: Adolfo Jayme Barrientos 
Date:   Sun Nov 23 16:54:47 2014 -0600

fdo#84904 Donât stretch icons horizontally

Seems you need this, see also 36f275cb0f19d11151abf85f3c191a2736bd73da

Change-Id: I06970401d73bf8f73170bb1fc6bf001eac9947cf
Reviewed-on: https://gerrit.libreoffice.org/13083
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/cui/uiconfig/ui/distributionpage.ui 
b/cui/uiconfig/ui/distributionpage.ui
index 455bcb1..9d29749 100644
--- a/cui/uiconfig/ui/distributionpage.ui
+++ b/cui/uiconfig/ui/distributionpage.ui
@@ -1,7 +1,7 @@
 
-
+
 
-  
+  
   
 True
 False
@@ -46,8 +46,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -64,8 +62,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -82,8 +78,6 @@
   
 2
 1
-1
-1
   
 
 
@@ -100,34 +94,32 @@
   
 4
 1
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_low.png
   
   
 1
 0
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_cen.png
   
   
 2
 0
-1
-1
   
 
 
@@ -144,34 +136,32 @@
   
 3
 1
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_cen.png
   
   
 3
 0
-1
-1
   
 
 
   
 True
 False
+center
+center
 svx/res/dsth_hig.png
   
   
 4
 0
-1
-1
   
 
 
@@ -195,8 +185,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -232,8 +220,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -250,8 +236,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -269,8 +253,6 @@
   
 2
 1
-1
-1
   
 
 
@@ -287,8 +269,6 @@
   
 3
 1
-1
-1
   
 
 
@@ -305,60 +285,58 @@
   
 4
 1
-1
-1
   
 
 
   
 True
 False
+center
+center

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - download.lst external/libodfgen

2014-11-24 Thread David Tardon

 download.lst|4 -
 external/libodfgen/ExternalPackage_libodfgen.mk |2 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 -
 external/libodfgen/ubsan.patch  |   60 
 4 files changed, 3 insertions(+), 67 deletions(-)

New commits:
commit 762a6171cd34ec6a16fff07cf9af0d323741253f
Author: David Tardon 
Date:   Mon Nov 24 11:41:04 2014 +0100

upload libodfgen 0.1.2

Change-Id: I9a4719e60f910256c529551fdbb387e98aefd6ce
(cherry picked from commit 4578ed5b0ae63850704027861b3d475d818ead33)

diff --git a/download.lst b/download.lst
index aa700aa..09d8a5f 100644
--- a/download.lst
+++ b/download.lst
@@ -108,8 +108,8 @@ export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
-export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
-export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
+export ODFGEN_MD5SUM := b261066a880ba4ad2d79c9291c8037af
+export ODFGEN_TARBALL := libodfgen-0.1.2.tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk 
b/external/libodfgen/ExternalPackage_libodfgen.mk
index 74423b4..0c05876 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.1))
+$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 66707dd..bb2153f 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
-external/libodfgen/ubsan.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ubsan.patch b/external/libodfgen/ubsan.patch
deleted file mode 100644
index 0b807dd..000
--- a/external/libodfgen/ubsan.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-See 
:
 src/GraphicFunctions.cxx
-+++ src/GraphicFunctions.cxx
-@@ -448,42 +448,42 @@
-   // 2540 is 2.54*1000, 2.54 in = 1 inch
-   if (path[i]["svg:x"] && action[0] == 'H')
-   {
--  sElement.sprintf("H%i", 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540));
-+  sElement.sprintf("H%i", 
(int)((getInchValue(path[i]["svg:x"])-px)*2540));
-   sValue.append(sElement);
-   }
-   else if (path[i]["svg:y"] && action[0] == 'V')
-   {
--  sElement.sprintf("V%i", 
(unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+  sElement.sprintf("V%i", 
(int)((getInchValue(path[i]["svg:y"])-py)*2540));
-   sValue.append(sElement);
-   }
-   else if (coordOk && (action[0] == 'M' || action[0] == 'L' || 
action[0] == 'T'))
-   {
--  sElement.sprintf("%c%i %i", action[0], 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
--   
(unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+  sElement.sprintf("%c%i %i", action[0], 
(int)((getInchValue(path[i]["svg:x"])-px)*2540),
-+   
(int)((getInchValue(path[i]["svg:y"])-py)*2540));
-   sValue.append(sElement);
-   }
-   else if (coord1Ok && (action[0] == 'Q' || action[0] == 'S'))
-   {
--  sElement.sprintf("%c%i %i %i %i", action[0], 
(unsigned)((getInchValue(path[i]["svg:x1"])-px)*2540),
--   
(unsigned)((getInchValue(path[i]["svg:y1"])-py)*2540), 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
--

[Libreoffice-commits] core.git: download.lst external/libodfgen

2014-11-24 Thread David Tardon

 download.lst|4 -
 external/libodfgen/ExternalPackage_libodfgen.mk |2 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 -
 external/libodfgen/ubsan.patch  |   60 
 4 files changed, 3 insertions(+), 67 deletions(-)

New commits:
commit 4578ed5b0ae63850704027861b3d475d818ead33
Author: David Tardon 
Date:   Mon Nov 24 11:41:04 2014 +0100

upload libodfgen 0.1.2

Change-Id: I9a4719e60f910256c529551fdbb387e98aefd6ce

diff --git a/download.lst b/download.lst
index aa700aa..09d8a5f 100644
--- a/download.lst
+++ b/download.lst
@@ -108,8 +108,8 @@ export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
-export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
-export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
+export ODFGEN_MD5SUM := b261066a880ba4ad2d79c9291c8037af
+export ODFGEN_TARBALL := libodfgen-0.1.2.tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk 
b/external/libodfgen/ExternalPackage_libodfgen.mk
index 74423b4..0c05876 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.1))
+$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 66707dd..bb2153f 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
-external/libodfgen/ubsan.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ubsan.patch b/external/libodfgen/ubsan.patch
deleted file mode 100644
index 0b807dd..000
--- a/external/libodfgen/ubsan.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-See 
:
 src/GraphicFunctions.cxx
-+++ src/GraphicFunctions.cxx
-@@ -448,42 +448,42 @@
-   // 2540 is 2.54*1000, 2.54 in = 1 inch
-   if (path[i]["svg:x"] && action[0] == 'H')
-   {
--  sElement.sprintf("H%i", 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540));
-+  sElement.sprintf("H%i", 
(int)((getInchValue(path[i]["svg:x"])-px)*2540));
-   sValue.append(sElement);
-   }
-   else if (path[i]["svg:y"] && action[0] == 'V')
-   {
--  sElement.sprintf("V%i", 
(unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+  sElement.sprintf("V%i", 
(int)((getInchValue(path[i]["svg:y"])-py)*2540));
-   sValue.append(sElement);
-   }
-   else if (coordOk && (action[0] == 'M' || action[0] == 'L' || 
action[0] == 'T'))
-   {
--  sElement.sprintf("%c%i %i", action[0], 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
--   
(unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+  sElement.sprintf("%c%i %i", action[0], 
(int)((getInchValue(path[i]["svg:x"])-px)*2540),
-+   
(int)((getInchValue(path[i]["svg:y"])-py)*2540));
-   sValue.append(sElement);
-   }
-   else if (coord1Ok && (action[0] == 'Q' || action[0] == 'S'))
-   {
--  sElement.sprintf("%c%i %i %i %i", action[0], 
(unsigned)((getInchValue(path[i]["svg:x1"])-px)*2540),
--   
(unsigned)((getInchValue(path[i]["svg:y1"])-py)*2540), 
(unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
--   
(unsigned)((getInchValue(path[i]["svg:y"])-py)*2540))

[Libreoffice-commits] core.git: Branch 'feature/priorities' - 2 commits - sc/source svx/source

2014-11-24 Thread Tobias Madl

 sc/source/ui/dbgui/dbnamdlg.cxx |   12 
 sc/source/ui/inc/dbnamdlg.hxx   |1 -
 svx/source/svdraw/svdpntv.cxx   |2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 25d020a3aa2c0e99898fec93cf3931ec09c13ce0
Author: Tobias Madl 
Date:   Mon Nov 24 10:34:56 2014 +

adapted priority to repaint

Change-Id: I6a780e93bcd0621d75222e182eb100694e02448d

diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 07794bc..4580d6c 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -190,7 +190,7 @@ void SdrPaintView::ImpClearVars()
 pDefaultStyleSheet=NULL;
 bSomeObjChgdFlag=false;
 nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
-aComeBackIdle.SetPriority(VCL_IDLE_PRIORITY_HIGH);
+aComeBackIdle.SetPriority(VCL_IDLE_PRIORITY_REPAINT);
 aComeBackIdle.SetIdleHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
 
 if (pMod)
commit 389feb66caa26711604f51c0699f2383468caded
Author: Tobias Madl 
Date:   Sun Nov 23 10:48:12 2014 +

timers: callback useless, remove timer completely.

Change-Id: I904a91b38d846841e24149f897962abb429878be

diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index c46be30..b6910bb 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -154,10 +154,6 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* 
pCW, vcl::Window* pPar
 pSaveObj = new DBSaveData( *m_pEdAssign, *m_pBtnHeader,
 *m_pBtnDoSize, *m_pBtnKeepFmt, *m_pBtnStripData, 
theCurArea );
 Init();
-
-SynFocusTimer.SetTimeout(150);
-SynFocusTimer.SetTimeoutHdl(LINK( this, ScDbNameDlg, FocusToComoboxHdl));
-SynFocusTimer.Start();
 }
 
 ScDbNameDlg::~ScDbNameDlg()
@@ -635,12 +631,4 @@ IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl)
 return 0;
 }
 
-IMPL_LINK( ScDbNameDlg, FocusToComoboxHdl, Timer*, pTi)
-{
-(void)pTi;
-// CallEventListeners is still protected - figure out if we need to make 
it public, or if the focus stuff can be handled better in VCL directly. First 
see what AT is expecting...
-// aEdName.CallEventListeners( VCLEVENT_CONTROL_GETFOCUS );
-return 0;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index ae2fdda..6b6d683 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -82,7 +82,6 @@ private:
 ScDBCollection  aLocalDbCol;
 ScRange theCurArea;
 std::vector aRemoveList;
-Timer   SynFocusTimer;
 DECL_LINK( FocusToComoboxHdl, Timer* );
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 editeng/source/editeng/editobj.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4c78ff11a26ca3109ceca1de99ce264973b5b762
Author: Stephan Bergmann 
Date:   Mon Nov 24 10:55:33 2014 +0100

Newly missing #include

Change-Id: Ic6599303fd654d82fd4edbcc933e08408aa798a8

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 89bc9fe..11e1b22 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -48,6 +48,8 @@
 #include 
 #include 
 
+#include 
+
 #if DEBUG_EDIT_ENGINE
 #include 
 using std::cout;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 include/editeng/editobj.hxx |4 +---
 svx/Library_svxcore.mk  |1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e548613a5bf49de2fce6cd9935cbbdf72a96dd2e
Author: Stephan Bergmann 
Date:   Mon Nov 24 10:51:44 2014 +0100

Do not depend on libxml include in widely included file

...and hope xmTextWriterPtr expanding to struct _xmlTextWriter * is a 
stable feature
of the libxml2 API

Change-Id: Ic5076df5a8b33f71c605b3aef737a99ea96b1753

diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 6226268..62263f1 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -33,8 +33,6 @@
 
 #include 
 
-#include 
-
 class SfxItemPool;
 class SfxStyleSheetPool;
 class SvxFieldItem;
@@ -148,7 +146,7 @@ public:
 #if DEBUG_EDIT_ENGINE
 void Dump() const;
 #endif
-void dumpAsXml(xmlTextWriterPtr pWriter) const;
+void dumpAsXml(struct _xmlTextWriter * pWriter) const;
 };
 
 #endif // INCLUDED_EDITENG_EDITOBJ_HXX
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 39d6be5..420a6b8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
icu_headers \
mesa_headers \
glew \
-   libxml2 \
 ))
 
 ifeq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Repair corrupted odt

2014-11-24 Thread Maxim Monastirsky

On Sunday 23 November 2014 12:01:32 Olivier Chorier wrote:
> Hello everybody,
Hi Olivier,

> I'm looking for a way to repair thousands of corrupted odt files. Those
> files have been corrupted after FTP send operations, for some reason.
> 
> The "zip" structure seems corrupted. I tried using 7-zip to unzip and zip
> again the odt file, but it doesn't work every time.
> Libre Office can repair them every time, but I need to open, repair, save
> and close those files one by one.
> 
> I wonder if a script or something like that could be used to repair those
> files. I can't do it manually because there is thousand of them. Ideally, I
> could check them, and repair them automatically using a bash or a java
> script...
The zip utility (of Info-ZIP) has the -F and -FF flags that should be able to 
recover your files. Anyway, if you want to use LibreOffice for that, you could 
use the attached Java code as a starting point. The key point in this code is 
to explicitly set the input filter name, and the "RepairPackage" property to 
true in the input MediaDescriptor.

Maximimport com.sun.star.beans.PropertyValue;
import com.sun.star.comp.helper.Bootstrap;
import com.sun.star.frame.*;
import com.sun.star.lang.*;
import com.sun.star.uno.*;
import com.sun.star.util.XCloseable;

public class DocRepair {

public static void main(String[] args) {
try {
XComponentContext xContext = Bootstrap.bootstrap();
XMultiComponentFactory xMCF = xContext.getServiceManager();
Object oDesktop = xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext);

// Open the corrupted document
PropertyValue inputMediaDesc[] = new PropertyValue[3];

inputMediaDesc[0] = new PropertyValue();
inputMediaDesc[0].Name = "Hidden";
inputMediaDesc[0].Value = Boolean.TRUE;

inputMediaDesc[1] = new PropertyValue();
inputMediaDesc[1].Name = "RepairPackage";
inputMediaDesc[1].Value = Boolean.TRUE;

inputMediaDesc[2] = new PropertyValue();
inputMediaDesc[2].Name = "FilterName";
inputMediaDesc[2].Value = "writer8";

XComponentLoader xCLoader = UnoRuntime.queryInterface(XComponentLoader.class, oDesktop);
XComponent xDocument = xCLoader.loadComponentFromURL("file:///home/maxim/Downloads/corrupted.odt", "_blank", 0, inputMediaDesc);

// Save to a new file
PropertyValue outputMediaDesc[] = new PropertyValue[2];

outputMediaDesc[0] = new PropertyValue();
outputMediaDesc[0].Name = "Overwrite";
outputMediaDesc[0].Value = Boolean.TRUE;

outputMediaDesc[1] = new PropertyValue();
outputMediaDesc[1].Name = "FilterName";
outputMediaDesc[1].Value = "writer8";

XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, xDocument);
xStorable.storeAsURL("file:///home/maxim/Downloads/repaired.odt", outputMediaDesc);

// Close the document
XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, xStorable);
if (xCloseable != null) {
xCloseable.close(false);
} else {
XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xStorable);
xComp.dispose();
}
System.exit(0);
} catch (java.lang.Exception e) {
e.printStackTrace(System.err);
System.exit(1);
}
}
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-24 Thread Seyeong Kim

 sc/inc/column.hxx |3 ++-
 sc/inc/columnspanset.hxx  |3 +++
 sc/source/core/data/column2.cxx   |4 ++--
 sc/source/core/data/columnspanset.cxx |   12 ++--
 sc/source/core/data/table2.cxx|   31 +++
 sc/source/core/data/table3.cxx|4 +++-
 6 files changed, 43 insertions(+), 14 deletions(-)

New commits:
commit ec4d045328d4651fe666169272fc5a2d0bcd1362
Author: Seyeong Kim 
Date:   Sat Aug 16 05:25:32 2014 +0200

fdo#77382, lp#1342175: fix poor performance with find & replace with empty 
value

this cherry-picks three master commits:
 1cf19ea84794ca065749667b480dfed2d27d47b7
don't call ScMarkData::GetMarkedRanges in ScColumn, related fdo#79422
 1e721077b43de84edab2a3ed2f316ddcbec6e3ec
fdo#83141: optimize slow performance after when using replaceall or 
searchall
Reviewed-on: https://gerrit.libreoffice.org/11829
 91502a72c12c559442e8bf77c27a516b49c2a68d
fdo#83141: also optimize ScTable::HasAttribSelection
Reviewed-on: https://gerrit.libreoffice.org/11877

Change-Id: I2df0eeefbe27b6a267e960f9ffedab0d4774c8a8
Reviewed-on: https://gerrit.libreoffice.org/13041
Reviewed-by: Seyeong Kim 
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d2b7799..8f8a93c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -24,6 +24,7 @@
 #include "global.hxx"
 #include "address.hxx"
 #include "rangenam.hxx"
+#include "rangelst.hxx"
 #include "types.hxx"
 #include "mtvelements.hxx"
 #include 
@@ -262,7 +263,7 @@ public:
 ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
 
 void UpdateSelectionFunction(
-const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows );
+const ScRangeList& rRanges, ScFunctionData& rData, 
ScFlatBoolRowSegments& rHiddenRows );
 
 void CopyToColumn(
 sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 
nFlags, bool bMarked,
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 7c7fdf5..f397c3e 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -20,6 +20,7 @@ class ScDocument;
 class ScColumn;
 class ScMarkData;
 class ScRange;
+class ScRangeList;
 
 namespace sc {
 
@@ -132,6 +133,8 @@ public:
  */
 void scan(const ScMarkData& rMark, SCTAB nTab, SCCOL nCol);
 
+void scan(const ScRangeList& rRanges, SCTAB nTab, SCCOL nCol);
+
 void set(SCROW nRow1, SCROW nRow2, bool bVal);
 
 void getRows(std::vector &rRows) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c19be82..08a00c0 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3072,10 +3072,10 @@ public:
 
 //  multiple selections:
 void ScColumn::UpdateSelectionFunction(
-const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows )
+const ScRangeList& rRanges, ScFunctionData& rData, ScFlatBoolRowSegments& 
rHiddenRows )
 {
 sc::SingleColumnSpanSet aSpanSet;
-aSpanSet.scan(rMark, nTab, nCol); // mark all selected rows.
+aSpanSet.scan(rRanges, nTab, nCol); // mark all selected rows.
 
 // Exclude all hidden rows.
 ScFlatBoolRowSegments::RangeData aRange;
diff --git a/sc/source/core/data/columnspanset.cxx 
b/sc/source/core/data/columnspanset.cxx
index e431361..faf99ad 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -278,9 +278,17 @@ void SingleColumnSpanSet::scan(const ScMarkData& rMark, 
SCTAB nTab, SCCOL nCol)
 return;
 
 ScRangeList aRanges = rMark.GetMarkedRanges();
-for (size_t i = 0, n = aRanges.size(); i < n; ++i)
+scan(aRanges, nTab, nCol);
+}
+
+void SingleColumnSpanSet::scan(const ScRangeList& rRanges, SCTAB nTab, SCCOL 
nCol)
+{
+for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
-const ScRange* p = aRanges[i];
+const ScRange* p = rRanges[i];
+if (nTab < p->aStart.Tab() || p->aEnd.Tab() < nTab)
+continue;
+
 if (nCol < p->aStart.Col() || p->aEnd.Col() < nCol)
 // This column is not in this range. Skip it.
 continue;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9b4fd02..8f81660 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -50,6 +50,7 @@
 #include "refupdatecontext.hxx"
 #include "scopetools.hxx"
 #include "tabprotection.hxx"
+#include "columnspanset.hxx"
 #include 
 #include 
 
@@ -1887,10 +1888,17 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2, sal
 
 bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) 
const
 {
-bool bFound = false;
-for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
-bFound |= aCol[i].HasAttribSelection( r

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

2014-11-24 Thread Caolán McNamara

 vcl/opengl/x11/X11DeviceInfo.cxx|3 ++-
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0ee01cf9bae25d47c5201ecabe3208c286581a4b
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:37:18 2014 +

coverity#1255905 Buffer not null terminated

Change-Id: I0822f04a296ec6c8c6ae559aef320a59afc8aa0d
(cherry picked from commit 24ee4cba937d1b69cb6b5fdb9d1b8116546e5a6e)

diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 6899f53..cf04d43 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -239,7 +239,8 @@ void X11OpenGLDeviceInfo::GetData()
 // read major.minor version numbers of the driver (not to be confused with 
the OpenGL version)
 if (whereToReadVersionNumbers) {
 // copy into writable buffer, for tokenization
-strncpy(buf, whereToReadVersionNumbers, buf_size);
+strncpy(buf, whereToReadVersionNumbers, buf_size-1);
+buf[buf_size-1] = 0;
 bufptr = buf;
 
 // now try to read major.minor version numbers. In case of failure, 
gracefully exit: these numbers have
commit 7d7d24a472eb72ee13df18d07f5041a4051e9113
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:28:40 2014 +

coverity#1255907 Explicit null dereferenced

Change-Id: I5b7be6698e2028f9b882c2f7deb96739bc968098
(cherry picked from commit 83ea7e76da284be6380fcdadf9848276fcdd080a)

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index dac3b5c..27f89a3 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -512,7 +512,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int& 
nBestFBC, bool bUseDoubl
 for(int i = 0; i < fbCount; ++i)
 {
 XVisualInfo* pVi = glXGetVisualFromFBConfig( dpy, pFBC[i] );
-if(pVi && (!bWithSameVisualID || pVi->visualid == 
xattr.visual->visualid) )
+if(pVi && (!bWithSameVisualID || (xattr.visual && pVi->visualid == 
xattr.visual->visualid)) )
 {
 // pick the one with the most samples per pixel
 int nSampleBuf = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/Library_svxcore.mk

2014-11-24 Thread Miklos Vajna

 svx/Library_svxcore.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 56633a2b1da4d36cd29c320a3d20761c8886907b
Author: Miklos Vajna 
Date:   Mon Nov 24 10:39:24 2014 +0100

svx: missing libxml2 external

Change-Id: I416e504d1f16530096056ea915dcfdb74f302c4c

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 420a6b8..39d6be5 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
icu_headers \
mesa_headers \
glew \
+   libxml2 \
 ))
 
 ifeq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Stephan Bergmann

 vcl/source/opengl/OpenGLContext.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1397b0a9e6f46a93aabca498ba26ed74ee96ef0d
Author: Stephan Bergmann 
Date:   Mon Nov 24 10:38:27 2014 +0100

Unchain OpenGLContext on all platforms

Change-Id: I679aae23d058a4d88fac0291cabe00629fd6de65

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 7df7970..46fc097 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -83,16 +83,6 @@ OpenGLContext::~OpenGLContext()
 wglDeleteContext( m_aGLWin.hRC );
 ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
 }
-ImplSVData* pSVData = ImplGetSVData();
-if( mpPrevContext )
-mpPrevContext->mpNextContext = mpNextContext;
-else
-pSVData->maGDIData.mpFirstContext = mpNextContext;
-if( mpNextContext )
-mpNextContext->mpPrevContext = mpPrevContext;
-else
-pSVData->maGDIData.mpLastContext = mpPrevContext;
-
 #elif defined( MACOSX )
 OpenGLWrapper::resetCurrent();
 #elif defined( IOS ) || defined( ANDROID )
@@ -113,6 +103,16 @@ OpenGLContext::~OpenGLContext()
 glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
 }
 #endif
+
+ImplSVData* pSVData = ImplGetSVData();
+if( mpPrevContext )
+mpPrevContext->mpNextContext = mpNextContext;
+else
+pSVData->maGDIData.mpFirstContext = mpNextContext;
+if( mpNextContext )
+mpNextContext->mpPrevContext = mpPrevContext;
+else
+pSVData->maGDIData.mpLastContext = mpPrevContext;
 }
 
 void OpenGLContext::AddRef()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Caolán McNamara

 vcl/opengl/x11/X11DeviceInfo.cxx|3 ++-
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 vcl/unx/glxtest.cxx |2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 24ee4cba937d1b69cb6b5fdb9d1b8116546e5a6e
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:37:18 2014 +

coverity#1255905 Buffer not null terminated

Change-Id: I0822f04a296ec6c8c6ae559aef320a59afc8aa0d

diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index cc328b0..e7e4b6b 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -239,7 +239,8 @@ void X11OpenGLDeviceInfo::GetData()
 // read major.minor version numbers of the driver (not to be confused with 
the OpenGL version)
 if (whereToReadVersionNumbers) {
 // copy into writable buffer, for tokenization
-strncpy(buf, whereToReadVersionNumbers, buf_size);
+strncpy(buf, whereToReadVersionNumbers, buf_size-1);
+buf[buf_size-1] = 0;
 bufptr = buf;
 
 // now try to read major.minor version numbers. In case of failure, 
gracefully exit: these numbers have
commit 83ea7e76da284be6380fcdadf9848276fcdd080a
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:28:40 2014 +

coverity#1255907 Explicit null dereferenced

Change-Id: I5b7be6698e2028f9b882c2f7deb96739bc968098

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 46fc097..a93185f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -549,7 +549,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int& 
nBestFBC, bool bUseDoubl
 for(int i = 0; i < fbCount; ++i)
 {
 XVisualInfo* pVi = glXGetVisualFromFBConfig( dpy, pFBC[i] );
-if(pVi && (!bWithSameVisualID || pVi->visualid == 
xattr.visual->visualid) )
+if(pVi && (!bWithSameVisualID || (xattr.visual && pVi->visualid == 
xattr.visual->visualid)) )
 {
 // pick the one with the most samples per pixel
 int nSampleBuf = 0;
commit 6b7561a87a8c1f99d56da71fa222efb178ffc1aa
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:26:35 2014 +

coverity#1195349 Argument cannot be negative

Change-Id: Id0a8bac3c14e668f066ddcafc84d3397c0d9b74f

diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index d1f9591..9e2fba4 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -106,6 +106,8 @@ void glxtest()
   // any PR logging file descriptors. To that effect, we redirect all positive
   // file descriptors up to what open() returns here. In particular, 1 is 
stdout and 2 is stderr.
   int fd = open("/dev/null", O_WRONLY);
+  if (fd == -1)
+fatal_error("could not redirect stdout+stderr");
   for (int i = 1; i < fd; i++)
 dup2(fd, i);
   close(fd);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Caolán McNamara

 sw/source/uibase/utlui/content.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 74279d773e28fdf3479502258ac64a1a06c3d3a1
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:21:42 2014 +

coverity#1255910 Uninitialized scalar field

Change-Id: Ifa4fb557ce4fc5ffc816b963df84e30fe6ef43c8

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index cac96ed..ef1fd2e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -822,6 +822,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const 
ResId& rResId) :
 bIsOutlineMoveable(true),
 bViewHasChanged(false),
 bIsImageListInitialized(false),
+m_bActiveDocModified(false),
 bIsKeySpace(false)
 {
 SetHelpId(HID_NAVIGATOR_TREELIST);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Tor Lillqvist

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

New commits:
commit 60b63ab620401ce305a0b12bb6647e1970207ef9
Author: Tor Lillqvist 
Date:   Mon Nov 24 11:16:07 2014 +0200

cid#1255906: Unchecked return value

Change-Id: I94696b3da73eb74a04b531ee8a93854208cddbec

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 17b1ff8..ab52adb 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1009,7 +1009,7 @@ struct OpenCLTester
 sc::AutoCalcSwitch aACSwitch(*mpDoc, true);
 
 mnTestAreas++;
-mpDocShell->GetDocFunc().InsertTable(mnTestAreas, rArea.msTitle, 
false, true);
+(void) mpDocShell->GetDocFunc().InsertTable(mnTestAreas, 
rArea.msTitle, false, true);
 
 rArea.addHeader(mpDoc, mnTestAreas);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Caolán McNamara

 svx/source/svdraw/svdview.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 89c2ade7b4eebd2a74d050b6c41ba747e3bb44a1
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 24 09:18:09 2014 +

Revert "show pointer_move arrow when passing over an object boundary"

revert on 4-4 until figured out the extra piece needed to get this
working nicely with table boundaries

This reverts commit 961ed635515a346a4395b4abf29675e121ddd8ab.

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 3e95552..784d1e8 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1011,7 +1011,6 @@ Pointer SdrView::GetPreferredPointer(const Point& 
rMousePos, const OutputDevice*
 case SDREVENT_BEGCREATEOBJ:
 return aAktCreatePointer;
 case SDREVENT_MARKOBJ:
-return Pointer(POINTER_MOVE);
 case SDREVENT_BEGMARK:
 return Pointer(POINTER_ARROW);
 case SDREVENT_MARKPOINT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Yousuf Philips

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d59554a50ae9870346d5e36a3cd5470016eda0e9
Author: Yousuf Philips 
Date:   Sun Nov 23 16:51:20 2014 +0400

added the missing '5' next to 'KDE Plasma'

Change-Id: I9a9b0d3b0198c7f37561b14cfeb55ec5a9d5bfe8
Reviewed-on: https://gerrit.libreoffice.org/13066
Reviewed-by: Jonathan Riddell 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index e4ada07..edede77 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5639,7 +5639,7 @@
   
   
 
-  Breeze - the icon theme from KDE Plasma
+  Breeze - the icon theme from KDE Plasma 5
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Miklos Vajna

 editeng/source/editeng/textconv.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 61540cf986cd25c40f12d86ae4760fa671cf35f0
Author: Miklos Vajna 
Date:   Mon Nov 24 09:33:16 2014 +0100

error C2872: 'Locale' : ambiguous symbol

Change-Id: I88482566c26218a4b71b8e5652af9fbbad6a8143

diff --git a/editeng/source/editeng/textconv.cxx 
b/editeng/source/editeng/textconv.cxx
index b7ac644..8a057cc 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -37,15 +37,14 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
-using namespace com::sun::star::lang;
 using namespace com::sun::star::linguistic2;
 
 
 
 TextConvWrapper::TextConvWrapper( vcl::Window* pWindow,
 const Reference< XComponentContext >& rxContext,
-const Locale& rSourceLocale,
-const Locale& rTargetLocale,
+const lang::Locale& rSourceLocale,
+const lang::Locale& rTargetLocale,
 const vcl::Font* pTargetFont,
 sal_Int32 nOptions,
 bool bIsInteractive,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Noel Grandin

 vcl/source/gdi/impimagetree.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4f7586a61e078ed8944d7f85697c809c4bd0d676
Author: Noel Grandin 
Date:   Mon Nov 24 10:15:27 2014 +0200

prevent unused warning in release build

i.e. where asserts are disabled

Change-Id: Ic47b0a65bf729ba2cc9460a6a4bf1bbbc06f34da

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 8955902..59b99dc 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -258,6 +258,7 @@ bool ImplImageTree::findImage(std::vector const & 
paths, BitmapEx & bi
 css::uno::Reference< css::io::XInputStream > s;
 bool ok = rNameAccess->getByName(*j) >>= s;
 assert(ok);
+(void)ok; // prevent unused warning in release build
 
 loadImageFromStream( wrapStream(s), *j, bitmap );
 return true;
@@ -280,6 +281,7 @@ void ImplImageTree::loadImageLinks()
 css::uno::Reference< css::io::XInputStream > s;
 bool ok = rNameAccess->getByName(aLinkFilename) >>= s;
 assert(ok);
+(void)ok; // prevent unused warning in release build
 
 parseLinkFile( wrapStream(s) );
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 101 matches

Mail list logo