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

[Miklos Vajna]

 editeng/source/items/textitem.cxx   |8 
 include/editeng/charrotateitem.hxx  |2 ++
 sw/source/core/docnode/nodedump.cxx |4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 3dee6c74c37d1667c1d56767896e9578e2836e29
Author: Miklos Vajna 
Date:   Thu Dec 11 08:52:06 2014 +0100

Factor out SvxCharRotateItem::dumpAsXml() from sw

Change-Id: I52bca77e8ff0d4fccf8423f01dac9b6a7498f8d1

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 7b4ed20..4d75b47 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3084,6 +3084,14 @@ bool SvxCharRotateItem::operator==( const SfxPoolItem& 
rItem ) const
IsFitToLine() == static_cast(rItem).IsFitToLine();
 }
 
+void SvxCharRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("svxCharRotateItem"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(OString::number(GetValue()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("fitToLine"), 
BAD_CAST(OString::boolean(IsFitToLine()).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
 
 /*
 |*class SvxCharScaleItem
diff --git a/include/editeng/charrotateitem.hxx 
b/include/editeng/charrotateitem.hxx
index 574d2fc..c78cfc6 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -74,6 +74,8 @@ public:
 
 bool IsFitToLine() const{ return bFitToLine; }
 void SetFitToLine( bool b ) { bFitToLine = b; }
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 #endif
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index d97bdcf..b2053cd 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -404,6 +404,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case RES_CHRATR_RSID:
 static_cast(pItem)->dumpAsXml(writer);
 break;
+case RES_CHRATR_ROTATE:
+static_cast(pItem)->dumpAsXml(writer);
+break;
 default: bDone = false; break;
 }
 if (bDone)
@@ -418,7 +421,6 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 boost::optional oValue;
 switch (pItem->Which())
 {
-case RES_CHRATR_ROTATE: pWhich = "character rotation"; oValue = 
OString::number(static_cast(pItem)->GetValue()); 
break;
 case RES_PARATR_OUTLINELEVEL: pWhich = "paragraph outline level"; 
oValue = OString::number(static_cast(pItem)->GetValue()); 
break;
 case RES_PARATR_NUMRULE: pWhich = "paragraph numbering rule"; 
oValue = OUStringToOString(static_cast(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); break;
 case RES_CHRATR_FONT: pWhich = "character font"; oValue = 
OUStringToOString(static_cast(pItem)->GetFamilyName(), 
RTL_TEXTENCODING_UTF8); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 vcl/win/source/gdi/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 94899de91c6adee0dab7218adbbd2d75c565a3ce
Author: Markus Mohrhard 
Date:   Thu Dec 11 08:03:57 2014 +0100

fix windows build

Change-Id: I0b6fd63f796598e56b2d8abe67df939240019217

diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index 6e6361a..6c133e6 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -633,7 +633,7 @@ void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, 
const WinSalBitmap& rSa
 COLORREF nTextColor = RGB( 0x00, 0x00, 0x00 );
 //fdo#33455 handle 1 bit depth pngs with palette entries
 //to set fore/back colors
-if (const BitmapBuffer* pBitmapBuffer = 
const_cast(rSalBitmap).AcquireBuffer(BITMAP_INFO_ACCESS))
+if (BitmapBuffer* pBitmapBuffer = 
const_cast(rSalBitmap).AcquireBuffer(BITMAP_INFO_ACCESS))
 {
 const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
 if (rPalette.GetEntryCount() == 2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Louis-Francis Ratté-Boulianne]

 include/vcl/bitmap.hxx   |4 
 include/vcl/bmpacc.hxx   |  120 ++
 include/vcl/opengl/OpenGLContext.hxx |8 
 include/vcl/salbtype.hxx |   10 
 sc/source/core/data/documen4.cxx |2 
 vcl/generic/print/genpspgraphics.cxx |4 
 vcl/headless/svpbmp.cxx  |6 
 vcl/inc/cairotextrender.hxx  |1 
 vcl/inc/headless/svpbmp.hxx  |4 
 vcl/inc/impbmp.hxx   |5 
 vcl/inc/opengl/framebuffer.hxx   |8 
 vcl/inc/opengl/salbmp.hxx|4 
 vcl/inc/openglgdiimpl.hxx|2 
 vcl/inc/quartz/salbmp.h  |4 
 vcl/inc/salbmp.hxx   |5 
 vcl/inc/unx/salbmp.h |4 
 vcl/inc/win/salbmp.h |4 
 vcl/opengl/framebuffer.cxx   |   26 +-
 vcl/opengl/gdiimpl.cxx   |   36 +--
 vcl/opengl/salbmp.cxx|   34 +-
 vcl/opengl/scale.cxx |2 
 vcl/quartz/salbmp.cxx|6 
 vcl/source/gdi/bitmap.cxx|   23 +
 vcl/source/gdi/bmpacc.cxx|  138 ++-
 vcl/source/gdi/impbmp.cxx|   10 
 vcl/source/opengl/OpenGLContext.cxx  |  271 ---
 vcl/unx/generic/gdi/cairotextrender.cxx  |4 
 vcl/unx/generic/gdi/gdiimpl.cxx  |   12 -
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |   39 +++
 vcl/unx/generic/gdi/openglx11cairotextrender.hxx |1 
 vcl/unx/generic/gdi/salbmp.cxx   |6 
 vcl/unx/generic/gdi/x11cairotextrender.cxx   |6 
 vcl/unx/generic/gdi/x11cairotextrender.hxx   |1 
 vcl/unx/generic/window/salframe.cxx  |   11 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   11 
 vcl/unx/gtk/window/gtksalframe.cxx   |8 
 vcl/win/source/gdi/gdiimpl.cxx   |3 
 vcl/win/source/gdi/salbmp.cxx|   24 +-
 38 files changed, 582 insertions(+), 285 deletions(-)

New commits:
commit b9c25fcc0d6aff0910348dcf3a53c16179f9ab56
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:27:38 2014 -0500

vcl: Don't keep a reference to the texture in the FBO object

Change-Id: I240d2b44e77d28af3cd5952b6d666a1709c4c54a

diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
index e9c9065..915008c 100644
--- a/vcl/inc/opengl/framebuffer.hxx
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -18,10 +18,10 @@
 class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
 {
 private:
-GLuintmnId;
-OpenGLTexture maAttachedTexture;
+GLuint  mnId;
 int mnWidth;
 int mnHeight;
+GLuint  mnAttachedTexture;
 
 public:
 OpenGLFramebuffer();
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index e760b53..c4dfb05 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -17,6 +17,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
 mnId( 0 ),
 mnWidth( 0 ),
 mnHeight( 0 ),
+mnAttachedTexture( 0 ),
 mpPrevFramebuffer( NULL ),
 mpNextFramebuffer( NULL )
 {
@@ -45,30 +46,37 @@ void OpenGLFramebuffer::Unbind()
 
 bool OpenGLFramebuffer::IsFree() const
 {
-return (!maAttachedTexture);
+return (!mnAttachedTexture);
 }
 
 bool OpenGLFramebuffer::IsAttached( const OpenGLTexture& rTexture ) const
 {
-return ( maAttachedTexture == rTexture );
+return ( mnAttachedTexture == rTexture.Id() );
 }
 
 void OpenGLFramebuffer::AttachTexture( const OpenGLTexture& rTexture )
 {
+if( rTexture.Id() == mnAttachedTexture )
+return;
+
 SAL_INFO( "vcl.opengl", "Attaching texture " << rTexture.Id() << " to 
framebuffer " << (int)mnId );
-maAttachedTexture = rTexture;
+mnAttachedTexture = rTexture.Id();
 mnWidth = rTexture.GetWidth();
 mnHeight = rTexture.GetHeight();
 glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D,
-maAttachedTexture.Id(), 0 );
+mnAttachedTexture, 0 );
 CHECK_GL_ERROR();
 }
 
 void OpenGLFramebuffer::DetachTexture()
 {
-maAttachedTexture = OpenGLTexture();
-glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D, 0, 0 );
-CHECK_GL_ERROR();
+if( mnAttachedTexture != 0 )
+{
+CHECK_GL_ERROR();
+mnAttachedTexture = 0;
+glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D, 0, 0 );
+CHECK_GL_ERROR();
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 01bed8089af907e7c0fb8e053d55bffb1eb81aac
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:25:5

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #153 from Commit Notification 
 ---
Daniel Sikeler committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39468: Translated some german comments

It will be available in 4.5.0.

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

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

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

[Daniel Sikeler]

 svx/inc/sxmtaitm.hxx   |9 -
 svx/source/form/fmobj.cxx  |4 ++--
 svx/source/form/tabwin.cxx |8 
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit a92c1939bf85ceb6e16ebc9fd8aa4c79eed20a2a
Author: Daniel Sikeler 
Date:   Wed Dec 3 16:17:33 2014 +0100

fdo#39468: Translated some german comments

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

diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx
index e191d79..c31723b 100644
--- a/svx/inc/sxmtaitm.hxx
+++ b/svx/inc/sxmtaitm.hxx
@@ -23,17 +23,16 @@
 #include 
 #include 
 
-// Den Text automatisch zurechtdrehen (Automatisches UpsideDown).
-// TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht
-// den Text bei sal_True nochmal.
+// Turn text automatically in wright position (automatic UpsideDown).
+// TextUpsideDown stays active and turns the text again if sal_True.
 class SdrMeasureTextAutoAngleItem: public SdrYesNoItem {
 public:
 SdrMeasureTextAutoAngleItem(bool bOn=true): 
SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {}
 SdrMeasureTextAutoAngleItem(SvStream& rIn): 
SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,rIn) {}
 };
 
-// Der bevorzugte Blickwinkel zum lesen des Textes. Wird nur ausgewertet, wenn
-// TextAutoAngle=TRUE. Winkel in 1/100deg aus der Zeichnung zum Betrachter.
+// Preferred perspective for reading text is only evaluated if 
TextAutoAngle=TRUE.
+// Angle in 1/100deg from viewpoint of the user.
 class SdrMeasureTextAutoAngleViewItem: public SdrAngleItem {
 public:
 SdrMeasureTextAutoAngleViewItem(long nVal=31500): 
SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal)  {}
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 80c508ae..e0b756c 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -383,8 +383,8 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj)
 return *this;
 SdrUnoObj::operator= (rObj);
 
-// liegt das UnoControlModel in einer Eventumgebung,
-// dann koennen noch Events zugeordnet sein
+// If UnoControlModel is part of an event environment,
+// events may assigned to it.
 Reference< XFormComponent >  xContent(rObj.xUnoControlModel, UNO_QUERY);
 if (xContent.is())
 {
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 2fd8ad0..60edd9b 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -309,7 +309,7 @@ void FmFieldWin::UpdateContent(const 
::com::sun::star::uno::Reference< ::com::su
 {
 try
 {
-// ListBox loeschen
+// delete ListBox
 pListBox->Clear();
 OUString aTitle(SVX_RES(RID_STR_FIELDSELECTION));
 SetText(aTitle);
@@ -344,7 +344,7 @@ void FmFieldWin::UpdateContent(const 
::com::sun::star::uno::Reference< ::com::su
 lcl_addToList(*pListBox,xColumns);
 }
 
-// Prefix setzen
+// set prefix
 OUString  aPrefix;
 StringListResource aPrefixes( SVX_RES( RID_RSC_TABWIN_PREFIX ) );
 
@@ -361,7 +361,7 @@ void FmFieldWin::UpdateContent(const 
::com::sun::star::uno::Reference< ::com::su
 break;
 }
 
-// an dem PropertySet nach Aenderungen der ControlSource lauschen
+// listen for changes at ControlSource in PropertySet
 if (m_pChangeListener)
 {
 m_pChangeListener->dispose();
@@ -392,7 +392,7 @@ void FmFieldWin::Resize()
 
 
 
-// Groesse der ::com::sun::star::form::ListBox anpassen
+// adapt size of ::com::sun::star::form::ListBox
 Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER );
 Size aLBSize( aOutputSize );
 aLBSize.Width() -= (2*LISTBOX_BORDER);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source canvas/source canvas/workben

[Michael Weghorn]

 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx   |4 +---
 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx  |8 
 canvas/source/cairo/cairo_canvashelper.cxx  |3 +--
 canvas/source/directx/dx_canvasbitmap.cxx   |3 +--
 canvas/source/directx/dx_surfacegraphics.cxx|3 +--
 canvas/workben/canvasdemo.cxx   |3 +--
 8 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 0e55feea6a6bb516c4198960b14192f363f08601
Author: Michael Weghorn 
Date:   Sat Dec 6 19:51:04 2014 +0100

reduce scope of local variables

This addresses some cppcheck warnings.

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

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 9060584..a8f27b6 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -357,11 +357,9 @@ static void cpp_call(
 
 void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
-bool bSimpleReturn = true;
 if (pReturnTypeDescr)
 {
-if (arm::return_in_hidden_param( pReturnTypeRef ) )
-bSimpleReturn = false;
+bool bSimpleReturn = !arm::return_in_hidden_param( pReturnTypeRef );
 
 if (bSimpleReturn)
 pCppReturn = pUnoReturn; // direct way for simple types
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 752137f..0a25f48 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -406,11 +406,9 @@ static void cpp_call(
 
 void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
-bool bSimpleReturn = true;
 if (pReturnTypeDescr)
 {
-if (arm::return_in_hidden_param( pReturnTypeRef ) )
-bSimpleReturn = false;
+bool bSimpleReturn = !arm::return_in_hidden_param( pReturnTypeRef )
 
 if (bSimpleReturn)
 pCppReturn = pUnoReturn; // direct way for simple types
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 01bb74a..342ab9c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -316,15 +316,13 @@ static void cpp_call(
 void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
 bool bOverflow = false;
-bool bSimpleReturn = true;
 
 if (pReturnTypeDescr)
 {
 #if OSL_DEBUG_LEVEL > 2
 fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass);
 #endif
-if (ppc64::return_in_hidden_param(pReturnTypeRef))
-bSimpleReturn = false;
+bool bSimpleReturn =!ppc64::return_in_hidden_param(pReturnTypeRef);
 
 if (bSimpleReturn)
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index ed0e6cf..c1815b4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -42,10 +42,11 @@ static sal_Int32
 invoke_count_words(char * pPT)
 {
  sal_Int32 overflow = 0, gpr = 0, fpr = 0;
- int c;// character of parameter type being decoded
 
  while (*pPT != 'X') {
-   c = *pPT;
+   // character of parameter type being decoded
+   const int c = *pPT;
+
switch (c) {
case 'D':   /* type is double */
 if (fpr < 2) fpr++; else overflow+=2;
@@ -84,10 +85,9 @@ invoke_copy_to_stack(sal_Int32 * pStackLongs, char * pPT, 
sal_Int32* d_ov, sal_I
 sal_Int32 *d_gpr = d_ov + overflow;
 sal_Int64 *d_fpr = (sal_Int64 *)(d_gpr + 5);
 sal_Int32 gpr = 0, fpr = 0;
-char c;
 
  while (*pPT != 'X') {
-   c = *pPT;
+   const char c = *pPT;
switch (c) {
case 'D':   /* type is double */
 if (fpr < 2)
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx 
b/canvas/source/cairo/cairo_canvashelper.cxx
index c501d57..68e05fe 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -670,7 +670,6 @@ namespace cairocanvas
 
 static void addColorStops( Pattern* pPattern, const uno::Sequence< 
uno::Sequence< double > >& rColors, const uno::Sequence< double >& rStops, bool 
bReverseStops = false )
 {
-float stop;
 int i;
 
 OSL_ASSERT( rColors.getLength() == rStops.getLength() );
@@ -678,7 +677,7 @@ namesp

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

[Kohei Yoshida]

 sc/Library_sc.mk |1 +
 sc/inc/celltextattr.hxx  |   30 ++
 sc/inc/clipcontext.hxx   |5 +
 sc/inc/column.hxx|4 +++-
 sc/inc/mtvelements.hxx   |   10 +-
 sc/source/core/data/celltextattr.cxx |   25 +
 sc/source/core/data/clipcontext.cxx  |   15 +++
 sc/source/core/data/column.cxx   |7 +++
 sc/source/core/data/column4.cxx  |   10 ++
 sc/source/core/data/document10.cxx   |5 -
 sc/source/core/data/mtvelements.cxx  |8 
 sc/source/core/data/table4.cxx   |2 +-
 12 files changed, 98 insertions(+), 24 deletions(-)

New commits:
commit a597f75d1452cc89f5ce31ea82f38b19cd71f7e7
Author: Kohei Yoshida 
Date:   Wed Dec 10 22:47:05 2014 -0500

Deteremine the script type of source cell during paste replication.

Doing this ahead of time eliminates the need to update script types of
all replicated cells after the paste.  This makes significant performance
impact.

Change-Id: Ic4f7d7b2fe152bd5640ddb1dae01cc2ed757657e
(cherry picked from commit 808fd5fbd8868dfd95c8a38676815798fa2b79c4)

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index a008328..52fefa0 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/data/autonamecache \
 sc/source/core/data/bcaslot \
 sc/source/core/data/bigrange \
+sc/source/core/data/celltextattr \
 sc/source/core/data/cellvalue \
 sc/source/core/data/cellvalues \
 sc/source/core/data/clipcontext \
diff --git a/sc/inc/celltextattr.hxx b/sc/inc/celltextattr.hxx
new file mode 100644
index 000..9e4675d
--- /dev/null
+++ b/sc/inc/celltextattr.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_CELLTEXTATTR_HXX
+#define INCLUDED_SC_CELLTEXTATTR_HXX
+
+#include 
+
+namespace sc {
+
+struct CellTextAttr
+{
+sal_uInt16 mnTextWidth;
+sal_uInt8 mnScriptType;
+
+CellTextAttr();
+CellTextAttr(const CellTextAttr& r);
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index aa783e4..7848199 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -12,6 +12,7 @@
 
 #include "address.hxx"
 #include "cellvalue.hxx"
+#include 
 
 #include 
 #include 
@@ -57,6 +58,7 @@ class CopyFromClipContext : public ClipContextBase
 InsertDeleteFlags mnDeleteFlag;
 
 std::vector maSingleCells;
+std::vector maSingleCellAttrs;
 std::vector maSinglePatterns;
 std::vector maSingleNotes;
 
@@ -107,8 +109,11 @@ public:
 void setSingleCellColumnSize( size_t nSize );
 
 ScCellValue& getSingleCell( size_t nColOffset );
+sc::CellTextAttr& getSingleCellAttr( size_t nColOffset );
+
 void setSingleCell( const ScAddress& rSrcPos, const ScColumn& rSrcCol );
 
+
 const ScPatternAttr* getSingleCellPattern( size_t nColOffset ) const;
 void setSingleCellPattern( size_t nColOffset, const ScPatternAttr* pAttr );
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f07cf8a..9e66f8f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -185,6 +185,7 @@ public:
 ScRefCellValue GetCellValue( sc::ColumnBlockConstPosition& rBlockPos, 
SCROW nRow ) const;
 ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& 
itPos, size_t nOffset ) const;
 
+const sc::CellTextAttr* GetCellTextAttr( SCROW nRow ) const;
 const sc::CellTextAttr* GetCellTextAttr( sc::ColumnBlockConstPosition& 
rBlockPos, SCROW nRow ) const;
 
 voidDelete( SCROW nRow );
@@ -327,7 +328,8 @@ public:
 bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
 
 void CloneFormulaCell(
-const ScFormulaCell& rSrc, const std::vector& rRanges, 
sc::StartListeningContext* pCxt );
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges, sc::StartListeningContext* 
pCxt );
 
 svl::SharedString GetSharedString( SCROW nRow ) const;
 
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 0e4093e..1d303ce 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -17,6 +17,7 @@
 #include 
 #include "calcmacros.hxx"
 #include "postit.hxx"
+#include 
 #include 
 
 #if DEBUG_COLUMN_STORAGE
@@ -38,15 +39,6 @@ struct ScRefCellValue;
 
 namespace sc {
 
-struct CellTextAttr
-{
-sal_uInt16 mnTextWidth;
-sal_uInt8 mnScriptType;
-
-CellTextAttr();
-CellTextAttr(const CellTextAttr& r);
-};
-
 /// Custom element type 

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on|61662   |

-- 
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: sc/inc sc/Library_sc.mk sc/source

[Kohei Yoshida]

 sc/Library_sc.mk |1 +
 sc/inc/celltextattr.hxx  |   30 ++
 sc/inc/clipcontext.hxx   |5 +
 sc/inc/column.hxx|4 +++-
 sc/inc/mtvelements.hxx   |   10 +-
 sc/source/core/data/celltextattr.cxx |   25 +
 sc/source/core/data/clipcontext.cxx  |   15 +++
 sc/source/core/data/column.cxx   |7 +++
 sc/source/core/data/column4.cxx  |   10 ++
 sc/source/core/data/document10.cxx   |5 -
 sc/source/core/data/mtvelements.cxx  |8 
 sc/source/core/data/table4.cxx   |2 +-
 12 files changed, 98 insertions(+), 24 deletions(-)

New commits:
commit 808fd5fbd8868dfd95c8a38676815798fa2b79c4
Author: Kohei Yoshida 
Date:   Wed Dec 10 22:47:05 2014 -0500

Deteremine the script type of source cell during paste replication.

Doing this ahead of time eliminates the need to update script types of
all replicated cells after the paste.  This makes significant performance
impact.

Change-Id: Ic4f7d7b2fe152bd5640ddb1dae01cc2ed757657e

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index bddec8e..d8cf1bc 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/data/autonamecache \
 sc/source/core/data/bcaslot \
 sc/source/core/data/bigrange \
+sc/source/core/data/celltextattr \
 sc/source/core/data/cellvalue \
 sc/source/core/data/cellvalues \
 sc/source/core/data/clipcontext \
diff --git a/sc/inc/celltextattr.hxx b/sc/inc/celltextattr.hxx
new file mode 100644
index 000..9e4675d
--- /dev/null
+++ b/sc/inc/celltextattr.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_CELLTEXTATTR_HXX
+#define INCLUDED_SC_CELLTEXTATTR_HXX
+
+#include 
+
+namespace sc {
+
+struct CellTextAttr
+{
+sal_uInt16 mnTextWidth;
+sal_uInt8 mnScriptType;
+
+CellTextAttr();
+CellTextAttr(const CellTextAttr& r);
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index aa783e4..7848199 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -12,6 +12,7 @@
 
 #include "address.hxx"
 #include "cellvalue.hxx"
+#include 
 
 #include 
 #include 
@@ -57,6 +58,7 @@ class CopyFromClipContext : public ClipContextBase
 InsertDeleteFlags mnDeleteFlag;
 
 std::vector maSingleCells;
+std::vector maSingleCellAttrs;
 std::vector maSinglePatterns;
 std::vector maSingleNotes;
 
@@ -107,8 +109,11 @@ public:
 void setSingleCellColumnSize( size_t nSize );
 
 ScCellValue& getSingleCell( size_t nColOffset );
+sc::CellTextAttr& getSingleCellAttr( size_t nColOffset );
+
 void setSingleCell( const ScAddress& rSrcPos, const ScColumn& rSrcCol );
 
+
 const ScPatternAttr* getSingleCellPattern( size_t nColOffset ) const;
 void setSingleCellPattern( size_t nColOffset, const ScPatternAttr* pAttr );
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 1d7078f..7eaf60c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -195,6 +195,7 @@ public:
 ScRefCellValue GetCellValue( sc::ColumnBlockConstPosition& rBlockPos, 
SCROW nRow ) const;
 ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& 
itPos, size_t nOffset ) const;
 
+const sc::CellTextAttr* GetCellTextAttr( SCROW nRow ) const;
 const sc::CellTextAttr* GetCellTextAttr( sc::ColumnBlockConstPosition& 
rBlockPos, SCROW nRow ) const;
 
 voidDelete( SCROW nRow );
@@ -337,7 +338,8 @@ public:
 bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
 
 void CloneFormulaCell(
-const ScFormulaCell& rSrc, const std::vector& rRanges, 
sc::StartListeningContext* pCxt );
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges, sc::StartListeningContext* 
pCxt );
 
 svl::SharedString GetSharedString( SCROW nRow ) const;
 
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 0e4093e..1d303ce 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -17,6 +17,7 @@
 #include 
 #include "calcmacros.hxx"
 #include "postit.hxx"
+#include 
 #include 
 
 #if DEBUG_COLUMN_STORAGE
@@ -38,15 +39,6 @@ struct ScRefCellValue;
 
 namespace sc {
 
-struct CellTextAttr
-{
-sal_uInt16 mnTextWidth;
-sal_uInt8 mnScriptType;
-
-CellTextAttr();
-CellTextAttr(const CellTextAttr& r);
-};
-
 /// Custom element type IDs for multi_type_vector.
 
 const mdds::mtv::element_t element_type_bro

Pimpl-ization

[Kohei Yoshida]

It has come to my attention that some folks are feeling a bit uneasy
about my recent pimplization of some of what I call "high impact" public
classes.  I just wanted to make it clear that the reason I'm doing this
is in direct reponse to the discussion we recently had during our ESC
call wrt the bloated object sizes of our shared objects, most notably
those generated from sc and sw modules.

There are 2 main reasons I'm doing this.

1) To reduce the size of our shared objects.
2) To improve our build time.

1) is apparently important for Michael Stahl, and I personally care
about 2) since it directly affects my development efficiency.

My belief was that this was not a controvercial change, but it appears
that it is.  If there is a strong objection I'll stop doing it.  If not,
I'd like to continue pursing this since it seems to improve both of the
2 aforementioned points, and I've only covered perhaps 10-20% of all
possible candidates.

Please share your opinions.

Kohei

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

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

[Andras Timar]

 formula/source/core/resource/core_resource.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d541065fe235de6f1dc3e673082e9a8cda9b328
Author: Andras Timar 
Date:   Wed Dec 10 21:18:27 2014 +0100

fdo#87203 make translatable AGGREGATE function

Change-Id: Ic376a4e03cafbba65ec78723de188bd627c0ef4f
(cherry picked from commit f6ef20b046c485c89fb25521dec1eb6642aac1ba)

diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index b6816c7..99b387d 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -2370,7 +2370,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
 };
 String SC_OPCODE_AGGREGATE
 {
-Text = "AGGREGATE" ;
+Text [ en-US ] = "AGGREGATE" ;
 };
 String SC_OPCODE_T_TEST
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/source/gdi/pdfwriter_impl.cxx |  140 ++
 1 file changed, 37 insertions(+), 103 deletions(-)

New commits:
commit 6e91763769a562b2a4c2a94b1367c6ed4866
Author: Tor Lillqvist 
Date:   Thu Dec 11 02:11:35 2014 +0200

fdo#87030: Generate a proper PKCS#7 signature

The signature should be in DER-encoded PKCS#7 format and what 
CryptSignHash()
produces is nothing like that. Luckily CryptSignMessage() is actually almost
easier to use and is capable of doing what we need. This also means that we
won't need any HCRYPTPROV or HCRYPTHASH after all so all the code related to
that can be removed. CryptSignMessage() handles both calculating the hash 
and
signing it.

One less than ideal issue with CryptSignMessage() is that it needs all the
data to be hashed and signed at the same time, so we need to keep both 
buffers
around for signing.

It also turns out that we don't need to look up the certificate anew from 
the
user's certificate store after all.

Now Adobe Reader doesn't complain any longer about the signature's format 
and
contents.

Change-Id: I25cfb93b516ffa723c6228d068d9ffa8e7cc4790

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index fe260d7..457af31 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6025,144 +6025,6 @@ OUString WindowsError(DWORD nErrorCode)
 return result;
 }
 
-#if SAL_LOG_INFO
-
-OUString CertificatePropertyName(int nId)
-{
-switch (nId)
-{
-case CERT_ACCESS_STATE_PROP_ID: return OUString("ACCESS_STATE");
-case CERT_AIA_URL_RETRIEVED_PROP_ID: return OUString("AIA_URL_RETRIEVED");
-case CERT_ARCHIVED_KEY_HASH_PROP_ID: return OUString("ARCHIVED_KEY_HASH");
-case CERT_ARCHIVED_PROP_ID: return OUString("ARCHIVED");
-case CERT_AUTHORITY_INFO_ACCESS_PROP_ID: return 
OUString("AUTHORITY_INFO_ACCESS");
-case CERT_AUTH_ROOT_SHA256_HASH_PROP_ID: return 
OUString("AUTH_ROOT_SHA256_HASH");
-case CERT_AUTO_ENROLL_PROP_ID: return OUString("AUTO_ENROLL");
-case CERT_AUTO_ENROLL_RETRY_PROP_ID: return OUString("AUTO_ENROLL_RETRY");
-case CERT_BACKED_UP_PROP_ID: return OUString("BACKED_UP");
-case CERT_CA_DISABLE_CRL_PROP_ID: return OUString("CA_DISABLE_CRL");
-case CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID: return 
OUString("CA_OCSP_AUTHORITY_INFO_ACCESS");
-case CERT_CEP_PROP_ID: return OUString("CEP");
-case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: return 
OUString("CROSS_CERT_DIST_POINTS");
-case CERT_CTL_USAGE_PROP_ID: return OUString("CTL_USAGE");
-case CERT_DATE_STAMP_PROP_ID: return OUString("DATE_STAMP");
-case CERT_DESCRIPTION_PROP_ID: return OUString("DESCRIPTION");
-case CERT_DISALLOWED_FILETIME_PROP_ID: return 
OUString("DISALLOWED_FILETIME");
-case CERT_EFS_PROP_ID: return OUString("EFS");
-case CERT_ENROLLMENT_PROP_ID: return OUString("ENROLLMENT");
-case CERT_EXTENDED_ERROR_INFO_PROP_ID: return 
OUString("EXTENDED_ERROR_INFO");
-case CERT_FORTEZZA_DATA_PROP_ID: return OUString("FORTEZZA_DATA");
-case CERT_FRIENDLY_NAME_PROP_ID: return OUString("FRIENDLY_NAME");
-case CERT_HASH_PROP_ID: return OUString("HASH");
-case CERT_HCRYPTPROV_OR_NCRYPT_KEY_HANDLE_PROP_ID: return 
OUString("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE");
-case CERT_HCRYPTPROV_TRANSFER_PROP_ID: return 
OUString("HCRYPTPROV_TRANSFER");
-case CERT_IE30_RESERVED_PROP_ID: return OUString("IE30_RESERVED");
-case CERT_ISSUER_CHAIN_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID: return 
OUString("ISSUER_CHAIN_PUB_KEY_CNG_ALG_BIT_LENGTH");
-case CERT_ISSUER_CHAIN_SIGN_HASH_CNG_ALG_PROP_ID: return 
OUString("ISSUER_CHAIN_SIGN_HASH_CNG_ALG");
-case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: return 
OUString("ISSUER_PUBLIC_KEY_MD5_HASH");
-case CERT_ISSUER_PUB_KEY_BIT_LENGTH_PROP_ID: return 
OUString("ISSUER_PUB_KEY_BIT_LENGTH");
-case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: return 
OUString("ISSUER_SERIAL_NUMBER_MD5_HASH");
-case CERT_KEY_CONTEXT_PROP_ID: return OUString("KEY_CONTEXT");
-case CERT_KEY_IDENTIFIER_PROP_ID: return OUString("KEY_IDENTIFIER");
-case CERT_KEY_PROV_HANDLE_PROP_ID: return OUString("KEY_PROV_HANDLE");
-case CERT_KEY_PROV_INFO_PROP_ID: return OUString("KEY_PROV_INFO");
-case CERT_KEY_REPAIR_ATTEMPTED_PROP_ID: return 
OUString("KEY_REPAIR_ATTEMPTED");
-case CERT_KEY_SPEC_PROP_ID: return OUString("KEY_SPEC");
-case CERT_MD5_HASH_PROP_ID: return OUString("MD5_HASH");
-case CERT_NCRYPT_KEY_HANDLE_PROP_ID: return OUString("NCRYPT_KEY_HANDLE");
-case CERT_NCRYPT_KEY_HANDLE_TRANSFER_PROP_ID: return 
OUString("NCRYPT_KEY_HANDLE_TRANSFER");
-case CERT_NEW_KEY_PROP_ID: return OUString("NEW_KEY");
-case CERT_NEXT_UPDATE_LOCATION_PROP_ID: return 
OUString("NEXT_UPDATE_LOCATION");
-case CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID: return 
OUString("NO_AUTO_EXPIRE_CHECK");
- 

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

[Eike Rathke]

 sc/source/core/data/column4.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9377c934434140d5e70b67cd4864a3631a70e438
Author: Eike Rathke 
Date:   Sat Dec 20 23:48:52 2014 +0100

fdo#86215 pool new ScPatternAttr if source and destination are different 
docs

Change-Id: Icdb68af83a0b208f9a427ee61ae18020c8835a41
(cherry picked from commit d9c15867e914d91a7e86c499ffb6ee62f5b443f6)

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2291d38..c4be8c8 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -149,6 +149,8 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 if (!pBlockPos)
 return;
 
+bool bSameDocPool = (rCxt.getClipDoc()->GetPool() == pDocument->GetPool());
+
 ScCellValue& rSrcCell = rCxt.getSingleCell(nColOffset);
 
 InsertDeleteFlags nFlags = rCxt.getInsertFlag();
@@ -157,7 +159,8 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 {
 if (!rCxt.isSkipAttrForEmptyCells() || rSrcCell.meType != 
CELLTYPE_NONE)
 {
-const ScPatternAttr* pAttr = rCxt.getSingleCellPattern(nColOffset);
+const ScPatternAttr* pAttr = (bSameDocPool ? 
rCxt.getSingleCellPattern(nColOffset) :
+rCxt.getSingleCellPattern(nColOffset)->PutInPool( 
pDocument, rCxt.getClipDoc()));
 pAttrArray->SetPatternArea(nRow1, nRow2, pAttr, true);
 }
 }
@@ -182,8 +185,7 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 {
 // Compare the ScDocumentPool* to determine if we are copying 
within the
 // same document. If not, re-intern shared strings.
-svl::SharedStringPool* pSharedStringPool = 
(rCxt.getClipDoc()->GetPool() != pDocument->GetPool()) ?
-&pDocument->GetSharedStringPool() : NULL;
+svl::SharedStringPool* pSharedStringPool = (bSameDocPool ? 
NULL : &pDocument->GetSharedStringPool());
 svl::SharedString aStr = (pSharedStringPool ?
 pSharedStringPool->intern( 
rSrcCell.mpString->getString()) :
 *rSrcCell.mpString);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Query about the direction of EMF/EMF+ processing

[Chris Sherlock]

Hi all,

Currently we are doing EMF processing in cppcanvas. I guess I'm trying to
understand whether cppcanvas is something we are actively developing.

Currently the only renderer that I can see (unless I'm misreading the
source code very badly!) is the mtfrenderer. I was wondering if we had
plans for using this for anything else in the future?

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

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

[Eike Rathke]

 sc/source/core/data/column4.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d9c15867e914d91a7e86c499ffb6ee62f5b443f6
Author: Eike Rathke 
Date:   Sat Dec 20 23:48:52 2014 +0100

fdo#86215 pool new ScPatternAttr if source and destination are different 
docs

Change-Id: Icdb68af83a0b208f9a427ee61ae18020c8835a41

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 5c49a78..6b0412b 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -149,6 +149,8 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 if (!pBlockPos)
 return;
 
+bool bSameDocPool = (rCxt.getClipDoc()->GetPool() == pDocument->GetPool());
+
 ScCellValue& rSrcCell = rCxt.getSingleCell(nColOffset);
 
 InsertDeleteFlags nFlags = rCxt.getInsertFlag();
@@ -157,7 +159,8 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 {
 if (!rCxt.isSkipAttrForEmptyCells() || rSrcCell.meType != 
CELLTYPE_NONE)
 {
-const ScPatternAttr* pAttr = rCxt.getSingleCellPattern(nColOffset);
+const ScPatternAttr* pAttr = (bSameDocPool ? 
rCxt.getSingleCellPattern(nColOffset) :
+rCxt.getSingleCellPattern(nColOffset)->PutInPool( 
pDocument, rCxt.getClipDoc()));
 pAttrArray->SetPatternArea(nRow1, nRow2, pAttr, true);
 }
 }
@@ -182,8 +185,7 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 {
 // Compare the ScDocumentPool* to determine if we are copying 
within the
 // same document. If not, re-intern shared strings.
-svl::SharedStringPool* pSharedStringPool = 
(rCxt.getClipDoc()->GetPool() != pDocument->GetPool()) ?
-&pDocument->GetSharedStringPool() : NULL;
+svl::SharedStringPool* pSharedStringPool = (bSameDocPool ? 
NULL : &pDocument->GetSharedStringPool());
 svl::SharedString aStr = (pSharedStringPool ?
 pSharedStringPool->intern( 
rSrcCell.mpString->getString()) :
 *rSrcCell.mpString);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2716 ++--
 1 file changed, 1394 insertions(+), 1322 deletions(-)

New commits:
commit 8283eeec48d8b0cd6a001eeb3c6a532d17a2656c
Author: Christian Lohmaier 
Date:   Thu Dec 11 00:34:18 2014 +0100

update credits

Change-Id: Ic8071c4b9907af1ecc855cafd08b82145e64b960

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 59dd6ed..6a5cfeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.3.2$Linux_X86_64
 
LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc6442012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   1824
+   607
501
32757
15162
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 1824
+ 607
  33256
- 16984
+ 15767
  0
  0
  false
@@ -43,6 +43,7 @@
false
false
false
+   false
true
true
true
@@ -81,7 +82,7 @@
false
0

-   2062120
+   2340509
false

true
@@ -303,23 +304,20 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -384,10 +382,10 @@

   
   
-   
+   
   
   
-   
+   
   
   

@@ -398,7 +396,7 @@
   

   
-  
+  

   
   
@@ -421,42 +419,50 @@


   
-  
-  
-  
-  
-  
-  
-  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+  
+  
+  
+  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

-   
+   
   
   

@@ -736,7 +742,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -999,7 +1005,7 @@

   
  Credits
-982 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-11-10 11:15:48.
+991 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-10 04:45:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1026,38 +1032,38 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 15736Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 16038Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
Ber

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2716 ++--
 1 file changed, 1394 insertions(+), 1322 deletions(-)

New commits:
commit de9f3661741db3223332433d9bd7c327559e4b70
Author: Christian Lohmaier 
Date:   Thu Dec 11 00:31:32 2014 +0100

update credits

Change-Id: I0446149f3f2517f360a70fd73fe6f1713ef1d19e

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 59dd6ed..6a5cfeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.3.2$Linux_X86_64
 
LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc6442012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   1824
+   607
501
32757
15162
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 1824
+ 607
  33256
- 16984
+ 15767
  0
  0
  false
@@ -43,6 +43,7 @@
false
false
false
+   false
true
true
true
@@ -81,7 +82,7 @@
false
0

-   2062120
+   2340509
false

true
@@ -303,23 +304,20 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -384,10 +382,10 @@

   
   
-   
+   
   
   
-   
+   
   
   

@@ -398,7 +396,7 @@
   

   
-  
+  

   
   
@@ -421,42 +419,50 @@


   
-  
-  
-  
-  
-  
-  
-  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+  
+  
+  
+  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

-   
+   
   
   

@@ -736,7 +742,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -999,7 +1005,7 @@

   
  Credits
-982 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-11-10 11:15:48.
+991 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-10 04:45:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1026,38 +1032,38 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 15736Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 16038Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
Ber

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2240 ++--
 1 file changed, 1129 insertions(+),  deletions(-)

New commits:
commit b5b65a2847ed98f3cc65798edda42b28d1c2ae76
Author: Christian Lohmaier 
Date:   Thu Dec 11 00:29:14 2014 +0100

update credits

Change-Id: I769ee8ed75a9691ab6cd54619b3fd9f2852f8baa

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 53de48e..6a5cfeb 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f2432012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   1559
+   607
501
32757
15162
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 1559
+ 607
  33256
- 16720
+ 15767
  0
  0
  false
@@ -82,7 +82,7 @@
false
0

-   2232268
+   2340509
false

true
@@ -301,26 +301,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -382,24 +379,24 @@

   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -426,40 +423,44 @@


   
-  
-  
-  
-  
-  
-  
-  
+  
+   
+   
+  
+  
+  
+  
+  
+  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  


   
@@ -741,7 +742,7 @@
 


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1004,7 +1005,7 @@

   
  Credits
-988 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-03 18:42:26.
+991 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2014-12-10 04:45:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1031,38 +1032,38 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 15991Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 16038Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 7546Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 7648

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3-5' - source/am source/br source/cs source/cy source/da source/de source/el source/es source/et source/eu source/fr source/gd source/gu s

[Christian Lohmaier]

 source/am/wizards/source/euro.po | 
   8 
 source/br/chart2/source/controller/dialogs.po| 
   8 
 source/br/cui/source/customize.po| 
   8 
 source/br/cui/uiconfig/ui.po | 
  14 
 source/br/dbaccess/source/ui/dlg.po  | 
  12 
 source/br/extensions/source/propctrlr.po | 
   8 
 source/br/sc/source/ui/src.po| 
  18 
 source/br/sc/uiconfig/scalc/ui.po| 
  16 
 source/br/scp2/source/extensions.po  | 
  10 
 source/br/sw/source/core/uibase/ribbar.po| 
   6 
 source/br/sw/source/core/uibase/utlui.po | 
   8 
 source/br/sw/source/ui/fldui.po  | 
   8 
 source/br/sw/source/ui/index.po  | 
   8 
 source/br/sw/uiconfig/swriter/ui.po  | 
  16 
 source/br/vcl/source/src.po  | 
   8 
 source/cs/cui/uiconfig/ui.po | 
  10 
 source/cs/dbaccess/uiconfig/ui.po| 
  12 
 source/cs/readlicense_oo/docs.po | 
   8 
 source/cs/sw/uiconfig/swriter/ui.po  | 
   6 
 source/cs/wizards/source/euro.po | 
   8 
 source/cy/cui/uiconfig/ui.po | 
  10 
 source/cy/dbaccess/uiconfig/ui.po| 
  12 
 source/cy/readlicense_oo/docs.po | 
   8 
 source/cy/wizards/source/euro.po | 
   8 
 source/da/filter/source/config/fragments/filters.po  | 
   8 
 source/da/helpcontent2/source/text/shared/00.po  | 
   6 
 source/da/helpcontent2/source/text/simpress.po   | 
  10 
 source/da/helpcontent2/source/text/swriter/01.po | 
   6 
 source/da/officecfg/registry/data/org/openoffice/Office/UI.po| 
   6 
 source/da/scp2/source/writer.po  | 
  12 
 source/de/dbaccess/uiconfig/ui.po| 
   9 
 source/de/helpcontent2/source/text/swriter/01.po | 
  18 
 source/de/readlicense_oo/docs.po | 
  10 
 source/de/sfx2/uiconfig/ui.po| 
   8 
 source/de/sw/source/ui/app.po| 
  14 
 source/de/wizards/source/euro.po | 
   8 
 source/el/cui/uiconfig/ui.po | 
  12 
 source/el/dbaccess/uiconfig/ui.po| 
  12 
 source/el/readlicense_oo/docs.po | 
   8 
 source/el/wizards/source/euro.po | 
   8 
 source/es/cui/uiconfig/ui.po | 
  10 
 source/es/dbaccess/uiconfig/ui.po| 
  12 
 source/es/readlicense_oo/docs.po | 
   8 
 source/es/wizards/source/euro.po | 
   8 
 source/et/cui/uiconfig/ui.po | 
  10 
 source/et/dbaccess/uiconfig/ui.po| 
  12 
 source/et/readlicense_oo/docs.po | 
   8 
 source/et/wizards/source/euro.po | 
   8 
 source/eu/cui/uiconfig/ui.po | 
  10 
 source/eu/dbaccess/uiconfig/ui.po| 
  13 
 source/eu/readlicense_oo/docs.po | 
   8 
 source/eu/wizards/source/euro.po | 
   8 
 source/fr/cui/uiconfig/ui.po | 
  12 
 source/fr/dbaccess/uiconfig/ui.po| 
  14 
 source/fr/filter/source/config/fragments/filters.po  | 
  33 
 source/fr/formula/source/core/resource.po| 
  10 
 source/fr/helpcontent2/source/text/scalc/01.po   | 
   8 
 source/fr/readlicense_oo/docs.po   

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

[Christian Lohmaier]

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

New commits:
commit c1056c95afa9ed8b1564a9891d3c21efed2eba75
Author: Christian Lohmaier 
Date:   Wed Dec 10 23:17:02 2014 +0100

Updated core
Project: translations  37a86a86212533e1ba1f85a3979bc2db16c98c48

diff --git a/translations b/translations
index 1857a89..37a86a8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1857a89c8140256a46da45e69cf28551578a5411
+Subproject commit 37a86a86212533e1ba1f85a3979bc2db16c98c48
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sw/source/core/crsr/swcrsr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08b1f9ba6800193ed0fa38cd5545c690b02bc014
Author: Takeshi Abe 
Date:   Wed Dec 10 12:45:44 2014 +0900

fdo#75137: Can't Move Cursor Between Footnotes with Up/Down Arrow Keys

This fixes a regression introduced at 
43941d9a5313fcd7fe39a61bd2eace64f7743486.

Change-Id: If73883569049f0f3ae8a2d40f6704f74e63eecb2
Reviewed-on: https://gerrit.libreoffice.org/13401
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit dad173d9588e6abc2a465198b7d2881d4629246a)
Signed-off-by: Michael Stahl 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 3233cd0..d297810 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1788,7 +1788,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 
 // It is allowed to move footnotes in other footnotes but not sections
-const bool bChkRange = pFrm->IsInFtn() && !HasMark();
+const bool bChkRange = !pFrm->IsInFtn() || HasMark();
 const SwPosition aOldPos( *GetPoint() );
 const bool bInReadOnly = IsReadOnlyAvailable();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sw/source/core/crsr/swcrsr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f25212197b7862575f8427f4a9c0b999ee6d5fd4
Author: Takeshi Abe 
Date:   Wed Dec 10 12:45:44 2014 +0900

fdo#75137: Can't Move Cursor Between Footnotes with Up/Down Arrow Keys

This fixes a regression introduced at 
43941d9a5313fcd7fe39a61bd2eace64f7743486.

Change-Id: If73883569049f0f3ae8a2d40f6704f74e63eecb2
Reviewed-on: https://gerrit.libreoffice.org/13401
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit dad173d9588e6abc2a465198b7d2881d4629246a)
Signed-off-by: Michael Stahl 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 071d51b..7f89c5e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1793,7 +1793,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 
 // It is allowed to move footnotes in other footnotes but not sections
-const bool bChkRange = pFrm->IsInFtn() && !HasMark();
+const bool bChkRange = !pFrm->IsInFtn() || HasMark();
 const SwPosition aOldPos( *GetPoint() );
 const bool bInReadOnly = IsReadOnlyAvailable();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 75137, which changed state.

Bug 75137 Summary: Can't Move Cursor Between Footnotes with Up/Down Arrow Keys. 
Need to Click with Mouse
https://bugs.freedesktop.org/show_bug.cgi?id=75137

   What|Removed |Added

 Status|NEW |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: sw/source

[Takeshi Abe]

 sw/source/core/crsr/swcrsr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dad173d9588e6abc2a465198b7d2881d4629246a
Author: Takeshi Abe 
Date:   Wed Dec 10 12:45:44 2014 +0900

fdo#75137: Can't Move Cursor Between Footnotes with Up/Down Arrow Keys

This fixes a regression introduced at 
43941d9a5313fcd7fe39a61bd2eace64f7743486.

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

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index d0f0005..ce67b7e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1792,7 +1792,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 
 // It is allowed to move footnotes in other footnotes but not sections
-const bool bChkRange = pFrm->IsInFtn() && !HasMark();
+const bool bChkRange = !pFrm->IsInFtn() || HasMark();
 const SwPosition aOldPos( *GetPoint() );
 const bool bInReadOnly = IsReadOnlyAvailable();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Ostrovsky]

 include/tools/debug.hxx  |2 +-
 tools/source/debug/debug.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c2a93a21a5a7af38ae659b9340beeb13c084eb12
Author: David Ostrovsky 
Date:   Mon Dec 8 08:19:15 2014 +0100

long is 32 bit on Windows x86_64 platform

So that this is always wrong (on this platform) to write:

reinterpret_cast(reinterpret_cast(bar))

it should be:
renterpret_cast(reinterpret_cast(bar))

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

diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index 6e73d2e..cdbe081 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -98,7 +98,7 @@ inline sal_uIntPtr DbgIsBoldAppFont()
 
 inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc )
 {
-DbgFunc( DBG_FUNC_SETTESTSOLARMUTEX, 
reinterpret_cast(reinterpret_cast(pProc)) );
+DbgFunc( DBG_FUNC_SETTESTSOLARMUTEX, 
reinterpret_cast(reinterpret_cast(pProc)) );
 }
 
 #define DBG_ASSERTWARNING( sCon, aWarning ) \
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 274d116..9e65c44 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -288,7 +288,7 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
 break;
 
 case DBG_FUNC_SETTESTSOLARMUTEX:
-pDebugData->pDbgTestSolarMutex = 
reinterpret_cast(reinterpret_cast(pParam));
+pDebugData->pDbgTestSolarMutex = 
reinterpret_cast(reinterpret_cast(pParam));
 break;
 
 case DBG_FUNC_TESTSOLARMUTEX:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source editeng/source include/svtools lotuswordpro/source sc/source sfx2/source starmath/inc sw/qa sw/source

[Julien Nabet]

 dbaccess/source/ui/tabledesign/TEditControl.hxx|2 +-
 editeng/source/editeng/impedit.hxx |2 +-
 editeng/source/editeng/impedit2.cxx|2 +-
 include/svtools/tabbar.hxx |2 +-
 lotuswordpro/source/filter/xfilter/xfdrawobj.hxx   |2 +-
 lotuswordpro/source/filter/xfilter/xfparastyle.hxx |2 +-
 sc/source/core/data/column4.cxx|2 +-
 sc/source/core/data/document.cxx   |2 +-
 sfx2/source/appl/appmain.cxx   |2 +-
 starmath/inc/caret.hxx |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |2 +-
 sw/source/core/edit/edlingu.cxx|2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit af7d374d013baad34f66989dbb9443af85bd8040
Author: Julien Nabet 
Date:   Wed Dec 10 22:33:40 2014 +0100

Typo: postion(s)=>position(s)

Change-Id: Id2957f1cb68fc4b2fef9966abeb6745b548bcb75

diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx 
b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 623c48e..3c0a550 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -192,7 +192,7 @@ namespace dbaui
 bool SaveData(long nRow, sal_uInt16 nColumnId);
 /** AdjustFieldDescription set the needed values for the description
 @param  _pFieldDesc the field description where to set the 
values
-@param  _rMultiSel  contains the postions which changed for 
undo/redo
+@param  _rMultiSel  contains the positions which changed for 
undo/redo
 @param  _nPos   the current position
 @param  _bSet   should a key be set
 @param  _bPrimaryKeywhich value should the pkey have
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index f98f943..78128ab 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -144,7 +144,7 @@ struct ImplIMEInfos
 voidDestroyAttribs();
 };
 
-// #i18881# to be able to identify the postions of changed words
+// #i18881# to be able to identify the positions of changed words
 // the positions of each portion need to be saved
 typedef std::vector  SpellContentSelections;
 
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index f4b48b8..db8fe9c 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3881,7 +3881,7 @@ long ImpEditEngine::GetPortionXOffset(
 }
 if ( bR2LPara )
 {
-// Switch X postions...
+// Switch X positions...
 OSL_ENSURE( GetTextRanger() || GetPaperSize().Width(), 
"GetPortionXOffset - paper size?!" );
 OSL_ENSURE( GetTextRanger() || (nX <= GetPaperSize().Width()), 
"GetPortionXOffset - position out of paper size!" );
 nX = GetPaperSize().Width() - nX;
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 5dd5aab..1ecb744 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -130,7 +130,7 @@ ShowDropPos - This method must be called by the 
QueryDrop handler,
   inserted. This method can also be used in the Drop
   handler, in order to determine the position at which
   the Tabs shall be inserted. In the method, the
-  postion of the Event must be passed. This method
+  position of the Event must be passed. This method
   returns the position, at which the Tabs shall be inserted.
 
 HideDropPos - This method takes back the DropPosition previously
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx 
b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index 9df2831..300b15c 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -72,7 +72,7 @@
 /**
  * @brief
  * Base class for all drawing object(ellipse,rect,circle,...).
- * I can set Postions,anchor,rotate,text style name here.
+ * I can set Positions,anchor,rotate,text style name here.
  *
  * Drawing objects can be rotated,scaled and skewed, drawing objects must have 
positions setted,
  * you can use SetPosition(...).
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx 
b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index 58ce28c..8d965df 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -163,7 +163,7 @@ public:
 voidSetLastLineAlign(enumXFAlignType align,bool bJustSingleWord = 
false);
 
 /**
- * @descr   Set the shadow of the paragraph.there is 4 postions, you
+ * @descr   Set the shadow of the paragraph.there is 4 positions, you
 can find it in the definition of enumShadowPos.
  * @pa

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier]

 solenv/gbuild/platform/com_MSC_defs.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 098242fdf2a2d48dd75c20d2ec9bf80057ae8021
Author: Christian Lohmaier 
Date:   Wed Dec 10 22:30:27 2014 +0100

_USING_V110_SDK71_ is not related to DirectX, restore

partially reverts ff17c5a2b06367e9fdeff2d5763ccaeb9725511f

Change-Id: I413fe859f7691d36334b68ad0862f3c100c72264

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 396163c..7590a7b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,6 +47,7 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
+   $(if $(findstring 
120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Ostrovsky]

 sw/source/filter/inc/fltshell.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80ae88836db78c5649e7953e4c5b850d7bad9e4f
Author: David Ostrovsky 
Date:   Mon Dec 8 08:18:17 2014 +0100

32/64 bit type mismatch

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

diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index 3738c19..f1f35f8 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -47,10 +47,10 @@ inline void SwFltClearFlag(sal_uLong& rFieldFlags, int no)
 { rFieldFlags &= ~(1L << no); }
 
 inline void SwFltSetFlag(sal_uLong& rFieldFlags, int no)
-{ rFieldFlags |= 1L << no; }
+{ rFieldFlags |= sal_uLong(1) << no; }
 
 inline bool SwFltGetFlag(sal_uLong nFieldFlags, int no)
-{ return (nFieldFlags & (1L << no)) != 0; }
+{ return (nFieldFlags & (sal_uLong(1) << no)) != 0; }
 
 //Subvert the Node/Content system to get positions which don't update as
 //content is appended to them
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: configure.ac .gitignore src/Makefile.am src/test

[Miklos Vajna]

 .gitignore   |2 
 configure.ac |   17 +
 src/Makefile.am  |2 
 src/test/.gitignore  |   12 +
 src/test/Makefile.am |   26 ++
 src/test/data/fdo86664.vsdx  |binary
 src/test/importtest.cpp  |  143 ++
 src/test/test.cpp|   36 +++
 src/test/xmldrawinggenerator.cpp |  386 +++
 src/test/xmldrawinggenerator.h   |   97 +
 10 files changed, 720 insertions(+), 1 deletion(-)

New commits:
commit abdc998562acac7174ac8f83935404456109a141
Author: Miklos Vajna 
Date:   Wed Dec 10 22:15:21 2014 +0100

fdo#86664 VSDX: test metadata import

Only title as a start.

Change-Id: I6d5f6e2dc1730ff2b2dfda760d575f605ab034eb

diff --git a/.gitignore b/.gitignore
index 3ead918..96ddc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@ missing
 mkinstalldirs
 stamp-h1
 tags
+test-driver
 *.pc
 *.rc
 *~
+*.tar.*
diff --git a/configure.ac b/configure.ac
index d279ec1..41e3d7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,6 +306,21 @@ AS_IF([test "x$enable_debug" = "xyes"], [
 ])
 AC_SUBST(DEBUG_CXXFLAGS)
 
+# ==
+# Unit tests
+# ==
+AC_ARG_ENABLE([tests],
+[AS_HELP_STRING([--enable-tests], [Build and run unit tests])],
+[enable_tests="$enableval"],
+[enable_tests=yes]
+)
+AS_IF([test "x$enable_tests" = "xyes"], [
+PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+], [])
+AC_SUBST([CPPUNIT_CFLAGS])
+AC_SUBST([CPPUNIT_LIBS])
+AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
+
 # =
 # Documentation
 # =
@@ -342,6 +357,7 @@ src/conv/text/vsd2text.rc
 src/conv/text/vss2text.rc
 src/lib/Makefile
 src/lib/libvisio.rc
+src/test/Makefile
 inc/Makefile
 inc/libvisio/Makefile
 build/Makefile
@@ -360,6 +376,7 @@ AC_MSG_NOTICE([
 Build configuration:
debug:   ${enable_debug}
docs:${build_docs}
+   tests:   ${enable_tests}
tools:   ${enable_tools}
werror:  ${enable_werror}
 ==
diff --git a/src/Makefile.am b/src/Makefile.am
index 64fd45e..2cf2099 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lib
+SUBDIRS = lib test
 
 if BUILD_TOOLS
 SUBDIRS += conv
diff --git a/src/test/.gitignore b/src/test/.gitignore
new file mode 100644
index 000..a4ecf9e
--- /dev/null
+++ b/src/test/.gitignore
@@ -0,0 +1,12 @@
+Makefile
+Makefile.in
+test
+testfileinfo
+.libs
+.deps
+*.lo
+*.log
+*.o
+*.trs
+*~
+*.exe
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
new file mode 100644
index 000..d136ecf
--- /dev/null
+++ b/src/test/Makefile.am
@@ -0,0 +1,26 @@
+check_PROGRAMS = test
+
+AM_CXXFLAGS = \
+ -I$(top_srcdir)/inc \
+ $(LIBVISIO_CXXFLAGS) \
+ $(REVENGE_STREAM_CFLAGS) \
+ $(CPPUNIT_CFLAGS) \
+ $(DEBUG_CXXFLAGS)
+
+test_CPPFLAGS = -DTDOC=\"$(top_srcdir)/src/test/data\"
+test_LDADD = \
+../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \
+$(CPPUNIT_LIBS) \
+$(LIBVISIO_LIBS) \
+$(REVENGE_STREAM_LIBS)
+test_SOURCES = \
+  xmldrawinggenerator.cpp \
+  xmldrawinggenerator.h \
+  importtest.cpp \
+  test.cpp
+
+EXTRA_DIST = \
+data/fdo86664.vsdx \
+$(test_SOURCES)
+
+TESTS = test
diff --git a/src/test/data/fdo86664.vsdx b/src/test/data/fdo86664.vsdx
new file mode 100644
index 000..bad6caa
Binary files /dev/null and b/src/test/data/fdo86664.vsdx differ
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
new file mode 100644
index 000..1560fef
--- /dev/null
+++ b/src/test/importtest.cpp
@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libvisio project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include "xmldrawinggenerator.h"
+
+namespace
+{
+
+/// Allows using CPPUNIT_ASSERT_EQUAL() on librevenge::RVNGString instances.
+std::ostream& operator <<(std::ostream& s, const librevenge::RVNGString 
&string)
+{
+return s << string.cstr();
+}
+
+/// Caller must call xmlXPathFreeObject.
+xmlXPathObjectPtr getXPathNode(xmlDocPtr doc, const librevenge::RVNGString 
&xpath)
+{
+  xmlXPathContextPtr xpathContext = xmlXPathNewContext(doc);
+  xmlXPathObjectPtr xpathObject = 
xmlXPathEvalExpression(BAD_CAST(xpath.cstr()), xpathContext);
+  xmlXPathFreeContext(xpathContext);
+  return xpathObject;
+}
+
+/// Same as the assertXPath(), but don't assert: return the string instead.
+librevenge::RVNGString getXPath(xmlDocPtr doc

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

[Matteo Casalin]

 sw/source/core/fields/authfld.cxx   |   10 -
 sw/source/core/fields/dbfld.cxx |   19 ---
 sw/source/core/fields/ddefld.cxx|5 
 sw/source/core/fields/docufld.cxx   |   40 +--
 sw/source/core/fields/expfld.cxx|   20 ---
 sw/source/core/fields/fldbas.cxx|5 
 sw/source/core/fields/flddat.cxx|   10 -
 sw/source/core/fields/scrptfld.cxx  |2 
 sw/source/core/fields/tblcalc.cxx   |5 
 sw/source/core/fields/usrfld.cxx|   15 --
 sw/source/core/graphic/grfatr.cxx   |4 
 sw/source/core/layout/atrfrm.cxx|   77 +++--
 sw/source/core/para/paratr.cxx  |2 
 sw/source/core/txtnode/fmtatr2.cxx  |2 
 sw/source/core/unocore/unocrsrhelper.cxx|6 -
 sw/source/core/unocore/unodraw.cxx  |5 
 sw/source/core/unocore/unofield.cxx |   16 +-
 sw/source/core/unocore/unoframe.cxx |6 -
 sw/source/core/unocore/unoidx.cxx   |3 
 sw/source/core/unocore/unoobj.cxx   |2 
 sw/source/core/unocore/unoport.cxx  |4 
 sw/source/core/unocore/unoredline.cxx   |   15 --
 sw/source/core/unocore/unosect.cxx  |   10 -
 sw/source/core/unocore/unosett.cxx  |   41 +--
 sw/source/core/unocore/unosrch.cxx  |4 
 sw/source/core/unocore/unostyle.cxx |   27 +---
 sw/source/core/unocore/unotbl.cxx   |   27 +---
 sw/source/filter/html/htmlform.cxx  |   23 +---
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |9 -
 sw/source/filter/xml/swxml.cxx  |   33 +
 sw/source/filter/xml/wrtxml.cxx |   18 ---
 sw/source/filter/xml/xmlexp.cxx |7 -
 sw/source/filter/xml/xmlimp.cxx |   10 -
 sw/source/filter/xml/xmltexte.cxx   |6 -
 sw/source/ui/dbui/dbinsdlg.cxx  |   23 +---
 sw/source/ui/frmdlg/frmpage.cxx |4 
 sw/source/ui/index/cntex.cxx|   11 -
 sw/source/uibase/config/modcfg.cxx  |   54 +++--
 sw/source/uibase/config/prtopt.cxx  |   34 ++
 sw/source/uibase/config/usrpref.cxx |   20 +--
 sw/source/uibase/envelp/envimg.cxx  |5 
 sw/source/uibase/envelp/labimg.cxx  |9 -
 sw/source/uibase/uiview/view.cxx|6 -
 sw/source/uibase/uiview/view0.cxx   |5 
 sw/source/uibase/uiview/view2.cxx   |4 
 sw/source/uibase/uno/SwXDocumentSettings.cxx|  136 +++-
 sw/source/uibase/uno/unomod.cxx |4 
 sw/source/uibase/uno/unotxdoc.cxx   |   10 -
 sw/source/uibase/utlui/navicfg.cxx  |5 
 sw/source/uibase/utlui/unotools.cxx |9 -
 50 files changed, 260 insertions(+), 567 deletions(-)

New commits:
commit 8aac6ecc58fa2c475f34817e607efb6a31317898
Author: Matteo Casalin 
Date:   Sun Nov 30 18:33:21 2014 +0100

Use Any specializations for bool, instead of SetValue

Change-Id: I7a5babe494bdb09a71164ea74d7be3f6bf985ff6
Reviewed-on: https://gerrit.libreoffice.org/13215
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/fields/authfld.cxx 
b/sw/source/core/fields/authfld.cxx
index b001b84..56060cd 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -379,11 +379,11 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, 
sal_uInt16 nWhichId ) const
 break;
 
 case FIELD_PROP_BOOL1:
+rVal <<= m_bIsSequence;
+break;
+
 case FIELD_PROP_BOOL2:
-{
-sal_Bool bVal = FIELD_PROP_BOOL1 == nWhichId ? m_bIsSequence: 
m_bSortByDocument;
-rVal.setValue(&bVal, ::getBooleanCppuType());
-}
+rVal <<= m_bSortByDocument;
 break;
 
 case FIELD_PROP_LOCALE:
@@ -402,7 +402,7 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, 
sal_uInt16 nWhichId ) const
 pValue[0].Name = UNO_NAME_SORT_KEY;
 pValue[0].Value <<= sal_Int16(pKey->eField);
 pValue[1].Name = UNO_NAME_IS_SORT_ASCENDING;
-pValue[1].Value.setValue(&pKey->bSortAscending, 
::getBooleanCppuType());
+pValue[1].Value <<= pKey->bSortAscending;
 }
 rVal <<= aRet;
 }
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index edc94d0..eca0e53 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -366,17 +366,11 @@ bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 
nWhichId ) const
 switch( nWhichId )
 {
 case FIELD_PROP_BOOL1:
-{
-sal_Bool bTemp = 0 == 
(GetSubType()&nsSwExtendedSubType::SUB_OWN_FMT);
-   

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

[David Ostrovsky]

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

New commits:
commit 5f77059ff156ecbd69967f278d3e8f814c15958e
Author: David Ostrovsky 
Date:   Sat Nov 22 21:46:23 2014 +0100

scp2: move numbertext to AutoInstall

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

diff --git a/Repository.mk b/Repository.mk
index e5eceac..d84dc6d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -780,6 +780,12 @@ $(eval $(call 
gb_Helper_register_packages_for_install,extensions_ct2n,\
 ))
 endif
 
+ifeq (NUMBERTEXT,$(filter NUMBERTEXT,$(BUILD_TYPE)))
+$(eval $(call gb_Helper_register_packages_for_install,extensions_numbertext,\
+   numbertext \
+))
+endif
+
 $(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 62f043c..30b0baf 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -21,6 +21,7 @@ $(eval $(call 
gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,extensions_ct2n))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,extensions_numbertext))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 113779f..a6022a7 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_ct2n))
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
+$(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_numbertext))
 
 $(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
 scp2/source/templates/module_langpack_extensions_templates \
diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index fec3835..637f566 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -35,19 +35,6 @@ End
 
 #endif
 
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-File gid_File_Oxt_NumberText
-TXT_FILE_BODY;
-Styles = (PACKED, FILELIST);
-Dir = FILELIST_DIR;
-Name = "numbertext.filelist";
-End
-
-#endif
-
 /* ** Hungarian Cross-reference Toolbar** */
 
 #ifdef WITH_EXTENSION_HUNART
diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index 5dfb7c1..a66d240 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -50,12 +50,14 @@ End
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
+
+#include "AutoInstall/extensions_numbertext"
+
 Module gid_Module_Optional_Extensions_NumberText
 PackageInfo = "packinfo_extensions.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
 ParentID = gid_Module_Optional_Extensions;
-Files = (
-gid_File_Oxt_NumberText );
+Files = (auto_extensions_numbertext_ALL);
 Minimal = NO;
 Default = YES;
 Styles = ( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/InstallModule_extensions.mk

[David Ostrovsky]

 scp2/InstallModule_extensions.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5eba12388042b456fc3dd29b3a77ded97179cbf2
Author: David Ostrovsky 
Date:   Wed Dec 10 00:20:24 2014 +0100

extensions_ct2n: Add dependency in scp2/InstallModule_extensions.mk

9df0e4a709735e5fb5c0e87779b0694c512f0de7 moved ct2n to AutoInstall,
but missed to add dependency in  scp2/InstallModule_extensions.mk.

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

diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 2511f1c..113779f 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
 
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
+$(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_ct2n))
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
 
 $(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 xmloff/source/chart/PropertyMap.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8dfaba9dc059cd27c14c8b9f3a1d1c6951e0b6fe
Author: Markus Mohrhard 
Date:   Tue Dec 9 23:20:13 2014 +0100

don't write extension elements into ODF namespaces, related fdo#45266

We will still import the old elements but only write them into the
lo-ext namespace. Also it will only be exported for ODF 1.2 extended.

(cherry picked from commit 88d3931d92bc89519acf95f0510f6f2a6ff7c72c)
Signed-off-by: Michael Stahl 

Backpoting the export part of this too since the attributes were added
in LO 4.3 so the change has very limited impact.

Conflicts:
xmloff/source/chart/PropertyMap.hxx

Change-Id: I1c41716b8b16e186ec84767b4b3a636d083162b8

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index af19843..12393dd 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -137,12 +137,12 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
 MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER 
),
 MAP_ENTRY_ODF12( "MissingValueTreatment", CHART, XML_TREAT_EMPTY_CELLS, 
XML_SCH_TYPE_MISSING_VALUE_TREATMENT ),
 // #72304 Chart data table flags
-MAP_ENTRY_ODF12( "DataTableHBorder", CHART, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
-MAP_ENTRY_ODF12( "DataTableVBorder", CHART, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
-MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, 
XML_TYPE_BOOL ),
-MAP_ENTRY_ODF_EXT_IMPORT( "DataTableHBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
-MAP_ENTRY_ODF_EXT_IMPORT( "DataTableVBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
-MAP_ENTRY_ODF_EXT_IMPORT( "DataTableOutline", LO_EXT, 
XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT( "DataTableHBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT( "DataTableVBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT( "DataTableOutline", LO_EXT, 
XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT_IMPORT( "DataTableHBorder", CHART, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT_IMPORT( "DataTableVBorder", CHART, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT_IMPORT( "DataTableOutline", CHART, 
XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ),
 // Chart display units flags
 MAP_ENTRY_ODF_EXT( "DisplayUnits", LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, 
XML_TYPE_BOOL ),
 MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, 
XML_TYPE_STRING ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 8660d1ebf9228cafec0082b5c69e596a03ae6f3c
Author: Caolán McNamara 
Date:   Wed Dec 10 15:58:42 2014 +

Resolves: fdo#87141 Remove deletes the node, release doesn't

regression from introduction of boost::ptr_vector originally one had to 
Remove
and delete the return to delete it, while now the Remove automatically 
delete
it. This bare Remove to just "release" it seems to have been overlooked

Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75
(cherry picked from commit efcbb12a27a380a442292f17c7f508555a66d4af)
(cherry picked from commit a27bb66382687ce348db5f57a1e64ee6afcb5c43)
Reviewed-on: https://gerrit.libreoffice.org/13423
Reviewed-by: Christian Lohmaier 
Reviewed-by: Markus Mohrhard 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index 55d3b5c3..a0f7d16 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -187,7 +187,7 @@ void EditUndoDelContent::Redo()
 pEE->RemoveParaPortion(nNode);
 
 // Do not delete node, depends on the undo!
-pEE->GetEditDoc().Remove( nNode );
+pEE->GetEditDoc().Release( nNode );
 if (pEE->IsCallParaInsertedOrDeleted())
 pEE->ParagraphDeleted( nNode );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 formula/source/core/resource/core_resource.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6ef20b046c485c89fb25521dec1eb6642aac1ba
Author: Andras Timar 
Date:   Wed Dec 10 21:18:27 2014 +0100

fdo#87203 make translatable AGGREGATE function

Change-Id: Ic376a4e03cafbba65ec78723de188bd627c0ef4f

diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index b6816c7..99b387d 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -2370,7 +2370,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
 };
 String SC_OPCODE_AGGREGATE
 {
-Text = "AGGREGATE" ;
+Text [ en-US ] = "AGGREGATE" ;
 };
 String SC_OPCODE_T_TEST
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/doc/objstor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ee9d871254b0c3befa86cb7a2209bac7355e6da
Author: Michael Stahl 
Date:   Fri Dec 5 23:52:34 2014 +0100

fdo#72811: Revert "Broken security/password when saving to older odf (sx?)

... formats."

This exports ODF 1.1 files as ODF 1.2 packages, which is quite wrong.
Since we don't support OOoXML export any more, just revert it.

This reverts commit 06b918053fb9cf455cf431ca001a63030092d018.

(cherry picked from commit ebfec3517d001f8aa8baaabde7c4af6b01347b95)

Change-Id: I27bdd83f96e46be054f808ff6782ad16ecc90da5
Reviewed-on: https://gerrit.libreoffice.org/13325
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit 5faedcab93d2f987f91e2750119198b18891f4d1)
Reviewed-on: https://gerrit.libreoffice.org/13377
Reviewed-by: Caolán McNamara 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 1e37373..66f6a74 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -382,7 +382,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< 
embed::XStorage >& xSto
 aEncryptionAlgs[1].Value <<= 
xml::crypto::CipherID::BLOWFISH_CFB_8;
 aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA1_1K;
 
-if ( nVersion >= SOFFICE_FILEFORMAT_8 )
+if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
 {
 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-3-5' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 85e973d3b95e66b7d396d94bf44011b5e8d51b21
Author: Caolán McNamara 
Date:   Mon Dec 8 11:24:14 2014 +

Resolves: fdo#86662 don't crash on docx load

ok in master, so just don't crash in 4-3 series

Change-Id: I2dcb7b0434341ff8058bdbdfc065ad08bd0600bc
Reviewed-on: https://gerrit.libreoffice.org/13374
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit dcc914ab55feb844d5d71e6568801fa1ffd47f6c)
Reviewed-on: https://gerrit.libreoffice.org/13375
Reviewed-by: Markus Mohrhard 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c3343f1..2c9740f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3943,10 +3943,13 @@ void DomainMapper_Impl::CloseFieldCommand()
 OUString aCode( pContext->GetCommand().trim() );
 xFieldInterface = 
m_xTextFactory->createInstance("com.sun.star.text.Fieldmark");
 const uno::Reference 
xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);
-uno::Reference< text::XTextAppend >  xTextAppend;
-xTextAppend = m_aTextAppendStack.top().xTextAppend;
-uno::Reference< text::XTextCursor > xCrsr = 
xTextAppend->createTextCursorByRange(pContext->GetStartRange());
-if (xTextContent.is())
+uno::Reference< text::XTextAppend > xTextAppend;
+if (!m_aTextAppendStack.empty())
+xTextAppend = m_aTextAppendStack.top().xTextAppend;
+uno::Reference< text::XTextCursor > xCrsr;
+if (xTextAppend.is())
+xCrsr = 
xTextAppend->createTextCursorByRange(pContext->GetStartRange());
+if (xTextAppend.is() && xTextContent.is())
 {
 xTextAppend->insertTextContent(xCrsr,xTextContent, 
sal_True);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CustomTarget_generated.mk sw/Library_sw.mk sw/Module_sw.mk sw/source

[Daniel Sikeler]

 sw/CustomTarget_generated.mk|   34 ++
 sw/Library_sw.mk|1 
 sw/Module_sw.mk |1 
 sw/source/core/inc/SwXMLBlockImport.hxx |   76 +-
 sw/source/core/swg/BlockListTokens.txt  |7 
 sw/source/core/swg/SwXMLBlockImport.cxx |  404 +++-
 sw/source/core/swg/SwXMLTextBlocks1.cxx |   37 ++
 sw/source/core/swg/TextBlockTokens.txt  |5 
 8 files changed, 340 insertions(+), 225 deletions(-)

New commits:
commit c2c0989794d5a4724da8b8880559764bffd059ec
Author: Daniel Sikeler 
Date:   Mon Nov 10 12:23:12 2014 +

fdo#80403: Writer specific AutoCorr use FastParser

Contextclasses implement XFastContextHandler
Importclasses implement XFastDocumentHandler
Tokens for BlockList.xml are defined in BlockListTokens.txt
Tokens for content.xml are defined in TextBlockTokens.txt
A perfect hash table is generated with gperf and used by the tokenhandlers

This is corrected version of c1e90457d2ecc6e1171b7a296ab8bd05821e39e6
(Also pushing again follow-up c940d4d30673dc02ea34b5e60a4a8140648a0dba
"loplugin:saloverride" and 5f0f3d4e91e9eb1d1f60b0cd073e7bbd8ea38c29
"Work around -Werror,-Wdeprecated-register")
The commits were reverted in 7ef4457b9fc06b5c25c607d7e0149f45c7015b10

Change-Id: I08cd852fa751f98fd0ac6a55dda22f82a869b4d8

diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
new file mode 100644
index 000..f8244d2
--- /dev/null
+++ b/sw/CustomTarget_generated.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,sw/generated))
+
+sw_SRC := $(SRCDIR)/sw/source/core/swg
+sw_PL := $(SRCDIR)/solenv/bin/gentoken.pl
+sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated)
+
+$(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PL)
+   mkdir -p $(sw_INC)
+   $(PERL) $(sw_PL) $(sw_SRC)/TextBlockTokens.txt 
$(sw_INC)/TextBlockTokens.gperf
+
+$(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PL)
+   mkdir -p $(sw_INC)
+   $(PERL) $(sw_PL) $(sw_SRC)/BlockListTokens.txt 
$(sw_INC)/BlockListTokens.gperf
+
+$(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf 
$(sw_INC)/BlockListTokens.gperf
+   $(GPERF) --compare-strncmp --readonly-tables 
--output-file=$(sw_INC)/tokens.cxx \
+   --class-name=TextBlockTokens --word-array-name=textBlockList --enum 
$(sw_INC)/TextBlockTokens.gperf
+   $(GPERF) --compare-strncmp --readonly-tables -T 
$(sw_INC)/BlockListTokens.gperf \
+   --class-name=BlockListTokens --word-array-name=blockListList >> 
$(sw_INC)/tokens.cxx
+   sed -i -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" 
$(sw_INC)/tokens.cxx
+   sed -i -e "/^#line/d" $(sw_INC)/tokens.cxx
+
+$(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1b16def..f9a4e03 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,sw,\
 
 $(eval $(call gb_Library_use_custom_headers,sw,\
officecfg/registry \
+   sw/generated \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,sw))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index a7a31ef..bf110be 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,sw))
 
 $(eval $(call gb_Module_add_targets,sw,\
$(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \
+CustomTarget_generated \
Library_msword \
Library_sw \
Library_swd \
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx 
b/sw/source/core/inc/SwXMLBlockImport.hxx
index ac166fd..9c4e77c 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -21,6 +21,14 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace css::xml::sax;
+using namespace xmloff::token;
 
 class SwXMLTextBlocks;
 class SwXMLBlockListImport : public SvXMLImport
@@ -31,10 +39,8 @@ private:
 protected:
 // This method is called after the namespace map has been updated, but
 // before a context for the current element has been pushed.
-virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
-  const OUString& rLocalName,
-  const ::com::sun::star::uno::Reference<
-::com::sun::star::xml::sax::XAttributeList > & xAttrList ) 
SAL_OVERRIDE;
+virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element,
+const css::uno::Reference< css:

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

[Stephan Bergmann]

 sw/source/filter/basflt/fltini.cxx |2 +-
 sw/source/filter/ww8/ww8scan.cxx   |2 +-
 sw/source/filter/ww8/ww8scan.hxx   |2 +-
 unotools/source/ucbhelper/ucblockbytes.cxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 55dc40bc85fa5f5b1491d4788eaee0fba415d017
Author: Stephan Bergmann 
Date:   Wed Dec 10 18:45:23 2014 +0100

Cargo cult?

Change-Id: Ib04880eee7ffed621a97ca0f6c6f9896eb54df0d

diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index 196a3a4..136d085 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -426,7 +426,7 @@ const CharSetNameMap *GetCharSetNameMap()
 {
 static const CharSetNameMap aMapArr[] =
 {
-#   define IMPLENTRY(X) { RTL_TEXTENCODING_##X, "" #X "" }
+#   define IMPLENTRY(X) { RTL_TEXTENCODING_##X, #X }
 IMPLENTRY(DONTKNOW),
 IMPLENTRY(MS_1252),
 IMPLENTRY(APPLE_ROMAN),
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 145886d..f5b71fb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::lang;
 //-begin
 namespace SL
 {
-#   define IMPLCONSTSTRINGARRAY(X) const char a##X[] = "" #X ""
+#   define IMPLCONSTSTRINGARRAY(X) const char a##X[] = #X
 IMPLCONSTSTRINGARRAY(ObjectPool);
 IMPLCONSTSTRINGARRAY(1Table);
 IMPLCONSTSTRINGARRAY(0Table);
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index afcb415..2dec722 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -46,7 +46,7 @@
 //Commonly used string literals for stream and storage names in word docs
 namespace SL
 {
-#   define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof("" #X "")]
+#   define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof(#X)]
 DEFCONSTSTRINGARRAY(ObjectPool);
 DEFCONSTSTRINGARRAY(1Table);
 DEFCONSTSTRINGARRAY(0Table);
commit 4bb684274b5d80d04260b7ed6f6adf361ef9a26f
Author: Stephan Bergmann 
Date:   Wed Dec 10 18:43:03 2014 +0100

This shall apparently check that aScheme is neither http nor https

...introduced when https was added in 
c21b8a1620808865d03239256221a6a86e6316f0
"INTEGRATION: CWS tkr05_SRC680: #31053# HTTPS WebDAV support"

Change-Id: Id7c361a078008d66391771f26b9c35999404091f

diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx 
b/unotools/source/ucbhelper/ucblockbytes.cxx
index 1d38f4a..0ec9f47 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -875,7 +875,7 @@ static bool UCBOpenContentSync(
 return _UCBOpenContentSync(
 xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler);
 
-if ( !aScheme.equalsAscii( "http" ) ||
+if ( !aScheme.equalsAscii( "http" ) &&
  !aScheme.equalsAscii( "https" ) )
 xLockBytes->SetStreamValid_Impl();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: AW: Patch of the LibreOfficeKit

[Stephan Bergmann]

On 12/10/2014 01:33 PM, Juergen Funk Mailinglist wrote:

but I have seen, in your patch have overseen

 else if ( oArg == "headless" )
 {
 // Headless means also invisibile, so set this parameter to 
true!
 m_headless = true;
 m_invisible = true;
 }

the "m_invisible" flag


oops, meanwhile fixed with 
 
"Headless implies invisible"


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

Re: AW: Patch of the LibreOfficeKit

[Stephan Bergmann]

On 12/10/2014 01:15 PM, Juergen Funk Mailinglist wrote:

But that don't work with "bool Application::IsHeadlessModeRequested()" but I 
think that not needed for the LibreOfficeKit.


should be addressed now with the commits leading up to 
 
"Make IsHeadlessModeRequested hack work for LOK"

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

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

[Stephan Bergmann]

 desktop/source/lib/init.cxx   |4 ++--
 vcl/unx/generic/plugadapt/salplug.cxx |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 68e2dd0dfbd7f1cec1771f68e65f46045365cf1f
Author: Stephan Bergmann 
Date:   Wed Dec 10 18:28:11 2014 +0100

Make IsHeadlessModeRequested hack work for LOK

Change-Id: I30bf474fc44b122c8b7218e187c822a8784783fd

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5a410e4..282cb99 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -740,6 +740,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* 
pAppPath)
 // CommandLineArgs):
 desktop::Desktop::GetCommandLineArgs().setHeadless();
 
+Application::EnableHeadlessMode(true);
+
 // We could use InitVCL() here -- and used to before using 
soffice_main,
 // however that now deals with the initialisation for us (and it's not
 // possible to try to set up VCL twice.
@@ -773,8 +775,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* 
pAppPath)
 return false;
 }
 
-Application::EnableHeadlessMode(true);
-
 ErrorHandler::RegisterDisplay(aBasicErrorFunc);
 
 SAL_INFO("lok", "LOK Initialized");
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index e2870f3..80b5acf 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -43,6 +43,9 @@ namespace {
 // Application::EnableHeadlessMode has potentially been called:
 bool IsHeadlessModeRequested()
 {
+if (Application::IsHeadlessModeEnabled()) {
+return true;
+}
 sal_uInt32 n = rtl_getAppCommandArgCount();
 for (sal_uInt32 i = 0; i < n; ++i) {
 OUString arg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/source canvas/StaticLibrary_directxcanvas.mk

[Michael Stahl]

 canvas/Library_directx9canvas.mk  |1 -
 canvas/Library_gdipluscanvas.mk   |1 -
 canvas/StaticLibrary_directxcanvas.mk |1 -
 canvas/source/directx/dx_9rm.cxx  |4 
 canvas/source/directx/dx_winstuff.hxx |4 
 5 files changed, 11 deletions(-)

New commits:
commit 7594c0c29d8f81c74d3e181e0197cf31c492a42e
Author: Michael Stahl 
Date:   Wed Dec 10 18:22:28 2014 +0100

canvas: DIRECTX_VERSION macro is obsolete

It was only checked by our own code, and only DirectX 9 is supported.

Change-Id: I03035f87969301624df011cb4d76c6a9532f3c99

diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 5621cee..64ff646 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_sdk_api,directx9canvas))
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx9canvas,\
-   -DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \
 ))
 
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 2e12d4d..fdb3927 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-   -DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \
 ))
 
diff --git a/canvas/StaticLibrary_directxcanvas.mk 
b/canvas/StaticLibrary_directxcanvas.mk
index da7f380..8b14d0b 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-   -DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \
 ))
 
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index f679bd1..e9fd666 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#if DIRECTX_VERSION == 0x0900
-
 #define MAX_TEXTURE_SIZE (2048)
 #define MIN_TEXTURE_SIZE (32)
 //#define FAKE_MAX_NUMBER_TEXTURES (2)
@@ -1342,6 +1340,4 @@ namespace dxcanvas
 }
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_winstuff.hxx 
b/canvas/source/directx/dx_winstuff.hxx
index b7c9d8e..7b7f3c2 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -38,10 +38,6 @@
 # define D3D_DEBUG_INFO
 #endif
 
-#ifndef DIRECTX_VERSION
-#error please define for which directx version we should compile
-#endif
-
 #if defined _MSC_VER
 #pragma warning(push,1)
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/svapp.hxx|1 -
 vcl/inc/svdata.hxx   |7 +++
 vcl/source/app/svapp.cxx |3 ---
 vcl/source/app/svdata.cxx|   20 +++-
 vcl/source/app/svmain.cxx|3 ---
 vcl/source/helper/lazydelete.cxx |5 -
 6 files changed, 10 insertions(+), 29 deletions(-)

New commits:
commit 55b68ad017d61f2fd4a3408632007880aabd05fe
Author: Stephan Bergmann 
Date:   Wed Dec 10 18:24:23 2014 +0100

Instantiate ImplSVData on demand

Change-Id: I661949a8635a2ed1a1efda77ced48a0fa9f6722e

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b4d69ba..fbc42ab 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -241,7 +241,6 @@ public:
 @attention The initialization of the application itself is done in Init()
 
 @seeInitSalData is implemented by platform specific code.
-ImplInitSVData initializes the global instance data
 */
 Application();
 
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 5fb496b..683f40d 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -300,6 +300,8 @@ struct BlendFrameCache
 
 struct ImplSVData
 {
+ImplSVData();
+
 SalData*mpSalData;
 SalInstance*mpDefInst;  // Default 
SalInstance
 Application*mpApp;  // pApp
@@ -339,9 +341,7 @@ struct ImplSVData
 Link maDeInitHook;
 };
 
-voidImplInitSVData();
 voidImplDeInitSVData();
-voidImplDestroySVData();
 VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultWindow();
 VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
 VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if 
no res mgr
@@ -357,8 +357,7 @@ voidImplFreeEventHookData();
 
 boolImplCallPreNotify( NotifyEvent& rEvt );
 
-extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
-inline ImplSVData* ImplGetSVData() { return pImplSVData; }
+VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData();
 VCL_PLUGIN_PUBLIC void ImplHideSplash();
 
 bool ImplInitAccessBridge();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 98b7454..f7a696f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -194,8 +194,6 @@ Application::Application()
 OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED);
 osl_setEnvironment(aVar.pData, aValue.pData);
 
-if( ! ImplGetSVData() )
-ImplInitSVData();
 ImplGetSVData()->mpApp = this;
 InitSalData();
 }
@@ -205,7 +203,6 @@ Application::~Application()
 ImplDeInitSVData();
 DeInitSalData();
 ImplGetSVData()->mpApp = NULL;
-ImplDestroySVData();
 }
 
 int Application::Main()
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 59b2d23..c539a76 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -64,8 +64,9 @@ namespace
 public rtl::Static {};
 }
 
-// static SV-Data
-ImplSVData* pImplSVData = NULL;
+ImplSVData* ImplGetSVData() {
+return &private_aImplSVData::get();
+}
 
 SalSystem* ImplGetSalSystem()
 {
@@ -75,14 +76,12 @@ SalSystem* ImplGetSalSystem()
 return pSVData->mpSalSystem;
 }
 
-void ImplInitSVData()
+ImplSVData::ImplSVData()
 {
-pImplSVData = &private_aImplSVData::get();
-
 // init global instance data
-memset( pImplSVData, 0, sizeof( ImplSVData ) );
-pImplSVData->maHelpData.mbAutoHelpId = true;
-pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color( 
COL_TRANSPARENT );
+memset( this, 0, sizeof( ImplSVData ) );
+maHelpData.mbAutoHelpId = true;
+maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT );
 }
 
 void ImplDeInitSVData()
@@ -104,11 +103,6 @@ void ImplDeInitSVData()
 delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL;
 }
 
-void ImplDestroySVData()
-{
-pImplSVData = NULL;
-}
-
 vcl::Window* ImplGetDefaultWindow()
 {
 ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index c1456ad..7636738 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -240,9 +240,6 @@ bool InitVCL()
 
 EmbeddedFontsHelper::clearTemporaryFontFiles();
 
-if( ! ImplGetSVData() )
-ImplInitSVData();
-
 if( !ImplGetSVData()->mpApp )
 {
 pOwnSvApp = new Application();
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 7ce8d1a..45ea7e0 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -80,11 +80,6 @@ DeleteOnDeinitBase::~DeleteOnDeinitBase()
 void DeleteOnDeinitBase::addDeinitContainer( DeleteOnDeinitBase* i_pContainer )
 {
 ImplSVData* pSVData = ImplGetSVData();
-if( ! pSVData )
-{
-ImplInitSVData();
-pSVData = ImplGetSVData();
-}
 
 DBG_ASSERT( ! pSVData->mbDeInit, "DeleteOnDeinit added after DeiInitVCL !" 
);
 if( pSVData->mbDeInit )

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

[Caolán McNamara]

 sw/source/core/layout/ssfrm.cxx |   26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 4de09a9efdb62cf90ce18662852e556cf7148e14
Author: Caolán McNamara 
Date:   Wed Dec 10 17:12:08 2014 +

coverity#738980 Use after free

Change-Id: I30657eb609a9d02217238dd37a3f23e05168569c

diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index dbda7c1..02f834f 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -457,7 +457,10 @@ void SwLayoutFrm::Destroy()
 // #i28701#
 SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[0];
 if ( pAnchoredObj->ISA(SwFlyFrm) )
+{
 delete pAnchoredObj;
+assert(!pFrm->GetDrawObjs() || nCnt > 
pFrm->GetDrawObjs()->size());
+}
 else
 {
 SdrObject* pSdrObj = pAnchoredObj->DrawObj();
@@ -469,11 +472,12 @@ void SwLayoutFrm::Destroy()
 {
 pContact->DisconnectObjFromLayout( pSdrObj );
 }
-}
-if ( pFrm->GetDrawObjs() &&
- nCnt == pFrm->GetDrawObjs()->size() )
-{
-pFrm->GetDrawObjs()->Remove( *pAnchoredObj );
+
+if ( pFrm->GetDrawObjs() &&
+ nCnt == pFrm->GetDrawObjs()->size() )
+{
+pFrm->GetDrawObjs()->Remove( *pAnchoredObj );
+}
 }
 }
 pFrm->Remove();
@@ -488,7 +492,10 @@ void SwLayoutFrm::Destroy()
 // #i28701#
 SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[0];
 if ( pAnchoredObj->ISA(SwFlyFrm) )
+{
 delete pAnchoredObj;
+assert(!GetDrawObjs() || nCnt > GetDrawObjs()->size());
+}
 else
 {
 SdrObject* pSdrObj = pAnchoredObj->DrawObj();
@@ -500,10 +507,11 @@ void SwLayoutFrm::Destroy()
 {
 pContact->DisconnectObjFromLayout( pSdrObj );
 }
-}
-if ( GetDrawObjs() && nCnt == GetDrawObjs()->size() )
-{
-GetDrawObjs()->Remove( *pAnchoredObj );
+
+if ( GetDrawObjs() && nCnt == GetDrawObjs()->size() )
+{
+GetDrawObjs()->Remove( *pAnchoredObj );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 configure.ac |   55 ---
 1 file changed, 55 deletions(-)

New commits:
commit a73ece414c6556fc88d1c42b71ce7548ddbf536a
Author: Michael Stahl 
Date:   Wed Dec 10 18:03:19 2014 +0100

configure: no need to check for DirectX SDK

Since MSVC 2012 the Windows SDK includes DirectX as well; the last
release of standalone DirectX SDK was in 2010.

Change-Id: I4236421e7abd7a4a7201ef5913dc21c76945ea53

diff --git a/configure.ac b/configure.ac
index b63d7ed..72ef58c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9580,58 +9580,6 @@ else
 fi
 fi
 
-dnl =
-dnl Check for the Microsoft DirectX SDK.
-dnl =
-if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
-AC_MSG_CHECKING([for DirectX SDK])
-if test "$build_os" = "cygwin"; then
-dnl A standard installation of the DirectX SDK sets $DXSDK_DIR
-if test -n "$DXSDK_DIR"; then
-DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
-DIRECTXSDK_HOME=`cygpath -u "$DIRECTXSDK_HOME"`
-fi
-# At this point $DIRECTXSDK_HOME might still be undefined. This will 
lead to
-# the "DirectX SDK not found" error later.
-# (Where?)
-
-# Remove a possible trailing backslash
-DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
-fi
-
-if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f 
"$DIRECTXSDK_HOME/Include/d3d9.h"; then
-HAVE_DIRECTXSDK_H="yes"
-else
-HAVE_DIRECTXSDK_H="no"
-fi
-
-if test "$BITNESS_OVERRIDE" = 64; then
-DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x64"
-else
-DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
-fi
-PathFormat "$DIRECTXSDK_LIB"
-DIRECTXSDK_LIB="$formatted_path"
-
-if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib"; 
then
-HAVE_DIRECTXSDK_LIB="yes"
-else
-HAVE_DIRECTXSDK_LIB="no"
-fi
-
-if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; 
then
-AC_MSG_RESULT([found])
-else
-AC_MSG_RESULT([no, hoping the necessary headers and libraries will be 
found anyway])
-fi
-if test -n "$DIRECTXSDK_HOME"; then
-PathFormat "$DIRECTXSDK_HOME"
-DIRECTXSDK_HOME="$formatted_path"
-SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
-fi
-fi
-AC_SUBST(DIRECTXSDK_HOME)
-
 dnl ***
 dnl Checking for bison and flex
 dnl ***
@@ -12527,9 +12475,6 @@ if test "$build_os" = "cygwin"; then
 fi
 ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib"
 
-if test "$ENABLE_DIRECTX" = "TRUE" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-ILIB="$ILIB;$DIRECTXSDK_LIB"
-fi
 AC_SUBST(ILIB)
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/source canvas/StaticLibrary_directxcanvas.mk solenv/gbuild

[Michael Stahl]

 canvas/Library_directx9canvas.mk   |6 --
 canvas/Library_gdipluscanvas.mk|6 --
 canvas/StaticLibrary_directxcanvas.mk  |6 --
 canvas/source/directx/dx_winstuff.hxx  |   20 ++--
 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 5 files changed, 2 insertions(+), 37 deletions(-)

New commits:
commit ff17c5a2b06367e9fdeff2d5763ccaeb9725511f
Author: Michael Stahl 
Date:   Wed Dec 10 17:45:00 2014 +0100

canvas: remove Windows SDK #ifdefs - all supported MSVC/SDK have DirectX

Change-Id: I5106593ad5472992e3607665849fb35802b6e266

diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 2b90429..5621cee 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_Library_add_defs,directx9canvas,\
-   -DWIN8_SDK=1 \
-))
-endif
-
 $(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 858c6de..2e12d4d 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -31,12 +31,6 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-   -DWIN8_SDK=1 \
-))
-endif
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DVERBOSE \
diff --git a/canvas/StaticLibrary_directxcanvas.mk 
b/canvas/StaticLibrary_directxcanvas.mk
index dabe9c3..da7f380 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -23,12 +23,6 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-   -DWIN8_SDK=1 \
-))
-endif
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \
diff --git a/canvas/source/directx/dx_winstuff.hxx 
b/canvas/source/directx/dx_winstuff.hxx
index 469b5cb..b7c9d8e 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -56,26 +56,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include 
 
-#if WIN8_SDK == 1 || defined(_USING_V110_SDK71_)
+#include 
 
-#include 
+typedef IDirect3DSurface9 surface_type;
 
-typedef IDirect3DSurface9 surface_type;
-
-#else
-
-#include 
-#include 
-#include 
-#if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
-#include 
-#else
-#include 
-#endif
-
-typedef IDirect3DSurface9 surface_type;
-
-#endif
 
 #undef DrawText
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 7590a7b..396163c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,7 +47,6 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-   $(if $(findstring 
120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/svapp.hxx |   12 
 vcl/source/app/svapp.cxx  |   14 --
 vcl/unx/generic/plugadapt/salplug.cxx |   22 +-
 3 files changed, 21 insertions(+), 27 deletions(-)

New commits:
commit 67f5fa5a23c9678a83eb75534307385475f1d586
Author: Stephan Bergmann 
Date:   Wed Dec 10 17:49:47 2014 +0100

Demote Application::IsHeadlessModeRequested to local hack

Change-Id: I3ae51b8c57e70593153805e5c7c139573c543b5a

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index bb547d5..b4d69ba 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1393,27 +1393,15 @@ public:
 /** Enables headless mode.
 
  @param dialogsAreFatal Set to true if a dialog ends the session, 
false if not.
-
- @see IsHeadlessModeEnabled, IsHeadlessModeRequested
 */
 static void EnableHeadlessMode( bool dialogsAreFatal );
 
 /** Determines if headless mode is enabled
 
  @return True if headless mode is enabled, false if not.
-
- @see EnableHeadlessMode, IsHeadlessModeRequested
 */
 static bool IsHeadlessModeEnabled();
 
-/** Check command line arguments for \code --headless \endcode
-
- @return True if headless mode was requested, false if not
-
- @see EnableHeadlessMode, IsHeadlessModeEnabled
-*/
-static bool IsHeadlessModeRequested();
-
 /** Enable Console Only mode
 
  Used to disable Mac specific app init that requires an app bundle.
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7c4a76d..98b7454 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -27,7 +27,6 @@
 
 #include "rtl/tencinfo.h"
 #include "rtl/instance.hxx"
-#include "rtl/process.h"
 
 #include "tools/debug.hxx"
 #include "tools/time.hxx"
@@ -1535,19 +1534,6 @@ bool Application::IsHeadlessModeEnabled()
 return IsDialogCancelEnabled();
 }
 
-bool Application::IsHeadlessModeRequested()
-{
-sal_uInt32 n = rtl_getAppCommandArgCount();
-for (sal_uInt32 i = 0; i < n; ++i) {
-OUString arg;
-rtl_getAppCommandArg(i, &arg.pData);
-if ( arg == "--headless" || arg == "-headless" ) {
-return true;
-}
-}
-return false;
-}
-
 static bool bConsoleOnly = false;
 
 bool Application::IsConsoleOnly()
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 2049b73..e2870f3 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -21,6 +21,7 @@
 #include "osl/process.h"
 
 #include "rtl/bootstrap.hxx"
+#include "rtl/process.h"
 
 #include "salinst.hxx"
 #include "generic/gensys.h"
@@ -36,6 +37,25 @@ extern "C" {
 typedef SalInstance*(*salFactoryProc)();
 }
 
+namespace {
+
+// HACK to obtain Application::IsHeadlessModeEnabled early on, before
+// Application::EnableHeadlessMode has potentially been called:
+bool IsHeadlessModeRequested()
+{
+sal_uInt32 n = rtl_getAppCommandArgCount();
+for (sal_uInt32 i = 0; i < n; ++i) {
+OUString arg;
+rtl_getAppCommandArg(i, &arg.pData);
+if ( arg == "--headless" || arg == "-headless" ) {
+return true;
+}
+}
+return false;
+}
+
+}
+
 static oslModule pCloseModule = NULL;
 
 static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = 
false )
@@ -216,7 +236,7 @@ SalInstance *CreateSalInstance()
 SalInstance *pInst = NULL;
 
 OUString aUsePlugin;
-if( Application::IsHeadlessModeRequested() )
+if( IsHeadlessModeRequested() )
 aUsePlugin = "svp";
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/image-noborder.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |6 +++
 sw/source/filter/ww8/docxattributeoutput.cxx  |   37 +-
 3 files changed, 28 insertions(+), 15 deletions(-)

New commits:
commit dbbfad3dfbee89c13956d3a9b4757c74a4a64cd2
Author: Miklos Vajna 
Date:   Wed Dec 10 17:06:28 2014 +0100

DocxAttributeOutput::FlyFrameGraphic: avoid  when there is no border

Change-Id: Ia94f490c0ad8c392bd8bbfbe889f5333c13e0022

diff --git a/sw/qa/extras/ooxmlexport/data/image-noborder.docx 
b/sw/qa/extras/ooxmlexport/data/image-noborder.docx
new file mode 100644
index 000..7e0fc90
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/image-noborder.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 7d4f988..89ead20 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -721,6 +721,12 @@ DECLARE_OOXMLEXPORT_TEST(testTblpprShape, 
"tblppr-shape.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(2540), 
getProperty(xPageStyle, "LeftMargin"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testImageNoborder, "image-noborder.docx")
+{
+// This was 26; we exported border for an image that had no border.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(getShape(1), "TopBorder").LineWidth);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 862d754..c8a80c5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4215,21 +4215,28 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 m_pSerializer->singleElementNS( XML_a, XML_avLst,
 FSEND );
 m_pSerializer->endElementNS( XML_a, XML_prstGeom );
-m_pSerializer->singleElementNS( XML_a, XML_noFill,
-FSEND );
-m_pSerializer->startElementNS( XML_a, XML_ln,
-XML_w, "9525",
-FSEND );
-m_pSerializer->singleElementNS( XML_a, XML_noFill,
-FSEND );
-m_pSerializer->singleElementNS( XML_a, XML_miter,
-XML_lim, "80",
-FSEND );
-m_pSerializer->singleElementNS( XML_a, XML_headEnd,
-FSEND );
-m_pSerializer->singleElementNS( XML_a, XML_tailEnd,
-FSEND );
-m_pSerializer->endElementNS( XML_a, XML_ln );
+
+const SvxBoxItem& rBoxItem = pFrmFmt->GetBox();
+const SvxBorderLine* pLeft = rBoxItem.GetLine(BOX_LINE_LEFT);
+const SvxBorderLine* pRight = rBoxItem.GetLine(BOX_LINE_RIGHT);
+const SvxBorderLine* pTop = rBoxItem.GetLine(BOX_LINE_TOP);
+const SvxBorderLine* pBottom = rBoxItem.GetLine(BOX_LINE_BOTTOM);
+if (pLeft || pRight || pTop || pBottom)
+{
+m_pSerializer->startElementNS( XML_a, XML_ln,
+   XML_w, "9525",
+   FSEND );
+m_pSerializer->singleElementNS( XML_a, XML_noFill,
+FSEND );
+m_pSerializer->singleElementNS( XML_a, XML_miter,
+XML_lim, "80",
+FSEND );
+m_pSerializer->singleElementNS( XML_a, XML_headEnd,
+FSEND );
+m_pSerializer->singleElementNS( XML_a, XML_tailEnd,
+FSEND );
+m_pSerializer->endElementNS( XML_a, XML_ln );
+}
 
 m_rExport.SdrExporter().writeDMLEffectLst(*pFrmFmt);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   29 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 -
 2 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit a645c8289454763568fbb5ba7ac99823778c7d3e
Author: Caolán McNamara 
Date:   Wed Dec 10 16:36:26 2014 +

revert writer won't allow us to enter multiple CrossRefBookmark

i.e.

commit af64f430181088460d5c574683dd1fdfd377ebcd
Date:   Mon Dec 8 16:11:41 2014 +

writer won't allow us to enter multiple CrossRefBookmarks on the same 
node

e.g. fdo63164-1.docx and loads more like that, and the .docx genuinely 
has
multiple bookmarks at the same place, so just allow the first one and 
discard
the following ones

in favour of

commit 7a12360e1f2c0a5bc0927131a750740d35cfd1ab
Date:   Wed Dec 10 14:56:27 2014 +0100

sw: don't assert when SwXBookmark creates duplicate CrossRef*Bookmark

The bugdoc of fdo#87110 has a couple such duplicates.  Check for it and
let SwXBookmark throw an IllegalArgumentException.

but leave test doc in place

Change-Id: Ib0bfc991684b2c9c4f1959a17c49bf1c0179be79

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0a7f268..7de9fb5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -55,7 +55,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -4416,31 +4415,11 @@ void DomainMapper_Impl::StartOrEndBookmark( const 
OUString& rId )
 {
 xCursor->goLeft( 1, false );
 }
-
 uno::Reference< container::XNamed > xBkmNamed( xBookmark, 
uno::UNO_QUERY_THROW );
-
-bool bAllowInsert = true;
-uno::Reference xRange(xCursor, 
uno::UNO_QUERY_THROW);
-if (m_xPrevBookmark.is())
-{
-uno::Reference 
xTextRangeCompare(xRange->getText(), uno::UNO_QUERY_THROW);
-if 
(xTextRangeCompare->compareRegionStarts(m_xPrevBookmark, xRange) == 0 &&
-xTextRangeCompare->compareRegionEnds(m_xPrevBookmark, 
xRange) == 0)
-{
-SAL_WARN("writerfilter", "Cannot insert bookmark " << 
aBookmarkIter->second.m_sBookmarkName
- << " because another one is 
already inserted at this point");
-bAllowInsert = false;
-}
-}
-
-if (bAllowInsert)
-{
-assert(!aBookmarkIter->second.m_sBookmarkName.isEmpty());
-//todo: make sure the name is not used already!
-xBkmNamed->setName( aBookmarkIter->second.m_sBookmarkName 
);
-xTextAppend->insertTextContent(xRange, xBookmark, 
!xCursor->isCollapsed());
-m_xPrevBookmark = xRange;
-}
+assert(!aBookmarkIter->second.m_sBookmarkName.isEmpty());
+//todo: make sure the name is not used already!
+xBkmNamed->setName( aBookmarkIter->second.m_sBookmarkName );
+xTextAppend->insertTextContent( uno::Reference< 
text::XTextRange >( xCursor, uno::UNO_QUERY_THROW), xBookmark, 
!xCursor->isCollapsed() );
 }
 m_aBookmarkMap.erase( aBookmarkIter );
 m_sCurrentBkmkId.clear();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c218f53..11e58cd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -349,8 +349,6 @@ private:
 LineNumberSettings 
 m_aLineNumberSettings;
 
 BookmarkMap_t  
 m_aBookmarkMap;
-/// Detect attempt to insert multiple bookmarks at the same position
-css::uno::Reference 
 m_xPrevBookmark;
 OUString   
 m_sCurrentBkmkId;
 OUString   
 m_sCurrentBkmkName;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Norbert Thiebaud]

On Wed, Dec 10, 2014 at 10:10 AM, Maarten Hoes  wrote:
>>
>> But that is a special case... making this available under tb is still
>> a valuable thing to make it easier for people running such tb-box to
>> include code coverage in the mix.
>>
> Now Im confused. Why would you want to run the same code coverage on a tb,
> when those results are already provided by a Jenkins build ? Doesnt it make
> more sense to 'just' have one box that (in this case, triggered by Jenkins),
> takes care of all your code coverage needs ?

because someone may want to work on improving the coverage.. it could
be usefull for someone to have his own tb box to do coverage report
on a feature branch or even a local one

maybe someone will want to run some test coverage that are not yet
part of the 'canonical one' etc...
in any case it is always good to be flexible, you never know what
vreative way to use a good script one will find :-)

>
> Anyway, I guess I could, once I verified that it works as intended, put the
> contents of my .tb directory in a subdirectory of
> buildbot.git/lcov-report/tinderbox, accompanied with a small README
> explaining how you could go about integrating the two ?

sure

>
> And the one lacking feature of the current way is of course that the reports
> gets generated, but you still have to take care of the uploading them
> somewhere useful part. (assuming youve done that with Jenkins, and not by
> modifying the lcov-reports.sh script).

I have not addressed it yet.. but that should be not too hard to do with jenkins
I'll just have to coordinate with cloph to find a home for it
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/run

[Stephan Bergmann]

 bin/run |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3c653a138ec02a9f72281ca9262340fa24eed50
Author: Stephan Bergmann 
Date:   Wed Dec 10 17:25:25 2014 +0100

bin/run LO_TRACE hook

(similar to our CPPUNITTRACE hook)

Change-Id: Iec4e8d4246ba7fca0afe5f9be6f6bcd9e0289e49

diff --git a/bin/run b/bin/run
index 341e7d5..6013f84 100755
--- a/bin/run
+++ b/bin/run
@@ -29,7 +29,7 @@ echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
 echo "setting search path to: ${PATH}"
 echo "execing: ${exedir}/$1"
 
-exec "${exedir}"/$@
+exec ${LO_TRACE} "${exedir}"/$@
 
 elif [ $(uname) = Darwin ]; then
 
@@ -48,7 +48,7 @@ echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
 echo "setting search path to: ${DYLD_LIBRARY_PATH}"
 echo "execing: ${exedir}/$1"
 
-exec "${exedir}"/$@
+exec ${LO_TRACE} "${exedir}"/$@
 
 else
 
@@ -70,6 +70,6 @@ echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
 echo "setting search path to: ${LD_LIBRARY_PATH}"
 echo "execing: ${exedir}/$1"
 
-exec "${exedir}"/$@
+exec ${LO_TRACE} "${exedir}"/$@
 
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - Repository.mk

[Markus Mohrhard]

 Repository.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit f3d87a8b0384cf35f7f5d9b7a20b9345eeaaea35
Author: Markus Mohrhard 
Date:   Wed Dec 10 17:06:30 2014 +0100

fix packaging of OpenGL shaders, related fdo#83875

Change-Id: I68f7d4e2d91d37013018fc3cc185c46eb81fcb7d

diff --git a/Repository.mk b/Repository.mk
index 58359d7..006f231 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -807,6 +807,13 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
xmlsec \
+   chart2_opengl_shader \
+   vcl_opengl_shader \
+   $(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
+   slideshow_opengl_shader \
 ))
 
 ifeq ($(GUIBASE),unx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk

[Markus Mohrhard]

 Repository.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 3fb0320e1e6fcc8007fc6f334aad91163b6ff83d
Author: Markus Mohrhard 
Date:   Wed Dec 10 17:06:30 2014 +0100

fix packaging of OpenGL shaders, related fdo#83875

Change-Id: I68f7d4e2d91d37013018fc3cc185c46eb81fcb7d

diff --git a/Repository.mk b/Repository.mk
index 3a65bc2..e5eceac 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -815,6 +815,13 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
xmlsec \
+   chart2_opengl_shader \
+   vcl_opengl_shader \
+   $(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
+   slideshow_opengl_shader \
 ))
 
 ifeq ($(GUIBASE),unx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 sc/source/ui/view/viewfun3.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 60b069ded797e654a5a169d4e331ed01db87015d
Author: David Tardon 
Date:   Wed Dec 10 10:32:53 2014 +0100

paste from system from the top left of selection

For example,
1. echo -e "5,6\n7,8"
2. select the lines and copy them to clipboard
3. select an area in Calc, starting from bottom right
4. paste
5. select comma as data separator in the CSV import dialog

I think most people would expect the data to appear in the selected
area, but currently it would be inserted starting from active cell
(which is the bottom right cell of the selection).

Reviewed-on: https://gerrit.libreoffice.org/13410
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 781639eb84fc09d0260092238c3f50216f15a3ff)
Reviewed-on: https://gerrit.libreoffice.org/13421

Conflicts:
sc/source/ui/view/viewfun3.cxx

Change-Id: Ief0e05deda18928a832dca2a261f8493ac9a03a9
Reviewed-on: https://gerrit.libreoffice.org/13424
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index be5d96c..dc05c14 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -681,8 +681,24 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, 
bool bApi )
 if ( !aDataHelper.GetTransferable().is() )
 return false;
 
+SCCOL nPosX = 0;
+SCROW nPosY = 0;
+
+ScViewData* pViewData = GetViewData();
+ScRange aRange;
+if ( pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
+{
+nPosX = aRange.aStart.Col();
+nPosY = aRange.aStart.Row();
+}
+else
+{
+nPosX = pViewData->GetCurX();
+nPosY = pViewData->GetCurY();
+}
+
 bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
-GetViewData()->GetCurX(), 
GetViewData()->GetCurY(),
+nPosX, nPosY,
 NULL, false, !bApi );   // allow warning 
dialog
 
 if ( !bRet && !bApi )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Maarten Hoes]

On Wed, Dec 10, 2014 at 4:51 PM, Norbert Thiebaud 
wrote:
>
> On Wed, Dec 10, 2014 at 9:45 AM, Maarten Hoes 
wrote:
> >
> > If still interested (and my tests completes as expected), I could
submit the
> > contents of my .tb directory somewhere, but im not too sure if that's
still
> > needed or relevant anymore with your current modifications/version of
the
> > script:
>
> I'm not using tb. I did the modification to be able to run the lcov
> script stand alone triggerred by jenkins.
>
Aawwwhhh... Now *I* wanted to do that task (with the required hand holding,
of course ;)


>
> But that is a special case... making this available under tb is still
> a valuable thing to make it easier for people running such tb-box to
> include code coverage in the mix.
>
Now Im confused. Why would you want to run the same code coverage on a tb,
when those results are already provided by a Jenkins build ? Doesnt it make
more sense to 'just' have one box that (in this case, triggered by
Jenkins), takes care of all your code coverage needs ?

Anyway, I guess I could, once I verified that it works as intended, put the
contents of my .tb directory in a subdirectory of
buildbot.git/lcov-report/tinderbox, accompanied with a small README
explaining how you could go about integrating the two ?

And the one lacking feature of the current way is of course that the
reports gets generated, but you still have to take care of the uploading
them somewhere useful part. (assuming youve done that with Jenkins, and not
by modifying the lcov-reports.sh script).


>
> Let me emphasis: I made some modification/extenstion to fit better my
> use case.. that does not imply that the model you used was wrong or
> needed change
>
I guess it's just that I dont see the 'tinderbox use cases' as clearly as
you anymore, especially when now youve already got code coverage working in
the Jenkins case.



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

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

[David Tardon]

 sc/source/ui/view/viewfun3.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 548e9d43c2f171263b7b53c00b48b3b732226919
Author: David Tardon 
Date:   Wed Dec 10 10:32:53 2014 +0100

paste from system from the top left of selection

For example,
1. echo -e "5,6\n7,8"
2. select the lines and copy them to clipboard
3. select an area in Calc, starting from bottom right
4. paste
5. select comma as data separator in the CSV import dialog

I think most people would expect the data to appear in the selected
area, but currently it would be inserted starting from active cell
(which is the bottom right cell of the selection).

Change-Id: Ief0e05deda18928a832dca2a261f8493ac9a03a9
Reviewed-on: https://gerrit.libreoffice.org/13410
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 781639eb84fc09d0260092238c3f50216f15a3ff)
Reviewed-on: https://gerrit.libreoffice.org/13421

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 8244e60..562135a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -676,8 +676,24 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, 
bool bApi )
 if ( !aDataHelper.GetTransferable().is() )
 return false;
 
+SCCOL nPosX = 0;
+SCROW nPosY = 0;
+
+ScViewData& rViewData = GetViewData();
+ScRange aRange;
+if ( rViewData.GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
+{
+nPosX = aRange.aStart.Col();
+nPosY = aRange.aStart.Row();
+}
+else
+{
+nPosX = rViewData.GetCurX();
+nPosY = rViewData.GetCurY();
+}
+
 bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
-GetViewData().GetCurX(), 
GetViewData().GetCurY(),
+nPosX, nPosY,
 NULL, false, !bApi );   // allow warning 
dialog
 
 if ( !bRet && !bApi )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit a27bb66382687ce348db5f57a1e64ee6afcb5c43
Author: Caolán McNamara 
Date:   Wed Dec 10 15:58:42 2014 +

Resolves: fdo#87141 Remove deletes the node, release doesn't

regression from introduction of boost::ptr_vector originally one had to 
Remove
and delete the return to delete it, while now the Remove automatically 
delete
it. This bare Remove to just "release" it seems to have been overlooked

Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75
(cherry picked from commit efcbb12a27a380a442292f17c7f508555a66d4af)

diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index 97ab743..674fc96 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -183,7 +183,7 @@ void EditUndoDelContent::Redo()
 pEE->RemoveParaPortion(nNode);
 
 // Do not delete node, depends on the undo!
-pEE->GetEditDoc().Remove( nNode );
+pEE->GetEditDoc().Release( nNode );
 if (pEE->IsCallParaInsertedOrDeleted())
 pEE->ParagraphDeleted( nNode );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/editundo.cxx |2 
 sw/source/core/doc/tblrwcl.cxx  |   81 
 2 files changed, 2 insertions(+), 81 deletions(-)

New commits:
commit efcbb12a27a380a442292f17c7f508555a66d4af
Author: Caolán McNamara 
Date:   Wed Dec 10 15:58:42 2014 +

Resolves: fdo#87141 Remove deletes the node, release doesn't

regression from introduction of boost::ptr_vector originally one had to 
Remove
and delete the return to delete it, while now the Remove automatically 
delete
it. This bare Remove to just "release" it seems to have been overlooked

Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75

diff --git a/editeng/source/editeng/editundo.cxx 
b/editeng/source/editeng/editundo.cxx
index 97ab743..674fc96 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -183,7 +183,7 @@ void EditUndoDelContent::Redo()
 pEE->RemoveParaPortion(nNode);
 
 // Do not delete node, depends on the undo!
-pEE->GetEditDoc().Remove( nNode );
+pEE->GetEditDoc().Release( nNode );
 if (pEE->IsCallParaInsertedOrDeleted())
 pEE->ParagraphDeleted( nNode );
 
commit 165c56d9d75268114aea4898bc06dbb09615b5f2
Author: Caolán McNamara 
Date:   Wed Dec 10 15:23:34 2014 +

coverity#735515 Logically dead code

Change-Id: I884aca0e49f424823201a69f03c6bba4e816f3c1

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index ac310b4..9f28bb3 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1483,7 +1483,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, 
_InsULPara *const pULPara)
 pULPara->pInsBox );
 }
 }
-else if( nLeft )
+else
 {
 // There are still Boxes on the left side, so put the Left-
 // and Merge-Box into one Box and Line, insert before/after
@@ -1515,85 +1515,6 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, 
_InsULPara *const pULPara)
 pLMBox );
 lcl_CalcWidth( pLMBox );// calculate the Box's width
 }
-else if( nRight+1 < (sal_uInt16)pFndLn->GetTabBoxes().size() )
-{
-// There are still Boxes on the right, so put the Right-
-// and Merge-Box into one Box and Line, insert before/after
-// a Line with a Box, into which the upper/lower Lines are
-// inserted
-SwTableLine* pInsLine = pULPara->pRightBox->GetUpper();
-SwTableBox* pRMBox;
-if( pULPara->pLeftBox->GetUpper() == pInsLine )
-{
-pRMBox = new SwTableBox(
-
static_cast(pULPara->pRightBox->GetFrmFmt()), 0, pInsLine );
-SwTableLine* pRMLn = new SwTableLine(
-static_cast(pInsLine->GetFrmFmt()), 2, 
pRMBox );
-pRMLn->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
-pRMBox->GetTabLines().insert( pRMBox->GetTabLines().begin(), 
pRMLn );
-
-lcl_CpyBoxes( 1, 3, pInsLine->GetTabBoxes(), pRMLn );
-
-pInsLine->GetTabBoxes().insert( 
pInsLine->GetTabBoxes().begin(), pRMBox );
-}
-else
-{
-// Left and Merge have been merged, so also move Right into 
the Line
-pInsLine = pULPara->pLeftBox->GetUpper();
-sal_uInt16 nMvPos = 
pULPara->pRightBox->GetUpper()->GetTabBoxes().GetPos(
-  pULPara->pRightBox );
-lcl_CpyBoxes( nMvPos, nMvPos+1,
-pULPara->pRightBox->GetUpper()->GetTabBoxes(),
-pInsLine );
-pRMBox = pInsLine->GetUpper();
-
-// If there are already Lines, then these need to go into a 
new Line and Box
-nMvPos = pRMBox->GetTabLines().GetPos( pInsLine );
-if( pULPara->bUL ? nMvPos != 0
-: nMvPos+1 < 
(sal_uInt16)pRMBox->GetTabLines().size() )
-{
-// Merge all Lines into a new Line and Box
-SwTableLine* pNewLn = new SwTableLine(
-static_cast(pInsLine->GetFrmFmt()), 
1, pRMBox );
-pNewLn->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
-pRMBox->GetTabLines().insert(
-pRMBox->GetTabLines().begin() + (pULPara->bUL 
? nMvPos : nMvPos+1),
-pNewLn );
-pRMBox = new SwTableBox( 
static_cast(pRMBox->GetFrmFmt()), 0, pNewLn );
-pNewLn->GetTabBoxes().insert( 
pNewLn->GetTabBoxes().begin(), pRMBox );
-
-sal_uInt16 nPos1, nPos2;
-if( pULPara->bUL )
-nPos1 = 0,
-nPos2 = nMvPos;
- 

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

[Kohei Yoshida]

 package/source/zippackage/ZipPackageStream.cxx |2 ++
 sc/source/filter/excel/xetable.cxx |1 +
 2 files changed, 3 insertions(+)

New commits:
commit d677bf455f08264096edd13e3306c55f74f7ee1d
Author: Kohei Yoshida 
Date:   Wed Dec 10 10:51:01 2014 -0500

Globally disable threading for these for now.

It doesn't win us much performance-wise (as it turned out), and causes
weird crashers with large documents.

Change-Id: I0566ce850b8f6656e6f9821c653b7a825a7874a3
(cherry picked from commit e0425f9493e25fa14f11505d9ebc12a2fe78d4b6)

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 64b48d3..2c9562b 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,6 +810,8 @@ bool ZipPackageStream::saveChild(
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
 
+bParallelDeflate = false; // globally disable parallel deflate 
for now.
+
 if (bParallelDeflate)
 {
 // Start a new thread deflating this zip entry
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 66df5d6..84fdaec 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2069,6 +2069,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& 
rDefRowData, const ScfUInt
 // on its own data.
 size_t nRows = maRowMap.size();
 size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U );
+nThreads = 1; // globally disable multi-threading for now.
 if ( nThreads == 1 || nRows < 128 )
 {
 RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = 
maRowMap.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 sc/source/ui/view/viewfun3.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 781639eb84fc09d0260092238c3f50216f15a3ff
Author: David Tardon 
Date:   Wed Dec 10 10:32:53 2014 +0100

paste from system from the top left of selection

For example,
1. echo -e "5,6\n7,8"
2. select the lines and copy them to clipboard
3. select an area in Calc, starting from bottom right
4. paste
5. select comma as data separator in the CSV import dialog

I think most people would expect the data to appear in the selected
area, but currently it would be inserted starting from active cell
(which is the bottom right cell of the selection).

Change-Id: Ief0e05deda18928a832dca2a261f8493ac9a03a9
Reviewed-on: https://gerrit.libreoffice.org/13410
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 8244e60..562135a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -676,8 +676,24 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, 
bool bApi )
 if ( !aDataHelper.GetTransferable().is() )
 return false;
 
+SCCOL nPosX = 0;
+SCROW nPosY = 0;
+
+ScViewData& rViewData = GetViewData();
+ScRange aRange;
+if ( rViewData.GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
+{
+nPosX = aRange.aStart.Col();
+nPosY = aRange.aStart.Row();
+}
+else
+{
+nPosX = rViewData.GetCurX();
+nPosY = rViewData.GetCurY();
+}
+
 bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
-GetViewData().GetCurX(), 
GetViewData().GetCurY(),
+nPosX, nPosY,
 NULL, false, !bApi );   // allow warning 
dialog
 
 if ( !bRet && !bApi )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 package/source/zippackage/ZipPackageStream.cxx |2 ++
 sc/source/filter/excel/xetable.cxx |1 +
 2 files changed, 3 insertions(+)

New commits:
commit e0425f9493e25fa14f11505d9ebc12a2fe78d4b6
Author: Kohei Yoshida 
Date:   Wed Dec 10 10:51:01 2014 -0500

Globally disable threading for these for now.

It doesn't win us much performance-wise (as it turned out), and causes
weird crashers with large documents.

Change-Id: I0566ce850b8f6656e6f9821c653b7a825a7874a3

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 64b48d3..2c9562b 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,6 +810,8 @@ bool ZipPackageStream::saveChild(
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
 
+bParallelDeflate = false; // globally disable parallel deflate 
for now.
+
 if (bParallelDeflate)
 {
 // Start a new thread deflating this zip entry
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 66df5d6..84fdaec 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2069,6 +2069,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& 
rDefRowData, const ScfUInt
 // on its own data.
 size_t nRows = maRowMap.size();
 size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U );
+nThreads = 1; // globally disable multi-threading for now.
 if ( nThreads == 1 || nRows < 128 )
 {
 RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = 
maRowMap.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Norbert Thiebaud]

On Wed, Dec 10, 2014 at 9:45 AM, Maarten Hoes  wrote:
>
> If still interested (and my tests completes as expected), I could submit the
> contents of my .tb directory somewhere, but im not too sure if that's still
> needed or relevant anymore with your current modifications/version of the
> script:

I'm not using tb. I did the modification to be able to run the lcov
script stand alone triggerred by jenkins.
But that is a special case... making this available under tb is still
a valuable thing to make it easier for people running such tb-box to
include code coverage in the mix.

Let me emphasis: I made some modification/extenstion to fit better my
use case.. that does not imply that the model you used was wrong or
needed change
letting people do the different step independently is a flexibility
that is a feature not a bug :-)

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

Re: Scheduling lcov code coverage script

[Maarten Hoes]

Hi,

On Wed, Dec 10, 2014 at 10:35 AM, Norbert Thiebaud 
wrote:
>
> On Wed, Dec 10, 2014 at 3:16 AM, Maarten Hoes 
wrote:
> > Hrm.
> >
> >
> > It appears I get the openldap build error when I do the build like this
> > (like it happens with the tb script) :
> >
> > $ LDFLAGS+='-fprofile-arcs'
> > $ CFLAGS+='-fprofile-arcs -ftest-coverage'
> > $ CXXFLAGS+='-fprofile-arcs -ftest-coverage'
> > $ CPPFLAGS+='-fprofile-arcs -ftest-coverage'
> > $ export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
> > $ ./autogen.sh --enable-python=internal --disable-online-update
> > --without-system-libs --without-system-headers
> > $ make build-nocheck
> >
> >
> >
> > But not when I do the build like this (like I do on the cmdline, or is
done
> > in the lcov-report.sh script) :
> >
> > $ LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs -ftest-coverage'
> > CXXFLAGS+='-fprofile-arcs -ftest-coverage' \
> > CPPFLAGS+='-fprofile-arcs -ftest-coverage' ./autogen.sh
> > --enable-python=internal --disable-online-update \
> > --without-system-libs --without-system-headers
> > $ make build-nocheck
> >
>
> then the easiest work around is to define a custom phase for that
> profile that overide the configure (aka autogen) step
> so that it does it the second way (and remove the *FLAGS from the
> profile's config
>
> Norbert


Ive taken another look at your suggestion, and I dont know where it went
wrong with my earlier attempts, but now it seems that at least Im getting
past the stage of building internal openldap correctly. Of course, this
workaround does mean that now there is a custom do_autogen() in phases.sh
that contains hardcoded FLAGS and options for autogen.sh, instead of
setting them in 'config' and autogen.lastrun. Im now doing a full build and
testrun to see if the rest of phase.sh does what I intended it to do.

If still interested (and my tests completes as expected), I could submit
the contents of my .tb directory somewhere, but im not too sure if that's
still needed or relevant anymore with your current modifications/version of
the script: it lets tb do a make build-nocheck, lcov-report -b, make check,
lcov-report -a, in separate steps (inside of a custom do_make in phases.sh)
instead of your 'lcov-report -f' everything in a single run.


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

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

[Michael Stahl]

 sw/source/core/doc/docbm.cxx   |   12 +
 xmloff/source/chart/PropertyMap.hxx|   12 -
 xmloff/source/text/XMLTextFrameContext.cxx |   10 +
 xmloff/source/text/txtimp.cxx  |8 -
 xmloff/source/text/txtparae.cxx|  201 +++--
 5 files changed, 129 insertions(+), 114 deletions(-)

New commits:
commit 041694abe6167ba06c89a4be6a732e4c36b86c59
Author: Michael Stahl 
Date:   Wed Dec 10 16:06:21 2014 +0100

xmloff: make the export of the horrible field marks aware of auto-styles

When exporting the .DOC bugdoc of fdo#87110 to ODF, the auto-styles
export will iterate over the fieldmarks in the page header and add the
attributes for them but not export the elements, so the first auto-style
gets a bunch of duplicate attributes.

Change-Id: I3fcf39f03e3d9ae5fca661efa7eb4bbb3eab9f5c
(cherry picked from commit 06f85d41d02ebef76487b230f35f2ec638c46c8b)

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4d43b3c..cdc468c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2277,130 +2277,139 @@ void 
XMLTextParagraphExport::exportTextRangeEnumeration(
 Reference< ::com::sun::star::text::XFormField > 
xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
 
 /* As of now, textmarks are a proposed extension to the 
OpenDocument standard. */
-if ( GetExport().getDefaultVersion() > 
SvtSaveOptions::ODFVER_012 )
+if (!bAutoStyles)
 {
-Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-if (xBookmark.is())
+if (GetExport().getDefaultVersion() > 
SvtSaveOptions::ODFVER_012)
 {
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, 
xBookmark->getName());
-}
-
-if (xFormField.is())
-{
-GetExport().AddAttribute(XML_NAMESPACE_FIELD, 
XML_TYPE, xFormField->getFieldType());
-}
-
-GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
-if (xFormField.is())
-{
-FieldParamExporter(&GetExport(), 
xFormField->getParameters()).Export();
-}
-GetExport().EndElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
-}
-/* The OpenDocument standard does not include support for 
TextMarks for now, so use bookmarks instead. */
-else
-{
-if (xFormField.is())
-{
-OUString sName;
-Reference< ::com::sun::star::container::XNameAccess > 
xParameters(xFormField->getParameters(), UNO_QUERY);
-if (xParameters.is() && xParameters->hasByName("Name"))
+Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+if (xBookmark.is())
 {
-const Any aValue = xParameters->getByName("Name");
-aValue >>= sName;
+GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, xBookmark->getName());
 }
-if (sName.isEmpty())
-{   // name attribute is mandatory, so have to pull a
-// rabbit out of the hat here
-sName = sFieldMarkName + OUString::number(
-m_pImpl->AddFieldMarkStart(xFormField));
-}
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
-sName);
-SvXMLElementExport aElem( GetExport(), !bAutoStyles,
-XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
-false, false );
-const OUString sFieldType = xFormField->getFieldType();
-if (sFieldType ==  ODF_FORMTEXT)
+
+if (xFormField.is())
 {
-openFieldMark = TEXT;
+GetExport().AddAttribute(XML_NAMESPACE_FIELD, 
XML_TYPE, xFormField->getFieldType());
 }
-else if (sFieldType == ODF_FORMCHECKBOX)
+
+GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
+if (xFormField.is())
 {
-openFieldMark = CHECK;
+FieldParamExporter(&GetExport(), 
xFormField->getParameters()).Export();
 }
-   

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

[Michael Stahl]

 sw/source/core/doc/docbm.cxx   |   12 +
 xmloff/source/text/XMLTextFrameContext.cxx |   10 +
 xmloff/source/text/txtimp.cxx  |8 -
 xmloff/source/text/txtparae.cxx|  201 +++--
 4 files changed, 123 insertions(+), 108 deletions(-)

New commits:
commit 06f85d41d02ebef76487b230f35f2ec638c46c8b
Author: Michael Stahl 
Date:   Wed Dec 10 16:06:21 2014 +0100

xmloff: make the export of the horrible field marks aware of auto-styles

When exporting the .DOC bugdoc of fdo#87110 to ODF, the auto-styles
export will iterate over the fieldmarks in the page header and add the
attributes for them but not export the elements, so the first auto-style
gets a bunch of duplicate attributes.

Change-Id: I3fcf39f03e3d9ae5fca661efa7eb4bbb3eab9f5c

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4d43b3c..cdc468c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2277,130 +2277,139 @@ void 
XMLTextParagraphExport::exportTextRangeEnumeration(
 Reference< ::com::sun::star::text::XFormField > 
xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
 
 /* As of now, textmarks are a proposed extension to the 
OpenDocument standard. */
-if ( GetExport().getDefaultVersion() > 
SvtSaveOptions::ODFVER_012 )
+if (!bAutoStyles)
 {
-Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-if (xBookmark.is())
+if (GetExport().getDefaultVersion() > 
SvtSaveOptions::ODFVER_012)
 {
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, 
xBookmark->getName());
-}
-
-if (xFormField.is())
-{
-GetExport().AddAttribute(XML_NAMESPACE_FIELD, 
XML_TYPE, xFormField->getFieldType());
-}
-
-GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
-if (xFormField.is())
-{
-FieldParamExporter(&GetExport(), 
xFormField->getParameters()).Export();
-}
-GetExport().EndElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
-}
-/* The OpenDocument standard does not include support for 
TextMarks for now, so use bookmarks instead. */
-else
-{
-if (xFormField.is())
-{
-OUString sName;
-Reference< ::com::sun::star::container::XNameAccess > 
xParameters(xFormField->getParameters(), UNO_QUERY);
-if (xParameters.is() && xParameters->hasByName("Name"))
+Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+if (xBookmark.is())
 {
-const Any aValue = xParameters->getByName("Name");
-aValue >>= sName;
+GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, xBookmark->getName());
 }
-if (sName.isEmpty())
-{   // name attribute is mandatory, so have to pull a
-// rabbit out of the hat here
-sName = sFieldMarkName + OUString::number(
-m_pImpl->AddFieldMarkStart(xFormField));
-}
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
-sName);
-SvXMLElementExport aElem( GetExport(), !bAutoStyles,
-XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
-false, false );
-const OUString sFieldType = xFormField->getFieldType();
-if (sFieldType ==  ODF_FORMTEXT)
+
+if (xFormField.is())
 {
-openFieldMark = TEXT;
+GetExport().AddAttribute(XML_NAMESPACE_FIELD, 
XML_TYPE, xFormField->getFieldType());
 }
-else if (sFieldType == ODF_FORMCHECKBOX)
+
+GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
+if (xFormField.is())
 {
-openFieldMark = CHECK;
+FieldParamExporter(&GetExport(), 
xFormField->getParameters()).Export();
 }
-else
+GetExport().EndElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_START, false);
+

Re: changing default frame setting in image auto-caption

[Sharuzzaman Ahmat Raslan]

Hi Miklos,

Sadly, I'm just a system admin without any knowledge in C or C++ :(

But, hopefully someone would be inspired to improve the functionality :)

If this is default as it is right now, I will open a ticket for enhancement
request.

Thanks.

On Wed, Dec 10, 2014 at 5:17 PM, Miklos Vajna 
wrote:

> Hi,
>
> On Wed, Dec 10, 2014 at 03:39:40AM +0800, Sharuzzaman Ahmat Raslan <
> sharuzza...@gmail.com> wrote:
> > The problem is, when I configure the auto-caption for image, there are no
> > option to specify which frame style I want to use. Thus, when I insert a
> > new image, a default frame style will be used. Even if I already
> customised
> > "Frame" style, eg. changing the border to dotted, the frame created with
> > new image will be without border, eg. plain default frame.
>
> Yes, applying the "Frame" style to such new frames sounds like a
> reasonable improvement.
>
> Feel free to ask here on this list for code pointers if you're
> interested in hacking on that yourself. :-)
>
> Regards,
>
> Miklos
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


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

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

[Matúš Kukan]

 sw/qa/extras/uiwriter/data/uno-cycle.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   17 +
 sw/source/core/unocore/unoportenum.cxx   |5 +
 3 files changed, 22 insertions(+)

New commits:
commit 4a3328a98f00818044694a9b6a0f7cda392273c6
Author: Matúš Kukan 
Date:   Wed Dec 10 12:06:49 2014 +0100

sw: Unit test for cycle in lcl_CreatePortions

Reviewed on:
https://gerrit.libreoffice.org/13413
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: I26a8707046d7f30381fb51c41e49f8dee4796ba7

diff --git a/sw/qa/extras/uiwriter/data/uno-cycle.odt 
b/sw/qa/extras/uiwriter/data/uno-cycle.odt
new file mode 100644
index 000..51e798f
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/uno-cycle.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 4229877..d3649d0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -63,6 +63,7 @@ public:
 void testAutoCorr();
 void testFdo87005();
 void testMergeDoc();
+void testCreatePortions();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -89,6 +90,7 @@ public:
 CPPUNIT_TEST(testAutoCorr);
 CPPUNIT_TEST(testFdo87005);
 CPPUNIT_TEST(testMergeDoc);
+CPPUNIT_TEST(testCreatePortions);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -662,6 +664,21 @@ void SwUiWriterTest::testMergeDoc()
 getParagraph(7, "");
 }
 
+void SwUiWriterTest::testCreatePortions()
+{
+createDoc("uno-cycle.odt");
+uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xText(xBookmarksSupplier->getBookmarks()->getByName("Mark"), uno::UNO_QUERY);
+uno::Reference 
xTextCursor(xText->getAnchor(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xTextCursor.is());
+
+uno::Reference xParagraph(
+xTextCursor->createEnumeration()->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xParagraph.is());
+// This looped forever in lcl_CreatePortions
+xParagraph->createEnumeration();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
commit 6d65e30fbaba383cbb9e1db6230a04865897ac8f
Author: Miklos Vajna 
Date:   Wed Dec 10 16:08:05 2014 +0100

sw UNO API: fix infinite loop when building portions of a bookmark range

The problem was that in case the bookmark range points to a number of
characters in a text node, where neither the start or the end is the 
paragraph
start and end, and in case there is an at-char anchored object at the 
beginning
of the paragraph, then lcl_CreatePortions() never ended.

It is assumed that the loop in lcl_CreatePortions() will end at some stage, 
as
every iteration moves the cursor forward. But this wasn't true in the above
situation: the first frame was anchored at char pos 0, the range was char
positions 1..7, and we failed to ignore frames which are anchored before 
start:
so position was constantly 1.

Fix the problem by explicitly ignoring frames before the current position, 
so
lcl_ExportFrames() properly returns -1 when there are no anchored objects in
the current range. Testcase is in the next commit.

Change-Id: I73662e09cd09ee7e0ea4575b1150beb40f1ccc3a

diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 039e60f..422bce9 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -1193,6 +1193,11 @@ static sal_Int32 lcl_ExportFrames(
 FrameDependSortList_t & i_rFrames,
 sal_Int32 const i_nCurrentIndex)
 {
+// Ignore frames which are not exported, as we are exporting a selection
+// and they are anchored before the start of the selection.
+while (i_rFrames.size() && i_rFrames.front().nIndex < i_nCurrentIndex)
+i_rFrames.pop_front();
+
 // find first Frame in (sorted) i_rFrames at current position
 while (i_rFrames.size() && (i_rFrames.front().nIndex == i_nCurrentIndex))
 // do not check for i_nEnd here; this is done implicity by lcl_MoveCursor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 test/source/bootstrapfixture.cxx  |4 ++-
 test/source/isheadless.hxx|   36 ++
 test/source/vclbootstrapprotector.cxx |4 ++-
 3 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit e3ce885504d19d81b03df621237b73768ce7736d
Author: Stephan Bergmann 
Date:   Wed Dec 10 16:17:15 2014 +0100

CppunitTest --headless is not the same as soffice --headless

...they just "happen" to have the same name

Change-Id: Ia602f9a62e07c3af6fba2ffb84a858e1fb4b09ce

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index fe0a1ea..ac30e5c 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -100,7 +102,7 @@ SAL_DLLPUBLIC_EXPORT void 
test_init(lang::XMultiServiceFactory *pFactory)
 LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
 
 InitVCL();
-if (Application::IsHeadlessModeRequested())
+if (test::isHeadless())
 Application::EnableHeadlessMode(true);
 
 test_init_impl(false, true, pFactory);
diff --git a/test/source/isheadless.hxx b/test/source/isheadless.hxx
new file mode 100644
index 000..79ff330
--- /dev/null
+++ b/test/source/isheadless.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
+#define INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
+
+#include 
+
+#include 
+#include 
+
+namespace test {
+
+inline bool isHeadless() {
+sal_uInt32 n = rtl_getAppCommandArgCount();
+for (sal_uInt32 i = 0; i != n; ++i) {
+OUString arg;
+rtl_getAppCommandArg(i, &arg.pData);
+if (arg == "--headless") {
+return true;
+}
+}
+return false;
+}
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/vclbootstrapprotector.cxx 
b/test/source/vclbootstrapprotector.cxx
index a7f7da2..b15ed96 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 namespace {
 
 class Protector: public CppUnit::Protector, private boost::noncopyable {
@@ -38,7 +40,7 @@ public:
 MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
 LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
 InitVCL();
-if (Application::IsHeadlessModeRequested()) {
+if (test::isHeadless()) {
 Application::EnableHeadlessMode(true);
 }
 Application::setDeInitHook(STATIC_LINK(this, Protector, deinitHook));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 codemaker/source/javamaker/javatype.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 48a52621647aa72d15c0c9fb430faf9cbac01e6f
Author: Stephan Bergmann 
Date:   Wed Dec 10 13:34:04 2014 +0100

Fix generation of com.sun.star.uno.[Runtime]Exception classes

Change-Id: If9bd4d906906e0e6cd7c5bb61f8a67a163218395
(cherry picked from commit 662e3299c578e2bff8a1cb9884e6266353ea1ebe)

diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index 4dc7f5c..f60b163 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1825,18 +1825,22 @@ void handleExceptionType(
 MethodDescriptor desc2(manager, dependencies, "void", 0, 0);
 code.reset(cf->newCode());
 code->loadLocalReference(0);
-sal_uInt16 index3 = 1;
-code->loadLocalReference(index3++);
-code->loadLocalReference(index3++);
+sal_uInt16 index3 = 3;
 // Note that we hack in the java.lang.Throwable parameter further down,
 // because MethodDescriptor does not know how to handle it.
 desc2.addParameter("string", false, true, 0);
-if (!(baseException || baseRuntimeException)) {
+if (baseException || baseRuntimeException) {
+code->loadLocalReference(2);
+code->loadLocalReference(1);
+code->instrInvokespecial(superClass, "", 
"(Ljava/lang/String;Ljava/lang/Throwable;)V");
+} else {
+code->loadLocalReference(1);
+code->loadLocalReference(2);
 addExceptionBaseArguments(
 manager, dependencies, &desc2, code.get(), entity->getDirectBase(),
 &index3);
+code->instrInvokespecial(superClass, "", 
"(Ljava/lang/Throwable;" + desc2.getDescriptor().copy(1));
 }
-code->instrInvokespecial(superClass, "", "(Ljava/lang/Throwable;" + 
desc2.getDescriptor().copy(1));
 sal_uInt16 maxSize2 = index3;
 if (baseRuntimeException) {
 maxSize2 = std::max(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/refhint.hxx  |   18 ++
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |   17 ++
 sc/source/core/data/document.cxx|5 
 sc/source/core/data/formulacell.cxx |   10 +
 sc/source/core/data/table2.cxx  |4 
 sc/source/core/data/table3.cxx  |  245 +++-
 sc/source/core/tool/refhint.cxx |6 
 sc/source/ui/docshell/dbdocfun.cxx  |2 
 11 files changed, 219 insertions(+), 94 deletions(-)

New commits:
commit 91e9b38bee769ab41332b1cae6d2bbbd83a27eff
Author: Eike Rathke 
Date:   Mon Dec 1 23:56:44 2014 +0100

fdo#86762 re-establish listeners to move cell broadcasters

... for UpdateReferenceOnSort=false

(cherry picked from commit 6c2111f17089eb667bf526561d7667d17825e822)

Conflicts:
sc/source/core/data/table3.cxx

fdo#86762 broadcast also empty cells after sort

(cherry picked from commit 08793e08c7e9cefe594c49130f782725e386c463)

Conflicts:
sc/inc/column.hxx
sc/source/core/data/column.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table2.cxx
sc/source/ui/docshell/dbdocfun.cxx

fdo#86762 re-establish listeners on moved broadcasters

...  also in SortReorderByColumn() similar to SortReorderByRow()

(cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f)

Conflicts:
sc/source/core/data/table3.cxx

e275a754c530d6039ed14304900dd71416f36e46
7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf

Change-Id: Id90288660e317d6e47ee01ee3b5ff9058cfa18df
Reviewed-on: https://gerrit.libreoffice.org/13274
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 097c377..6911ca0 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -343,7 +343,7 @@ public:
 bool IsFormulaDirty( SCROW nRow ) const;
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt );
-voidSetDirty( SCROW nRow1, SCROW nRow2 );
+voidSetDirty( SCROW nRow1, SCROW nRow2, bool bIncludeEmptyCells = 
false );
 voidSetDirtyVar();
 voidSetDirtyAfterLoad();
 voidSetTableOpDirty( const ScRange& );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1052e6c..f37bfa2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1011,7 +1011,7 @@ public:
 voidResetChanged( const ScRange& rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt );
-voidSetDirty( const ScRange& );
+voidSetDirty( const ScRange&, bool bIncludeEmptyCells = false 
);
 voidSetTableOpDirty( const ScRange& );  // for Interpreter 
TableOp
 voidInterpretDirtyCells( const ScRangeList& rRanges );
 SC_DLLPUBLIC void CalcAll();
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 1eff906..a61e4b6 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -21,7 +21,9 @@ public:
 enum Type {
 Moved,
 ColumnReordered,
-RowReordered
+RowReordered,
+StartListening,
+StopListening
 };
 
 private:
@@ -95,6 +97,20 @@ public:
 SCCOL getEndColumn() const;
 };
 
+class RefStartListeningHint : public RefHint
+{
+public:
+RefStartListeningHint();
+virtual ~RefStartListeningHint();
+};
+
+class RefStopListeningHint : public RefHint
+{
+public:
+RefStopListeningHint();
+virtual ~RefStopListeningHint();
+};
+
 }
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fe36dac..49b8571 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -522,7 +522,7 @@ public:
 voidResetChanged( const ScRange& rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt );
-voidSetDirty( const ScRange& );
+voidSetDirty( const ScRange&, bool bIncludeEmptyCells = false );
 voidSetDirtyAfterLoad();
 voidSetDirtyVar();
 voidSetTableOpDirty( const ScRange& );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 42da658..64174ab 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3050,14 +3050,27 @@ void ScColumn::SetAllFormulasDirty( const 
sc::SetFormulaDirtyContext& rCxt )
 sc::ProcessFormula(maCells, aFunc);
 }
 
-void ScColumn::SetDirty( SCROW nRow1, SCROW nRow2 )
+void ScColumn::SetDirty( SCROW nRow1, SCROW nRow2, bool bIncludeEmptyCells )
 {
 // broadcasts everything within the range, with FormulaTracking
 sc::AutoCalcSwitch aSwitch(*pDocument, false);
 
 SetDirtyOnRangeHandler aHdl(*this);
 sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aHdl, aHdl);
-aHdl.broadcast();
+if (bIn

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

[Markus Mohrhard]

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

New commits:
commit 906fdfa21fc8741b27657ec0c497485b0cb5ff1f
Author: Markus Mohrhard 
Date:   Mon Dec 1 04:05:46 2014 +0100

avoid modifying range name references that are not affected, fdo#86518

Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5
Reviewed-on: https://gerrit.libreoffice.org/13299
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 74c61a5..ebc072e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3236,6 +3236,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 // column range of the reference is not entirely in 
the deleted column range.
 break;
 
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() || 
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
 ScRange aDeleted = rCxt.maRange;
 aDeleted.aStart.IncRow(rCxt.mnRowDelta);
 
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Norbert Thiebaud]

On Wed, Dec 10, 2014 at 5:27 AM, Maarten Hoes  wrote:
>
> However, doesnt the 'make it run it all in one call' implementation conflict
> at least a little with the previously stated desire to run the code coverage
> on other tests than just 'make check' ?

again being flexible does not mean that one could not propose sensible
'default'.


> Its the main reason I split
> everything up in -before' and '-after' parts, so that you can easily run any
> test you desire in between.

yeah that is a great feature... I have not removed it in anyway. just
expended things a bit to implify my use case.

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

Re: Scheduling lcov code coverage script

[Norbert Thiebaud]

On Wed, Dec 10, 2014 at 7:13 AM, Maarten Hoes  wrote:
> Hi ,
>
> Also,
>
> On Wed, Dec 10, 2014 at 10:40 AM, Norbert Thiebaud 
> wrote:
>>
>> SRC_DIR = $(pwd)
>> BUILD=SRC
>>
> These defaults set the source and build directory to the same
> value/directory: I was under the impression that separate/different source
> and build dirs were a requirement ?
>

the ability to support it is a requirement...
but that does not mean that one _has_ to do a split-build. :-)

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

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

[Christian Lohmaier]

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

New commits:
commit 234ff84315da6228628a4257ee52bda0068704a5
Author: Christian Lohmaier 
Date:   Wed Dec 10 15:46:47 2014 +0100

look for WiLangId.vbs in 8.1 SDK-dir

the 8.1 one is the only where it is installed to in a plain install of
VS2013 (update 4)

Change-Id: I797c3d1501d6ee87e5f662279221c4d285933f2d

diff --git a/configure.ac b/configure.ac
index 4db47f3..b63d7ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9546,7 +9546,7 @@ the  Windows SDK are installed.])
 
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs
 fi
 if ! test -e "$WINDOWS_SDK_WILANGID" ; then
-WINDOWS_SDK_WILANGID=$(cygpath -sm "C:/Program Files (x86)/Windows 
Kits/8.0/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs")
+WINDOWS_SDK_WILANGID=$(cygpath -sm "C:/Program Files (x86)/Windows 
Kits/8.1/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs")
 fi
 if ! test -e "$WINDOWS_SDK_WILANGID" ; then
 AC_MSG_WARN([WiLangId.vbs not found - building translated packages 
will fail])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Lubos Lunak]

On Monday 08 of December 2014, Bjoern Michaelsen wrote:
> Hi Lubos,
>
> On Fri, Dec 05, 2014 at 06:46:17PM +0100, Lubos Lunak wrote:
> > On Thursday 04 of December 2014, Michael Meeks wrote:
> > > * Large scale renames (Kendy)
> >
> > ...
> >
> > > + if cleanup there; perhaps some improved naming too.
> >
> > http://qt-project.org/wiki/API-Design-Principles#d8bc4b5cb3e68ae6e38b29e3
> >71b7f734 would be a very worthwhile reading here.
>
> good link, thanks! I think the problem -- at least in Writer -- is a bit
> deeper, no only naming: the classes in sw/ have somewhat muddy purposes and
> arent too well defined in their scope. The naming is just the topping on
> the cake (What is a SwFmtFrmSize and how is (if at all) it related to a
> SwFrmFmt?).

 I would agree that unfortunately the problem indeed is deeper, to the core 
issue that code written poorly in some way attacts more code written poorly. 
So when we inherited this codebase from OOo, we also inherited code that's 
poorly named, poorly commented, poorly documented (et cetera). And with that, 
we also inherited a culture where all that is perfectly fine and acceptable, 
which was realistically inevitable if we wanted to actually get something 
done with the code.

 The bad part is that since it's fine and normal to have such poorly done 
code, it's also fine to keep with that tradition and continue producing new 
code that has the same flaws. Just look at some of the newly written code, 
such as Clang plugins (I explicitly documented the purpose of each of mine 
ones, but when I looked recently I either could guess from the name or 
decipher it from the code) or the OpenGL VCL backend (the main class there 
has functions DrawLine() and drawLine(), and yes, they differ).

 So if you treat this only as a problem of some localized code, you may end up 
in a situation of fixing up old code while new code gets written in a form 
that immediately qualifies them for a such cleanup as well.

> IMHO, the best way out of this mess would be to:
> 1/ find groups of around ~5 classes as a batch and define (and
> doxygen-document) the single responsiblity of each of those well. It likely
> makes sense to refer to the old "::SwFoo StarOffice/OpenOffice.org class
> name" in doxygen too.
> 2/ move this set of classes a name matching the defined responsiblity in
>namespace sw
>
> That would mean we would try to start some consistent well-scoped naming in
> namespace sw, while the global (top-level) namespace still contains the old
> wild west naming. And them we would step by step grow the pocket by adding
> stuff in a ordered fashion to it.

 Given what I wrote above, I think this should start by first actually writing 
down somewhere what the new proper state of things should be. Otherwise 
nobody will know what the code ideally should look like, given that people 
either can write code based on what the existing code looks like (where the 
current code is pathetic when it comes to these criteria) or what some kind 
of OOo resource like the OOo coding style says (which is just as pathetic) or 
on their idea of what a good code should look like (which, to put it bluntly, 
is probably not that good either, given the above). And then require it for 
new commits. I'm generally not a big fan of being strict with rules (and it 
certainly can be taken too far, try e.g. to submit a patch to Clang), but 
then apparently the situation won't change on its own, if it hasn't in the 
last 4 years.

 Or, alternatively, we can just accept the fact that this codebase will in 
some aspects suck forever.

-- 
 Lubos Lunak
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 vcl/unx/generic/desktopdetect/desktopdetector.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 011c2950de31126d424236dbea55aab79e8272ef
Author: Stephan Bergmann 
Date:   Wed Dec 10 15:35:44 2014 +0100

No need to re-check IsHeadlessModeRequested in get_desktop_environment

It is already checked on all call chains:

* CreateSalInstance (vcl/unx/generic/plugadapt/salplug.cxx) checks
  IsHeadlessModeRequested before calling autodetect_plugin ->
  get_desktop_environment -> get_desktop_environment

* Application::GetDesktopEnvironment (vcl/source/app/svapp.cxx) checks
  IsHeadlessModeEnabled before potentially calling SalGetDesktopEnvironment
  (vcl/unx/generic/plugadapt/salplug.cxx) -> get_desktop_environment
  -> get_desktop_environment

* The two calls to SalGetDesktopEnvironment in vcl/unx/gtk/ are clearly 
only done
  for GTK plugins, not headless

Change-Id: I44b43cecd63effc5b2e3ad2a449943fee183462a

diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx 
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 067e729..386925e 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -28,7 +28,6 @@
 #include "rtl/ustrbuf.hxx"
 #include "osl/module.h"
 #include "osl/thread.h"
-#include "vcl/svapp.hxx"
 
 #include "vclpluginapi.h"
 
@@ -326,7 +325,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType 
get_desktop_environment()
 OUString plugin;
 rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", plugin);
 
-if (plugin == "svp" || Application::IsHeadlessModeRequested())
+if (plugin == "svp")
 pDisplayStr = NULL;
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 drawinglayer/source/processor2d/vclprocessor2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63a2168a6ea783d2c3824cdde8983dbfad147417
Author: Caolán McNamara 
Date:   Wed Dec 10 14:29:20 2014 +

Resolves: fdo#87189 don't draw negative canvas sizes

Change-Id: Ia52bc54084883817ffdd8ade06c3079865d52f70
(cherry picked from commit 6624484a608ed43fdeea1596f254915add671e08)

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 0f92e63..9e6c5a6 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -840,7 +840,7 @@ namespace drawinglayer
 // Prepare target output size
 Size aDestSize(aDestRectView.GetSize());
 
-if(aDestSize.getWidth() && aDestSize.getHeight())
+if(aDestSize.getWidth() > 0 && aDestSize.getHeight() > 0)
 {
 // Get preferred Metafile output size. When it's very equal to 
the output size, it's probably
 // a rounding error somewhere, so correct it to get a 1:1 
output without single pixel scalings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 drawinglayer/source/processor2d/vclprocessor2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6624484a608ed43fdeea1596f254915add671e08
Author: Caolán McNamara 
Date:   Wed Dec 10 14:29:20 2014 +

Resolves: fdo#87189 don't draw negative canvas sizes

Change-Id: Ia52bc54084883817ffdd8ade06c3079865d52f70

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 0f92e63..9e6c5a6 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -840,7 +840,7 @@ namespace drawinglayer
 // Prepare target output size
 Size aDestSize(aDestRectView.GetSize());
 
-if(aDestSize.getWidth() && aDestSize.getHeight())
+if(aDestSize.getWidth() > 0 && aDestSize.getHeight() > 0)
 {
 // Get preferred Metafile output size. When it's very equal to 
the output size, it's probably
 // a rounding error somewhere, so correct it to get a 1:1 
output without single pixel scalings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

[Christian Lohmaier]

 configure.ac   |6 +-
 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 5225cd46919a028add3772564fd0d63e99078820
Author: Christian Lohmaier 
Date:   Wed Dec 10 15:21:30 2014 +0100

define _USING_V110_SDK71_ when building with VS2013 against 7.1A SDK

and drop old VS2012 part from configure.ac

Change-Id: If0bedff0972a40f92aaf86140a0405d2af1dbc8d

diff --git a/configure.ac b/configure.ac
index 0fcfbc1..4db47f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3522,13 +3522,9 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case $vcnum in
-110)
-COMEX=14
-WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.0 7.1A"
-;;
 120)
 COMEX=15
-WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0"
+WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0 7.1A"
 ;;
 esac
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2c6dc19..7590a7b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,7 +47,7 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-   $(if $(findstring 
110_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
+   $(if $(findstring 
120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/app/sddll.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59e2678499747ac29a3aed6d47362255b3cc57ef
Author: Stephan Bergmann 
Date:   Wed Dec 10 15:18:01 2014 +0100

Any reason to use IsHeadlessModeRequested here?

IsHeadlessModeEnabled should work just as well, given that
Desktop::RegisterServices (desktop/source/app/appinit.cxx) calls
EnableHeadlessMode if IsHeadless

Change-Id: I4ffd8e6e3a37a8929620418e97854106ea937c9f

diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 085f72f..e86735b 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -336,7 +336,7 @@ void SdDLL::Init()
 
 // register your exotic remote controls here
 #ifdef ENABLE_SDREMOTE
-if ( !Application::IsHeadlessModeRequested() )
+if ( !Application::IsHeadlessModeEnabled() )
 RegisterRemotes();
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 desktop/source/app/cmdlineargs.cxx |4 +---
 desktop/source/app/cmdlineargs.hxx |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b63810cf50648caff9781b693f8c74c16ea6ed8a
Author: Stephan Bergmann 
Date:   Wed Dec 10 14:27:18 2014 +0100

Headless implies invisible

Change-Id: I97c1becd4a3f31ebb5d984d5efbfef7b9339f6bf

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index d3271fd..6f2c1a6 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -186,9 +186,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 }
 else if ( oArg == "headless" )
 {
-// Headless means also invisibile, so set this parameter to 
true!
-m_headless = true;
-m_invisible = true;
+setHeadless();
 }
 else if ( oArg == "cat" )
 {
diff --git a/desktop/source/app/cmdlineargs.hxx 
b/desktop/source/app/cmdlineargs.hxx
index 0ab54e0..580466f5 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -111,7 +111,7 @@ class CommandLineArgs: private boost::noncopyable
 // Special analyzed states (does not match directly to a command line 
parameter!)
 bool IsEmpty() const { return m_bEmpty;}
 
-void setHeadless() { m_headless = true; }
+void setHeadless() { m_headless = true; m_invisible = true; }
 
 private:
 voidParseCommandLine_Impl( Supplier& supplier );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/llunak/mailmerge_03'

[Luboš Luňák]

New branch 'private/llunak/mailmerge_03' available with the following commits:
commit f3b8775050fea0b0242b94b947672cf3e5ba3f5d
Author: Luboš Luňák 
Date:   Mon Dec 1 12:58:47 2014 +0100

do not save UNO marks in undo history

These are usually very short-lived marks that are used for various
internal purposes or by UNO interfaces, so restoring them from undo history
does not make any sense. It can in fact lead to a crash on undo if the mark 
has
been already deleted (which is usually the case with UNO marks) but
the restoring still refers to it (this is not a problem with other mark 
types
since those should be deleted only when they are no longer in the document,
in which case they are saved in undo history by content positions rather 
than
mark references).

(cherry picked from commit 1ecf9ed3fc33c984890848eacbecad5e009eb33d)

Conflicts:
sw/source/core/undo/undobj.cxx

Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c

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

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

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 577db4b16627c6376c50786d6098a2b2eff34350
Author: Caolán McNamara 
Date:   Wed Dec 10 13:16:34 2014 +

stray fprintf

Change-Id: I9046c57440b6adb83204d0f596b1cb8467405dfa

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 27901f7..0a7f268 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4423,10 +4423,7 @@ void DomainMapper_Impl::StartOrEndBookmark( const 
OUString& rId )
 uno::Reference xRange(xCursor, 
uno::UNO_QUERY_THROW);
 if (m_xPrevBookmark.is())
 {
-fprintf(stderr, "ok here\n");
 uno::Reference 
xTextRangeCompare(xRange->getText(), uno::UNO_QUERY_THROW);
-fprintf(stderr, "still ok here\n");
-
 if 
(xTextRangeCompare->compareRegionStarts(m_xPrevBookmark, xRange) == 0 &&
 xTextRangeCompare->compareRegionEnds(m_xPrevBookmark, 
xRange) == 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/eertfpar.cxx |7 +++
 include/svtools/rtftoken.h  |1 +
 svtools/source/svrtf/rtfkeywd.cxx   |2 ++
 3 files changed, 10 insertions(+)

New commits:
commit e77c573811dd9d685f2e7e936edc62963739800f
Author: Caolán McNamara 
Date:   Wed Dec 10 12:54:46 2014 +

fdo#76776 crashes after paste a table from Writer

Change-Id: If859352a7d8d409e5c3c651e0ffea0b3687007db

diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index 4eb6a03..e3ab1db 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -197,6 +197,13 @@ void EditRTFParser::NextToken( int nToken )
 ReadField();
 }
 break;
+case RTF_SHPINST:  // fdo#76776 process contents of shpinst
+break;
+case RTF_SP:   // fdo#76776 but skip SP groups
+{
+SkipGroup();
+}
+break;
 case RTF_PGDSCTBL: // #i29453# ignore \*\pgdsctbl destination
 case RTF_LISTTEXT:
 {
diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h
index b799526..cb23f30 100644
--- a/include/svtools/rtftoken.h
+++ b/include/svtools/rtftoken.h
@@ -1100,6 +1100,7 @@ enum RTF_TOKEN_IDS {
 RTF_SHPTXT,
 RTF_SHPFHDR,
 RTF_SHPGRP,
+RTF_SHPINST,
 RTF_SHPRIGHT,
 RTF_SHPFBLWTXT,
 RTF_SHPZ,
diff --git a/svtools/source/svrtf/rtfkeywd.cxx 
b/svtools/source/svrtf/rtfkeywd.cxx
index 18f7ad1..ef032a5 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1000,6 +1000,7 @@ static RTF_TokenEntry aRTFTokenTab[] = {
 {{OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT},   RTF_SHPFBLWTXT},
 {{OOO_STRING_SVTOOLS_RTF_SHPFHDR},  RTF_SHPFHDR},
 {{OOO_STRING_SVTOOLS_RTF_SHPGRP},   RTF_SHPGRP},
+{{OOO_STRING_SVTOOLS_RTF_SHPINST},  RTF_SHPINST},
 {{OOO_STRING_SVTOOLS_RTF_SHPLEFT},  RTF_SHPLEFT},
 {{OOO_STRING_SVTOOLS_RTF_SHPLID},   RTF_SHPLID},
 {{OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR},RTF_SHPLOCKANCHOR},
@@ -1227,6 +1228,7 @@ int GetRTFToken( const OUString& rSearch )
 sizeof( RTF_TokenEntry ),
 RTFKeyCompare )))
 nRet = ((RTF_TokenEntry*)pFound)->nToken;
+
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Maarten Hoes]

Hi ,

Also,

On Wed, Dec 10, 2014 at 10:40 AM, Norbert Thiebaud 
wrote:
>
> SRC_DIR = $(pwd)
> BUILD=SRC
>
These defaults set the source and build directory to the same
value/directory: I was under the impression that separate/different source
and build dirs were a requirement ?


Anyway, just my 2$.



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

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

[Luboš Luňák]

 sw/source/core/undo/undobj.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1ecf9ed3fc33c984890848eacbecad5e009eb33d
Author: Luboš Luňák 
Date:   Mon Dec 1 12:58:47 2014 +0100

do not save UNO marks in undo history

These are usually very short-lived marks that are used for various
internal purposes or by UNO interfaces, so restoring them from undo history
does not make any sense. It can in fact lead to a crash on undo if the mark 
has
been already deleted (which is usually the case with UNO marks) but
the restoring still refers to it (this is not a problem with other mark 
types
since those should be deleted only when they are no longer in the document,
in which case they are saved in undo history by content positions rather 
than
mark references).

Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c

diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index e0dd5b7..855795d 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -767,10 +767,12 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& 
rMark,
 
 if ( bSavePos || bSaveOtherPos )
 {
-if( !pHistory )
-pHistory = new SwHistory;
-
-pHistory->Add( *pBkmk, bSavePos, bSaveOtherPos );
+if( IDocumentMarkAccess::GetType(*pBkmk) != 
IDocumentMarkAccess::UNO_BOOKMARK )
+{
+if( !pHistory )
+pHistory = new SwHistory;
+pHistory->Add( *pBkmk, bSavePos, bSaveOtherPos );
+}
 if ( bSavePos
  && ( bSaveOtherPos
   || !pBkmk->IsExpanded() ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - 3136 commits - accessibility/source android/Bootstrap android/experimental android/mobile-config.py android/Module_android.mk animations/s

[Tobias Madl]

Rebased ref, commits from common ancestor:
commit d1577ee1ed215d9d4adfcdc0a71e2cfec0f3ebda
Author: Tobias Madl 
Date:   Wed Dec 10 11:01:48 2014 +

priorities: prevent future compatibility problems

Change-Id: I735bac570a0bed35d9ddc07e5f107fb696b49082

diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx 
b/sd/source/ui/framework/module/ShellStackGuard.cxx
index cf72edc..d567c20 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,12 +118,12 @@ void SAL_CALL ShellStackGuard::disposing (
 }
 }
 
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
 {
 #ifdef DEBUG
-OSL_ASSERT(pTimer==&maPrinterPollingIdle);
+OSL_ASSERT(pIdle==&maPrinterPollingIdle);
 #else
-(void)pTimer;
+(void)pIdle;
 #endif
 if (mpUpdateLock.get() != NULL)
 {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx 
b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 227..c41158c 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -86,7 +86,7 @@ private:
 ::boost::scoped_ptr mpUpdateLock;
 Idle maPrinterPollingIdle;
 
-DECL_LINK(TimeoutHandler, Timer*);
+DECL_LINK(TimeoutHandler, Idle*);
 
 /** Return  when the printer is printing.  Return  when
 the printer is not printing, or there is no printer, or something
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 77265a2..cdad563 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -538,7 +538,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, 
SfxHelpIndexWindow_Im
 
 m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
 Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
-aFactoryIdle.SetIdleHdl( aTimeoutLink );
+aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
 aFactoryIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER);
 aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
 }
@@ -708,12 +708,17 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
 return 0;
 }
 
-IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
+IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle )
 {
-if ( &aFactoryIdle == pTimer )
+if ( &aFactoryIdle == pIdle )
 InitializeIndex();
-else if ( &aKeywordTimer == pTimer && !sKeyword.isEmpty() )
-aKeywordLink.Call( this );
+return 0;
+}
+
+IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer)
+{
+if(&aKeywordTimer == pTimer && !sKeyword.isEmpty())
+aKeywordLink.Call(this);
 return 0;
 }
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e3f5202..95b8794 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -134,7 +134,8 @@ private:
 voidClearIndex();
 
 DECL_LINK(OpenHdl, void *);
-DECL_LINK(  TimeoutHdl, Timer* );
+DECL_LINK(IdleHdl, Idle* );
+DECL_LINK(TimeoutHdl, Timer*);
 
 public:
 IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin 
);
commit 861e7853e3b98b0adf5a72c88e2bf8c16ca17d09
Author: Miklos Vajna 
Date:   Wed Dec 10 12:48:03 2014 +0100

fdo#85286 android: add missing library for PPT loading

Change-Id: I5f7bfffd1b9751c30c737c886afcd572fa44d234

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index aff6f90..52d98c9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -150,6 +150,7 @@ draw_factory_list = [
 ("libsvgfilterlo.a", "svgfilter_component_getFactory"),
 ("libdeployment.a", "deployment_component_getFactory"),
 ("libemboleobj.a", "emboleobj_component_getFactory"),
+("libanimcorelo.a", "animcore_component_getFactory", "#ifdef ANDROID"),
 ]
 
 draw_constructor_list = [
commit ac8796dd5e1120ffc67752eb298ebd3e24c198b2
Author: Stephan Bergmann 
Date:   Wed Dec 10 12:42:23 2014 +0100

loplugin:cstylecast

Change-Id: I7f7e9094cb992b2cec3ab156a83791559cbb4344

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c559c49..e04392d 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1492,7 +1492,7 @@ void SAL_CALL BluetoothServer::run()
 // Create service
 IOBluetoothSDPServiceRecordRef serviceRecordRef;
 SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 IOBluetoothAddServiceDict
-IOReturn rc = IOBluetoothAddServiceDict((CFDictionaryRef) dict, 
&serviceRecordRef);
+IOReturn rc = 
IOBluetoothAddServiceDict(reinterpret_cast(dict), 
&serviceRecordRef);
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
 SAL_INFO("sdremote.bluetooth", "IOBluetoothAddServiceDict returned " << 
rc);
commit fd60dd5226b6cefb1eb621f8e479ba59bf11b0b7
Author: Noel

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

[Stephan Bergmann]

 codemaker/source/javamaker/javatype.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 662e3299c578e2bff8a1cb9884e6266353ea1ebe
Author: Stephan Bergmann 
Date:   Wed Dec 10 13:34:04 2014 +0100

Fix generation of com.sun.star.uno.[Runtime]Exception classes

Change-Id: If9bd4d906906e0e6cd7c5bb61f8a67a163218395

diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index 4dc7f5c..f60b163 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1825,18 +1825,22 @@ void handleExceptionType(
 MethodDescriptor desc2(manager, dependencies, "void", 0, 0);
 code.reset(cf->newCode());
 code->loadLocalReference(0);
-sal_uInt16 index3 = 1;
-code->loadLocalReference(index3++);
-code->loadLocalReference(index3++);
+sal_uInt16 index3 = 3;
 // Note that we hack in the java.lang.Throwable parameter further down,
 // because MethodDescriptor does not know how to handle it.
 desc2.addParameter("string", false, true, 0);
-if (!(baseException || baseRuntimeException)) {
+if (baseException || baseRuntimeException) {
+code->loadLocalReference(2);
+code->loadLocalReference(1);
+code->instrInvokespecial(superClass, "", 
"(Ljava/lang/String;Ljava/lang/Throwable;)V");
+} else {
+code->loadLocalReference(1);
+code->loadLocalReference(2);
 addExceptionBaseArguments(
 manager, dependencies, &desc2, code.get(), entity->getDirectBase(),
 &index3);
+code->instrInvokespecial(superClass, "", 
"(Ljava/lang/Throwable;" + desc2.getDescriptor().copy(1));
 }
-code->instrInvokespecial(superClass, "", "(Ljava/lang/Throwable;" + 
desc2.getDescriptor().copy(1));
 sal_uInt16 maxSize2 = index3;
 if (baseRuntimeException) {
 maxSize2 = std::max(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: Patch of the LibreOfficeKit

[Juergen Funk Mailinglist]

Sorry Stephan,  for the spam, 

but I have seen, in your patch have overseen 

else if ( oArg == "headless" )
{
// Headless means also invisibile, so set this parameter to 
true!
m_headless = true;
m_invisible = true;
}

the "m_invisible" flag

PS.: In my solution (3) is that set, but anyway not work right? 


Juergen


> -Ursprüngliche Nachricht-
> Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im
> Auftrag von Juergen Funk Mailinglist
> Gesendet: Mittwoch, 10. Dezember 2014 13:15
> An: Stephan Bergmann
> Cc: libreoffice@lists.freedesktop.org
> Betreff: AW: Patch of the LibreOfficeKit
> 
> Hi Stephan,
> 
> thanks for that fix, that is solution 4.
> 
> But that don't work with "bool Application::IsHeadlessModeRequested()"
> but I think that not needed for the LibreOfficeKit.
> 
> My solution 3 I have tested and it is not so good solution, but I have
> set the Headless mode anyway, but the Writer-Application appears.
> 
> Do you know what the problem is?
> 
> Juergen
> 
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

AW: Patch of the LibreOfficeKit

[Juergen Funk Mailinglist]

Hi Stephan,

thanks for that fix, that is solution 4.

But that don't work with "bool Application::IsHeadlessModeRequested()" but I 
think that not needed for the LibreOfficeKit.

My solution 3 I have tested and it is not so good solution, but I have set the 
Headless mode anyway, but the Writer-Application appears. 

Do you know what the problem is?

Juergen   


> -Ursprüngliche Nachricht-
> Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im
> Auftrag von Stephan Bergmann
> Gesendet: Mittwoch, 10. Dezember 2014 12:32
> An: libreoffice@lists.freedesktop.org
> Betreff: Re: Patch of the LibreOfficeKit
> 
> On 12/09/2014 10:16 AM, Juergen Funk Mailinglist wrote:
> > I have found 3 solution for solve the problem with the Headless mode
> on Windows.
> 
> should be fixed now with
>  498acd482148e491b879766bd4>
> "Fake --headless more cleanly"
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tobias Madl]

 sd/source/ui/framework/module/ShellStackGuard.cxx |6 +++---
 sd/source/ui/framework/module/ShellStackGuard.hxx |2 +-
 sfx2/source/appl/newhelp.cxx  |   15 ++-
 sfx2/source/appl/newhelp.hxx  |3 ++-
 4 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit d1577ee1ed215d9d4adfcdc0a71e2cfec0f3ebda
Author: Tobias Madl 
Date:   Wed Dec 10 11:01:48 2014 +

priorities: prevent future compatibility problems

Change-Id: I735bac570a0bed35d9ddc07e5f107fb696b49082

diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx 
b/sd/source/ui/framework/module/ShellStackGuard.cxx
index cf72edc..d567c20 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,12 +118,12 @@ void SAL_CALL ShellStackGuard::disposing (
 }
 }
 
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
 {
 #ifdef DEBUG
-OSL_ASSERT(pTimer==&maPrinterPollingIdle);
+OSL_ASSERT(pIdle==&maPrinterPollingIdle);
 #else
-(void)pTimer;
+(void)pIdle;
 #endif
 if (mpUpdateLock.get() != NULL)
 {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx 
b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 227..c41158c 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -86,7 +86,7 @@ private:
 ::boost::scoped_ptr mpUpdateLock;
 Idle maPrinterPollingIdle;
 
-DECL_LINK(TimeoutHandler, Timer*);
+DECL_LINK(TimeoutHandler, Idle*);
 
 /** Return  when the printer is printing.  Return  when
 the printer is not printing, or there is no printer, or something
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 77265a2..cdad563 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -538,7 +538,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, 
SfxHelpIndexWindow_Im
 
 m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
 Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
-aFactoryIdle.SetIdleHdl( aTimeoutLink );
+aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
 aFactoryIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER);
 aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
 }
@@ -708,12 +708,17 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
 return 0;
 }
 
-IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
+IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle )
 {
-if ( &aFactoryIdle == pTimer )
+if ( &aFactoryIdle == pIdle )
 InitializeIndex();
-else if ( &aKeywordTimer == pTimer && !sKeyword.isEmpty() )
-aKeywordLink.Call( this );
+return 0;
+}
+
+IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer)
+{
+if(&aKeywordTimer == pTimer && !sKeyword.isEmpty())
+aKeywordLink.Call(this);
 return 0;
 }
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e3f5202..95b8794 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -134,7 +134,8 @@ private:
 voidClearIndex();
 
 DECL_LINK(OpenHdl, void *);
-DECL_LINK(  TimeoutHdl, Timer* );
+DECL_LINK(IdleHdl, Idle* );
+DECL_LINK(TimeoutHdl, Timer*);
 
 public:
 IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

[Miklos Vajna]

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 861e7853e3b98b0adf5a72c88e2bf8c16ca17d09
Author: Miklos Vajna 
Date:   Wed Dec 10 12:48:03 2014 +0100

fdo#85286 android: add missing library for PPT loading

Change-Id: I5f7bfffd1b9751c30c737c886afcd572fa44d234

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index aff6f90..52d98c9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -150,6 +150,7 @@ draw_factory_list = [
 ("libsvgfilterlo.a", "svgfilter_component_getFactory"),
 ("libdeployment.a", "deployment_component_getFactory"),
 ("libemboleobj.a", "emboleobj_component_getFactory"),
+("libanimcorelo.a", "animcore_component_getFactory", "#ifdef ANDROID"),
 ]
 
 draw_constructor_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About fdo#70185 starmath: unit test writing

[Markus Mohrhard]

Hey,

On Tue, Dec 9, 2014 at 9:30 AM, Takeshi Abe  wrote:

> Hi Markus,
>
> On Tue, 9 Dec 2014 07:13:37 +0100, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
> > so the attched version of the patch gets you past that problem. Now the
> > test fails actually in parsing which you should debug and check if there
> is
> > something missing or if there is a setup problem.
> >
> > The problem that I fixed is that because you passed the filter version as
> > current it was trying to handle the file as a ODF file. I think there are
> > still a few wrong filter flags but that would need some more debugging
> and
> > checking which are used during a normal import.
> Thanks a lot for pointing out the filter version, which I suspected but
> could not figure out which version should work.
> Anyway the same problem still persists in my environment as follows.
> Just in case, I have run 'make clean' and then 'make starmath.all'.
>


I know that it is still not working. I just helped to get you to a point
where it is now failing inside of the starmath import. You need to debug
now why the import actually fails.

Regards,
Markus


> ---
> [build CUT] starmath_import
> warn:vcl.app:24879:1:vcl/source/app/IconThemeScanner.cxx:76: Could not
> find any icon themes in the provided directory
> ('file:///home/tabe/build/instdir/share/config/'.
> warn:legacy.osl:24879:1:starmath/source/mathmlimport.cxx:537: So there
> *was* a uno problem after all
> /home/tabe/core/starmath/qa/extras/mmlimport-test.cxx:63:(anonymous
> namespace)::Test::testSimple
> assertion failed
> - Expression: bLoaded
> - failed to load file:///home/tabe/core/starmath/qa/extras/data/simple.mml
>
> mmlimport-test.cxx:63:Assertion
> Test name: (anonymous namespace)::Test::testSimple
> assertion failed
> - Expression: bLoaded
> - failed to load file:///home/tabe/core/starmath/qa/extras/data/simple.mml
>
> Failures !!!
> Run: 1   Failure total: 1   Failures: 1   Errors: 0
> warn:fwk:24879:1:framework/source/services/desktop.cxx:1020: Desktop
> disposed before terminating it
> warn:tools.debug:24879:1:tools/source/debug/debug.cxx:297: no
> DbgTestSolarMutex function set
> warn:fwk:24879:1:framework/source/services/desktop.cxx:185: Desktop not
> terminated before being destructed
> warn:legacy.osl:24879:1:unotools/source/config/configmgr.cxx:167:
> OSL_ASSERT: items_.empty()
>
> Error: a unit test failed, please do one of:
>
> export DEBUGCPPUNIT=TRUE# for exception catching
> export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux
> export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for
> interactive debugging in Visual Studio
> export VALGRIND=memcheck# for memory checking
>
> and retry using: make CppunitTest_starmath_import
> ---
>
> Cheers,
> -- Takeshi Abe
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac8796dd5e1120ffc67752eb298ebd3e24c198b2
Author: Stephan Bergmann 
Date:   Wed Dec 10 12:42:23 2014 +0100

loplugin:cstylecast

Change-Id: I7f7e9094cb992b2cec3ab156a83791559cbb4344

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c559c49..e04392d 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1492,7 +1492,7 @@ void SAL_CALL BluetoothServer::run()
 // Create service
 IOBluetoothSDPServiceRecordRef serviceRecordRef;
 SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 IOBluetoothAddServiceDict
-IOReturn rc = IOBluetoothAddServiceDict((CFDictionaryRef) dict, 
&serviceRecordRef);
+IOReturn rc = 
IOBluetoothAddServiceDict(reinterpret_cast(dict), 
&serviceRecordRef);
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
 SAL_INFO("sdremote.bluetooth", "IOBluetoothAddServiceDict returned " << 
rc);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/test desktop/test javaunohelper/com odk/examples sfx2/qa sw/qa unoxml/qa

[Noel Grandin]

 bridges/test/java_uno/nativethreadpool/Relay.java  
 |4 -
 desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java 
 |2 
 
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 |2 
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java 
|2 
 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java 
 |6 +-
 javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
 |6 +-
 odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java 
 |2 
 sfx2/qa/complex/sfx2/DocumentMetadataAccess.java   
 |   20 -
 sw/qa/complex/writer/LoadSaveTest.java 
 |   21 --
 unoxml/qa/complex/unoxml/RDFRepositoryTest.java
 |   21 --
 10 files changed, 12 insertions(+), 74 deletions(-)

New commits:
commit fd60dd5226b6cefb1eb621f8e479ba59bf11b0b7
Author: Noel Grandin 
Date:   Wed Dec 10 13:35:17 2014 +0200

java: improve use of WrappedTargetException to set cause properly

since we introduced the new constructors that pass the cause all the
way up to java.lang.Throwable.
Also simplify some exeception printing sites, because Throwable
will correctly print out child exceptions for us.

Change-Id: Ibbecce3c6f971fbc80d6de2052ab4f33a4503c0a

diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java 
b/bridges/test/java_uno/nativethreadpool/Relay.java
index fb1063b..7b523f3 100644
--- a/bridges/test/java_uno/nativethreadpool/Relay.java
+++ b/bridges/test/java_uno/nativethreadpool/Relay.java
@@ -43,7 +43,7 @@ public final class Relay implements XRelay, XSource {
 } catch (RuntimeException e) {
 throw e;
 } catch (com.sun.star.uno.Exception e) {
-throw new WrappedTargetRuntimeException(e.getMessage(), this, e);
+throw new WrappedTargetRuntimeException(e, e.getMessage(), this, 
e);
 } catch (Exception e) {
 throw new com.sun.star.uno.RuntimeException(e, "", this);
 }
@@ -55,7 +55,7 @@ public final class Relay implements XRelay, XSource {
 context.getServiceManager().createInstanceWithContext(
 "com.sun.star.bridge.BridgeFactory", context));
 } catch (com.sun.star.uno.Exception e) {
-throw new WrappedTargetRuntimeException(e.getMessage(), this, e);
+throw new WrappedTargetRuntimeException(e, e.getMessage(), this, 
e);
 }
 new Thread() {
 @Override
diff --git 
a/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java
 
b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java
index f50cdea..e224c94 100644
--- 
a/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java
+++ 
b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java
@@ -77,7 +77,7 @@ public final class Dispatch extends WeakBase implements 
XServiceInfo, XDispatch
 } catch (com.sun.star.uno.RuntimeException e) {
 throw e;
 } catch (com.sun.star.uno.Exception e) {
-throw new WrappedTargetRuntimeException(
+throw new WrappedTargetRuntimeException(e,
 "wrapped: " + e.getMessage(), this, e);
 }
 }
diff --git 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index f7499ce..7cd3688 100644
--- 
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ 
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -135,7 +135,7 @@ public class OptionsEventHandler {
 try {
 return handleExternalEvent(aWindow, aEventObject);
 } catch (com.sun.star.uno.Exception e) {
-throw new WrappedTargetException(sMethod, this, e);
+throw new WrappedTargetException(e, sMethod, this, e);
 }
 }
 
diff --git 
a/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java
 
b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java
index 701fb31..74882bc 100644
--- 
a/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java
+++ 
b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java
@@ -77,7 +77,7 @@ public final class Dispatch extends WeakBase implements 
XServiceInfo,

Re: Patch of the LibreOfficeKit

[Stephan Bergmann]

On 12/09/2014 10:16 AM, Juergen Funk Mailinglist wrote:

I have found 3 solution for solve the problem with the Headless mode on Windows.


should be fixed now with 
 
"Fake --headless more cleanly"


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

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

[Stephan Bergmann]

 desktop/source/app/cmdlineargs.hxx |2 ++
 desktop/source/lib/init.cxx|   25 -
 2 files changed, 10 insertions(+), 17 deletions(-)

New commits:
commit 07c54fff7ad9da498acd482148e491b879766bd4
Author: Stephan Bergmann 
Date:   Wed Dec 10 12:31:15 2014 +0100

Fake --headless more cleanly

Change-Id: I3c119182c093b625b57ebc1c23986cab7faf09b0

diff --git a/desktop/source/app/cmdlineargs.hxx 
b/desktop/source/app/cmdlineargs.hxx
index 74c8c0e..0ab54e0 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -111,6 +111,8 @@ class CommandLineArgs: private boost::noncopyable
 // Special analyzed states (does not match directly to a command line 
parameter!)
 bool IsEmpty() const { return m_bEmpty;}
 
+void setHeadless() { m_headless = true; }
+
 private:
 voidParseCommandLine_Impl( Supplier& supplier );
 voidInitParamValues();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 659be67..5a410e4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 // Tiled Rendering is Linux only for now.
@@ -59,7 +60,8 @@
 #include 
 #endif
 
-// We also need to hackily be able to start the main libreoffice thread
+#include "../app/cmdlineargs.hxx"
+// We also need to hackily be able to start the main libreoffice thread:
 #include "../app/sofficemain.h"
 #include "../app/officeipcthread.hxx"
 
@@ -722,22 +724,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath)
 
 try
 {
-// We specifically need to make sure we have the "headless"
-// command arg set (various code specifically checks via
-// CommandLineArgs). We could alternatively add some other
-// flag elsewhere to indicate headlessness, which would
-// then be set from here or via CommandLineArgs.
-// (The first argument is treated specially by osl_setCommandArgs
-// however it is valid to make it \0 instead.)
-char sName[] = "";
-char sHeadless[] = "--headless";
-char* pArgs[2] = { sName, sHeadless };
-
-// If we've set up the command args elsewhere then we cannot do it
-// again (as an assert will fire), this will be the case e.g.
-// for unit tests (and possibly if UNO is being used in addition
-// to LOK in an external program).
-osl_setCommandArgs(2, pArgs);
 SAL_INFO("lok", "Attempting to initalize UNO");
 if (!initialize_uno(aAppURL))
 {
@@ -749,6 +735,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath)
 // Force headless -- this is only for bitmap rendering.
 rtl::Bootstrap::set("SAL_USE_VCLPLUGIN", "svp");
 
+// We specifically need to make sure we have the "headless"
+// command arg set (various code specifically checks via
+// CommandLineArgs):
+desktop::Desktop::GetCommandLineArgs().setHeadless();
+
 // We could use InitVCL() here -- and used to before using 
soffice_main,
 // however that now deals with the initialisation for us (and it's not
 // possible to try to set up VCL twice.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2621a852eb089b7f1edcab88a703d83b2f2fbb41
Author: Stephan Bergmann 
Date:   Wed Dec 10 12:29:28 2014 +0100

The document argument to gtktiledviewer is apparently non-optional

Change-Id: I81ac033ebe887256279232d192f5ab93dccc0434

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 9b2572b..e6a8d82 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -20,7 +20,7 @@
 
 static int help()
 {
-fprintf( stderr, "Usage: gtktiledviewer 
 [path to document]\n" );
+fprintf( stderr, "Usage: gtktiledviewer 
 \n" );
 return 1;
 }
 
@@ -197,7 +197,7 @@ void changePartMode( GtkWidget* pSelector, gpointer /* 
pItem */ )
 
 int main( int argc, char* argv[] )
 {
-if( argc < 2 ||
+if( argc < 3 ||
 ( argc > 1 && ( !strcmp( argv[1], "--help" ) || !strcmp( argv[1], "-h" 
) ) ) )
 return help();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Scheduling lcov code coverage script

[Maarten Hoes]

Hi,

On Wed, Dec 10, 2014 at 10:40 AM, Norbert Thiebaud 
wrote:
>
> On Wed, Dec 10, 2014 at 2:29 AM, Maarten Hoes 
wrote:
> > No, of course not, I guess. But the alternative to using all the
internal
> > libraries, is installing all required libraries in the right versions
> > required on the system, and then doing --with-system-foo for all of
them.
>
> that is a trade-off between a generaly usefull script and a tuned for
> a dedicated tb one
> my changes (that I have not upstreamed yet.. as I'm still testing  -
> very long build on that box)
> were mostly to simplify the invocation
> I added a -f option
> that do the build the before, run make check and run the after all in one
call
> and all the directory have default values:
>
> SRC_DIR = $(pwd)
> BUILD=SRC
> HTML=BUILD/workdir/lcov/html
> TESTDATA=BUILD/workdir/lcov/data
>
> in the end I should be able to just run
>
> lcov-report.sh -f
>
Sorry, didnt take the time to properly read all that in my previous
response; i was in a hurry.
:(

I guess having some sort of default dirs makes sense. Lets add that. ;)

However, doesnt the 'make it run it all in one call' implementation
conflict at least a little with the previously stated desire to run the
code coverage on other tests than just 'make check' ? Its the main reason I
split everything up in -before' and '-after' parts, so that you can easily
run any test you desire in between. Or is that no longer a requirement ?


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