date:20130213

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-02-13 Thread bugzilla-daemon

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

Bug 6 depends on bug 34548, which changed state.

Bug 34548 Summary: EDITING: CRASH in action after Undo
https://bugs.freedesktop.org/show_bug.cgi?id=34548

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

2013-02-13 Thread David Tardon

 svx/inc/svx/svdundo.hxx   |9 -
 svx/source/svdraw/svdundo.cxx |   20 
 2 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit e462a30d03c16aa4202f8d28ad52b15feb3d9255
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 08:52:52 2013 +0100

fdo#34558 don't crash on undoing text frame removal

Change-Id: I48b95c6c0cbfb2f4c4b09cc90b254b96de40b3e9

diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 0d3713e..8066c72 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -20,6 +20,7 @@
 #ifndef _SVDUNDO_HXX
 #define _SVDUNDO_HXX
 
+#include svl/lstner.hxx
 #include svl/solar.hrc
 #include svl/undo.hxx
 #include tools/gen.hxx
@@ -252,9 +253,12 @@ public:
 //
 //
 
-class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
+class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj, public SfxListener {
 boolbOwner;
 
+public:
+TYPEINFO();
+
 protected:
 SdrObjList* pObjList;
 SdrView*pView;  // um bei ObjDel, Undo die
@@ -270,6 +274,9 @@ protected:
 void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1; 
pPageView=pPageView1; }
 bool IsOwner() { return bOwner; }
 void SetOwner(bool bNew);
+
+private:
+virtual void Notify(SfxBroadcaster rBroadcaster, const SfxHint rHint);
 };
 
 //
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 452761d..5e53ab1 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -655,6 +655,8 @@ OUString SdrUndoGeoObj::GetComment() const
 
 

 
+TYPEINIT1(SdrUndoObjList, SfxListener);
+
 SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool bOrdNumDirect)
 :   SdrUndoObj(rNewObj),
 bOwner(sal_False),
@@ -667,10 +669,14 @@ SdrUndoObjList::SdrUndoObjList(SdrObject rNewObj, bool 
bOrdNumDirect)
 } else {
 nOrdNum=pObj-GetOrdNum();
 }
+
+StartListening(*pObjList-GetModel());
 }
 
 SdrUndoObjList::~SdrUndoObjList()
 {
+EndListening(*pObjList-GetModel());
+
 if (pObj!=NULL  IsOwner())
 {
 // Attribute have to go back to the regular Pool
@@ -686,6 +692,20 @@ void SdrUndoObjList::SetOwner(bool bNew)
 bOwner = bNew;
 }
 
+void SdrUndoObjList::Notify(SfxBroadcaster, const SfxHint rHint)
+{
+const SdrHint* pSdrHint(dynamic_castconst SdrHint*(rHint));
+if (pSdrHint)
+{
+if ((pSdrHint-GetObject() == pObj)  (pSdrHint-GetKind() == 
HINT_OBJCHG))
+{
+const sal_uInt32 nNewOrdNum(pObj-GetOrdNum());
+if (nNewOrdNum != nOrdNum)
+nOrdNum = nNewOrdNum;
+}
+}
+}
+
 

 
 void SdrUndoRemoveObj::Undo()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help with fdo#60471

2013-02-13 Thread Noel Grandin



I tried using the catch/throw stuff in GDB for debugging, gave up, and 
now simply set a breakpoint in the constructor of the Exception object :-)


Works for me.

On 2013-02-13 03:11, Marcos Souza wrote:
I tried to get the error message from uno::Exception using a SAL_WARN, 
but this is the message:


[ line 4]: error

This don't say anything to me : )




Disclaimer: http://www.peralex.com/disclaimer.html


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

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

2013-02-13 Thread Michael Stahl

 sw/source/core/txtnode/ndtxt.cxx |   43 +++
 1 file changed, 30 insertions(+), 13 deletions(-)

New commits:
commit aa3c9716c2492447e7dc3daa3592efbf52e8f186
Author: Michael Stahl mst...@redhat.com
Date:   Tue Feb 12 19:43:16 2013 +0100

fdo#60668: filter out fieldmark chars from Index entries:

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)
Reviewed-on: https://gerrit.libreoffice.org/2122
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4fedcfa..eb2dd25 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2959,8 +2959,7 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode rDestNd, 
const SwIndex* pDestIdx,
 
 // mask hidden characters
 const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), 
cChar );
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
 
 sTmpText = sTmpText.Copy( nIdx, nLen );
 rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3063,22 +3062,40 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode rDestNd, 
const SwIndex* pDestIdx,
 rDestNd.InsertText( GetNumString(), aDestIdx );
 }
 
-if ( nHiddenChrs  0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx  rDestNd.GetTxt().Len())
 {
-aDestIdx = 0;
-while ( aDestIdx  rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if (   (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
 {
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
 {
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex  rDestNd.GetTxt().Len() 
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
 }
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx  rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph = delete, see below
 }
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have 
contined
+rDestNd.EraseText(
+SwIndex(rDestNd, static_castxub_StrLen(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
 }
 
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/inc Makefile.in oox/inc sc/inc sd/inc svtools/inc svx/inc sw/inc vcl/inc writerfilter/inc xmloff/inc

2013-02-13 Thread Luboš Luňák

 Makefile.in   |1 
 dbaccess/inc/pch/precompiled_dbu.hxx  |2 +
 oox/inc/pch/precompiled_oox.hxx   |9 +++--
 sc/inc/pch/precompiled_sc.hxx |   39 ++
 sd/inc/pch/precompiled_sd.hxx |   11 --
 svtools/inc/pch/precompiled_svt.hxx   |6 ++-
 svx/inc/pch/precompiled_svx.hxx   |   11 +++---
 svx/inc/pch/precompiled_svxcore.hxx   |   21 ++-
 sw/inc/pch/precompiled_msword.hxx |8 +++-
 sw/inc/pch/precompiled_sw.hxx |   23 
 vcl/inc/pch/precompiled_vcl.hxx   |   10 ++---
 writerfilter/inc/pch/precompiled_writerfilter.hxx |1 
 xmloff/inc/pch/precompiled_xo.hxx |   10 +
 13 files changed, 108 insertions(+), 44 deletions(-)

New commits:
commit fad1cce4d23eefcbb59430fdee5e8cf9c5852f4a
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Feb 13 09:45:41 2013 +0100

update pch headers, broken by 1aaf9a9

diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 0d598b6..92654e6 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -102,6 +102,7 @@
 #include com/sun/star/form/runtime/XFormController.hpp
 #include com/sun/star/frame/Desktop.hpp
 #include com/sun/star/frame/FrameSearchFlag.hpp
+#include com/sun/star/frame/TaskCreator.hpp
 #include com/sun/star/frame/UICommandDescription.hpp
 #include com/sun/star/frame/XComponentLoader.hpp
 #include com/sun/star/frame/XController2.hpp
@@ -136,6 +137,7 @@
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/lang/XSingleServiceFactory.hpp
 #include com/sun/star/lang/XUnoTunnel.hpp
+#include com/sun/star/mozilla/MozillaBootstrap.hpp
 #include com/sun/star/mozilla/XMozillaBootstrap.hpp
 #include com/sun/star/registry/XRegistryKey.hpp
 #include com/sun/star/sdb/CommandType.hpp
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index c59a451..fcd43be 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -11,6 +11,7 @@
 #include comphelper/anytostring.hxx
 #include cppuhelper/exc_hlp.hxx
 #include rtl/ustrbuf.hxx
+#include sal/log.hxx
 #include tools/string.hxx
 #include algorithm
 #include assert.h
@@ -19,6 +20,7 @@
 #include basegfx/point/b2dpoint.hxx
 #include basegfx/polygon/b2dpolygon.hxx
 #include boost/bind.hpp
+#include boost/optional.hpp
 #include boost/unordered_map.hpp
 #include com/sun/star/animations/AnimationCalcMode.hpp
 #include com/sun/star/animations/AnimationColorSpace.hpp
@@ -126,6 +128,7 @@
 #include com/sun/star/chart2/XRegressionCurveContainer.hpp
 #include com/sun/star/chart2/XTitle.hpp
 #include com/sun/star/chart2/XTitled.hpp
+#include com/sun/star/chart2/data/LabeledDataSequence.hpp
 #include com/sun/star/chart2/data/XDataProvider.hpp
 #include com/sun/star/chart2/data/XDataReceiver.hpp
 #include com/sun/star/chart2/data/XDataSink.hpp
@@ -206,6 +209,8 @@
 #include com/sun/star/graphic/XGraphicTransformer.hpp
 #include com/sun/star/i18n/ScriptType.hpp
 #include com/sun/star/io/TempFile.hpp
+#include com/sun/star/io/TextInputStream.hpp
+#include com/sun/star/io/TextOutputStream.hpp
 #include com/sun/star/io/XActiveDataSink.hpp
 #include com/sun/star/io/XActiveDataSource.hpp
 #include com/sun/star/io/XInputStream.hpp
@@ -213,8 +218,7 @@
 #include com/sun/star/io/XOutputStream.hpp
 #include com/sun/star/io/XSeekable.hpp
 #include com/sun/star/io/XStream.hpp
-#include com/sun/star/io/XTextInputStream.hpp
-#include com/sun/star/io/XTextOutputStream.hpp
+#include com/sun/star/io/XTextInputStream2.hpp
 #include com/sun/star/lang/DisposedException.hpp
 #include com/sun/star/lang/Locale.hpp
 #include com/sun/star/lang/XComponent.hpp
@@ -253,6 +257,7 @@
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/CellAddress.hpp
 #include com/sun/star/table/CellRangeAddress.hpp
+#include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/table/XCellRange.hpp
 #include com/sun/star/table/XColumnRowRange.hpp
 #include com/sun/star/table/XMergeableCell.hpp
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 31753ab..0f344a1 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -16,11 +16,29 @@
 #include cppuhelper/implbase1.hxx
 #include drawinglayer/primitive2d/baseprimitive2d.hxx
 #include drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+#include editeng/autokernitem.hxx
+#include editeng/charreliefitem.hxx
+#include editeng/charscaleitem.hxx
+#include editeng/colritem.hxx
+#include editeng/contouritem.hxx
+#include editeng/crossedoutitem.hxx
 #include editeng/editdata.hxx
+#include editeng/editstat.hxx
+#include editeng/eeitem.hxx
+#include editeng/emphasismarkitem.hxx
 #include editeng/escapementitem.hxx
+#include editeng/fhgtitem.hxx
 #include

Re: Help with fdo#60471

2013-02-13 Thread Stephan Bergmann


On 02/12/2013 07:04 PM, Marcos Souza wrote:

And one more thing, there is a place for learn how UNO works and how
this is used inside LO?


See the Developer's Guide at 
http://wiki.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide.


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

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

2013-02-13 Thread Cédric Bosdonnat

 sfx2/inc/sfx2/doctempl.hxx|   15 +++
 sfx2/inc/sfx2/templatelocalview.hxx   |2 
 sfx2/inc/sfx2/templateview.hxx|3 
 sfx2/inc/sfx2/templateviewitem.hxx|4 
 sfx2/inc/sfx2/thumbnailview.hxx   |2 
 sfx2/inc/sfx2/thumbnailviewitem.hxx   |9 ++
 sfx2/source/control/templatelocalview.cxx |   21 
 sfx2/source/control/templateview.cxx  |   10 ++
 sfx2/source/control/templateviewitem.cxx  |4 
 sfx2/source/control/thumbnailview.cxx |9 ++
 sfx2/source/control/thumbnailviewitem.cxx |  128 +-
 sfx2/source/doc/doctempl.cxx  |   55 
 12 files changed, 257 insertions(+), 5 deletions(-)

New commits:
commit 0b1deadc72eca6f782a5bb3a180d6f1d95f52721
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Feb 11 15:30:16 2013 +0100

Templates Manager: UI for renaming templates and folders, fdo#60579

After thinking this was a feature regression, I finally discovered that
the old template manager couldn't rename templates. This commit is
bringing back some previously unused code dropped in an ealier commit.

Even though this is a UI change, no new string is added by this commit.

Conflicts:
sfx2/inc/sfx2/templateview.hxx
sfx2/source/control/templatelocalview.cxx
sfx2/source/control/templateview.cxx

Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4
Reviewed-on: https://gerrit.libreoffice.org/2108
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 507117c..b9ca56d 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -96,6 +96,21 @@ public:
 sal_BoolInsertDir(const String rText, sal_uInt16 nRegion);
 sal_BoolSetName(const String rName, sal_uInt16 nRegion, 
sal_uInt16 nIdx);
 
+/** Change the name of an entry or a directory
+
+\param rName
+The new name to set
+\param nRegion
+The id of the region to rename or containing the template to rename
+\param nIdx
+The id of the template to rename or USHRT_MAX to rename the region.
+
+\return
+sal_True if the action could be performed, sal_False otherwise
+
+*/
+sal_BoolSetName(const rtl::OUString rName, sal_uInt16 
nRegion, sal_uInt16 nIdx);
+
 sal_BoolCopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const 
String rName) const;
 sal_BoolCopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String 
rName);
 
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index e11c42b..dbf00ef 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -71,6 +71,8 @@ public:
 
 bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString 
rName) const;
 
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
 private:
 
 virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index 6e81ea4..07b8487 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -39,6 +39,8 @@ public:
 void setDblClickHdl (const Link rLink) { maDblClickHdl = rLink; }
 
 void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
+void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView = 
pMasterView; }
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
 
 protected:
 
@@ -47,6 +49,7 @@ protected:
 virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
 
 private:
+TemplateAbstractView* mpMasterView;
 
 ControlmaButtons;
 PushButton maAllButton;
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx 
b/sfx2/inc/sfx2/templateviewitem.hxx
index b19a060..0a3cb3e 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/sfx2/templateviewitem.hxx
@@ -42,6 +42,10 @@ public:
 
 virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
 const ThumbnailItemAttributes *pAttrs);
+
+sal_uInt16mnRegionId;
+sal_uInt16mnDocId;
+
 private:
 
 rtl::OUString maPath;
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9548bd1..a33e762 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -238,6 +238,8 @@ public:
 
 virtual void Resize();
 
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
 protected:
 
 virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx 
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 18b7eae..2acc8de 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++

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

2013-02-13 Thread Cédric Bosdonnat

 sfx2/inc/sfx2/templatelocalview.hxx   |2 +-
 sfx2/inc/sfx2/templateview.hxx|2 +-
 sfx2/inc/sfx2/thumbnailview.hxx   |2 +-
 sfx2/source/control/templatelocalview.cxx |4 ++--
 sfx2/source/control/templateview.cxx  |5 +++--
 sfx2/source/control/thumbnailview.cxx |3 ++-
 sfx2/source/control/thumbnailviewitem.cxx |4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 1a6ae8e83df22deca193c58bc940d1dc265eb4b8
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Feb 11 18:09:45 2013 +0100

Templates Manager: if the title can't be edited, don't update it in UI

Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Reviewed-on: https://gerrit.libreoffice.org/2109
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index dbf00ef..78cf547 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -71,7 +71,7 @@ public:
 
 bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString 
rName) const;
 
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
 
 private:
 
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index 07b8487..3e2a7c8 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -40,7 +40,7 @@ public:
 
 void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
 void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView = 
pMasterView; }
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
 
 protected:
 
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index a33e762..8eb9426 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -238,7 +238,7 @@ public:
 
 virtual void Resize();
 
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
 
 protected:
 
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 2bbf0d0..ca8856e 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -605,7 +605,7 @@ void TemplateLocalView::OnItemDblClicked (ThumbnailViewItem 
*pRegionItem)
 showOverlay(true);
 }
 
-void TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString 
sNewTitle)
+bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString 
sNewTitle)
 {
 sal_uInt16 nRegionId = 0;
 sal_uInt16 nDocId = USHRT_MAX;
@@ -620,7 +620,7 @@ void TemplateLocalView::renameItem(ThumbnailViewItem* 
pItem, rtl::OUString sNewT
 {
 nRegionId = pContainerItem-mnId - 1;
 }
-mpDocTemplates-SetName( sNewTitle, nRegionId, nDocId );
+return mpDocTemplates-SetName( sNewTitle, nRegionId, nDocId );
 }
 
 static void lcl_updateThumbnails (TemplateContainerItem *pItem)
diff --git a/sfx2/source/control/templateview.cxx 
b/sfx2/source/control/templateview.cxx
index 90e86ec..615465d 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -105,10 +105,11 @@ void TemplateView::OnItemDblClicked(ThumbnailViewItem 
*pItem)
 maDblClickHdl.Call(pItem);
 }
 
-void TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString 
sNewTitle)
+bool TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString 
sNewTitle)
 {
 if (mpMasterView)
-mpMasterView-renameItem(pItem, sNewTitle);
+return mpMasterView-renameItem(pItem, sNewTitle);
+return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 9a29381..c996f0f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -980,9 +980,10 @@ void ThumbnailView::sortItems (const boost::functionbool 
(const ThumbnailViewIt
 Invalidate();
 }
 
-void ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString)
+bool ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString)
 {
 // Do nothing by default
+return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailviewitem.cxx 
b/sfx2/source/control/thumbnailviewitem.cxx
index c228bab..2a83bc1 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -187,8 +187,8 @@ void ThumbnailViewItem::updateTitleEditSize()
 
 void ThumbnailViewItem::setTitle (const rtl::OUString rTitle)
 {
-mrParent.renameItem(this, rTitle);
-

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

2013-02-13 Thread Michael Stahl

 sw/source/ui/dbui/dbinsdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b1004870a37aba0232c451580ca21d33184bbeca
Author: Michael Stahl mst...@redhat.com
Date:   Tue Feb 12 14:48:56 2013 +0100

fdo#60092: fix STL regression in SwInsertDBColAutoPilot::DataToDoc

(regression from f7d681dc34e60eb8532403079d007ca1250f4941)

Change-Id: Ida92854efe6ddb8fe10e5ef1f42c53747f40
(cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96)
Reviewed-on: https://gerrit.libreoffice.org/2119
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 617da5a..451cb66 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1002,8 +1002,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const 
SequenceAny rSelection,
 {
 SwInsDBColumn aSrch( aLbTableCol.GetEntry( n ), 0 );
 SwInsDBColumns::const_iterator it = aDBColumns.find( aSrch );
-if( it != aDBColumns.end() )
-aColFlds[ n ] = *it;
+if (it != aDBColumns.end())
+aColFlds.push_back(*it);
 else {
 OSL_ENSURE( !this, database column not found );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-13 Thread Michael Stahl

 embeddedobj/source/msole/oleembed.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 27a69f957dc981ed42d594a8a4ebf9baba08d372
Author: Michael Stahl mst...@redhat.com
Date:   Sun Feb 10 00:18:46 2013 +0100

fdo#60491: embeddedobj: catch exception in fallback path

This allows the OLE object to at least be passed to the OS for
opening...

(cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
Reviewed-on: https://gerrit.libreoffice.org/2096
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index ccf8161..2cd399b 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -709,7 +709,14 @@ namespace
 aArgs ), uno::UNO_QUERY_THROW );
 
 uno::Reference io::XStream  xCONTENTS;
-
xNameContainer-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CONTENTS)))
 = xCONTENTS;
+try
+{
+xNameContainer-getByName(CONTENTS) = xCONTENTS;
+}
+catch (container::NoSuchElementException const)
+{
+// ignore
+}
 
 sal_Bool bCopied = xCONTENTS.is()  
lcl_CopyStream(xCONTENTS-getInputStream(), xStream-getOutputStream());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unpublishing API post 4.0

2013-02-13 Thread Stephan Bergmann


On 02/08/2013 06:01 PM, Kohei Yoshida wrote:

1) Try to limit API changes to the major releases (4.0, 5.0, 6.0 etc).

2) API changes in minor and micro releases are still considered only if
it's really really necessary. Otherwise, wait until the next major release.


I would weaken that to just one really for minor releases.

(Also, considering just major and minor releases, we do not have the 
mismatch problem between lexicographical order of release numbers and 
chronological order of releases.  At least that is my understanding of 
how we plan releases.)


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

[Libreoffice-commits] core.git: helpcontent2

2013-02-13 Thread Andras Timar

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

New commits:
commit 089a9afc95acf7eeff242369fcddee0f5337df62
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 12 22:04:02 2013 +0100

Updated core
Project: help  4d7b72491649f33d115f687f5deee58bd9619ca4

diff --git a/helpcontent2 b/helpcontent2
index a5cae6c..4d7b724 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a5cae6c3e83ddae0b26fac30cf95378d2a5882a3
+Subproject commit 4d7b72491649f33d115f687f5deee58bd9619ca4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.1'

2013-02-13 Thread Stephan Bergmann

Tag 'sdremote-1.0.1' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 22:46 -0800

Tag sdremote-1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGXSsAAoJEPQ0oe+v7q6jQooP/1e+jo1VJ99ZO9IAFQm74pZJ
QKxdu27rOL/xsC7zTb7Lz5w+XMbc0hdhWbLLwLtdoKHExvK6RUzca7KO/GG7YaWa
Ks7GyM9wUZlBdA2U4xlI6exLJNJLsvjD8C2jz25FGShG66YVJYUq3mwk9JaMGnxG
nrZrHgCeWmsiFnRrm/Eqh/UjyuL4AEM6h/BPgmN6zvbQdwwhyeh6QW1WDJRJ4Cga
1RuWn0sfmJs7LcGbW2vENxuhPmDOKs/mVYsBZWsa1WsWsr1b4EBu+qbVC76na+zl
PBbCZXgpr3S1vv4C05f8jftN1llKJ3l3iNq/OwEro9E51t6feU2ae4ZzC97iHOjr
QPl6E8Ige5FSTiTp22HEdZAiOm/BFh3b0BMKYas3uKJcWXxWkBV+dql4Xsj5zFWE
aHGMBKlcKYr/O05Ggw6O7YAp1mhbyyGcHTQ6Fl1Li4GmETCzU6pR+JX/3ZBEAM3j
F/RxlA7X+WfsS25rvMmLQIcpzbqNE0axcr5A+NVRZStgqkXiRWeR1RluR/tNd85H
T+HNQ0DPbYOlzq5EsTk7vufJmdRwqRZE/q4XUGjLZ0q2M0CgmLDyy/3Vx7qaPXef
6uTRhlZZbfAcdBiVwaBQbEKbXjVuio9UUpu7b9BoH1TdP8xyiL19rXDgj5izdK8r
23CU+LP/s/+yGWvBHzl1
=oc+H
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.0'

2013-02-13 Thread Andras Timar

Tag 'sdremote-1.0.0' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-07 16:52 -0800

Tag sdremote-1.0.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRE9u9AAoJEPQ0oe+v7q6jkPsP/je3++SPJ74BD+vYdzj8anId
KaGM3x5jrip7HCLcPqcLh/LtFefZ4GKIoGrzJ8leGSPYljZReuuGOovQLVX3M1d8
+y7seqJAD3L0JNv8LTdgkYEv1Bnx2iBh6rYJSYUabAHfQwc6XtLY8bUVDumV0ohH
jppFM1pZ3DnRqMHRMT1zLm/NgUe7BouJ/6fxb0uJnRhSrGrEUGC233eHI1y2rDjz
5urNtJ5MiA8uQQ6b29zrMWqJu0EY4MQrooBSHqs3gSA+6yhEeOhWpKJeHpsVFJrl
XyIiXfjP2mg9EDywXViBFi3GH55yZjPkXMu8Ruu3tVH8BVgjrUZPstfdLnzf1ZWp
VhHiofjRwwDuCyN78s0vVmGxmD0JUovWZNWuIgnqu/XH73sShrsDl5yZWDCTR3Rg
lzgIMT5xDmBJkDiRY5BrLN8KSpEVHZijy46wOomhCUChQUNrjg8Py/b3eOtY7upA
nozrN7RdsO20sNNtCSghCHkLEX5qLP7Dn7vviQ0XefVdM7vDKRLkJfqX5EW3J0yR
ss/+6Ef7AhOy3dbLsDLF9/FVqEqcwnyJ493XT1bNkCdeymnS9JNuJhlizGhm16cH
Nz11+tfkk01h983QuXG0+DelICX4T4Fl68JPb7G1+TlWJPJbJLR1HLUyJqBpRU8Q
ELaCoJj/hJZQAfkiDZZV
=WFiE
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.2'

2013-02-13 Thread Stephan Bergmann

Tag 'sdremote-1.0.2' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 23:49 -0800

Tag sdremote-1.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGYOjAAoJEPQ0oe+v7q6jT1AP/jG/H2HKrL1vNUJlMj6Yx159
u0azurcsDcOcmlmXzI5ncQjQ0eL6nmwjV5de2iqZSqzdqevLAQTXj9xCjfblJwDr
SYm0KJ2wpyAxy/Vl2oGPfCuI0oDp0So0jxKoBsG4cBlo1Af78hlCWF0fD1183VPV
cdanjqw4dw3PHT6BQFclx/wd0L+2gr945Am485OgfDbJMb75yLesuocaJYWCfGAU
ZHzdLTP8fpqOPWUfhwt0xKq+o8lyuE7NZZ3JI5pvsNJFeiKAZWD1zuK+146Kmt6l
wJH5T7o4JZb6KTSv/Pim6gVhg73kIWAPgTfNYpBn0KxPJs03aqxgP+U/T+aVt2wG
SRhsVkqV3P7e4OOYtHfqqG8pjWVKD19mKgg1NeXhigYZhsfFTkPb0qooszJ5KabH
EacOvBaWb1O/8sndhwChKrqYECUZ/xDlL8AnbejAA3xkux6iLQM2M2gedeZXGUDK
U/7Pchl9r+r91rF9U0/t8qpufOCQMRZDFie4kdhyEyVTSB2Twvj4OxA+zEHrsBnJ
OIKVFVNHuELYeJ7IS5eqFJ7wdPmLqWA6wScjpU3nbt7cHCX6Ng53DOZKJG7xoHNA
xULevs/mWwMF+6ZnMwmX+Nsgv8xhtM+jFk66Vgu+i5malpAmluJ+n8ifOI6i7cAS
es6W3Q3C2XXQNGw7RScc
=9PF5
-END PGP SIGNATURE-

Changes since sdremote-1.0.0:
Stephan Bergmann (1):
  fdo#60139: Rename bundled extensions's Lightproof service implementation 
names

---
 en/Lightproof.py   |6 
+++---
 en/Linguistic.xcu  |2 +-
 en/description.xml |2 +-
 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu|2 +-
 en/pythonpath/lightproof_handler_en.py |2 +-
 hu_HU/Lightproof.py|6 
+++---
 hu_HU/Linguistic.xcu   |2 +-
 hu_HU/description.xml  |2 +-
 hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 hu_HU/pythonpath/lightproof_handler_hu_HU.py   |2 +-
 pt_BR/Lightproof.py|6 
+++---
 pt_BR/Linguistic.xcu   |2 +-
 pt_BR/description.xml  |4 ++--
 pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 pt_BR/pythonpath/lightproof_handler_pt_BR.py   |2 +-
 ru_RU/Lightproof.py|6 
+++---
 ru_RU/Linguistic.xcu   |2 +-
 ru_RU/description.xml  |2 +-
 ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 ru_RU/pythonpath/lightproof_handler_ru_RU.py   |2 +-
 20 files changed, 29 insertions(+), 29 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: en/description.xml en/dialog en/Lightproof.py en/Linguistic.xcu en/pythonpath hu_HU/description.xml hu_HU/dialog hu_HU/Lightproof.py hu_HU/Linguistic.xcu hu_HU/

2013-02-13 Thread Stephan Bergmann

 en/Lightproof.py   |6 
+++---
 en/Linguistic.xcu  |2 +-
 en/description.xml |2 +-
 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu|2 +-
 en/pythonpath/lightproof_handler_en.py |2 +-
 hu_HU/Lightproof.py|6 
+++---
 hu_HU/Linguistic.xcu   |2 +-
 hu_HU/description.xml  |2 +-
 hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 hu_HU/pythonpath/lightproof_handler_hu_HU.py   |2 +-
 pt_BR/Lightproof.py|8 

 pt_BR/Linguistic.xcu   |2 +-
 pt_BR/description.xml  |4 ++--
 pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 pt_BR/pythonpath/lightproof_handler_pt_BR.py   |2 +-
 ru_RU/Lightproof.py|6 
+++---
 ru_RU/Linguistic.xcu   |2 +-
 ru_RU/description.xml  |2 +-
 ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 ru_RU/pythonpath/lightproof_handler_ru_RU.py   |2 +-
 20 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 350dc590b04041f15d6c570075ade425e4db93ad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 8 09:12:31 2013 +0100

fdo#60139: Rename bundled extensions's Lightproof service implementation 
names

... from org.openoffice.comp.pyuno.Lightproof... to
org.libreoffice.comp.pyuno.Lightproof... (and increment the corresponding
extensions' version numbers) to avoid clashes with any freestanding 
Lightproof
extension.

diff --git a/en/Lightproof.py b/en/Lightproof.py
index cdc93c6..dae4b20 100644
--- a/en/Lightproof.py
+++ b/en/Lightproof.py
@@ -23,7 +23,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, 
XServiceName, XSer
 def __init__( self, ctx, *args ):
 self.ctx = ctx
 self.ServiceName = com.sun.star.linguistic2.Proofreader
-self.ImplementationName = org.openoffice.comp.pyuno.Lightproof. + pkg
+self.ImplementationName = org.libreoffice.comp.pyuno.Lightproof. + 
pkg
 self.SupportedServiceNames = (self.ServiceName, )
 self.locales = []
 for i in locales:
@@ -147,9 +147,9 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( Lightproof, \
-org.openoffice.comp.pyuno.Lightproof. + pkg,
+org.libreoffice.comp.pyuno.Lightproof. + pkg,
 (com.sun.star.linguistic2.Proofreader,),)
 
 g_ImplementationHelper.addImplementation( 
lightproof_handler_en.LightproofOptionsEventHandler, \
-org.openoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg,
+org.libreoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg,
 (com.sun.star.awt.XContainerWindowEventHandler,),)
diff --git a/en/Linguistic.xcu b/en/Linguistic.xcu
index 78fdd21..99011a7 100644
--- a/en/Linguistic.xcu
+++ b/en/Linguistic.xcu
@@ -5,7 +5,7 @@
 node oor:name=ServiceManager
 
 node oor:name=GrammarCheckers
-node 
oor:name=org.openoffice.comp.pyuno.Lightproof.en
+node 
oor:name=org.libreoffice.comp.pyuno.Lightproof.en
 oor:op=fuse
 prop oor:name=Locales 
oor:type=oor:string-list
 valueen-GB en-US en-PH en-ZA en-NA 
en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT/value
diff --git a/en/description.xml b/en/description.xml
index f3523c3..11de53b 100644
--- a/en/description.xml
+++ b/en/description.xml
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8?
 description xmlns=http://openoffice.org/extensions/description/2006; 
xmlns:d=http://openoffice.org/extensions/description/2006;  
xmlns:xlink=http://www.w3.org/1999/xlink;
-version value=2011.12.05 /
+version value=2011.12.05.1 /
 identifier value=org.openoffice.en.hunspell.dictionaries /
 display-name
 name lang=en-USEnglish spelling dictionaries, hyphenation rules, 
thesaurus, and grammar checker/name
diff --git a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 6a36775..563fa67 100644
--- a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-0' - en/description.xml en/dialog en/Lightproof.py en/Linguistic.xcu en/pythonpath hu_HU/description.xml hu_HU/dialog hu_HU/Lightproof.py

2013-02-13 Thread Stephan Bergmann

 en/Lightproof.py   |6 
+++---
 en/Linguistic.xcu  |2 +-
 en/description.xml |2 +-
 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu|2 +-
 en/pythonpath/lightproof_handler_en.py |2 +-
 hu_HU/Lightproof.py|6 
+++---
 hu_HU/Linguistic.xcu   |2 +-
 hu_HU/description.xml  |2 +-
 hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 hu_HU/pythonpath/lightproof_handler_hu_HU.py   |2 +-
 pt_BR/Lightproof.py|6 
+++---
 pt_BR/Linguistic.xcu   |2 +-
 pt_BR/description.xml  |4 ++--
 pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 pt_BR/pythonpath/lightproof_handler_pt_BR.py   |2 +-
 ru_RU/Lightproof.py|6 
+++---
 ru_RU/Linguistic.xcu   |2 +-
 ru_RU/description.xml  |2 +-
 ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |2 +-
 ru_RU/pythonpath/lightproof_handler_ru_RU.py   |2 +-
 20 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 8669b40a8835c007682507d1efd06f7f24452226
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 8 09:12:31 2013 +0100

fdo#60139: Rename bundled extensions's Lightproof service implementation 
names

... from org.openoffice.comp.pyuno.Lightproof... to
org.libreoffice.comp.pyuno.Lightproof... (and increment the corresponding
extensions' version numbers) to avoid clashes with any freestanding 
Lightproof
extension.

(cherry picked from commit 350dc590b04041f15d6c570075ade425e4db93ad)
Conflicts:
pt_BR/Lightproof.py

Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548
Reviewed-on: https://gerrit.libreoffice.org/2032
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/en/Lightproof.py b/en/Lightproof.py
index cdc93c6..dae4b20 100644
--- a/en/Lightproof.py
+++ b/en/Lightproof.py
@@ -23,7 +23,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, 
XServiceName, XSer
 def __init__( self, ctx, *args ):
 self.ctx = ctx
 self.ServiceName = com.sun.star.linguistic2.Proofreader
-self.ImplementationName = org.openoffice.comp.pyuno.Lightproof. + pkg
+self.ImplementationName = org.libreoffice.comp.pyuno.Lightproof. + 
pkg
 self.SupportedServiceNames = (self.ServiceName, )
 self.locales = []
 for i in locales:
@@ -147,9 +147,9 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( Lightproof, \
-org.openoffice.comp.pyuno.Lightproof. + pkg,
+org.libreoffice.comp.pyuno.Lightproof. + pkg,
 (com.sun.star.linguistic2.Proofreader,),)
 
 g_ImplementationHelper.addImplementation( 
lightproof_handler_en.LightproofOptionsEventHandler, \
-org.openoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg,
+org.libreoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg,
 (com.sun.star.awt.XContainerWindowEventHandler,),)
diff --git a/en/Linguistic.xcu b/en/Linguistic.xcu
index 78fdd21..99011a7 100644
--- a/en/Linguistic.xcu
+++ b/en/Linguistic.xcu
@@ -5,7 +5,7 @@
 node oor:name=ServiceManager
 
 node oor:name=GrammarCheckers
-node 
oor:name=org.openoffice.comp.pyuno.Lightproof.en
+node 
oor:name=org.libreoffice.comp.pyuno.Lightproof.en
 oor:op=fuse
 prop oor:name=Locales 
oor:type=oor:string-list
 valueen-GB en-US en-PH en-ZA en-NA 
en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT/value
diff --git a/en/description.xml b/en/description.xml
index f3523c3..11de53b 100644
--- a/en/description.xml
+++ b/en/description.xml
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8?
 description xmlns=http://openoffice.org/extensions/description/2006; 
xmlns:d=http://openoffice.org/extensions/description/2006;  
xmlns:xlink=http://www.w3.org/1999/xlink;
-version value=2011.12.05 /
+version value=2011.12.05.1 /
 identifier value=org.openoffice.en.hunspell.dictionaries /
 display-name
 name lang=en-USEnglish spelling dictionaries, hyphenation rules, 
thesaurus, and grammar

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-10'

2013-02-13 Thread Andras Timar

Tag 'suse-3.6-10' created by Andras Timar ati...@suse.com at 2013-02-05 21:05 
-0800

suse-3.6-10

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

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.1'

2013-02-13 Thread Dávid Vastag

Tag 'sdremote-1.0.1' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 22:46 -0800

Tag sdremote-1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGXS7AAoJEPQ0oe+v7q6jdOUP/RDK+W3TuQl+ICR0WFmrLszJ
/szYQOazKyTefD10RaxvshmLjFl7Uw+wRwMsh1kmhkbVFBPbIBvtyY0nV/f5pujm
5hC+bKTeWixV3ETmvoZH9rgOr4XNtAj7tU86mpEP3RX4qRbLwGegnHHWkvXEeOvq
wFRxQXwNVv6b2EETW2415AO3AG7A54c4UDhZKjOmrz0bhDhoQRavE+p/jFgZoa9p
E44XelUqMTVgzD1afKolLpeMuzIS+IfHpuyCvvoVhrE6TCiSadZUnchtoM8dZo+c
yiKMQypeOS4dS4fNwnty8baPTqeVOrGq2TpcDpSw02cuN7oIz5tqOID7GXLdEB5z
Z//cC1a4ktV5ZiyXf2UaOI3pzkFqqAFsYlzVUjp7rRwNR4nyrmd95z+ev6hWvFft
AvXX3W4ruO1VDtKniyGiJm/xC0w0xT6sX8A58sQW+xW15RS3IKgIrg38jcyIVzmL
yRhmzYBuGtS3bbvj3byUnyu0oTI4uy5eWzPVowkEN0TrTlOZJcdh/uyVb7kKXwNQ
QwIOeBmKGTPqh9+pIBJamdLeeSnYafklMtXRjrbLGnfRrD5EuYQyuT4xoMbJBsif
7Swv/jBsX7yAcUMfMNJezdENHpg7JmHsNQVAl3xpzZ9E9y76puJYLk4YvOOGjBmx
TudQGYMICig5RIpw6mZl
=8qrB
-END PGP SIGNATURE-

Changes since libreoffice-4-0-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] Changes to 'refs/tags/sdremote-1.0.0'

2013-02-13 Thread Dávid Vastag

Tag 'sdremote-1.0.0' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-07 16:52 -0800

Tag sdremote-1.0.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRE9viAAoJEPQ0oe+v7q6jwFcP/1awuycwlOnPTCZo8iFVrPd/
dZL9NA8Zky94YvhjIgZc2LYyy0330VJCRffSNrfe+KHSstZSO/hRsN8YEuL3Sylq
MOiqI3NkETpCHxlvdkZMXQzdwFk1CBfyK1uZbCcTSYob6zL+Ud9XgyxKSGsozcn1
MyW8JFt3EVHVgm8TGClfmn70KaPhHGvT2Mpz5IpFcorjTTz3to6AJjR/tF+VRZr2
qHt1PGU60AT82sGvhafABKyqouJovg/4Ee+MFQ92xwIYLczA1sGjaO+TW5Qy535q
wMyFygBTUEM1gu0tzyMAnqYHxhiqWN4uWlpxtOf5VHMBHRaofJF0sJ8WnAPf5SAO
+Bna+PNtXy2nkkUMJrpS/4YzJYk2RooC9YTTM7rF12HTItI3gsgwRxaYvbtx5/bN
rKJwsK/PX5KV++h9aETZniitvrXhiXGFByuJhODcuxgC/9THoc+qbDZwuqZoals0
PJFdQRjKgOJx7GsAK34260HgRZLxgmtvzgiWDolJYQRE53ACkTKdu6iuQU731uwG
9AhJrywXTJPhNBr4GfWa1ToSjpUV1fF1bGffoRJRCHEhh8Xu6qJhTQCdGzynMEA3
r4/yATkjI6xnVg95ifsV5eaEBZvhEdyCpIWa/lm8KFtbfOMtJbT+NQ6+lLALwZkg
Q28DuwEyMf/7Nablw8nZ
=t+pJ
-END PGP SIGNATURE-

Changes since libreoffice-4-0-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] Changes to 'refs/tags/sdremote-1.0.2'

2013-02-13 Thread Dávid Vastag

Tag 'sdremote-1.0.2' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 23:50 -0800

Tag sdremote-1.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGYO1AAoJEPQ0oe+v7q6jT5kQAKOx61MysXqEXJoswxTaGXX3
Xnw4wNs+xEky2r+614StuEG75bNWLQjY+8YjtRXLnmZt1bCLCbwngZ7PHcfAJuNF
MgFYIMVmlf4t1h+om3AUBQ9++17ZDqbg7ALyg3p+yo50zfM/dVfGmhbIv1Mm1xHY
cQT72PdOTOEcX5JglIpUZra4S/HJxbMe9ooAnqt9hu0W7js74uJRg4NweWjJYokK
mQVD60jVz+H+UVWuufDnDdavB+zX6tcegByizM8xPYnWmH+HzTV4as/JG1VekRb1
pqNrvToFWsqyefgua+nZasecTmCVheNN5mxfhp4+gMf7hZ3mMPF/ix+EH5sXQ5Lq
dFGP2pzyjrC6GbcL4DZycVw8akO40fgjCIfrrZJwc60jlPX/0gDOIjFgcE6UfGC0
zjgSpxlZDAZhi1rmQxgqLybWb2bKS0hORm1ysQfgHiF8SnMaPCO/Rf0i8cDUaqzb
AH/MlLjW0vrqrEu7PENFgxLo79wm5ojsA2TPeRlF0x41IEPcw03XH5nyKT0zjCld
PsHMRQVQeufu15FFiQt9V5Iez4E1eQimcdmqOTfn/a30dblbZ5ISspNXI1r+ZE1z
X58uPeSK5RvALXWNd33GONROrk9b9bKjNvwJFvO8fRNS3wWEQFkd3GXdtPwYLQmd
hfyB50OCjPHYg0KwDUUj
=W6Ln
-END PGP SIGNATURE-

Changes since libreoffice-4-0-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: Branch 'libreoffice-4-0' - help-to-wiki.py to-wiki/wikiconv2.py

2013-02-13 Thread Dávid Vastag

 help-to-wiki.py  |8 +-
 to-wiki/wikiconv2.py |  151 ---
 2 files changed, 112 insertions(+), 47 deletions(-)

New commits:
commit 7dded42472968783f5c90a0aa9e497ee3dfb247f
Author: DÃ¡vid Vastag davewwpub...@gmail.com
Date:   Mon Feb 4 22:05:01 2013 +0100

help-to-wiki.py now uses .po files as source of translations.

Plus added erro handling

Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 4a15f95..0ee17ba 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -95,13 +95,13 @@ print Generating the titles...
 os.system( python to-wiki/getalltitles.py source/text  alltitles.csv )
 
 try:
-sdf_path = args[0]
+po_path = args[0]
 except:
-sdf_path = '../../translations/unxlngx6.pro/misc/sdf-l10n'
-sys.stderr.write('Path to the .sdf files not provided, using %s\n'% 
sdf_path)
+po_path = '../translations/source'
+sys.stderr.write('Path to the .po files not provided, using %s\n'% 
po_path)
 
 # do the work
 for lang in langs:
-wikiconv2.convert(generate_redirects, lang, '%s/%s.sdf'% (sdf_path, lang))
+wikiconv2.convert(generate_redirects, lang, '%s/%s/helpcontent2/source'% 
(po_path, lang))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index be968cb..0e3bb5b 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-import os, sys, thread, threading, time
+import os, sys, thread, threading, time, re, copy
 import xml.parsers.expat
 import codecs
 from threading import Thread
@@ -179,31 +179,79 @@ def escape_equals_sign(text):
 
 return t
 
-def load_localization_data(sdf_file):
-global localization_data
-localization_data = {}
-try:
-file = codecs.open(sdf_file, r, utf-8)
-except:
-sys.stderr.write('Error: Cannot open .sdf file %s\n'% sdf_file)
-return False
+def xopen(path, mode, encoding):
+Wrapper around open() to support both python2 and python3.
+if sys.version_info = (3,):
+return open(path, mode, encoding=encoding)
+else:
+return open(path, mode)
+
+# used by ecape_help_text
+helptagre = re.compile('''[/]??[a-z_\-]+?(?:| +[a-zA-Z]+?=[]??.*?) 
*[/]??''')
+
+def escape_help_text(text):
+Escapes the help text as it would be in an SDF file.
+
+for tag in helptagre.findall(text):
+escapethistag = False
+for escape_tag in [ahelp, link, item, emph, defaultinline, 
switchinline, caseinline, variable, bookmark_value, image, 
embedvar, alt]:
+if tag.startswith(%s % escape_tag) or tag == /%s % 
escape_tag:
+escapethistag = True
+if tag in [br/, help-id-missing/]:
+escapethistag = True
+if escapethistag:
+escaped_tag = (\\ + tag[1:-1] + \\)
+text = text.replace(tag, escaped_tag)
+return text
 
-for line in file:
-line = line.strip()
-if line[0] == '#':
-continue
-spl = line.split(\t)
-
-# the form of the key is like
-# source/text/shared/explorer/database/02010100.xhp#hd_id3149233
-# otherwise we are getting duplicates
-key = '%s#%s'% (spl[1].replace('\\', '/'), spl[4])
-try:
-localization_data[key] = spl[10]
-except:
-sys.stderr.write('Warning: Ignored line %s\n'% 
line.encode('utf-8'))
 
-file.close()
+def load_localization_data(po_root):
+global localization_data
+localization_data = {}
+for root, dirs, files in os.walk(po_root):
+for file in files:
+if re.search(r'\.po$', file) == None:
+continue
+path = %s/%s % (root, file)
+sock = xopen(path, r, encoding='utf-8')
+hashKey = None
+transCollecting = False
+trans = 
+it = iter(sock)
+line = next(it, None)
+while line != None:
+line=line.decode(utf-8)
+if line.startswith('msgctxt '): # constructing the hashKey
+key=[]
+allGood = True
+i=0
+while i2 and allGood:
+msgctxt_line = next(it, None);
+if  msgctxt_line != None and 
msgctxt_line.strip().startswith(''):
+key.append( msgctxt_line[1:-4] ) #-4 cuts \\n\n 
from the end of the line
+i=i+1
+else:
+allGood = False
+if i==2: #hash key is allowed to be constructed
+hashKey = '#'.join( 
(re.sub(r'^.*helpcontent2/source/', r'source/', path[:-3]) + '/' + key[0] , 
key[1]) )
+

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-10'

2013-02-13 Thread Petr Mladek

Tag 'suse-3.6-10' created by Andras Timar ati...@suse.com at 2013-02-05 21:05 
-0800

suse-3.6-10

Changes since suse-3.6-0:
Fridrich Å trba (1):
  Branch libreoffice-3-6-3

Petr Mladek (1):
  Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6

Stephan Bergmann (1):
  fdo#51074: Start table cells with | |

---
 helpcontent2/to-wiki/wikiconv2.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.0'

2013-02-13 Thread Andras Timar

Tag 'sdremote-1.0.0' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-07 16:53 -0800

Tag sdremote-1.0.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRE9vzAAoJEPQ0oe+v7q6jFXoQAKa4+oK82QQfsS4QOZmjpzTP
oG+n/kT3EdkS4golJrinRULXPQkKsQZzZygDuZYRbJgavxoGnIKujUypn93UOfMI
h6jCeJz3xdvWe49TmxNtzrPTXy9s4kxNkN7mw8T17J7vKmHdMMg0kfDH1OrhyBaF
e0x2cz+OGYBhoHmup+yIM09vYuxv7/DSYFzhGZb5yBHsQ/kEulTxsvbYG9UdTID9
u/HAkvvfoS/M+7KDI00MRPuALMb4zece/8Y9n0ZI6yum/Ps32/WqYVR+2PdJ73mU
2j3vo7MiNIzcId2KQmU3kIDhREkdYuYFcd5sTsjsareaXwezB83d8DNy8XGYQVUs
kln4Ou9xnUWTlqVuQzC0JgA9Gdq4y0eOKsZRqVtUUSW4zhM26Szld7iEV9FwK9wA
dtcoByZZX1jY7JpfB52jLJv1a+voGhhn5DykBslbKEctyceO9753gpEWWjokabe3
nKkVw0giUqcEqeVEcDRwTSFmCtz9A71hES3RKjvJMAwSUl+EPK5EaLnCj/Dl/WtR
besL3+Z8X+t2uO1uw2e2pg/alppmMioxTz/ClvNDhlEasyeUu7IK0+hq4q+Az98d
I8yq8ovLnOxNM8Rq4pafDotEAImYkea6S81NcIjNNz7HgKmC9jQReIHJp57xL+2v
yQnc9WPoKyPg88Px804s
=rLlM
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.1'

2013-02-13 Thread Andras Timar

Tag 'sdremote-1.0.1' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 22:45 -0800

Tag sdremote-1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGXSUAAoJEPQ0oe+v7q6jkJcQALVWTuiPvTTUBwfJW7htChv0
OsjomUm9kmHqwIrWbHXgmKBXXt7HDKQYmd6WXMkrV2J45NtheYyYcddA3dH3HGFi
lnGq/7d8wkAenO2jY2WM7Q4Vvnxj/5+610FoDNcJ3pbYRnsq9ZkKt5yRoopiqpZO
x+smz0c7VjtzQUCPV/VfnKNJgtPQbIpXNqBjGGSz8a6lMNQtofN8dQxBNJIT5+O9
QuZHJKLsgmJC3OnFTtroWv2GB1RiCoAbFP6THb0G5YgWRbHAuTUQcrceZD0Hn90j
xFds3AIqBILtp1pPEWIS6QzX8ce5Y44/zu1ckgHX7V4c3liUwVPx7NEaMXaKAh4K
3qJzQCiyUtwcYep3I8wExaL4FA5OAjeQoa+b43aWAoQENyQ0oQUVHYy+YcWLgbzn
1V7XBjovK/5b7plwYTsTqImJ3ulXdyqDKFlG/TJFl6lKWn2Gd8iLfhVYCZc2gInt
0Ax+/e4tHiLoTNoiCt3cGe2sB4rnGfjK2DZnD4Cj+kGQlUMxWw5fWMsk3OZmNtqu
DpFR/aW1vGsBAJie9dwITLPV9Amng1cyukS7XP/UTujjeRbjrtg3Rhn6ddwO5xu2
86FZwgPAeqOZPxj08fbrlCYGiJhVZDpChXN9y6v2KM121usZ9W0Mydr8JNU17ikm
n6ABk+23h4aQN4BOxLDm
=kGDz
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/sdremote-1.0.2'

2013-02-13 Thread Andras Timar

Tag 'sdremote-1.0.2' created by Thorsten Behrens tbehr...@suse.com at 
2013-02-11 23:49 -0800

Tag sdremote-1.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJRGYOpAAoJEPQ0oe+v7q6j5XMQAJ31KdAKUACvXADIk8fDgzkd
20AImn5Hw7qIu426841L9J/V75xENd4lplVfkvWgSBKaLkrKpsUWLmDFfz/CASL9
YErBxMJdf595M2Nbuf9gJE+f2S0GAAM+PPt0fE+lMhaQk8Ba8DWO1w1+8iHvOg3+
HYfqA4mXmR81TjfVyjMbM7gKyV47z03q+PE8yMP0y7JHO0W0tOGS9pOpRfpdMlpZ
FQTMSFpsMI8uXZCflmBgUKT30KebQBlF6/v1KwajTg11KQQzEGYEVTc4XYpIO6Wr
1bbzf/we2/dIv7yPnoP45ThHpL4UG5ihZTkTLdVlM/cc9pYupuriwqqUR8iJyzqd
wBetQkS/yHGthg5OvbwyrFtcxKWCcKxgQuQt9c2umwbffWQ77/pVsgetMGuUkqps
+OTYLGzagZVjIiKQ3OpKcAf5ks9rq65zFMbEhtAHOxzIA7hUjOkpGQbIHhWz9d35
Pmm/oku2Q9SiTK2cJOGM2U7QDFui5wCCB4dHZYzqAkKzw7HCSj26CrT7G3ASwaBk
GtOlOQJx1pG7Q10Q1EtrwioPHxmBZn738XSEy23trGOE9z+GsD+d6k0lTvaqXxMc
FRsV/CxOZJroAwu8KPERCyCHjOCdJAquQCJb1JXG/TUDT7jLuuUoC2vuWGCoVFX3
QDHRggeI2p7bY9x7f4OQ
=wX7P
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: source/ast source/bg source/da source/el source/eo source/es source/et source/fi source/fr source/hu source/id source/nl source/nn source/sv source/tr

2013-02-13 Thread David Tardon

 source/ast/helpcontent2/source/text/shared/guide.po|2 +-
 source/bg/helpcontent2/source/text/scalc/01.po |2 +-
 source/bg/helpcontent2/source/text/swriter/01.po   |2 +-
 source/da/helpcontent2/source/text/scalc/00.po |2 +-
 source/da/helpcontent2/source/text/scalc/01.po |4 ++--
 source/da/helpcontent2/source/text/shared/01.po|2 +-
 source/da/helpcontent2/source/text/swriter/01.po   |2 +-
 source/el/helpcontent2/source/text/sbasic/shared.po|2 +-
 source/eo/helpcontent2/source/text/simpress/guide.po   |2 +-
 source/es/helpcontent2/source/text/sbasic/shared.po|2 +-
 source/es/helpcontent2/source/text/sbasic/shared/02.po |2 +-
 source/es/helpcontent2/source/text/swriter/guide.po|2 +-
 source/et/helpcontent2/source/text/sbasic/shared.po|2 +-
 source/fi/helpcontent2/source/text/scalc/01.po |4 ++--
 source/fr/helpcontent2/source/text/scalc/01.po |2 +-
 source/hu/helpcontent2/source/text/shared.po   |2 +-
 source/id/helpcontent2/source/text/simpress/01.po  |2 +-
 source/nl/helpcontent2/source/text/scalc/01.po |4 ++--
 source/nl/helpcontent2/source/text/shared.po   |2 +-
 source/nl/helpcontent2/source/text/shared/01.po|4 ++--
 source/nl/helpcontent2/source/text/shared/guide.po |2 +-
 source/nl/helpcontent2/source/text/shared/optionen.po  |6 +++---
 source/nl/helpcontent2/source/text/swriter/01.po   |2 +-
 source/nn/helpcontent2/source/text/sbasic/shared/02.po |2 +-
 source/nn/helpcontent2/source/text/scalc/01.po |2 +-
 source/nn/helpcontent2/source/text/shared/optionen.po  |2 +-
 source/sv/helpcontent2/source/text/sbasic/shared/02.po |2 +-
 source/sv/helpcontent2/source/text/scalc/01.po |2 +-
 source/sv/helpcontent2/source/text/shared/00.po|2 +-
 source/tr/helpcontent2/source/text/swriter/01.po   |4 ++--
 30 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 6ee465836d1fee4b4fbe714bde3b804cdda1b4ff
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 6 11:23:17 2013 +0100

fix parser errors in help translations

Change-Id: I9f5b3e637e36cadc397eacd9b60edac78e849fac

diff --git a/source/ast/helpcontent2/source/text/shared/guide.po 
b/source/ast/helpcontent2/source/text/shared/guide.po
index 0351fc2..2b3d200 100644
--- a/source/ast/helpcontent2/source/text/shared/guide.po
+++ b/source/ast/helpcontent2/source/text/shared/guide.po
@@ -20810,7 +20810,7 @@ msgctxt 
 par_id3155450\n
 help.text
 msgid image id=\img_id3152349\ src=\cmd/sc_save.png\ width=\0.222inch\ 
height=\0.222inch\alt id=\alt_id3152349\This icon is for tips on how to 
use the program more effectively./alt/image
-msgstr image id=\img_id3152349\ src=\cmd/sc_save.png\ 
width=\0.222inch\ height=\0.222inch\Esti iconu amuesa conseyos sobre cÃ³mo 
usar el programa de forma mÃ¡s eficaz./alt/image
+msgstr image id=\img_id3152349\ src=\cmd/sc_save.png\ 
width=\0.222inch\ height=\0.222inch\alt id=\alt_id3152349\Esti iconu 
amuesa conseyos sobre cÃ³mo usar el programa de forma mÃ¡s 
eficaz./alt/image
 
 #: doc_save.xhp
 msgctxt 
diff --git a/source/bg/helpcontent2/source/text/scalc/01.po 
b/source/bg/helpcontent2/source/text/scalc/01.po
index 85b78c7..33e19c3 100644
--- a/source/bg/helpcontent2/source/text/scalc/01.po
+++ b/source/bg/helpcontent2/source/text/scalc/01.po
@@ -241,7 +241,7 @@ msgctxt 
 par_id9838862\n
 help.text
 msgid You can also press switchinline select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Page
 Up and switchinline select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Page
 Down keys to scroll through the pages.
-msgstr ÐÐ° Ð¿ÑÐµÐ²ÑÑÑÐ°Ð½Ðµ Ð¿ÑÐµÐ· ÑÑÑÐ°Ð½Ð¸ÑÐ¸ÑÐµ Ð¼Ð¾Ð¶ÐµÑÐµ 
Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÑÐµ ÑÑÑÐ¾ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ÑÐµ switchinline 
select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Page
 Up Ð¸ switchinline select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline+Page 
Down.
+msgstr ÐÐ° Ð¿ÑÐµÐ²ÑÑÑÐ°Ð½Ðµ Ð¿ÑÐµÐ· ÑÑÑÐ°Ð½Ð¸ÑÐ¸ÑÐµ Ð¼Ð¾Ð¶ÐµÑÐµ 
Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÑÐµ ÑÑÑÐ¾ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ÑÐµ switchinline 
select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Page
 Up Ð¸ switchinline select=\sys\caseinline 
select=\MAC\Command/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Page
 Down.
 
 #: 0112.xhp
 msgctxt 
diff --git a/source/bg/helpcontent2/source/text/swriter/01.po 
b/source/bg/helpcontent2/source/text/swriter/01.po
index 001abc2..a29c75c 100644
--- a/source/bg/helpcontent2/source/text/swriter/01.po
+++ b/source/bg/helpcontent2/source/text/swriter/01.po
@@ -11705,7 +11705,7 @@ msgctxt 
 25\n
 help.text
 msgid ahelp hid=\modules/swriter/ui/linenumbering/linesspin\Enter the 
number

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-10'

2013-02-13 Thread Andras Timar

Tag 'suse-3.6-10' created by Andras Timar ati...@suse.com at 2013-02-05 21:05 
-0800

suse-3.6-10

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

[Libreoffice-commits] core.git: 7 commits - basctl/source helpcompiler/inc helpcompiler/Library_helplinker.mk helpcompiler/Package_inc.mk helpcompiler/source svtools/inc svtools/source

2013-02-13 Thread Andras Timar

 basctl/source/basicide/baside2b.cxx   |4 
 helpcompiler/Library_helplinker.mk|9 
 helpcompiler/Package_inc.mk   |1 
 helpcompiler/inc/BasCodeTagger.hxx|   56 ++
 helpcompiler/inc/HelpCompiler.hxx |7 
 helpcompiler/source/BasCodeTagger.cxx |  236 ++
 helpcompiler/source/HelpCompiler.cxx  |   56 +-
 helpcompiler/source/HelpLinker.cxx|2 
 svtools/inc/svtools/syntaxhighlight.hxx   |8 
 svtools/source/edit/editsyntaxhighlighter.cxx |2 
 svtools/source/edit/syntaxhighlight.cxx   |  235 ++---
 11 files changed, 423 insertions(+), 193 deletions(-)

New commits:
commit b6eed8596485380484245a77344ad9a3bd476a73
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 12 22:47:06 2013 +0100

fix a Basic keyword in syntax highlighter: withevent - withevents

Change-Id: I47b527ad6e68dba83ebb253bcc55a2717c7dd0ca

diff --git a/svtools/source/edit/syntaxhighlight.cxx 
b/svtools/source/edit/syntaxhighlight.cxx
index 8d33ac3..920bac5 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -152,7 +152,7 @@ static const char* strListBasicKeyWords[] = {
 wend,
 while,
 with,
-withevent,
+withevents,
 write,
 xor
 };
commit 67b8c0339e90c42dca402a925a624fce67f8ea5c
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 12 22:32:53 2013 +0100

fdo#41737 syntax highlighting of Basic code examples in offline help

Change-Id: I7dc5b189e98a0351bac0eab28c1161b5893f5ef1

diff --git a/helpcompiler/inc/BasCodeTagger.hxx 
b/helpcompiler/inc/BasCodeTagger.hxx
index 3cf9261..9ff376a 100644
--- a/helpcompiler/inc/BasCodeTagger.hxx
+++ b/helpcompiler/inc/BasCodeTagger.hxx
@@ -34,7 +34,6 @@ class L10N_DLLPUBLIC BasicCodeTagger
 BasicCodeTagger( xmlDocPtr rootDoc );
 ~BasicCodeTagger();
 void tagBasicCodes();
-void saveTreeToFile( const std::string filePath, const std::string 
encoding );
 };
 
 
//LibXmlTreeWalker===
diff --git a/helpcompiler/inc/HelpCompiler.hxx 
b/helpcompiler/inc/HelpCompiler.hxx
index 034a629..8a5dda1 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -245,7 +245,8 @@ public:
 const std::string entryName, const Hashtable bytesToAdd);
 private:
 xmlDocPtr getSourceDocument(const fs::path filePath);
-void sourceDocumentPreWorks( xmlDocPtr doc , const fs::path filePath);
+void tagBasicCodeExamples(xmlDocPtr doc);
+void saveXhpForJar(xmlDocPtr doc, const fs::path filePath);
 xmlNodePtr clone(xmlNodePtr node, const std::string appl);
 StreamTable streamTable;
 const fs::path inputFile, src, zipdir;
diff --git a/helpcompiler/source/BasCodeTagger.cxx 
b/helpcompiler/source/BasCodeTagger.cxx
index 339d96b..5852912 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -137,15 +137,9 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
 }
 
 //3. create new paragraph content
-String strLine(
-OUString(
-reinterpret_castconst sal_Char*(codeSnippet),
-strlen(
-reinterpret_castconst char*(codeSnippet)
-),
-RTL_TEXTENCODING_UTF8
-)
- ) ;
+OUString strLine( reinterpret_castconst sal_Char*(codeSnippet),
+strlen(reinterpret_castconst 
char*(codeSnippet)),
+RTL_TEXTENCODING_UTF8 );
 m_Highlighter.notifyChange ( 0, 0, strLine, 1 );
 HighlightPortions portions;
 m_Highlighter.getHighlightPortions( 0, strLine, portions );
@@ -155,7 +149,7 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
 for ( size_t i=0; iportions.size(); i++ )
 {
 HighlightPortion r = portions[i];
-subStr = xmlStrsub( codeSnippet, r.nBegin, r.nEnd-r.nBegin );
+subStr = (xmlChar*) OUStringToOString( strLine.copy( r.nBegin, 
r.nEnd-r.nBegin ), RTL_TEXTENCODING_UTF8 ).getStr();
 text = xmlNewText( subStr );
 if ( r.tokenType != TT_WHITESPACE )
 {
@@ -185,7 +179,7 @@ void BasicCodeTagger::tagBasicCodes()
 {
 getBasicCodeContainerNodes();
 }
-catch (TaggerException ex)
+catch (TaggerException ex)
 {
   std::cout  BasCodeTagger error occured. Error code:  ex  
std::endl;
 }
@@ -229,7 +223,7 @@ xmlChar* BasicCodeTagger::getTypeString( TokenTypes 
tokenType )
 str = operator;
 break;
 case TT_KEYWORDS :
-str = keywords;
+str = keyword;
 break;
 case TT_PARAMETER :
 str = parameter;
@@

Re: About macro VALIDTAB (sc module)

2013-02-13 Thread Michael Meeks


On Tue, 2013-02-12 at 20:09 -0500, Kohei Yoshida wrote:
 Actually I don't get the purpose of those macros either.  Anyway, I'm 
 pretty sure that those macros are there for none other than some weird 
 historical reasons.  I don't use them when writing new code, and try to 
 replace them with the real methods whenever I can.  I hope that 
 eventually we can totally get rid of them.

Any chance of filing an easy-hack - ie. a bug with:

EasyHack,DifficultyInteresting,SkillCpp,TopicCleanup

in the whiteboard ? :-) We need more clear  useful easy-hacks filing
for people to do IMHO.

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

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

2013-02-13 Thread Caolán McNamara

 cui/source/inc/chardlg.hxx|2 
 cui/source/tabpages/chardlg.cxx   |2 
 cui/uiconfig/ui/backgroundpage.ui |   12 +---
 cui/uiconfig/ui/charnamepage.ui   |3 -
 cui/uiconfig/ui/effectspage.ui|   86 ++
 cui/uiconfig/ui/positionpage.ui   |   32 
 cui/uiconfig/ui/twolinespage.ui   |7 +-
 sw/uiconfig/swriter/ui/charurlpage.ui |   12 ++--
 8 files changed, 56 insertions(+), 100 deletions(-)

New commits:
commit 43edaa1b3a79341a7a9394291954ff097042
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 13 09:48:47 2013 +

consistent padding around various format-character pages

Change-Id: I8c8ed2db29d1175ba2187509482cdaf858ed660c

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index ce08f42..71b5542 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -200,8 +200,6 @@ private:
 
 CheckBox*   m_pIndividualWordsBtn;
 
-FixedLine*  m_pAsianLine;
-
 FixedText*  m_pEmphasisFT;
 ListBox*m_pEmphasisLB;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7622e9d4..7048be1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1309,7 +1309,6 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, 
const SfxItemSet rInSe
 get(m_pUnderlineColorFT, underlinecolorft);
 get(m_pUnderlineColorLB, underlinecolorlb);
 get(m_pIndividualWordsBtn, individualwordscb);
-get(m_pAsianLine, asianfl);
 get(m_pEmphasisFT, emphasisft);
 get(m_pEmphasisLB, emphasislb);
 get(m_pPositionFT, positionft);
@@ -1414,7 +1413,6 @@ void SvxCharEffectsPage::Initialize()
 
 if ( !SvtLanguageOptions().IsAsianTypographyEnabled() )
 {
-m_pAsianLine-Hide();
 m_pEmphasisFT-Hide();
 m_pEmphasisLB-Hide();
 m_pPositionFT-Hide();
diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index d601ca9..d6395a2 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -9,12 +9,9 @@
   object class=GtkGrid id=BackgroundPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_right6/property
-property name=margin_top6/property
-property name=margin_bottom6/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=border_width6/property
 property name=row_spacing6/property
 child
   object class=GtkGrid id=grid2
@@ -139,6 +136,7 @@
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkGrid id=grid3
@@ -418,9 +416,9 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
-  accessibility
-relation type=labelled-by 
target=positionrb/
-  /accessibility
+accessibility
+  relation type=labelled-by 
target=positionrb/
+/accessibility
   /object
   packing
 property name=left_attach1/property
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 9ab5b02..47f5ae8 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -4,8 +4,9 @@
   object class=GtkBox id=CharNamePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
-property name=spacing6/property
+property name=spacing12/property
 child
   object class=GtkFrame id=simple
 property name=can_focusFalse/property
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 9ae0686..2219cb4 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -197,25 +197,32 @@
   object class=GtkBox id=EffectsPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkFrame id=frame15
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property

Re: Help with fdo#60471

2013-02-13 Thread Jan Holesovsky

Hi Marcos, Michael,

Marcos Souza píše v Út 12. 02. 2013 v 23:11 -0200:

 I tried to get the error message from uno::Exception using a SAL_WARN,
 but this is the message:
 
 [ line 4]: error
 
 This don't say anything to me : )

Yes - unhelpful ;-)  I've had a better look, and it is down to throwing
SaxExpatParser: internal entity declaration, stopping, added by
Michael S.:

http://lists.freedesktop.org/archives/libreoffice-commits/2012-May/031218.html

Michael, can you please have a look?  The SVG.odp from fdo#60471 throws
that when parsing Pictures/100020E19BE89C15.svg that
contains 

!ENTITY ns_flows http://ns.adobe.com/Flows/1.0/;

Thank you,
Kendy


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

[Libreoffice-commits] core.git: 3 commits -

2013-02-13 Thread David Tardon

 0 files changed

New commits:
commit 7e3d969155ff38f216965cbd7dace26e74c9255c
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 10:59:37 2013 +0100

fix translation of crash reporter

Change-Id: I52cda360116b719bf05776e01bf3d15303eea97d

diff --git a/crashrep/CustomTarget_crashrep_res.mk 
b/crashrep/CustomTarget_crashrep_res.mk
index e29ecc5..c64f4cb 100644
--- a/crashrep/CustomTarget_crashrep_res.mk
+++ b/crashrep/CustomTarget_crashrep_res.mk
@@ -10,14 +10,15 @@
 $(eval $(call gb_CustomTarget_CustomTarget,crashrep/source/win32))
 
 $(eval $(call gb_CustomTarget_register_targets,crashrep/source/win32, \
+   crashrep.ulf \
crashrep_impl.rc \
 ))
 
 $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \
+   $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf \
$(SRCDIR)/crashrep/source/win32/rcfooter.txt \
$(SRCDIR)/crashrep/source/win32/rcheader.txt \
$(SRCDIR)/crashrep/source/win32/rctemplate.txt \
-   $(SRCDIR)/crashrep/source/win32/crashrep.ulf \
$(call gb_Executable_get_runtime_dependencies,lngconvex)
 
 #BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)
@@ -26,10 +27,18 @@ $(call 
gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc :
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/crashrep/source/win32  \
$(call gb_Executable_get_command,lngconvex) \
-   -ulf crashrep.ulf \
+   -ulf $ \
-rc $@ \
-rct rctemplate.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \
+   $(SRCDIR)/crashrep/source/win32/crashrep.ulf \
+   $(call gb_Executable_get_runtime_dependencies,ulfex)
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_command,ulfex) -p crashrep -i $ -o $@ -m 
$${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 10:59:09 2013 +0100

fdo#60386 fix l10n of windows shell extension

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 6a07701..2885176 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -27,14 +27,19 @@
 
 $(eval $(call 
gb_CustomTarget_CustomTarget,shell/source/win32/shlxthandler/res))
 
+$(eval $(call 
gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/res,\
+   shlxthdl.ulf \
+   shlxthdl_impl.rc \
+))
+
 $(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
$(call gb_Executable_get_runtime_dependencies,lngconvex) \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
 
@@ -44,10 +49,18 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_command,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $ \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_runtime_dependencies,ulfex)
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_command,ulfex) -p shell -i $ -o $@ -m 
$${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit 7c8d4cfb2bc8cb24373791ab9da4cd068baa67eb
Author: David Tardon

[Libreoffice-commits] core.git: shell/CustomTarget_shlxthdl_res.mk

2013-02-13 Thread David Tardon

 shell/CustomTarget_shlxthdl_res.mk |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 3696f90a559293c94d42e07c8084c728b5f296e6
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 11:06:36 2013 +0100

simplify makefile

Change-Id: Id40bdd821308b18a49630c15b1e28c004d7311ed

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 2885176..1e0e12b 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -32,18 +32,12 @@ $(eval $(call 
gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/r
shlxthdl_impl.rc \
 ))
 
-$(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
-   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
-
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
-   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(call gb_Executable_get_runtime_dependencies,lngconvex) \
-   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
-
-$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 :
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
+   $(call gb_Executable_get_runtime_dependencies,lngconvex)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

reboot of gerrit in 8 hours

2013-02-13 Thread Florian Effenberger


Hello,

once again, the VM and the host of gerrit need a reboot due to a 
security upgrade.


Unless someone objects (please write to me directly, since I'm not 
reading this list), I will do this in approximately 8 hours, at 1800 
UTC. Outage should be about 5 minutes, if all goes well.


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

[Bug 37361] LibreOffice 3.5 most annoying bugs

2013-02-13 Thread bugzilla-daemon

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

--- Comment #404 from nomnex nom...@gmail.com ---
(In reply to comment #403)
 @nomnex - we try not to bump bugs in MAB or discuss them here in the
 comments.

Yes, sorry about that.

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

Re: About macro VALIDTAB (sc module)

2013-02-13 Thread Julien Nabet


On 13/02/2013 10:34, Michael Meeks wrote:

On Tue, 2013-02-12 at 20:09 -0500, Kohei Yoshida wrote:

Actually I don't get the purpose of those macros either.  Anyway, I'm
pretty sure that those macros are there for none other than some weird
historical reasons.  I don't use them when writing new code, and try to
replace them with the real methods whenever I can.  I hope that
eventually we can totally get rid of them.

Any chance of filing an easy-hack - ie. a bug with:

EasyHack,DifficultyInteresting,SkillCpp,TopicCleanup

in the whiteboard ? :-) We need more clear  useful easy-hacks filing
for people to do IMHO.
If it's just about replacing VALIDTAB and other similar macros by their 
equivalent, I'll do it and so, no need to file a new easy hack bug.


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

Re: Help with fdo#60471

2013-02-13 Thread Michael Stahl

On 13/02/13 10:53, Jan Holesovsky wrote:
 
 Yes - unhelpful ;-)  I've had a better look, and it is down to throwing
 SaxExpatParser: internal entity declaration, stopping, added by
 Michael S.:
 
 http://lists.freedesktop.org/archives/libreoffice-commits/2012-May/031218.html
 
 Michael, can you please have a look?  The SVG.odp from fdo#60471 throws
 that when parsing Pictures/100020E19BE89C15.svg that
 contains 
 
 !ENTITY ns_flows http://ns.adobe.com/Flows/1.0/;

both parsers in the sax module abort on the first XML entity
encountered, to make the import filters robust against billion laughs
kind of Denial of Service attacks.

http://en.wikipedia.org/wiki/Billion_laughs

how common is it anyway to have these internal entities in SVG files?

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

Strange loop in vcl/source/control/combobox

2013-02-13 Thread Jean-Noël Rouvignac

Hello,

I have been looking at the following code, but struggle a bit to understand
how this loop is working in IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) :
xub_StrLen nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
{
xub_StrLen  nPrevIndex = nIndex;
XubString   aToken = aText.GetToken( 0, mcMultiSep, nIndex
);
xub_StrLen  nTokenLen = aToken.Len();
aToken = comphelper::string::strip(aToken, ' ');
sal_uInt16  nP = mpImplLB-GetEntryList()-FindEntry(
aToken );
if ( (nP != LISTBOX_ENTRY_NOTFOUND) 
(!mpImplLB-GetEntryList()-IsEntryPosSelected( nP )) )
{
aText.Erase( nPrevIndex, nTokenLen );
nIndex = sal::static_int_castxub_StrLen(nIndex -
nTokenLen);
if ( (nPrevIndex  aText.Len())  (aText.GetChar(
nPrevIndex ) == mcMultiSep) )
{
aText.Erase( nPrevIndex, 1 );
nIndex--;
}
}
aText = comphelper::string::strip(aText, ' ');
}

My problem lies with how the nIndex variable gets updated, I don't see how
it can reach STRING_NOTFOUND any other way than by luck. I must be missing
something.
Does anybody have a better read than me here?

BTW I am trying to convert this code to use OUString, so any suggestion in
this direction is more than welcome :)

Cheers,
Jean--Noël
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Help with fdo#60471

2013-02-13 Thread Michael Stahl

On 13/02/13 11:37, Michael Stahl wrote:
 On 13/02/13 10:53, Jan Holesovsky wrote:

 Yes - unhelpful ;-)  I've had a better look, and it is down to throwing
 SaxExpatParser: internal entity declaration, stopping, added by
 Michael S.:

 http://lists.freedesktop.org/archives/libreoffice-commits/2012-May/031218.html

 Michael, can you please have a look?  The SVG.odp from fdo#60471 throws
 that when parsing Pictures/100020E19BE89C15.svg that
 contains 

 !ENTITY ns_flows http://ns.adobe.com/Flows/1.0/;
 
 both parsers in the sax module abort on the first XML entity
 encountered, to make the import filters robust against billion laughs
 kind of Denial of Service attacks.
 
 http://en.wikipedia.org/wiki/Billion_laughs
 
 how common is it anyway to have these internal entities in SVG files?

apparently Adobe Illustrator is written by monkeys who thought the
following gratuitous nonsense is a good way to define XML namespaces:

 !DOCTYPE svg PUBLIC [...]
   !ENTITY ns_flows http://ns.adobe.com/Flows/1.0/;
   !ENTITY ns_svg http://www.w3.org/2000/svg;
   !ENTITY ns_xlink http://www.w3.org/1999/xlink;
 ]
 svg [...] xmlns:xlink=ns_xlink; xmlns=ns_svg; [...] 

sigh... guess i'll have to add a parameter to the SAX parser so it can
still ignore entities when reading ODF files...

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

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

2013-02-13 Thread Miklos Vajna

 cui/source/tabpages/backgrnd.cxx |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 33fcc140ba412bd7565cc469418e65d445c98b52
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Feb 13 11:26:50 2013 +0100

SvxBackgroundTabPage::FillItemSet: handle XFILL_BITMAP - XFILL_GRADIENT

This makes it possible to turn the bitmap background of a Writer frame
into a gradient one.

Change-Id: Iae88793d40593a2adbcc7f83e82e28265cdd9be7

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 15b6d10..3553df8 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -844,8 +844,20 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 }
 else // Brush - Bitmap changed!
 {
-if ( bIsBrush )
+if (bIsBrush || bIsGradient)
+{
 rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
+if (bIsGradient)
+{
+// Handle XFILL_BITMAP - XFILL_GRADIENT
+XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_ATTR_FILL_STYLE));
+rCoreSet.Put(aFillStyleItem);
+
+const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)m_rXFillSet.Get(XATTR_FILLGRADIENT);
+XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT));
+rCoreSet.Put(aFillGradientItem);
+}
+}
 else
 {
 SvxBrushItem* pTmpBrush = 0;
@@ -873,7 +885,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 delete pTmpBrush;
 }
 }
-bModified = ( bIsBrush || m_pBtnLink-IsChecked() || 
bIsGraphicValid );
+bModified = ( bIsBrush || bIsGradient || m_pBtnLink-IsChecked() 
|| bIsGraphicValid );
 }
 }
 else if ( SID_ATTR_BRUSH_CHAR == nSlot  aBgdColor != Color( COL_WHITE ) )
commit 206c088c092d484dbbed82ff3c18e6dfc00de513
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Feb 13 10:50:03 2013 +0100

SvxBackgroundTabPage::FillItemSet: handle XFILL_GRADIENT - XFILL_SOLID

This makes it possible to turn off the gradient background of a Writer
frame.

Change-Id: Ic7bdfec252847f463da47c838c7de0fdb7625869

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index b5c2f63..15b6d10 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -785,6 +785,9 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 }
 else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( 
nWhich, sal_False ) )
 rCoreSet.ClearItem( nWhich );
+// Handle XFILL_GRADIENT - XFILL_SOLID
+XFillStyleItem aFillStyleItem(XFILL_SOLID, 
GetWhich(SID_ATTR_FILL_STYLE));
+rCoreSet.Put(aFillStyleItem);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - setup_native/Library_instooofiltmsi.mk setup_native/Library_jfregca.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Li

2013-02-13 Thread Andras Timar

 setup_native/Library_instooofiltmsi.mk 
   |4 
 setup_native/Library_jfregca.mk
   |4 
 setup_native/Library_qslnkmsi.mk   
   |4 
 setup_native/Library_reg4allmsdoc.mk   
   |6 
 setup_native/Library_regactivex.mk 
   |4 
 setup_native/Library_regpatchactivex.mk
   |4 
 setup_native/Library_sdqsmsi.mk
   |4 
 setup_native/Library_shlxtmsi.mk   
   |4 
 setup_native/Library_sn_tools.mk   
   |4 
 setup_native/Library_thidxmsi.mk   
   |   28 -
 setup_native/Module_setup_native.mk
   |1 
 setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def  
   |3 
 
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
 |2 
 setup_native/source/win32/customactions/javafilter/jfregca.def 
   |4 
 setup_native/source/win32/customactions/quickstarter/qslnkmsi.def  
   |3 
 
setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx 
  |2 
 setup_native/source/win32/customactions/quickstarter/sdqsmsi.def   
   |3 
 setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx   
   |2 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def  
   |6 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
   |8 
 setup_native/source/win32/customactions/regactivex/regactivex.cxx  
   |4 
 setup_native/source/win32/customactions/regactivex/regactivex.def  
   |4 
 setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
   |2 
 setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
   |3 
 setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx 
   |2 
 setup_native/source/win32/customactions/shellextensions/checkpatches.cxx   
   |2 
 
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx 
  |2 
 setup_native/source/win32/customactions/shellextensions/iconcache.cxx  
   |2 
 setup_native/source/win32/customactions/shellextensions/layerlinks.cxx 
   |4 
 setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx 
   |2 
 setup_native/source/win32/customactions/shellextensions/shlxtmsi.def   
   |   14 
 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx  
   |4 
 setup_native/source/win32/customactions/shellextensions/upgrade.cxx
   |2 
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx   
   |4 
 setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
   |  201 --
 setup_native/source/win32/customactions/tools/checkversion.cxx 
   |2 
 setup_native/source/win32/customactions/tools/sn_tools.def 
   |3 
 37 files changed, 103 insertions(+), 254 deletions(-)

New commits:
commit dbb60dd9aeaaa9e4547e80aa7da4ae3a76e2470f
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 13 12:04:11 2013 +0100

fix exported DLL function names for all CustomActions

Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3

diff --git a/setup_native/Library_instooofiltmsi.mk 
b/setup_native/Library_instooofiltmsi.mk
index c37f9ff..07900b1 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_Library_Library,instooofiltmsi))
 
+$(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
+   
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
 \
+))
+
 $(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\
 
setup_native/source/win32/customactions/indexingfilter/restartindexingservice \
 ))
diff --git a/setup_native/Library_jfregca.mk b/setup_native/Library_jfregca.mk
index 9dcb3c5..d3eea27 100644
--- a/setup_native/Library_jfregca.mk
+++ b/setup_native/Library_jfregca.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_Library_Library,jfregca))
 
+$(eval $(call gb_Library_add_ldflags,jfregca,\
+   
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/javafilter/jfregca.def \
+))
+
 $(eval $(call gb_Library_add_exception_objects,jfregca,\
 setup_native/source/win32/customactions/javafilter/jfregca \
 ))
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 602c046..04dd1fb 100644
---

Re: [PATCH] convert setup_native to gbuild and add to tail_build

2013-02-13 Thread Andras Timar

Hi Peter,

Thanks, it was a good fix, I did the same for all CustomActions. Just
one more problem: now MSVCRT is linked dinamically. It is not good,
because MSVCRT is not part of the default Windows installation. We
need to link it statically like we did that before.

Thanks,
Andras


On Mon, Feb 11, 2013 at 11:03 PM, Peter Foley pefol...@verizon.net wrote:
 Andras,

 I just pushed a patch that should fix it.
 Could you test it?

 Thanks,

 Peter

 -Original Message- From: Andras Timar Sent: Monday, February 11,
 2013 7:37 AM To: Peter Foley Cc: libreoffice Subject: Re: [PATCH] convert
 setup_native to gbuild and add to tail_build
 Hi Peter,

 On Sat, Feb 9, 2013 at 3:54 PM, Peter Foley (via Code Review)
 ger...@gerrit.libreoffice.org wrote:

 Hi,

 I have submitted a patch for review:

 https://gerrit.libreoffice.org/2063


 I tested you patch and it does not work for me.
 Windows Installer cannot execure any of the CustomActions. E.g.:
 MSI (c) (9C:B0) [13:23:41:427]: Invoking remote custom action. DLL:
 C:\Users\timar\AppData\Local\Temp\MSIAF36.tmp, Entrypoint:
 SelectLanguage
 CustomAction SelectLanguage returned actual error code 1154 but will
 be translated to success due to continue marking
 The problem is that in newly built DLLs the names are mangled, I see
 _SelectLanguage@4 instead of SelectLanguage in Dependency Walker.

 Best regards,
 Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-02-13 Thread Tor Lillqvist

 sc/source/core/inc/interpre.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2bdea3b8cf15f3529348813fd253dfdbb8ff5556
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Feb 13 13:24:24 2013 +0200

WaE: struct/class mixup

Change-Id: Ia400ca7fdd2728e4fa12b96ace75ba1d5b7231f2

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 8cc48a8..16eb22c 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -47,8 +47,8 @@ struct ScQueryEntry;
 
 struct ScCompare;
 struct ScCompareOptions;
-class ScSingleRefData;
-class ScComplexRefData;
+struct ScSingleRefData;
+struct ScComplexRefData;
 
 class ScToken;
 class ScJumpMatrix;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Strange loop in vcl/source/control/combobox

2013-02-13 Thread julien2412

Hello Jean-Noël,

About STRING_NOTFOUND, you can take a look to getToken function in
tools/source/string/tustring.cxx since this function is called line 388:
385 while ( nIndex != STRING_NOTFOUND )
386 {
387 xub_StrLen  nPrevIndex = nIndex;
388 XubString   aToken = aText.GetToken( 0, mcMultiSep,
nIndex );

About string classes, you can take a look here:
https://wiki.documentfoundation.org/Development/String_Classes

Finally, about convertion examples, you'll find some here:
http://cgit.freedesktop.org/libreoffice/core/log/?qt=grepq=XubString

Hope it helps.

Julien




--
View this message in context: 
http://nabble.documentfoundation.org/Strange-loop-in-vcl-source-control-combobox-tp4037060p4037082.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-02-13 Thread Caolán McNamara

 helpcompiler/source/BasCodeTagger.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 62fb1958f6ac4d238e98cfb6b497f5990615450f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 13 11:50:35 2013 +

make building help not crash

a) subStr is not ours to delete, belongs to the OString
b) and anyway subStr points to the buffer of the out-of-scope temporary 
OString

Change-Id: I1689c6626c52ae9d94e0cfa5de4235be3c1f3262

diff --git a/helpcompiler/source/BasCodeTagger.cxx 
b/helpcompiler/source/BasCodeTagger.cxx
index 5852912..a984eb7 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -143,17 +143,14 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
 m_Highlighter.notifyChange ( 0, 0, strLine, 1 );
 HighlightPortions portions;
 m_Highlighter.getHighlightPortions( 0, strLine, portions );
-xmlChar* subStr;
-xmlChar* typeStr;
-xmlNodePtr text;
 for ( size_t i=0; iportions.size(); i++ )
 {
 HighlightPortion r = portions[i];
-subStr = (xmlChar*) OUStringToOString( strLine.copy( r.nBegin, 
r.nEnd-r.nBegin ), RTL_TEXTENCODING_UTF8 ).getStr();
-text = xmlNewText( subStr );
+OString sToken(OUStringToOString(strLine.copy(r.nBegin, 
r.nEnd-r.nBegin), RTL_TEXTENCODING_UTF8));
+xmlNodePtr text = xmlNewText((const xmlChar*)sToken.getStr());
 if ( r.tokenType != TT_WHITESPACE )
 {
-typeStr = getTypeString( r.tokenType );
+xmlChar* typeStr = getTypeString( r.tokenType );
 curNode = xmlNewTextChild( paragraph, 0, (xmlChar*)item, 0 );
 xmlNewProp( curNode, (xmlChar*)type, typeStr );
 xmlAddChild( curNode, text );
@@ -161,7 +158,6 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
 }
 else
 xmlAddChild( paragraph, text );
-xmlFree( subStr );
 }
 xmlFree( codeSnippet );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-13 Thread Michael Meeks

 sw/inc/IDocumentStatistics.hxx  |   17 ++-
 sw/inc/doc.hxx  |   16 ++
 sw/inc/ndtxt.hxx|4 
 sw/source/core/doc/doc.cxx  |  181 ++--
 sw/source/core/doc/docnew.cxx   |4 
 sw/source/core/txtnode/txtedt.cxx   |   18 +--
 sw/source/ui/dialog/wordcountdialog.cxx |2 
 sw/source/ui/inc/view.hxx   |6 -
 sw/source/ui/uiview/view.cxx|1 
 sw/source/ui/uiview/view2.cxx   |9 +
 10 files changed, 163 insertions(+), 95 deletions(-)

New commits:
commit c138a8aec8dccb97948a7d7993e6869da4079b32
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 11:35:13 2013 +

asynchronous word-count.

diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 4ec926a..2c5a0501 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -35,13 +35,26 @@
 
 /** Document - Statistics
 */
+/// Returns a reference to the existing document statistics
 virtual const SwDocStat GetDocStat() const = 0;
 
-virtual const SwDocStat GetUpdatedDocStat() = 0;
+/**
+  * Updates the document statistics if the document has been
+  * modified and returns a reference to the result.
+  * \param bCompleteAsync if true will return a partial result,
+  * and potentially trigger a timeout to complete the work.
+  */
+virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync) = 0;
 
+/// Set the document statistics
 virtual void SetDocStat(const SwDocStat rStat) = 0;
 
-virtual void UpdateDocStat() = 0;
+/**
+  * Updates the internal document's statistics
+  * \param bCompleteAsync if true it may do part of the
+  * work and trigger a timeout to complete it.
+  */
+virtual void UpdateDocStat(bool bCompleteAsync) = 0;
 
 protected:
 virtual ~IDocumentStatistics() {};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c67f79f..ccebf5c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -282,6 +282,7 @@ class SW_DLLPUBLIC SwDoc :
 */
 Timer   aIdleTimer; /// Own IdleTimer
 Timer   aOLEModifiedTimer;  /// Timer for update modified 
OLE-Objecs
+Timer   aStatsUpdateTimer;  /// Timer for asynchronous stats 
calculation
 SwDBDataaDBData;/// database descriptor
 ::com::sun::star::uno::Sequence sal_Int8  aRedlinePasswd;
 String  sTOIAutoMarkURL;/// ::com::sun::star::util::URL of 
table of index AutoMark file
@@ -909,9 +910,9 @@ public:
 */
 virtual void DocInfoChgd();
 virtual const SwDocStat GetDocStat() const;
-virtual const SwDocStat GetUpdatedDocStat();
+virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync = false);
 virtual void SetDocStat(const SwDocStat rStat);
-virtual void UpdateDocStat();
+virtual void UpdateDocStat(bool bCompleteAsync = false);
 
 /** IDocumentState
 */
@@ -2071,6 +2072,17 @@ private:
 void CopyMasterHeader(const SwPageDesc rChged, const SwFmtHeader rHead, 
SwPageDesc *pDesc, bool bLeft);
 /// Copies master footer to left / first one, if necessary - used by 
ChgPageDesc().
 void CopyMasterFooter(const SwPageDesc rChged, const SwFmtFooter rFoot, 
SwPageDesc *pDesc, bool bLeft);
+
+/** continue computing a chunk of document statistics
+  * \param nTextNodes number of paragraphs to calculate before
+  * exiting
+  *
+  * returns false when there is no more to calculate
+  */
+bool IncrementalDocStatCalculate(long nTextNodes = 250);
+
+/// Our own 'StatsUpdateTimer' calls the following method
+DECL_LINK( DoIdleStatsUpdate, Timer * );
 };
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 18c2b02..5a47fb2 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -745,8 +745,8 @@ public:
 xub_StrLen nStart, xub_StrLen nEnd,
 SwUndoTransliterate* pUndo = 0 );
 
-/// count words in given range
-void CountWords( SwDocStat rStat, xub_StrLen nStart, xub_StrLen nEnd ) 
const;
+/// count words in given range - returns true if we refreshed out count
+bool CountWords( SwDocStat rStat, xub_StrLen nStart, xub_StrLen nEnd ) 
const;
 
 /** Checks some global conditions like loading or destruction of document
to economize notifications */
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index cd71cf5..0470ef3 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -55,6 +55,7 @@
 #include editeng/rsiditem.hxx
 #include unotools/charclass.hxx
 #include unotools/localedatawrapper.hxx
+#include vcl/timer.hxx
 
 #include swatrset.hxx
 #include swmodule.hxx
@@ -112,6 +113,7 @@
 #include shellres.hxx
 #include txtfrm.hxx
 #include attrhint.hxx
+#include view.hxx

[Libreoffice-commits] core.git: helpcontent2

2013-02-13 Thread Caolán McNamara

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

New commits:
commit e1c4d620234f5f2861cf591171e8eb9423034a06
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 13 12:20:40 2013 +

Updated core
Project: help  7a051b06eee9561a19aa1248ec5dfde655c624e7

diff --git a/helpcontent2 b/helpcontent2
index 4d7b724..7a051b0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4d7b72491649f33d115f687f5deee58bd9619ca4
+Subproject commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-02-13 Thread Caolán McNamara

 helpers/help_hid.lst |   20 
 source/text/shared/optionen/01010900.xhp |   71 +++
 2 files changed, 36 insertions(+), 55 deletions(-)

New commits:
commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 13 12:20:40 2013 +

update help ids for print options page .ui conversion

Change-Id: Ic5ea2c6acc4a157d726331ddc7ef826350df5fcc

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 825b0b2..d44f0d3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4001,7 +4001,6 @@ HID_TPROTATION_CTRL2,33995,
 HID_TPSHADOW_CTRL,33990,
 HID_TPSIZE_CTRL,33993,
 HID_TP_BUSINESS_DATA,53248,
-HID_TP_COMMONPRINTOPTIONS,33343,
 HID_TP_CUSTOMPROPERTIES,33392,
 HID_TP_MAILCONFIG,54978,
 HID_TP_PRIVATE_DATA,53247,
@@ -7332,14 +7331,6 @@ sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_WHOLEWORDS,2187084813,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_WRAPAROUND,2187084815,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES,576160808,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION,576160820,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE,576160819,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS,576160798,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY,576160802,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS,576160788,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY,576160778,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY,576160821,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
 sfx2_CheckBox_TP_MANAGE_STYLES_CB_AUTO,541246476,
@@ -7364,7 +7355,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION,576163363,
 sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203,
 sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE,541249030,
@@ -7380,7 +7370,6 @@ sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008,
 sfx2_MultiLineEdit_DLG_COMMENTS_ME_VERSIONS,1112705550,
 sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_MultiLineEdit_TP_MANAGE_STYLES_ED_DESC,541248011,
-sfx2_NumericField_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT,576165911,
 sfx2_PushButton_DLG_COMMENTS_PB_CLOSE,1112707592,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_DLG_VERSIONS_PB_COMPARE,1112691217,
@@ -7395,15 +7384,6 @@ sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_PRINTEROUTPUT,576160259,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT,576160260,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL,576160288,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_OPTIMAL,576160287,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_RESOLUTION,576160289,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR,576160278,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_STRIPES,576160277,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO,576160267,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE,576160268,
 starmath_CheckBox_RID_DISTANCEDIALOG_1,1401504769,
 starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
 starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
diff --git a/source/text/shared/optionen/01010900.xhp 
b/source/text/shared/optionen/01010900.xhp
index c8fdd77..b18af50 100644
--- a/source/text/shared/optionen/01010900.xhp
+++ b/source/text/shared/optionen/01010900.xhp
@@ -36,6 +36,7 @@
 bookmark_valueprinting; warnings/bookmark_value
 bookmark_valuepaper size warning/bookmark_value
 /bookmark
+bookmark xml-lang=en-US branch=hid/sfx/ui/optprintpage/OptPrintPage 
id=bm_id3149809 localize=false/
 paragraph role=heading id=hd_id3148946 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/optionen/01010900.xhp name=Print 
OptionsPrint Options/link/paragraph
 paragraph role=paragraph id=par_id3150359 xml-lang=en-US l10n=U 
oldref=2ahelp hid=.Specifies the print setting 
options./ahelp/paragraph
 /section
@@ -45,44 +46,44 @@
 embed href=text/shared/guide/print_faster.xhp#print_faster/
 paragraph role=heading id=hd_id3148451 xml-lang=en-US level=2 
l10n=U oldref=56Reduce print data/paragraph
 paragraph role=paragraph id=par_id3154910 xml-lang=en-US l10n=U 
oldref=68You can reduce the amount of data to be sent to the printer. 
Reducing the print data increases the print speed because the print files are

[Libreoffice-commits] core.git: libxml2/ExternalProject_xml2.mk

2013-02-13 Thread Michael Stahl

 libxml2/ExternalProject_xml2.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 75ce51026e699d74e3f5bc5f7e19e24ae3fd20ea
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 13 12:57:02 2013 +0100

libxml2: do not use --with-mem-debug

it prints millions of lines of output.

Change-Id: I99039f9039a7928f47d4a1d3f9bc36634240888c

diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index cce11cd..b687736 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_use_unpacked,xml2,xml2))
 $(eval $(call gb_ExternalProject_register_targets,xml2,\
build \
 ))
+
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,xml2,build):
@@ -39,7 +40,7 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xml2,build):
cd $(EXTERNAL_WORKDIR) \
 ./configure --disable-ipv6 --without-python --without-zlib 
--with-sax1 \
-   $(if $(debug),--with-mem-debug --with-run-debug) \
+   $(if $(debug),--with-run-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
LDFLAGS=$(if $(SYSBASE),-L$(SYSBASE)/usr/lib) \
@@ -48,4 +49,5 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 $(MAKE) \
 touch $@
 endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - shell/CustomTarget_shlxthdl_res.mk

2013-02-13 Thread David Tardon

 shell/CustomTarget_shlxthdl_res.mk |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a648103cfc0c4d51f2ad929d9514561e47106a9e
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 10:59:09 2013 +0100

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Reviewed-on: https://gerrit.libreoffice.org/2135
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..9b48e47 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@ $(call 
gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -44,10 +44,19 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $ \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $ -o $@ 
-m $${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - shell/CustomTarget_shlxthdl_res.mk

2013-02-13 Thread David Tardon

 shell/CustomTarget_shlxthdl_res.mk |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d13a9d558b5f5bf4c0c29787160878ab5ac9918d
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 13 10:59:09 2013 +0100

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Reviewed-on: https://gerrit.libreoffice.org/2136
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 67e27a6..5a3bcb5 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@ $(call 
gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -43,10 +43,19 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $ \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $ -o $@ 
-m $${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-dev] -calling a service function from BASIC macro

2013-02-13 Thread Michael Stahl

On 12/02/13 16:31, Rai, Neeraj wrote:
 Hi Stephan,
 
 Is there any example of using uno calls from the forms bundled with LO ?
 I am not very familiar with the Reference  and googling uno::Reference is 
 not helping me either.
 I also couldn't find usage in sdk dir and examples dir. Would it be possible 
 to point out a dir/file or a web link.

please read this chapter:

http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/C%2B%2B_Language_Binding

and especially:

http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/Mapping_of_Interface_Types

 I  also wanted to understand the lifetime of uno objects .
 Does the CalcAddimThr_impl object live for the life of open doc ?
 I tried to keep my object without reference counting as there is only one 
 instance of it and I am unfamiliar with Reference.
 The runThread was passed the same pointer that I assumed with live for the 
 life of open scalc doc.
 But you seem to be suggesting that some other reference counted object is 
 going out of scope making the pointer dangling.

it is generally unsound to retain a plain C++ pointer to an object after
the first uno::Reference for it has been constructed.  (you may retain a
rtl::Reference however, which is often convenient because it can contain
your implementation class directly and not just some UNO interface).

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

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

2013-02-13 Thread Julien Nabet

 sc/inc/address.hxx   |5 --
 sc/source/core/data/attarray.cxx |   10 ++--
 sc/source/core/data/column3.cxx  |4 -
 sc/source/core/data/documen2.cxx |   10 ++--
 sc/source/core/data/documen3.cxx |   36 -
 sc/source/core/data/documen4.cxx |   10 ++--
 sc/source/core/data/documen5.cxx |2 
 sc/source/core/data/documen7.cxx |4 -
 sc/source/core/data/document.cxx |   80 +++
 sc/source/core/data/markarr.cxx  |2 
 sc/source/core/data/table1.cxx   |8 +--
 sc/source/core/data/table2.cxx   |   48 +++
 sc/source/core/data/table6.cxx   |4 -
 sc/source/core/tool/refdata.cxx  |6 +-
 sc/source/ui/view/tabview3.cxx   |4 -
 15 files changed, 115 insertions(+), 118 deletions(-)

New commits:
commit 2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Feb 13 13:39:27 2013 +0100

Remove VALIDTAB and other similar macros

Change-Id: I57e4ca031553bfeb2abfbf48a7cb024b6d8b0b5b

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 5f7c83f..a45b346 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -121,11 +121,6 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1;
 #define MAXROW  W16MAXROW
 #endif
 
-#define VALIDCOL(nCol)  (ValidCol(nCol))
-#define VALIDROW(nRow)  (ValidRow(nRow))
-#define VALIDTAB(nTab)  (ValidTab(nTab))
-#define VALIDCOLROW(nCol,nRow)  (ValidColRow(nCol,nRow))
-
 // === old stuff defines end =
 
 inline bool ValidCol( SCCOL nCol )
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index c450509..f8f982a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -240,7 +240,7 @@ const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW 
rStartRow,
 
 void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 
nIndex )
 {
-if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow))
+if(!ValidRow(nStartRow) || !ValidRow(nEndRow))
 return;
 
 if(nEndRow  nStartRow)
@@ -291,7 +291,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 
 void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 
nIndex )
 {
-if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow))
+if(!ValidRow(nStartRow) || !ValidRow(nEndRow))
 return;
 
 if(nEndRow  nStartRow)
@@ -1670,7 +1670,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW 
nEndRow, bool bIncrement
 SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const
 {
 long nRet = nRow;
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 SCSIZE nIndex;
 Search(nRow, nIndex);
@@ -2309,7 +2309,7 @@ SCsROW ScAttrArray::SearchStyle(
 if (pMarkArray)
 {
 nRow = pMarkArray-GetNextMarked( nRow, bUp );
-if (!VALIDROW(nRow))
+if (!ValidRow(nRow))
 return nRow;
 }
 
@@ -2369,7 +2369,7 @@ bool ScAttrArray::SearchStyleRange(
 const ScMarkArray* pMarkArray) const
 {
 SCsROW nStartRow = SearchStyle( rRow, pSearchStyle, bUp, pMarkArray );
-if (VALIDROW(nStartRow))
+if (ValidRow(nStartRow))
 {
 SCSIZE nIndex;
 Search(nStartRow,nIndex);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 043cec9..7976996 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1643,7 +1643,7 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW 
nEndRow )
 
 void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError)
 {
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 ScFormulaCell* pCell = new ScFormulaCell
 ( pDocument, ScAddress( nCol, nRow, nTab ) );
@@ -1655,7 +1655,7 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 
nError)
 
 void ScColumn::SetValue( SCROW nRow, const double rVal)
 {
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 ScBaseCell* pCell = new ScValueCell(rVal);
 Insert( nRow, pCell );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f182316..a995d12 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -576,7 +576,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB 
nTab )
 void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
   ScBaseCell* pCell, sal_uLong nFormatIndex, bool 
bForceTab )
 {
-if (VALIDTAB(nTab))
+if (ValidTab(nTab))
 {
 if ( bForceTab  ( nTab = static_castSCTAB(maTabs.size()) || 
!maTabs[nTab] ) )
 {
@@ -697,7 +697,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, 
ScProgress* pProgress )
 return false;
 
 bool bValid = false;
-if (VALIDTAB(nOldPos)  nOldPos  nTabCount )
+if (ValidTab(nOldPos)  nOldPos  nTabCount )
 {

[SOLVED]Re: About macro VALIDTAB (sc module)

2013-02-13 Thread julien2412

I pushed a patch to remove all these macros, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-macro-VALIDTAB-sc-module-tp4036946p4037097.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Strange loop in vcl/source/control/combobox

2013-02-13 Thread Jean-Noël Rouvignac

2013/2/13 julien2412 serval2...@yahoo.fr

 About STRING_NOTFOUND, you can take a look to getToken function in
 tools/source/string/tustring.cxx since this function is called line 388:
 385 while ( nIndex != STRING_NOTFOUND )
 386 {
 387 xub_StrLen  nPrevIndex = nIndex;
 388 XubString   aToken = aText.GetToken( 0, mcMultiSep,
 nIndex );


Pass by ref! Coming from Java, I did not think about it.
It makes sense now.

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

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

2013-02-13 Thread Luboš Luňák

 sd/source/ui/slideshow/slideshow.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 005729c78705434efd2a5f46901eb63a5618b5ce
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Feb 13 14:49:45 2013 +0100

fix ambiguity in pch build

Change-Id: I1a1638d9a5ad6bea002336d20c93c450d4bc1650

diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index af2033e..99e7efc 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -63,7 +63,6 @@ using namespace ::sd;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
@@ -1312,9 +1311,9 @@ bool SlideShow::dependsOn( ViewShellBase* pViewShellBase )
 
 // -
 
-Reference XPresentation2  CreatePresentation( const SdDrawDocument 
rDocument )
+Reference presentation::XPresentation2  CreatePresentation( const 
SdDrawDocument rDocument )
 {
-return Reference XPresentation2 ( SlideShow::Create( const_cast 
SdDrawDocument* ( rDocument ) ).get() );
+return Reference presentation::XPresentation2 ( SlideShow::Create( 
const_cast SdDrawDocument* ( rDocument ) ).get() );
 }
 
 // -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-13 Thread Michael Meeks

 android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 
   2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 13:51:08 2013 +

sdremote: avoid crash when fiddling with elapsed time.

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 0de6b32..d3a0352 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -485,7 +485,7 @@ public class PresentationActivity extends 
SherlockFragmentActivity {
 
 @Override
 public boolean onEditorAction(TextView tv, int aID, KeyEvent aEvent) {
-if (aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+if (aEvent != null  aEvent.getKeyCode() == 
KeyEvent.KEYCODE_ENTER) {
 
 long aTime = 0;
 try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-13 Thread Tor Lillqvist

 configure.ac |   34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 185e1be6cd1954b8cc5a302c879384f2549cd060
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Dec 4 11:26:39 2012 +0200

Let's try to enable compiling the Bluetooth code for Windows

(cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472)

Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Reviewed-on: https://gerrit.libreoffice.org/2129
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/configure.ac b/configure.ac
index e7c06f2..bb3f96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,9 +862,8 @@ AC_ARG_ENABLE(sdremote,
 
 AC_ARG_ENABLE(sdremote-bluetooth,
 AS_HELP_STRING([--disable-sdremote-bluetooth],
-[Determines whether to build sdremote with bluetooth support
- Requires: dbus]),
-,enable_sdremote_bluetooth=yes)
+[Determines whether to build sdremote with bluetooth support.
+ Requires dbus on Linux.]))
 
 AC_ARG_ENABLE(gconf,
 AS_HELP_STRING([--disable-gconf],
@@ -9298,12 +9297,28 @@ else
 fi
 AC_SUBST(ENABLE_PACKAGEKIT)
 
-AC_MSG_CHECKING([whether to enable sd remotecontrol])
+AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n $enable_sdremote -a $enable_sdremote != no; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE=YES
-AC_MSG_CHECKING([whether to enable bluetooth support in sdremote])
-if test -n $enable_sdremote_bluetooth -a $enable_sdremote_bluetooth != 
no; then
+AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
+
+# If not explicitly enabled or disabled, default
+if test -z $enable_sdremote_bluetooth; then
+case $OS in
+LINUX|WNT)
+# Default to yes for these
+enable_sdremote_bluetooth=yes
+;;
+*)
+# otherwise no
+enable_sdremote_bluetooth=no
+;;
+esac
+fi
+# $enable_sdremote_bluetooth is guaranteed non-empty now
+
+if test $enable_sdremote_bluetooth != no; then
 if test $OS = LINUX; then
 if test $ENABLE_DBUS = TRUE; then
 AC_MSG_RESULT([yes])
@@ -9311,7 +9326,7 @@ if test -n $enable_sdremote -a $enable_sdremote != 
no; then
 dnl 
===
 dnl Check for system bluez
 dnl 
===
-AC_MSG_CHECKING([which bluetooth header to use])
+AC_MSG_CHECKING([which Bluetooth header to use])
 if test $with_system_bluez = yes; then
 AC_MSG_RESULT([external])
 AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
@@ -9325,9 +9340,8 @@ if test -n $enable_sdremote -a $enable_sdremote != 
no; then
 ENABLE_SDREMOTE_BLUETOOTH=NO
 fi
 else
-# FIXME: should this really be disabled in everything non-Linux?
-AC_MSG_RESULT([no])
-ENABLE_SDREMOTE_BLUETOOTH=NO
+AC_MSG_RESULT([yes])
+ENABLE_SDREMOTE_BLUETOOTH=YES
 fi
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/test idlc/source svtools/bmpmaker ucb/source

2013-02-13 Thread Julien Nabet

 extensions/test/ole/OleConverterVar1/smartarray.h |3 -
 idlc/source/astscope.cxx  |3 -
 svtools/bmpmaker/bmpcore.cxx  |2 -
 ucb/source/ucp/ftp/test_ftpurl.cxx|   40 ++
 4 files changed, 29 insertions(+), 19 deletions(-)

New commits:
commit 814ae45d4b968c95a49fb35c47f4c813fa2dc026
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Feb 13 15:08:01 2013 +0100

Some cppcheck cleaning

Change-Id: I099171d85a51095f0ff6d592c1260d931f9769b2

diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h 
b/extensions/test/ole/OleConverterVar1/smartarray.h
index 01b0e69..f501892 100644
--- a/extensions/test/ole/OleConverterVar1/smartarray.h
+++ b/extensions/test/ole/OleConverterVar1/smartarray.h
@@ -205,9 +205,6 @@ template  SmartArray IUnknown*::SmartArray(sourceType * 
parParams, int count
 {
 ATLTRACE(SmartArrayIUnknown);
 HRESULT hr= S_OK;
-SAFEARRAYBOUND rgsabound[1];
-rgsabound[0].cElements= count;
-rgsabound[0].lLbound= 0;
 m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
 SafeArrayLock( m_array);
 
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 3d26b3a..1c0d4fd 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -259,7 +259,6 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
 {
 AstDeclaration* pDecl = NULL;
 AstScope*   pScope = NULL;
-AstBaseType*pBaseType = NULL;
 OString typeName;
 pDecl = scopeAsDecl(this);
 if ( !pDecl )
@@ -324,7 +323,7 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
 
 if ( pDecl  (pDecl-getNodeType() == NT_predefined) )
 {
-pBaseType = (AstBaseType*)pDecl;
+AstBaseType* pBaseType = (AstBaseType*)pDecl;
 
 if ( pBaseType-getExprType() == type )
 return pDecl;
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index f5366ff..50ae293 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -51,7 +51,7 @@ static String ImplGetSystemFileName( const String rFileName )
 // - BmpCreator -
 // --
 
-BmpCreator::BmpCreator()
+BmpCreator::BmpCreator():pSRS(NULL)
 {
 }
 
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx 
b/ucb/source/ucp/ftp/test_ftpurl.cxx
index bb9fa02..d37ce90 100644
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -25,12 +25,6 @@
 #include debughelper.hxx
 #include vector
 
-#define TESTEVAL \
-if(number_of_errors)   \
-fprintf(stderr,errors in %s: %d\n,name,number_of_errors);  \
-return number_of_errors
-
-
 struct ServerInfo {
 rtl::OUString host;
 rtl::OUString port;
@@ -138,7 +132,11 @@ int test_ftpurl(void) {
 ascii = ftp://host/bla/../../test/;, n = anonymous, p = ;
 TESTURL;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,errors in %s: %d\n,name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
@@ -161,7 +159,11 @@ int test_ftplist(void) {
 if(!(vec[0].m_aName == dir1  vec[1].m_aName == dir2  
vec[2].m_aName == file1 ))
++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,errors in %s: %d\n,name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
@@ -202,13 +204,16 @@ int test_ftpparent(void) {
 expect = ftp://abi:psswd@abi-1/..;;
 TESTPARENT;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,errors in %s: %d\n,name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
 int test_ftpproperties(void) {
 int number_of_errors = 0;
-const char* name = test_ftpproperties;
 FTPHandleProviderI provider;
 
 ftp::FTPURL url(
@@ -220,14 +225,18 @@ int test_ftpproperties(void) {
 if(!(ade.m_aName == file  ade.isFile()))
 ++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+const char* name = test_ftpproperties;
+fprintf(stderr,errors in %s: %d\n,name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
 int test_ftpopen(void)
 {
 int number_of_errors = 0;
-const char* name = test_ftpopen;
 
 FTPHandleProviderI provider;
 ftp::FTPURL url(
@@ -258,7 +267,12 @@ int test_ftpopen(void)
 } else
 ++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+const char* name = test_ftpopen;
+fprintf(stderr,errors in %s: %d\n,name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - android/sdremote

2013-02-13 Thread Michael Meeks

 android/sdremote/res/values/styles.xml |   56 +++--
 1 file changed, 54 insertions(+), 2 deletions(-)

New commits:
commit 31eeb79521b952212e3018f262e25e6b3f4599e7
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 14:12:00 2013 +

Revert resolve fdo#60379 Impress Remote: Options look disabled

This reverts commit 23e6ac150b217be70a80d42deb5b253059030783.

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index c88c947..80a4b4a 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -72,9 +72,9 @@
 item 
name=android:actionDropDownStyle@style/Theme.ImpressRemote.ActionBarMenu/item
 item name=android:windowBackground@color/light_grey/item
 item 
name=android:homeAsUpIndicator@drawable/up_indicator_white/item
-item name=android:textColor@color/light_grey/item
+item name=android:textColor@color/text_grey/item
 item 
name=android:alertDialogStyle@style/Theme.ImpressRemote.Dialog/item
 
 /style
 
-/resources
+/resources
\ No newline at end of file
commit c922df9814c85c080272fc4962584133fa6f5316
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 14:09:02 2013 +

Revert Just use default colours until proven they don't work;)

Colors should be orange by design.

This reverts commit ab0bbe53ae02361d521c133dd5c0b6db3423b0cb.

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index 683114f..c88c947 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -14,15 +14,67 @@
 color name=thumbnail_border#B4B4B4/color
 color name=thumbnail_border_selected#EE4400/color
 
+style name=Theme.ImpressRemote.ActionBar.Title 
parent=android:style/Widget.Holo.Light.ActionBar
+item name=android:textColor@color/white/item
+item name=android:textSize18dp/item
+/style
+
+style name=Theme.ImpressRemote.ActionBar 
parent=Widget.Sherlock.Light.ActionBar.Solid.Inverse
+item name=android:background@color/orange/item
+item name=background@color/orange/item
+item 
name=android:titleTextStyle@style/Theme.ImpressRemote.ActionBar.Title/item
+item 
name=titleTextStyle@style/Theme.ImpressRemote.ActionBar.Title/item
+item name=backgroundSplit@color/text_grey/item
+item name=android:backgroundSplit@color/text_grey/item
+/style
+
+style name=Theme.ImpressRemote.ActionBarWidget 
parent=android:style/Widget.Holo.Light
+item name=android:background@color/orange/item
+item name=android:textColor@color/white/item
+item name=android:textSize22dp/item
+/style
+
+style name=Theme.ImpressRemote.ActionBarMenu 
parent=android:style/Widget.Holo.Light.ListPopupWindow
+item name=android:background@color/grey/item
+!-- item name=android:popupBackground@color/black/item --
+/style
+
 style name=Theme.ImpressRemote.ActionBarMenuItem 
parent=Widget.Sherlock.Light.Spinner.DropDown.ActionBar
+item name=android:background@color/grey/item
+item name=android:textColor@color/white/item
 item name=android:textSize16dp/item
 /style
 
+style name=Theme.ImpressRemote.Dialog 
parent=@android:style/Theme.Dialog
+item name=android:windowBackground@color/light_grey/item
+item name=android:fullDark@color/light_grey/item
+item name=android:topDark@color/light_grey/item
+item name=android:centerDark@color/light_grey/item
+item name=android:bottomDark@color/light_grey/item
+item name=android:fullBright@color/light_grey/item
+item name=android:centerBright@color/light_grey/item
+item name=android:bottomBright@color/light_grey/item
+item name=android:bottomMedium@color/light_grey/item
+item name=android:centerMedium@color/light_grey/item
+item name=android:textColor@color/grey/item
+/style
+
+style name=Theme.ImpressRemote.Dialog.Title 
parent=@android:style/Theme.Dialog
+item name=android:textColor@color/grey/item
+/style
+
 style name=Theme.ImpressRemote 
parent=Theme.Sherlock.Light.DarkActionBar
+item 
name=android:actionBarStyle@style/Theme.ImpressRemote.ActionBar/item
+item name=actionBarStyle@style/Theme.ImpressRemote.ActionBar/item
+item 
name=android:popupMenuStyle@style/Theme.ImpressRemote.ActionBarMenu/item
 item 
name=android:dropDownListViewStyle@style/Theme.ImpressRemote.ActionBarMenuItem/item
-item 
name=android:textAppearanceLargePopupMenu@style/Theme.ImpressRemote.ActionBarMenuItem/item
+item 
name=android:textAppearanceLargePopupMenu@style/Theme.ImpressRemote.ActionBarMenuItem/item
 !-- item 
name=android:actionBarWidgetTheme@style/Theme.ImpressRemote.ActionBarWidget/item
 --
+item

useless definition of _SV_RULER_CXX ?

2013-02-13 Thread Rodolfo

While working on a patch, I saw this #define inside a .cxx file... [1]

Some (private) methods of class Ruler are declared inside an #ifdef of
it [2]. But that can be only triggered inside ruler.cxx file [1] : a
trick by defining _SV_RULER_CXX right before including the header
file.

Is it really necessary? Shouldn't SVT_DLLPRIVATE do this
completely-private-thing?

Note there's some using namespace inside it.

$ git grep _SV_RULER_CXX
svtools/inc/svtools/ruler.hxx:#ifdef _SV_RULER_CXX
svtools/source/control/ruler.cxx:#define _SV_RULER_CXX
svtools/source/control/ruler.cxx:#ifdef _SV_RULER_CXX

[1] 
http://opengrok.libreoffice.org/xref/core/svtools/source/control/ruler.cxx#27
[2] http://opengrok.libreoffice.org/xref/core/svtools/inc/svtools/ruler.hxx#647
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

2013-02-13 Thread Michael Meeks

 android/sdremote/res/values/styles.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f477a88b743ee3cb8835463cc5cd5e3f0c800dba
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 14:16:18 2013 +

Revert resolve fdo#60379 Impress Remote: Options look disabled

Actually revert it as Thorsten mentioned on the list.
This reverts commit 23e6ac150b217be70a80d42deb5b253059030783.

Change-Id: Ib387017225040272095aff54d51a9767c73c7d1f

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index c88c947..80a4b4a 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -72,9 +72,9 @@
 item 
name=android:actionDropDownStyle@style/Theme.ImpressRemote.ActionBarMenu/item
 item name=android:windowBackground@color/light_grey/item
 item 
name=android:homeAsUpIndicator@drawable/up_indicator_white/item
-item name=android:textColor@color/light_grey/item
+item name=android:textColor@color/text_grey/item
 item 
name=android:alertDialogStyle@style/Theme.ImpressRemote.Dialog/item
 
 /style
 
-/resources
+/resources
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Cppcheck: 'bMark' is assigned a value never used (sc module)

2013-02-13 Thread julien2412

Hello,

Cppcheck reported this:
sc/source/ui/view/tabview2.cxx
970 unreadVariable  style   Variable 'bMark' is assigned a value that is 
never
used.951 void ScTabView::PaintBlock( bool bReset )
952 {
953 ScMarkData rMark = aViewData.GetMarkData();
954 SCTAB nTab = aViewData.GetTabNo();
955 bool bMark = rMark.IsMarked();
956 bool bMulti = rMark.IsMultiMarked();
957 if (bMark || bMulti)
958 {
959 ScRange aMarkRange;
960 HideAllCursors();
961 if (bMulti)
962 {
963 bool bFlag = rMark.GetMarkingFlag();
964 rMark.SetMarking(false);
965 rMark.MarkToMulti();
966 rMark.GetMultiMarkArea(aMarkRange);
967 rMark.MarkToSimple();
968 rMark.SetMarking(bFlag);
969 
970 bMark = rMark.IsMarked();

See
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/tabview2.cxx#950

Is line 970 can be removed or is something lacking?

Julien




--
View this message in context: 
http://nabble.documentfoundation.org/Cppcheck-bMark-is-assigned-a-value-never-used-sc-module-tp4037118.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [SOLVED]Re: About macro VALIDTAB (sc module)

2013-02-13 Thread Kohei Yoshida


On 02/13/2013 07:45 AM, julien2412 wrote:

I pushed a patch to remove all these macros, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9.


Excellent!  Thanks for this.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-02-13 Thread Michael Meeks

 officecfg/registry/cppheader.xsl |   12 ++--
 sd/source/ui/view/drviews7.cxx   |   26 ++
 2 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 13cb088a2d8902822e3eb5607ba4cac81ad4d2f2
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 14:35:40 2013 +

sdremote: hide TCP/IP server selection dialog menu item

Now shown only in experimental mode (ie. when TCP/IP is enabled)
to reduce user-confusion. Said dialog is not needed for bluetooth.

diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f2d69be..f077d30 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -26,6 +26,7 @@
 #include editeng/eeitem.hxx
 #include editeng/flditem.hxx
 #include editeng/outlobj.hxx
+#include officecfg/Office/Common.hxx
 #include officecfg/Office/Impress.hxx
 #include svx/svxids.hrc
 #include svx/svdpagv.hxx
@@ -51,7 +52,6 @@
 #include comphelper/processfactory.hxx
 #include sfx2/request.hxx
 
-
 #include svx/pfiledlg.hxx
 #include svx/grafctrl.hxx
 #include svtools/cliplistener.hxx
@@ -996,15 +996,25 @@ void DrawViewShell::GetMenuState( SfxItemSet rSet )
rSet.DisableItem(SID_ZOOM_PREV);
 }
 
-bool bDisableSdremoteForGood = false;
+if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REMOTE_DLG ) )
+{
+
+bool bDisableSdremoteForGood = false;
 #ifndef ENABLE_SDREMOTE
-bDisableSdremoteForGood = true;
+bDisableSdremoteForGood = true;
 #endif
-uno::Reference uno::XComponentContext  xContext = 
comphelper::getProcessComponentContext();
-if ( bDisableSdremoteForGood || ( xContext.is()  
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) ) )
-{
-rSet.ClearItem(SID_REMOTE_DLG);
-rSet.DisableItem(SID_REMOTE_DLG);
+uno::Reference uno::XComponentContext  xContext = 
comphelper::getProcessComponentContext();
+if ( xContext.is() )
+bDisableSdremoteForGood |= ! ( 
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext ) 
+
+   
officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) );
+
+// This dialog is only useful for TCP/IP remote control
+// which is unusual, under-tested and a security issue.
+if ( bDisableSdremoteForGood )
+{
+rSet.Put(SfxVisibilityItem(SID_REMOTE_DLG, false));
+}
 }
 
 // EditText aktiv
commit 90d42440eeaf7994f3ad57ebfdc8edb129c8faff
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 13 14:24:26 2013 +

cleanup generated config includes to make them more readable.

diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 372876e..9bdce8e 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -149,11 +149,11 @@
   xsl:value-of select=$name/
   xsl:textgt; {#xA;/xsl:text
   xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
-  --RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+  --/xsl:text
   xsl:value-of select=$path/
   xsl:text//xsl:text
   xsl:value-of select=@oor:name/
-  xsl:text)); }#xA;/xsl:text
+  xsl:text); }#xA;/xsl:text
   xsl:text#xA;/xsl:text
   xsl:apply-templates select=group|set|prop
 xsl:with-param name=path
@@ -183,11 +183,11 @@
 xsl:value-of select=$name/
 xsl:textgt; {#xA;/xsl:text
 xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
---RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+--/xsl:text
 xsl:value-of select=$path/
 xsl:text//xsl:text
 xsl:value-of select=@oor:name/
-xsl:text)); }#xA;/xsl:text
+xsl:text); }#xA;/xsl:text
 xsl:textprivate:#xA;/xsl:text
 xsl:text/xsl:text
 xsl:value-of select=$name/
@@ -272,11 +272,11 @@
 /xsl:if
 xsl:textgt; {#xA;/xsl:text
 xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
---RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+--/xsl:text
 xsl:value-of select=$path/
 xsl:text//xsl:text
 xsl:value-of select=@oor:name/
-xsl:text)); }#xA;/xsl:text
+xsl:text); }#xA;/xsl:text
 xsl:textprivate:#xA;/xsl:text
 xsl:text/xsl:text
 xsl:value-of select=$name/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-4-0] sdremote cherry-picks ...

2013-02-13 Thread Michael Meeks

Hi there,

I picked all of Tor's nice work to -4-0 which should make things work
well on Windows. We discussed and sorted out the UI issue on IRC - there
were some bits that needed reverting and pushing it seems around colors.

That leaves a couple of fixes I'd like cherry-picked:

Andras Tor had a couple of string changes:
056968fae7fa598e8cb528fb6b45c999de33a102
ea264f0c8165eb0c62bf624af5f450b20898469f

To make the UI much more clear wrt. adding a server that this was an
TCP/IP thing only. Can we get those in past the l10n freeze ? and/or
would translators help out there ?

I'd also like to pick:

03b941e9ae63626a3336aabdb6a3485835ec6f9d

Which fixes a random crash (in a rather bad bit of code which now has
an easy-hack associated with it ;-).

I'd also like to kill the menu item of extreme pointlessness which
confuses ~everyone trying to use bluetooth - and relegate the TCP/IP /
Wifi remote to an also-ran Experimental feature in the UI. There
should be no need for that dialog otherwise, so I'd love to see:

sdremote: hide TCP/IP server selection dialog menu item
13cb088a2d8902822e3eb5607ba4cac81ad4d2f2

Cherry-picked to 4-0 as well.

Otherwise, I think we're in increasingly good shape there - the last
major thing on my TODO is to re-work the dbus / bluez code so we can
cope with suspend/resume and dynamic enable/disable of bluetooth.

HTH,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Re: InteractiveAugmentedIOException in CUT sc_ucalc

2013-02-13 Thread Stephan Bergmann


On 02/09/2013 10:04 PM, Henrik /KaarPoSoft wrote:

Program received signal SIGABRT, Aborted.
0x76fcaf65 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
63  ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
#0  0x76fcaf65 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
#1  0x76fcc3e8 in __GI_abort () at abort.c:90
#2  0x778a8edd in __gnu_cxx::__verbose_terminate_handler () at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/vterminate.cc:95
#3  0x778a6fd6 in __cxxabiv1::__terminate (handler=optimized out) at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_terminate.cc:40
#4  0x778a7003 in std::terminate () at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_terminate.cc:50
#5  0x778a722e in __cxxabiv1::__cxa_throw (obj=0x49f270, tinfo=optimized 
out, dest=optimized out) at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_throw.cc:83
#6  0x756ef5fa in 
cpp2uno_call(bridges::cpp_uno::shared::CppInterfaceProxy*, 
_typelib_TypeDescription const*, _typelib_TypeDescriptionReference*, int, 
_typelib_MethodParameter*, void**, void**, void**, unsigned long*) [clone 
.3078] () from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libgcc3_uno.so
#7  0x756eb31c in cpp_vtable_call () from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libgcc3_uno.so
#8  0x756f0a1e in privateSnippetExecutor () at 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s:56
#9  0x77eacf1e in cppu::throwException(com::sun::star::uno::Any const) 
() from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libuno_cppuhelpergcc3.so.3


cppu::throwException is dirty in that it synthesizes a C++ throw 
expression, by using the bridge between C++ and binary UNO 
(bridges/source/cpp_uno/).  __cxxabiv1::__cxa_throw calling 
std::terminate can either mean that the synthesized stuff LO passes into 
the C++ runtime is not acceptable at all, or that the synthesized RTTI 
is bad, so that some catch block that should match doesn't.


Looks like the C++ UNO bridge is not working well with your toolchain, 
for whatever reason.


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

[Libreoffice-commits] core.git: 4 commits - filter/source sal/inc sax/source svgio/source svx/inc svx/source

2013-02-13 Thread Michael Stahl

 filter/source/svg/svgreader.cxx  |6 +++-
 sal/inc/sal/log-areas.dox|1 
 sax/source/expatwrap/sax_expat.cxx   |   48 +--
 sax/source/fastparser/fastparser.cxx |   15 +-
 svgio/source/svguno/xsvgparser.cxx   |9 ++
 svx/inc/svx/svdundo.hxx  |9 --
 svx/source/svdraw/svdundo.cxx|   20 --
 7 files changed, 58 insertions(+), 50 deletions(-)

New commits:
commit fcb1e4d8433b49686cd8e53c699dd5d6503ea314
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 13 15:59:38 2013 +0100

fdo#60471: svgio, sax: enable internal entity declarations for SVG

Change-Id: I147acac61dfe0b626268fe1e600dcf641ca63a0c

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 7d4d792..b9ce821 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -24,7 +24,7 @@
 #include osl/diagnose.h
 
 #include com/sun/star/lang/XServiceInfo.hpp
-#include com/sun/star/util/XCloneable.hpp
+#include com/sun/star/lang/XInitialization.hpp
 #include com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
 #include com/sun/star/xml/sax/XParser.hpp
 #include com/sun/star/xml/sax/SAXParseException.hpp
@@ -32,8 +32,7 @@
 
 #include cppuhelper/factory.hxx
 #include cppuhelper/weak.hxx
-#include cppuhelper/implbase1.hxx
-#include cppuhelper/implbase2.hxx
+#include cppuhelper/implbase3.hxx
 
 #include expat.h
 
@@ -45,7 +44,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::io;
 
 #include factory.hxx
@@ -136,11 +134,10 @@ class SaxExpatParser_Impl;
 
 
 // This class implements the external Parser interface
-class SaxExpatParser :
-public WeakImplHelper2
-XParser,
-XServiceInfo
-  
+class SaxExpatParser
+: public WeakImplHelper3 XInitialization
+, XServiceInfo
+, XParser 
 {
 
 public:
@@ -153,6 +150,10 @@ public:
 static Sequence OUString  getSupportedServiceNames_Static(void) 
throw ();
 
 public:
+// ::com::sun::star::lang::XInitialization:
+virtual void SAL_CALL initialize(SequenceAny const rArguments)
+throw (RuntimeException, Exception);
+
 // The SAX-Parser-Interface
 virtual void SAL_CALL parseStream(  const InputSource structSource)
 throw ( SAXException,
@@ -222,6 +223,7 @@ class SaxExpatParser_Impl
 public: // module scope
 Mutex   aMutex;
 OUStringsCDATA;
+bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator
 
 Reference XDocumentHandlerrDocumentHandler;
 Reference XExtendedDocumentHandler  rExtendedDocumentHandler;
@@ -257,6 +259,7 @@ public: // module scope
 public:
 SaxExpatParser_Impl()
 : sCDATA(CDATA)
+, m_bEnableDoS(false)
 {
 }
 
@@ -452,6 +455,22 @@ SaxExpatParser::~SaxExpatParser()
 delete m_pImpl;
 }
 
+// ::com::sun::star::lang::XInitialization:
+void SAL_CALL
+SaxExpatParser::initialize(Sequence Any  const rArguments)
+throw (RuntimeException, Exception)
+{
+// possible arguments: a string DoSmeplease
+if (rArguments.getLength())
+{
+OUString str;
+if ((rArguments[0] = str)  DoSmeplease == str)
+{
+MutexGuard guard( m_pImpl-aMutex );
+m_pImpl-m_bEnableDoS = true;
+}
+}
+}
 
 /***
 *
@@ -500,7 +519,10 @@ void SaxExpatParser::parseStream(   const InputSource 
structSource)
 XML_SetCharacterDataHandler( entity.pParser , call_callbackCharacters );
 XML_SetProcessingInstructionHandler(entity.pParser ,
 call_callbackProcessingInstruction );
-XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+if (!m_pImpl-m_bEnableDoS)
+{
+XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+}
 XML_SetNotationDeclHandler( entity.pParser, call_callbackNotationDecl );
 XML_SetExternalEntityRefHandler(entity.pParser,
 call_callbackExternalEntityRef);
diff --git a/svgio/source/svguno/xsvgparser.cxx 
b/svgio/source/svguno/xsvgparser.cxx
index 26a81c0..1b12d9ad 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -21,6 +21,7 @@
 
 #include com/sun/star/graphic/XSvgParser.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/lang/XInitialization.hpp
 #include cppuhelper/implbase2.hxx
 #include svgio/svgreader/svgdocumenthandler.hxx
 #include com/sun/star/xml/sax/XParser.hpp
@@ -131,6 +132,14 @@ namespace svgio
 // get parser
 uno::Reference xml::sax::XParser  xParser(

[PATCH libreoffice-4-0] fdo#60668: filter out fieldmark chars from Index entries:

2013-02-13 Thread Michael Stahl (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2122

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/2122/1

fdo#60668: filter out fieldmark chars from Index entries:

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 30 insertions(+), 13 deletions(-)



diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4fedcfa..eb2dd25 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2959,8 +2959,7 @@
 
 // mask hidden characters
 const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), 
cChar );
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
 
 sTmpText = sTmpText.Copy( nIdx, nLen );
 rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3063,22 +3062,40 @@
 rDestNd.InsertText( GetNumString(), aDestIdx );
 }
 
-if ( nHiddenChrs  0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx  rDestNd.GetTxt().Len())
 {
-aDestIdx = 0;
-while ( aDestIdx  rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if (   (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
 {
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
 {
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex  rDestNd.GetTxt().Len() 
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
 }
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx  rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph = delete, see below
 }
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have 
contined
+rDestNd.EraseText(
+SwIndex(rDestNd, static_castxub_StrLen(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
 }
 
 return sal_True;

-- 
To view, visit https://gerrit.libreoffice.org/2122
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Comment translation german - english - some corrections and ...

2013-02-13 Thread Matthias Freund (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2123

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2123/1

Comment translation german - english - some corrections and improvements :-)

Change-Id: I9ad07188f2addad3369e070836b34151bf8ef9d5
---
M sw/source/core/draw/dpage.cxx
M sw/source/core/draw/drawdoc.cxx
M sw/source/filter/writer/writer.cxx
3 files changed, 10 insertions(+), 10 deletions(-)



diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 72cf1be..dbb61e2 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -111,7 +111,7 @@
 
 if ( pRect )
 {
-//The drawing demands all sides which overlap with the rest.
+//The drawing demands all pages which overlap with the rest.
 const SwRect aRect( *pRect );
 const SwFrm *pPg = pSh-GetLayout()-Lower();
 do
@@ -122,7 +122,7 @@
 }
 else
 {
-//The drawing demands all visible sides
+//The drawing demands all visible pages
 const SwFrm *pPg = pSh-Imp()-GetFirstVisPage();
 if ( pPg )
 do
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 000ef8e..ee35d1e9 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -137,9 +137,9 @@
 /*
 |*
 |* This method creates a new page (SdPage) and thereupon returns a pointer
-|* back. The drawing engine is unsing this method while loading for the
-|* creating of pages (whose type it not even know, because they are
-|* derivations of the SdrPage).
+|* to it back. The drawing engine is using this method while loading for
+|* the creating of pages (whose type it not even know, because they are
+|* inherited from SdrPage).
 |*
 \/
 
diff --git a/sw/source/filter/writer/writer.cxx 
b/sw/source/filter/writer/writer.cxx
index 1cca958..828614c 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -268,7 +268,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = rPaM;
 
 sal_uLong nRet = WriteStream();
@@ -353,7 +353,7 @@
 void Writer::PutNumFmtFontsInAttrPool()
 {
 // then there are a few fonts in the NumRules
-// These putt into the Pool. After this does they have a RefCount  1
+// These put into the Pool. After this does they have a RefCount  1
 // it can be removed - it is already in the Pool
 SfxItemPool rPool = pDoc-GetAttrPool();
 const SwNumRuleTbl rListTbl = pDoc-GetNumRuleTbl();
@@ -452,7 +452,7 @@
 sal_uInt16 Writer::GetBookmarks(const SwCntntNode rNd, xub_StrLen nStt,
 xub_StrLen nEnd, std::vector const ::sw::mark::IMark*  rArr)
 {
-OSL_ENSURE( rArr.empty(), there are entries available );
+OSL_ENSURE( rArr.empty(), there are still entries available );
 
 sal_uLong nNd = rNd.GetIndex();
 std::pairSwBookmarkNodeTable::const_iterator, 
SwBookmarkNodeTable::const_iterator aIterPair 
@@ -508,7 +508,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = rPaM;
 
 sal_uLong nRet = WriteStorage();
@@ -529,7 +529,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = rPaM;
 
 sal_uLong nRet = pMedium ? WriteMedium( *pMedium ) : WriteStorage();

-- 
To view, visit https://gerrit.libreoffice.org/2123
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad07188f2addad3369e070836b34151bf8ef9d5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

2013-02-13 Thread Mathias Hasselmann

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

Change I73297209f0410db607c1ae4787ba15c3ac08133f was contributed on
private basis, without any affiliation.

Future contributions will carry a clear indication ownership, making
clear if that work is a personal contribution, or if it results from
work for my employer or one of its customers. Please notify me during
review already if the commit message is missing such indication.

Thank you for this awesome project,
Mathias


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

[PATCH] Comment translation german - english

2013-02-13 Thread Matthias Freund (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2124

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2124/1

Comment translation german - english

Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
---
M sw/source/core/draw/dcontact.cxx
1 file changed, 17 insertions(+), 16 deletions(-)



diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3449521..e1a5b53 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -89,11 +89,11 @@
 }
 
 
-//Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
-//Wenn das Object ein SwVirtFlyDrawObj ist so wird das Format von
-//selbigem besorgt.
-//Anderfalls ist es eben ein einfaches Zeichenobjekt. Diese hat einen
-//UserCall und der ist Client vom gesuchten Format.
+// The Get reverse way: seeks the format to the specified object.
+// If the object is a SwVirtFlyDrawObj then the format of this
+// will be acquired.
+// Otherwise it is just a simple drawing object. This has a
+// UserCall and is the client of the searched format.
 
 SwFrmFmt *FindFrmFmt( SdrObject *pObj )
 {
@@ -130,7 +130,7 @@
 
 /*
  *
- * GetBoundRect liefert das BoundRect _inklusive_ Abstand des Objekts.
+ * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
  *
  */
 
@@ -151,7 +151,7 @@
 return aRet;
 }
 
-//Liefert den UserCall ggf. vom Gruppenobjekt
+// Returns the UserCall if applicable from the group object
 // OD 2004-03-31 #i26791# - change return type
 SwContact* GetUserCall( const SdrObject* pObj )
 {
@@ -163,7 +163,7 @@
 return static_castSwContact*(pObj-GetUserCall());
 }
 
-// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
 sal_Bool IsMarqueeTextObj( const SdrObject rObj )
 {
 SdrTextAniKind eTKind;
@@ -175,7 +175,7 @@
 
 /*
 |*
-|*  SwContact, Ctor und Dtor
+|*  SwContact, Ctor and Dtor
 |*
 |*/
 
@@ -643,8 +643,8 @@
 InsertObject( pObj, pObj-GetOrdNumDirect() );
 }
 
-//Controls muessen immer im Control-Layer liegen. Das gilt auch fuer
-//Gruppenobjekte, wenn diese Controls enthalten.
+//Controls have to be always in the Control-Layer. This is also true for
+//group objects, if they contain controls.
 if ( ::CheckControlLayer( pObj ) )
 {
 // set layer of object to corresponding invisible layer.
@@ -1105,7 +1105,8 @@
 return;
 }
 
-//Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft.
+//Put on Action, but not if presently anywhere an action runs.
+aber nicht wenn gerade irgendwo eine Action laeuft.
 ViewShell *pSh = 0, *pOrg;
 SwRootFrm *pTmpRoot = pDoc-GetCurrentLayout();//swmod 080317
 if ( pTmpRoot  pTmpRoot-IsCallbackActionEnabled() )
@@ -1125,7 +1126,7 @@
 pTmpRoot-StartAllAction();
 }
 SdrObjUserCall::Changed( rObj, eType, rOldBoundRect );
-_Changed( rObj, eType, rOldBoundRect );//Achtung, ggf. Suizid!
+_Changed( rObj, eType, rOldBoundRect );//Attention, possibly suicidal!
 
 if ( pSh )
 pTmpRoot-EndAllAction();
@@ -1203,7 +1204,7 @@
 };
 
 //
-// !!!ACHTUNG!!! The object may commit suicide!!!
+// !!!ATTENTION!!! The object may commit suicide!!!
 //
 void SwDrawContact::_Changed( const SdrObject rObj,
   SdrUserCallType eType,
@@ -1485,7 +1486,7 @@
 
 if ( pNewAnchorFmt )
 {
-// nicht auf ein Reset Anchor reagieren !
+// Do not respond to a Reset Anchor !
 if ( SFX_ITEM_SET ==
 GetFmt()-GetAttrSet().GetItemState( RES_ANCHOR, sal_False ) )
 {
@@ -1812,7 +1813,7 @@
 pPage-AppendDrawObj( maAnchoredDrawObj );
 }
 else
-//Sieht doof aus, ist aber erlaubt (vlg. 
SwFEShell::SetPageObjsNewPage)
+//Looks stupid but is allowed (compare 
SwFEShell::SetPageObjsNewPage)
 pRoot-SetAssertFlyPages();
 }
 break;

-- 
To view, visit https://gerrit.libreoffice.org/2124
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] add copy() and toInt32() to OUStringBuffer

2013-02-13 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2125

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2125/1

add copy() and toInt32() to OUStringBuffer

Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
---
M sal/inc/rtl/ustrbuf.hxx
1 file changed, 57 insertions(+), 0 deletions(-)



diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a7d5748..c222e4d 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -1309,6 +1309,56 @@
 {
 return stripStart(c) + stripEnd(c);
 }
+/**
+  Returns the int32 value from this string buffer.
+
+  This function can't be used for language specific conversion.
+
+  @paramradix   the radix (between 2 and 36)
+  @return   the int32 represented from this string.
+0 if this string represents no number.
+  @since LibreOffice 4.1
+*/
+sal_Int32 toInt32( sal_Int16 radix = 10 ) const SAL_THROW(())
+{
+return rtl_ustr_toInt32( pData-buffer, radix );
+}
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex. If
+  beginIndex is negative or be greater than the length of
+  this string, behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex ) const SAL_THROW(())
+{
+rtl_uString *pNew = 0;
+rtl_uString_newFromSubString( pNew, pData, beginIndex, getLength() - 
beginIndex );
+return OUStringBuffer( pNew, (DO_NOT_ACQUIRE*)0 );
+}
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex and contains count
+  characters.  If either beginIndex or count are negative,
+  or beginIndex + count are greater than the length of this string
+  then behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @param countthe number of characters.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex, sal_Int32 count ) const 
SAL_THROW(())
+{
+rtl_uString *pNew = 0;
+rtl_uString_newFromSubString( pNew, pData, beginIndex, count );
+return OUStringBuffer( pNew, (DO_NOT_ACQUIRE*)0 );
+}
 
 #ifdef LIBO_INTERNAL_ONLY
 // This is to complement the RTL_FAST_STRING operator+, which allows any 
combination of valid operands,
@@ -1326,6 +1376,13 @@
 #endif
 
 private:
+class DO_NOT_ACQUIRE{};
+
+OUStringBuffer( rtl_uString * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * 
)
+{
+pData = value;
+}
+
 /**
 A pointer to the data structur which contains the data.
  */

-- 
To view, visit https://gerrit.libreoffice.org/2125
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] MODKEY_BigOrtho is never defined

2013-02-13 Thread Julien Nabet (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2126

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2126/1

MODKEY_BigOrtho is never defined

Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c
---
M svx/source/svdraw/svdview.cxx
1 file changed, 0 insertions(+), 3 deletions(-)



diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 39b0e99..b9c9f99 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -770,9 +770,6 @@
 #ifdef MODKEY_Ortho
 SetOrtho(MODKEY_Ortho!=IsOrthoDesired());
 #endif
-#ifdef MODKEY_BigOrtho
-SetBigOrtho(MODKEY_BigOrtho);
-#endif
 #ifdef MODKEY_AngleSnap
 SetAngleSnapEnabled(MODKEY_AngleSnap);
 #endif

-- 
To view, visit https://gerrit.libreoffice.org/2126
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Add findbar close icons to other icon-themes as well

2013-02-13 Thread Joren De Cuyper (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2127

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/2127/1

Add findbar close icons to other icon-themes as well

So far I only add an icon to the galaxy theme.
Therefore I add now the other icons on the other themes as well.

Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f
---
A icon-themes/crystal/cmd/lc_exitsearch.png
A icon-themes/crystal/cmd/sc_exitsearch.png
A icon-themes/galaxy/cmd/sc_exitsearch.png
A icon-themes/hicontrast/cmd/lc_exitsearch.png
A icon-themes/hicontrast/cmd/sc_exitsearch.png
A icon-themes/human/cmd/lc_exitsearch.png
A icon-themes/human/cmd/sc_exitsearch.png
A icon-themes/industrial/cmd/lc_exitsearch.png
A icon-themes/industrial/cmd/sc_exitsearch.png
A icon-themes/oxygen/cmd/lc_exitsearch.png
A icon-themes/oxygen/cmd/sc_exitsearch.png
A icon-themes/tango/cmd/lc_exitsearch.png
A icon-themes/tango/cmd/sc_exitsearch.png
13 files changed, 0 insertions(+), 0 deletions(-)



diff --git a/icon-themes/crystal/cmd/lc_exitsearch.png 
b/icon-themes/crystal/cmd/lc_exitsearch.png
new file mode 100644
index 000..38d7e4e
--- /dev/null
+++ b/icon-themes/crystal/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/crystal/cmd/sc_exitsearch.png 
b/icon-themes/crystal/cmd/sc_exitsearch.png
new file mode 100644
index 000..853548d
--- /dev/null
+++ b/icon-themes/crystal/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/galaxy/cmd/sc_exitsearch.png 
b/icon-themes/galaxy/cmd/sc_exitsearch.png
new file mode 100644
index 000..0030208
--- /dev/null
+++ b/icon-themes/galaxy/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/lc_exitsearch.png 
b/icon-themes/hicontrast/cmd/lc_exitsearch.png
new file mode 100644
index 000..3d54090
--- /dev/null
+++ b/icon-themes/hicontrast/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/sc_exitsearch.png 
b/icon-themes/hicontrast/cmd/sc_exitsearch.png
new file mode 100644
index 000..deedf75
--- /dev/null
+++ b/icon-themes/hicontrast/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/human/cmd/lc_exitsearch.png 
b/icon-themes/human/cmd/lc_exitsearch.png
new file mode 100644
index 000..f795224
--- /dev/null
+++ b/icon-themes/human/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/human/cmd/sc_exitsearch.png 
b/icon-themes/human/cmd/sc_exitsearch.png
new file mode 100644
index 000..2fdc737
--- /dev/null
+++ b/icon-themes/human/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/industrial/cmd/lc_exitsearch.png 
b/icon-themes/industrial/cmd/lc_exitsearch.png
new file mode 100644
index 000..98b099d
--- /dev/null
+++ b/icon-themes/industrial/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/industrial/cmd/sc_exitsearch.png 
b/icon-themes/industrial/cmd/sc_exitsearch.png
new file mode 100644
index 000..a2f58e9
--- /dev/null
+++ b/icon-themes/industrial/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/oxygen/cmd/lc_exitsearch.png 
b/icon-themes/oxygen/cmd/lc_exitsearch.png
new file mode 100644
index 000..ed5f8b2
--- /dev/null
+++ b/icon-themes/oxygen/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/oxygen/cmd/sc_exitsearch.png 
b/icon-themes/oxygen/cmd/sc_exitsearch.png
new file mode 100644
index 000..4839c61
--- /dev/null
+++ b/icon-themes/oxygen/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/tango/cmd/lc_exitsearch.png 
b/icon-themes/tango/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/tango/cmd/sc_exitsearch.png 
b/icon-themes/tango/cmd/sc_exitsearch.png
new file mode 100644
index 000..0030208
--- /dev/null
+++ b/icon-themes/tango/cmd/sc_exitsearch.png
Binary files differ

-- 
To view, visit https://gerrit.libreoffice.org/2127
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] bnc#802350: Cell validation is not a special (cell) content.

2013-02-13 Thread Kohei Yoshida (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2128

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/2128/1

bnc#802350: Cell validation is not a special (cell) content.

Cell validation is stored as cell attributes which are stored with
columns not with cells.  When HasSpecialContent() is true, it flags
the *cell* not empty, which in turns causes AddTextAndValueCell to
iterate over every single cell position for all repeated columns
and rows.  That can very very slow when the number of repeated rows
is very high.

Since cell validation is stored with columns, skipping empty cells
even when they have cell validation settings set won't cause any
issues, and all cell validation settings are imported correctly even
after this change.

With the test document I have (confidential), this change alone reduces
the load time from 30 seconds to 0.3 seconds.

(cherry picked from commit f6acfb5fe41fb166b5b588ec73e2e9331489c632)

Conflicts:
sc/source/filter/xml/xmlcelli.cxx

Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
---
M sc/source/filter/xml/xmlcelli.cxx
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 42714a1..e9776ec 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -956,8 +956,7 @@
 
 bool ScXMLTableRowCellContext::HasSpecialContent() const
 {
-return ( (pContentValidationName  !pContentValidationName-isEmpty()) ||
-  mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource );
+return (mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource);
 }
 
 bool ScXMLTableRowCellContext::CellsAreRepeated() const

-- 
To view, visit https://gerrit.libreoffice.org/2128
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] Let's try to enable compiling the Bluetooth code for Windows

2013-02-13 Thread Tor Lillqvist (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2129

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/2129/1

Let's try to enable compiling the Bluetooth code for Windows

(cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472)

Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
---
M configure.ac
1 file changed, 24 insertions(+), 10 deletions(-)



diff --git a/configure.ac b/configure.ac
index e7c06f2..bb3f96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,9 +862,8 @@
 
 AC_ARG_ENABLE(sdremote-bluetooth,
 AS_HELP_STRING([--disable-sdremote-bluetooth],
-[Determines whether to build sdremote with bluetooth support
- Requires: dbus]),
-,enable_sdremote_bluetooth=yes)
+[Determines whether to build sdremote with bluetooth support.
+ Requires dbus on Linux.]))
 
 AC_ARG_ENABLE(gconf,
 AS_HELP_STRING([--disable-gconf],
@@ -9298,12 +9297,28 @@
 fi
 AC_SUBST(ENABLE_PACKAGEKIT)
 
-AC_MSG_CHECKING([whether to enable sd remotecontrol])
+AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n $enable_sdremote -a $enable_sdremote != no; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE=YES
-AC_MSG_CHECKING([whether to enable bluetooth support in sdremote])
-if test -n $enable_sdremote_bluetooth -a $enable_sdremote_bluetooth != 
no; then
+AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
+
+# If not explicitly enabled or disabled, default
+if test -z $enable_sdremote_bluetooth; then
+case $OS in
+LINUX|WNT)
+# Default to yes for these
+enable_sdremote_bluetooth=yes
+;;
+*)
+# otherwise no
+enable_sdremote_bluetooth=no
+;;
+esac
+fi
+# $enable_sdremote_bluetooth is guaranteed non-empty now
+
+if test $enable_sdremote_bluetooth != no; then
 if test $OS = LINUX; then
 if test $ENABLE_DBUS = TRUE; then
 AC_MSG_RESULT([yes])
@@ -9311,7 +9326,7 @@
 dnl 
===
 dnl Check for system bluez
 dnl 
===
-AC_MSG_CHECKING([which bluetooth header to use])
+AC_MSG_CHECKING([which Bluetooth header to use])
 if test $with_system_bluez = yes; then
 AC_MSG_RESULT([external])
 AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
@@ -9325,9 +9340,8 @@
 ENABLE_SDREMOTE_BLUETOOTH=NO
 fi
 else
-# FIXME: should this really be disabled in everything non-Linux?
-AC_MSG_RESULT([no])
-ENABLE_SDREMOTE_BLUETOOTH=NO
+AC_MSG_RESULT([yes])
+ENABLE_SDREMOTE_BLUETOOTH=YES
 fi
 else
 AC_MSG_RESULT([no])

-- 
To view, visit https://gerrit.libreoffice.org/2129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist t...@iki.fi
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Converted Insert - Names - Define widget.

2013-02-13 Thread Abdulelah Alarifi (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2130

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/2130/1

Converted Insert - Names - Define widget.

Change-Id: I1772da085487358854ae5cc41fb0a802fd761786
---
A sc/uiconfig/scalc/ui/definename.ui
1 file changed, 301 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/definename.ui 
b/sc/uiconfig/scalc/ui/definename.ui
new file mode 100644
index 000..b217086
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/definename.ui
@@ -0,0 +1,301 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkAction id=action1/
+  object class=GtkAction id=action2/
+  object class=GtkDialog id=Define Name
+property name=can_focusFalse/property
+property name=border_width5/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=add
+property name=labelgtk-add/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing10/property
+child
+  object class=GtkLabel id=label1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesDefine the name and 
range or formula expression./property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkGrid id=grid1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing15/property
+child
+  object class=GtkLabel id=label2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesName/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesRange/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach1/property
+

[PATCH] Converted Insert - Names - insert widget.

2013-02-13 Thread Abdulelah Alarifi (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2131

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/2131/1

Converted Insert - Names - insert widget.

Change-Id: I903d329cffd77daa9987cfc6079d9cfd10d98fc5
---
A sc/uiconfig/scalc/ui/insertname.ui
1 file changed, 184 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/insertname.ui 
b/sc/uiconfig/scalc/ui/insertname.ui
new file mode 100644
index 000..5986ec7
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/insertname.ui
@@ -0,0 +1,184 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkAction id=action1/
+  object class=GtkWindow id=Paste Names
+property name=can_focusFalse/property
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing6/property
+child
+  object class=GtkBox id=box4
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkBox id=box5
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=spacing100/property
+child
+  object class=GtkLabel id=label1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesName/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesRange/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesScope/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkScrolledWindow id=scrolledwindow1
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=shadow_typein/property
+child
+  placeholder/
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkButton id=button1
+property name=label translatable=yes_Paste All/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_underlineTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=paste
+

[PATCH] fdo#46808, Adapt UNO services to new style, Part 1

2013-02-13 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2132

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/2132/1

fdo#46808, Adapt UNO services to new style, Part 1

Updated the AccessBridge.idl file in offapi to the new style. This is my first 
patch.

fdo#46808, Adapt UNO services to new style, Part 1

Updated Accessible.idl file in offapi to the new style.

Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b
---
M offapi/com/sun/star/accessibility/AccessBridge.idl
M offapi/com/sun/star/accessibility/Accessible.idl
2 files changed, 2 insertions(+), 9 deletions(-)



diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl 
b/offapi/com/sun/star/accessibility/AccessBridge.idl
index 44703ed..7d28f9c 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -35,11 +35,7 @@
 @since OOo 1.1.2
 */
 
-service AccessBridge
-{
-/** Expects and instance of XExtendedToolkit as first parameter */
-interface ::com::sun::star::lang::XInitialization;
-};
+service AccessBridge : com::sun::star::lang::XInitialization;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl 
b/offapi/com/sun/star/accessibility/Accessible.idl
index a3b5e5b..1c860cb 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -38,10 +38,7 @@
 
 @since OOo 1.1.2
 */
-service Accessible
-{
-interface XAccessible;
-};
+service Accessible : XAccessible;
 
 }; }; }; };
 

-- 
To view, visit https://gerrit.libreoffice.org/2132
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60668: filter out fieldmark chars from Index entries:

2013-02-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2122

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2122
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Templates Manager: UI for renaming templates and folders, fd...

2013-02-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2108

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2108
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Templates Manager: if the title can't be edited, don't updat...

2013-02-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2109

Approvals:
  Tor Lillqvist: Looks good to me, approved
  Miklos Vajna: Verified


-- 
To view, visit https://gerrit.libreoffice.org/2109
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60092: fix STL regression in SwInsertDBColAutoPilot::Dat...

2013-02-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2119

Approvals:
  Miklos Vajna: Verified
  Eike Rathke: Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2119
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida92854efe6ddb8fe10e5ef1f42c53747f40
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60491: embeddedobj: catch exception in fallback path

2013-02-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2096

Approvals:
  Miklos Vajna: Verified
  Eike Rathke: Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2096
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#43105: apply old sw-nested-positionned-tables-ww8-import...

2013-02-13 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2133

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/2133/1

fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diff

- replaced the really ugly goto hack though

Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e
---
M sw/source/filter/ww8/ww8par.cxx
1 file changed, 107 insertions(+), 103 deletions(-)



diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e71b6c0..fb93ac5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2196,113 +2196,117 @@
 if (!nCellLevel)
 nCellLevel = 0 != pPlcxMan-HasParaSprm(0x244B);
 }
-
-WW8_TablePos *pTabPos=0;
-WW8_TablePos aTabPos;
-if (nCellLevel  !bVer67)
+do
 {
-WW8PLCFxSave1 aSave;
-pPlcxMan-GetPap()-Save( aSave );
-rbReSync = true;
-WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
-WW8_CP nMyStartCp=nStartCp;
-
-if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
-nCellLevel = *pLevel;
-
-bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
-
-//Bad Table, remain unchanged in level, e.g. #i19667#
-if (!bHasRowEnd)
-nCellLevel = static_cast sal_uInt8 (nInTable);
-
-if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
-pTabPos = aTabPos;
-
-pPlcxMan-GetPap()-Restore( aSave );
-}
-
-//  then look if we are in an Apo
-
-ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
-
-//look to see if we are in a Table, but Table in foot/end note not allowed
-bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
-
-bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
-
-bWasTabRowEnd = false;  // must be deactivated right here to prevent next
-// WW8TabDesc::TableCellEnd() from making nonsense
-
-if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel  
aApo.HasStartStop()))
-bStopTab = bStartTab = true;// Required to stop and start table
-
-//  Dann auf Anl (Nummerierung) testen
-//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
-
-if( bAnl  !bTableRowEnd )
-{
-const sal_uInt8* pSprm13 = pPlcxMan-HasParaSprm( 13 );
-if( pSprm13 )
-{   // Noch Anl ?
-sal_uInt8 nT = static_cast sal_uInt8 (GetNumType( *pSprm13 ));
-if( ( nT != WW8_Pause  nT != nWwNumType ) // Anl-Wechsel
-|| aApo.HasStartStop()  // erzwungenes Anl-Ende
-|| bStopTab || bStartTab )
-{
-StopAnlToRestart(nT);  // Anl-Restart ( = Wechsel ) ueber sprms
-}
-else
-{
-NextAnlLine( pSprm13 ); // naechste Anl-Zeile
-}
-}
-else
-{   // Anl normal zuende
-StopAllAnl();  // Wirkliches Ende
-}
-}
-if (bStopTab)
-{
-StopTable();
-maApos.pop_back();
---nInTable;
-}
-if (aApo.mbStopApo)
-{
-StopApo();
-maApos[nInTable] = false;
-}
-
-if (aApo.mbStartApo)
-{
-maApos[nInTable] = StartApo(aApo, pTabPos);
-// nach StartApo ist ein ReSync noetig ( eigentlich nur, falls die Apo
-// ueber eine FKP-Grenze geht
-rbReSync = true;
-}
-if (bStartTab)
-{
-WW8PLCFxSave1 aSave;
-pPlcxMan-GetPap()-Save( aSave );
-
-if (bAnl)   // Nummerierung ueber Zellengrenzen
-StopAllAnl();   // fuehrt zu Absturz - keine Anls
-// in Tabellen
-while (nInTable  nCellLevel)
+WW8_TablePos *pTabPos=0;
+WW8_TablePos aTabPos;
+if(nCellLevel  !bVer67)
 {
-if (StartTable(nStartCp))
-++nInTable;
-else
-break;
+WW8PLCFxSave1 aSave;
+pPlcxMan-GetPap()-Save( aSave );
+rbReSync = true;
+WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
+WW8_CP nMyStartCp=nStartCp;
 
-maApos.push_back(false);
+if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
+nCellLevel = *pLevel;
+
+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablenCellLevel?nInTable:nCellLevel-1));
+
+//Bad Table, remain unchanged in level, e.g. #i19667#
+if (!bHasRowEnd)
+nCellLevel = static_cast sal_uInt8 (nInTable);
+
+if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
+pTabPos = aTabPos;
+
+pPlcxMan-GetPap()-Restore( aSave );
 }
-//

[PATCH libreoffice-3-6] fdo#60668: filter out fieldmark chars from Index entries:

2013-02-13 Thread Michael Stahl (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2134

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/2134/1

fdo#60668: filter out fieldmark chars from Index entries:

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)

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

Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 31 insertions(+), 14 deletions(-)



diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e9e30a7..46ef849 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2965,9 +2965,8 @@
 sTmpText.SearchAndReplaceAll('\t', ' ');
 
 // mask hidden characters
-const xub_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), 
cChar );
+const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
 
 sTmpText = sTmpText.Copy( nIdx, nLen );
 rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3070,22 +3069,40 @@
 rDestNd.InsertText( GetNumString(), aDestIdx );
 }
 
-if ( nHiddenChrs  0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx  rDestNd.GetTxt().Len())
 {
-aDestIdx = 0;
-while ( aDestIdx  rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if (   (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
 {
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
 {
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex  rDestNd.GetTxt().Len() 
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
 }
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx  rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph = delete, see below
 }
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have 
contined
+rDestNd.EraseText(
+SwIndex(rDestNd, static_castxub_StrLen(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
 }
 
 return sal_True;

-- 
To view, visit https://gerrit.libreoffice.org/2134
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#60386 fix l10n of windows shell extension

2013-02-13 Thread David Tardon (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2135

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2135/1

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
M shell/CustomTarget_shlxthdl_res.mk
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..9b48e47 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -44,10 +44,19 @@
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $ \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $ -o $@ 
-m $${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

-- 
To view, visit https://gerrit.libreoffice.org/2135
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon dtar...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-3-6] fdo#60386 fix l10n of windows shell extension

2013-02-13 Thread David Tardon (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2136

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/2136/1

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
M shell/CustomTarget_shlxthdl_res.mk
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 67e27a6..5a3bcb5 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -43,10 +43,19 @@
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res  \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $ \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)`  \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $ -o $@ 
-m $${MERGEINPUT} -l all  \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

-- 
To view, visit https://gerrit.libreoffice.org/2136
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: David Tardon dtar...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60386 fix l10n of windows shell extension

2013-02-13 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2135

Approvals:
  Andras Timar: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2135
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-3-6] fdo#60386 fix l10n of windows shell extension

2013-02-13 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2136

Approvals:
  Andras Timar: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2136
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] minimal change to fix fdo#57908 for backport

2013-02-13 Thread Luke Deller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2137

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2137/1

minimal change to fix fdo#57908 for backport

wwSectionManager::GetPageULData adjusts margins and header/footer
heights according to whether there is a header/footer or not.
It could be confused into thinking there was no header/footer when
indeed there was, in the case where a first page header/footer was
inherited from a previous section which contained but did not actually
show that header.

Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
---
M sw/source/filter/ww8/ww8par6.cxx
1 file changed, 7 insertions(+), 3 deletions(-)



diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..691b8f7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1115,10 +1115,14 @@
 aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer = ww::eWW2 ? 128 : 
153, 0);
 else if (mrReader.pHdFt)
 {
-aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD;
+aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD
+| WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
 
-if (aNewSection.HasTitlePage())
-aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
+// It is possible for a first page header to be provided
+// for this section, but not actually shown in this section.  In this
+// case (aNewSection.maSep.grpfIhdt  WW8_HEADER_FIRST) will be nonzero
+// but aNewSection.HasTitlePage() will be false.
+// Likewise for first page footer.
 
 if (mrReader.pWDop-fFacingPages)
 aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN;

-- 
To view, visit https://gerrit.libreoffice.org/2137
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller l...@deller.id.au
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Let's try to enable compiling the Bluetooth code for Windows

2013-02-13 Thread Michael Meeks (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2129

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist t...@iki.fi
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Unpublishing API post 4.0

2013-02-13 Thread Wols Lists

On 13/02/13 09:02, Stephan Bergmann wrote:
 On 02/08/2013 06:01 PM, Kohei Yoshida wrote:
 1) Try to limit API changes to the major releases (4.0, 5.0, 6.0 etc).

 2) API changes in minor and micro releases are still considered only if
 it's really really necessary. Otherwise, wait until the next major
 release.
 
 I would weaken that to just one really for minor releases.
 
 (Also, considering just major and minor releases, we do not have the
 mismatch problem between lexicographical order of release numbers and
 chronological order of releases.  At least that is my understanding of
 how we plan releases.)
 
 Stephan

And if you want to avoid hiccups like it going in 4.0.1 and 4.1 and not
knowing which is later, then just adopt the kernel approach.

Which is that ALL changes have to go in the latest development release,
and then and only then are back-ported to currently supported releases.

Which also has the useful side-effect that bugfixes etc can't get lost.

(Okay, it could have a failure mode if 4.2 is the development version
and 4.0.x and 4.1.x are still both supported, but that's probably
liveable with, especially if dependencies can be specified as 4.1.2+ or
4.0.6+ style.)

Cheers,
Wol
(Making a re-appearance after a difficult while of home-life...)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: convert setup_native to gbuild and add to tail_build

2013-02-13 Thread Niko Rönkkö


Hi!

This commit breaks my Mac build with error message:
Unrecognized option: -p
Usage: ulfconv [-o output file] [-t encoding table] [ulf file]

Problem seems to be on line 22 in CustomTarget_mac.mk:
http://opengrok.libreoffice.org/xref/core/setup_native/CustomTarget_mac.mk#22

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

[Libreoffice-commits] core.git: helpcontent2

2013-02-13 Thread Andras Timar

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

New commits:
commit 4552bd5a7c61c4f9428ad73e19bbee5b78e510ab
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 13 16:22:37 2013 +0100

Updated core
Project: help  cbf9ca859ce3381e1598201bfba2423b919633cc

diff --git a/helpcontent2 b/helpcontent2
index 7a051b0..cbf9ca8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
+Subproject commit cbf9ca859ce3381e1598201bfba2423b919633cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: util/target.pmk

2013-02-13 Thread Andras Timar

 util/target.pmk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cbf9ca859ce3381e1598201bfba2423b919633cc
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 13 16:22:37 2013 +0100

compact help xml files with xslt which removes the cruft

Change-Id: I7dfea1d7fd42a5e7aeed96db508a606982530b7f

diff --git a/util/target.pmk b/util/target.pmk
index 0430239..63e15ce 100644
--- a/util/target.pmk
+++ b/util/target.pmk
@@ -24,7 +24,7 @@ ALLTAR : $(LINKALLTARGETS)
 XSL_DIR*:=$(SOLARBINDIR)
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) 
$(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) 
$(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) 
$(COMMONMISC)$/xhp_changed.flag
-$(COMMAND_ECHO)$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) 
-sty $(XSL_DIR)/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption 
$(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl -lang 
{$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, 
$(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) 
$(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
+$(COMMAND_ECHO)$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) 
-compact $(XSL_DIR)/compact.xsl -sty $(XSL_DIR)/embed.xsl -zipdir 
$(MISC)$/ziptmp$(@:b) -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent 
$(XSL_DIR)/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} 
$(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) 
$(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) 
-o $@.$(INPATH))
 $(COMMAND_ECHO)$(HELPINDEXER) -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) 
-dir $(MISC)$/ziptmp$(@:b)
 @echo [ building ZIP ] $(@:f)
 .IF $(LINKNAME)==sdatabase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcompiler/inc helpcompiler/source xmlhelp/Package_xsl.mk xmlhelp/util

2013-02-13 Thread Andras Timar

 helpcompiler/inc/HelpCompiler.hxx|3 ++
 helpcompiler/inc/HelpLinker.hxx  |1 
 helpcompiler/source/HelpCompiler.cxx |   29 +
 helpcompiler/source/HelpLinker.cxx   |   14 +-
 xmlhelp/Package_xsl.mk   |1 
 xmlhelp/util/compact.xsl |   47 +++
 6 files changed, 89 insertions(+), 6 deletions(-)

New commits:
commit a775aa57f7b1d5f0f69b8faa5277d1914455ba38
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 13 16:28:16 2013 +0100

compact help xml files with xslt which removes the cruft

Change-Id: Iee923174169d6ba9961a9cee14115c9a4bf7ba09

diff --git a/helpcompiler/inc/HelpCompiler.hxx 
b/helpcompiler/inc/HelpCompiler.hxx
index 8a5dda1..0ee2801 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -230,6 +230,7 @@ public:
 const fs::path in_inputFile,
 const fs::path in_src,
 const fs::path in_zipdir,
+const fs::path in_resCompactStylesheet,
 const fs::path in_resEmbStylesheet,
 const std::string in_module,
 const std::string in_lang,
@@ -246,11 +247,13 @@ public:
 private:
 xmlDocPtr getSourceDocument(const fs::path filePath);
 void tagBasicCodeExamples(xmlDocPtr doc);
+xmlDocPtr compactXhpForJar(xmlDocPtr doc);
 void saveXhpForJar(xmlDocPtr doc, const fs::path filePath);
 xmlNodePtr clone(xmlNodePtr node, const std::string appl);
 StreamTable streamTable;
 const fs::path inputFile, src, zipdir;
 const std::string module, lang;
+const fs::path resCompactStylesheet;
 const fs::path resEmbStylesheet;
 bool bExtensionMode;
 std::string gui;
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 57e21a5..5e2e88d 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -66,6 +66,7 @@ private:
 Stringtable additionalFiles;
 HashSet helpFiles;
 fs::path sourceRoot;
+fs::path compactStylesheet;
 fs::path embeddStylesheet;
 fs::path idxCaptionStylesheet;
 fs::path idxContentStylesheet;
diff --git a/helpcompiler/source/HelpCompiler.cxx 
b/helpcompiler/source/HelpCompiler.cxx
index 3983f16..eedc7fd 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -38,11 +38,12 @@ static void impl_sleep( sal_uInt32 nSec )
 osl::Thread::wait( aTime );
 }
 HelpCompiler::HelpCompiler(StreamTable in_streamTable, const fs::path 
in_inputFile,
-const fs::path in_src, const fs::path in_zipdir, const fs::path 
in_resEmbStylesheet,
-const std::string in_module, const std::string in_lang, bool 
in_bExtensionMode)
+const fs::path in_src, const fs::path in_zipdir, const fs::path 
in_resCompactStylesheet,
+const fs::path in_resEmbStylesheet, const std::string in_module, const 
std::string in_lang,
+bool in_bExtensionMode)
 : streamTable(in_streamTable), inputFile(in_inputFile),
-src(in_src), zipdir(in_zipdir), module(in_module), lang(in_lang), 
resEmbStylesheet(in_resEmbStylesheet),
-bExtensionMode( in_bExtensionMode )
+src(in_src), zipdir(in_zipdir), module(in_module), lang(in_lang), 
resCompactStylesheet(in_resCompactStylesheet),
+resEmbStylesheet(in_resEmbStylesheet), bExtensionMode( in_bExtensionMode )
 {
 xmlKeepBlanksDefaultValue = 0;
 char* guitmp = getenv(GUI);
@@ -68,6 +69,22 @@ void HelpCompiler::tagBasicCodeExamples( xmlDocPtr doc )
 }
 }
 
+xmlDocPtr HelpCompiler::compactXhpForJar( xmlDocPtr doc )
+{
+static xsltStylesheetPtr compact = NULL;
+static const char *params[2 + 1];
+params[0] = NULL;
+xmlDocPtr compacted;
+
+if (!compact)
+{
+compact = xsltParseStylesheetFile((const xmlChar 
*)resCompactStylesheet.native_file_string().c_str());
+}
+
+compacted = xsltApplyStylesheet(compact, doc, params);
+return compacted;
+}
+
 void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const fs::path filePath )
 {
 //save processed xhp document in ziptmpmodule_lang/text directory
@@ -90,9 +107,11 @@ void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const 
fs::path filePath )
 size_t pos = zipdirPath.find( ziptmp ) + 6;
 zipdirPath.replace( pos, module.length(), shared );
 }
+xmlDocPtr compacted = compactXhpForJar( doc );
 fs::create_directory( fs::path( zipdirPath + jarXhpPath, fs::native ) );
-if ( -1 == xmlSaveFormatFileEnc( (zipdirPath + jarXhpPath + pathSep + 
xhpFileName).c_str(), doc, utf-8, 0 ) )
+if ( -1 == xmlSaveFormatFileEnc( (zipdirPath + jarXhpPath + pathSep + 
xhpFileName).c_str(), compacted, utf-8, 0 ) )
 std::cerr  Error saving file to   (zipdirPath + jarXhpPath + 
pathSep + xhpFileName).c_str()  std::endl;
+xmlFreeDoc(compacted);
 }
 
 
diff --git a/helpcompiler/source/HelpLinker.cxx 
b/helpcompiler/source/HelpLinker.cxx
index 4bbe2b6..6d00f67 100644

[Bug 37361] LibreOffice 3.5 most annoying bugs

2013-02-13 Thread bugzilla-daemon

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

Bug 37361 depends on bug 46393, which changed state.

Bug 46393 Summary: PRINTING result for cell borders of particular document.xls 
unsatisfying
https://bugs.freedesktop.org/show_bug.cgi?id=46393

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

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

1 2 3 4 5 >

1 - 100 of 429 matches

Mail list logo