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

[Maxim Monastirsky]

 xmloff/source/style/XMLFontAutoStylePool.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c354deac3c6174b0e725c9bb6aab10b65a95fa0d
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Tue May 20 17:53:25 2014 +0300

fdo#78921 Don't crash when there is no storage specified

Not sure it's a good idea to get here at all
when exporting as flat xml, but anyway it
shouldn't crash.

Change-Id: Ib2ce6b044b4395222a394312d49f5a01d157f9f3

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx 
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index ff95ad6..4800c05 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -325,6 +325,10 @@ OUString XMLFontAutoStylePool::embedFontFile( const 
OUString fileUrl )
 osl::File file( fileUrl );
 if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
 return OUString();
+
+if ( !GetExport().GetTargetStorage().is() )
+return OUString();
+
 uno::Reference embed::XStorage  storage;
 storage.set( GetExport().GetTargetStorage()-openStorageElement( 
OUString( Fonts ),
 ::embed::ElementModes::WRITE ), uno::UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for submodules on 2014-05-21

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

+ fdo#77282 Replace Edit Group with Enter Group in Writer as in Draw
  in https://gerrit.libreoffice.org/8944 from Laurent BP


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

None

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

None

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

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2014-05-21

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#39631: Add SAL_LIKELY, SAL_UNLIKELY, SAL_HOT and SAT COLD macros.
  in https://gerrit.libreoffice.org/9418 from Michal Strnad
  about module include
+ fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
  in https://gerrit.libreoffice.org/9419 from Mukhiddin Yusupov
  about module sal
+ RID_DLG_UPDATE conversion to .ui
  in https://gerrit.libreoffice.org/9417 from Szymon Kłos
  about module desktop, extras
+ care for Java 1.5 support in external packages
  in https://gerrit.libreoffice.org/9312 from Douglas Mencken
  about module build, external, reportbuilder, swext
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
  about module officecfg, starmath
+ fdo#78886 File getting corrupted after Roundtrip due to fieldChar
  in https://gerrit.libreoffice.org/9414 from Dinesh Patil
  about module sw
+ fdo#78333 : SdtContent and a Shape overlapping causes corruption
  in https://gerrit.libreoffice.org/9374 from Umesh Kadam
  about module sw
+ fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing tool
  in https://gerrit.libreoffice.org/9392 from Rajashri Udhoji
  about module sw
+ fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
  in https://gerrit.libreoffice.org/9400 from Mukhiddin Yusupov
  about module sal
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
  about module filter
+ fdo#39631: Add SAL_LIKELY, SAL_UNLIKELY, SAL_HOT and SAT COLD macros.
  in https://gerrit.libreoffice.org/9407 from Michal Strnad
  about module include
 End of freshness 

+ fdo#78833 Improve AutoTexts for all languages (mainly FN Autotext)
  in https://gerrit.libreoffice.org/9408 from Laurent BP
  about module extras
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
  about module sw
+ libgltf: Update to the new version.
  in https://gerrit.libreoffice.org/9333 from Jan Holesovsky
  about module avmedia, build, external
+ fdo#78590: Fix for Corruption of para with framePr  drawing object into 
  in https://gerrit.libreoffice.org/9389 from Rohit Deshmukh
  about module sw, writerfilter
+ WIP: Remove Crystal icon duplicates using symlinks
  in https://gerrit.libreoffice.org/7454 from Rodolfo Ribeiro Gomes
  about module icon-themes
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
  about module sw, writerfilter
+ fdo#78469:FileCorrupt:During export LO was adding wrong tags inside w:sd
  in https://gerrit.libreoffice.org/9371 from Tushar Bende
  about module sw
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
  about module icon-themes


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

+ upgrade to python-3.3.5
  in https://gerrit.libreoffice.org/9311 from Thomas Arnhold
+ fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
  in https://gerrit.libreoffice.org/9401 from Mukhiddin Yusupov
+ Displaying the number of standardized pages in the Word count window
  in https://gerrit.libreoffice.org/7642 from Michał Siedlaczek
+ Move #include from middle of file to top
  in https://gerrit.libreoffice.org/9381 from Chris Laplante
+ fdo#78689 PDF Import: get font's ascent value from different source
  in https://gerrit.libreoffice.org/9410 from Vort
+ fdo#77282 Replace Edit Group with Enter Group
  in https://gerrit.libreoffice.org/8923 from Laurent BP
+ fdo#78290 : The File gets corrupted when saved in LO
  in https://gerrit.libreoffice.org/9273 from BisalNayal
+ fdo#78658 Corruption: lockedCanvas tag is missing from RT file
  in https://gerrit.libreoffice.org/9377 from Dinesh Patil
+ enhance pass-by-ref plugin to detect large arguments
  in https://gerrit.libreoffice.org/9403 from Noel Grandin
+ fdo#78659:FIle geting corrupted after Roundtrip due to fieldchar.
  in https://gerrit.libreoffice.org/9368 from Ravindra Vidhate
+ fdo#78654 LO was exporting corrupt docx file.
  in https://gerrit.libreoffice.org/9364 from Sushil Shinde
+ C string usage improvment
  in https://gerrit.libreoffice.org/9296 from Arnaud Versini


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

+ fdo#60338: Saved files have incorrect permissions on linux
  in https://gerrit.libreoffice.org/9287 from Ulrich Kitzinger


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

+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
  in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad
+ WIP: Converting 

[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer' - 3 commits - desktop/inc desktop/qa desktop/source

[Andrzej Hunt]

Rebased ref, commits from common ancestor:
commit 26c813ec810d367aa4e0cbd676f8cb0362c5879a
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sun May 18 08:37:13 2014 +0100

Draw the whole image for our gtk tiled viewer.

We just draw one huge tile, it doesn't seem to work too well
for larger documents though where the latter portions can appear
empty.

Change-Id: Ic527aec377bf2f82a528a04392186d3d8b752762

diff --git a/desktop/qa/gtktiledviewer/gtktiledviewer.cxx 
b/desktop/qa/gtktiledviewer/gtktiledviewer.cxx
index ead3c24..ee81cbc 100644
--- a/desktop/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/desktop/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -37,11 +37,23 @@ bool drawCallback(GtkWidget* /* The eventbox */, void* /* 
cairo_t* cr */, gpoint
 
 LODocument* pDocument = static_cast LODocument* ( pData );
 
-// Hardcoded tile just to see whether or not we get any sort of output.
-unsigned char* pBuffer = pDocument-paintTile( 1000, 1000, 0, 0, 1, 
1 );
+long nWidth, nHeight;
+pDocument-getDocumentSize( nWidth, nHeight );
+
+// Draw the whole document at once (for now)
+int nRenderWidth = nWidth / 10;
+int nRenderHeight = nHeight / 10;
+int nRowStride;
+unsigned char* pBuffer = pDocument-paintTile( nRenderWidth, nRenderHeight,
+   nRowStride,
+   0, 0, // origin
+   nWidth, nHeight );
+
 
 GdkPixbuf* pBixBuf = gdk_pixbuf_new_from_data( pBuffer, GDK_COLORSPACE_RGB,
-   false, 8, 1000, 1000, 
3*1000,
+   false, 8,
+   nRenderWidth, nRenderHeight,
+   nRowStride,
0, 0 );
 pBixBuf = gdk_pixbuf_flip( pBixBuf, false );
 gtk_image_set_from_pixbuf( GTK_IMAGE(ourCanvas), pBixBuf );
commit fc9d9e224cb9fe16e838336ad7656637d350f9b8
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sun May 18 08:36:16 2014 +0100

Implement document size retrieval for LibLO.

Change-Id: Ibd69f8e766fd421b05d2305f967179a969bc5b56

diff --git a/desktop/inc/liblibreoffice.h b/desktop/inc/liblibreoffice.h
index 9644a04..dc001b6 100644
--- a/desktop/inc/liblibreoffice.h
+++ b/desktop/inc/liblibreoffice.h
@@ -75,6 +75,11 @@ struct _LibreOfficeDocument
  const int nTilePosY,
  const int nTileWidth,
  const int nTileHeight);
+
+  // Get the document sizes in twips.
+  void (*getDocumentSize) (LibreOfficeDocument* pThis,
+   long* pWidth,
+   long* pHeight);
 #endif // LLO_USE_UNSTABLE_API
 };
 
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 6c8afb7..5ad73f9 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -76,6 +76,11 @@ public:
 return mpDoc-paintTile(mpDoc, nCanvasWidth, nCanvasHeight, pRowStride,
 nTilePosX, nTilePosY, nTileWidth, nTileHeight);
 }
+
+inline void getDocumentSize(long* pWidth, long* pHeight)
+{
+mpDoc-getDocumentSize(mpDoc, pWidth, pHeight);
+}
 #endif // LLO_USE_UNSTABLE_API
 };
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ba53dcd..7761c3a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -170,6 +170,9 @@ static unsigned char* doc_paintTile(LibreOfficeDocument* 
pThis,
   int* pRowStride,
   const int nTilePosX, const int nTilePosY,
   const int nTileWidth, const int nTileHeight);
+static void doc_getDocumentSize(LibreOfficeDocument* pThis,
+long* pWidth,
+long* pHeight);
 
 struct LibLODocument_Impl : public _LibreOfficeDocument
 {
@@ -187,6 +190,7 @@ struct LibLODocument_Impl : public _LibreOfficeDocument
 getNumberOfParts = doc_getNumberOfParts;
 setPart = doc_setPart;
 paintTile = doc_paintTile;
+getDocumentSize = doc_getDocumentSize;
 }
 };
 
@@ -422,7 +426,23 @@ static unsigned char* doc_paintTile (LibreOfficeDocument* 
pThis,
 return pRet;
 }
 
+static void doc_getDocumentSize(LibreOfficeDocument* pThis,
+long* pWidth,
+long* pHeight)
+{
+LibLODocument_Impl* pDocument = static_castLibLODocument_Impl*(pThis);
 
+if (true) // TODO: test that we have a writer document here (vs 
calc/impress/etc.)
+{
+SwXTextDocument* pTxtDoc = dynamic_cast SwXTextDocument* ( 
pDocument-mxComponent.get() );
+SwDocShell* pDocShell = pTxtDoc-GetDocShell();
+SwDoc* pDoc = 

[Libreoffice-commits] core.git: 2 commits - bridges/source sal/osl

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx |   65 
+-
 sal/osl/unx/thread.c|   17 +-
 2 files changed, 50 insertions(+), 32 deletions(-)

New commits:
commit 85dc388993beca806b5a7ec91c9c49172b3a781b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 09:02:43 2014 +0200

Default OS X thread stack size too small for -fsanitize=address

...witnessed stack overflow in huge function
FunctionMapFactory::createFunctionMap__library_effects__allChildren in

workdir/UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/
COLLADASaxFWLColladaParserAutoGen14PrivateFunctionMapFactory.cpp

Change-Id: I9451912043e282c8e06aff446cf3d1190f1de9cf

diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 0140936..5335dd6 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -22,6 +22,7 @@
 #if defined(OPENBSD)
 #include sched.h
 #endif
+#include config_options.h
 #include osl/diagnose.h
 #include osl/thread.h
 #include osl/nlsupport.h
@@ -251,8 +252,9 @@ static oslThread osl_thread_create_Impl (
 short nFlags)
 {
 Thread_Impl* pImpl;
-#if defined(OPENBSD)
+#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
 pthread_attr_t attr;
+size_t stacksize;
 #endif
 int nRet=0;
 
@@ -266,11 +268,16 @@ static oslThread osl_thread_create_Impl (
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
-#if defined(OPENBSD)
+#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
 if (pthread_attr_init(attr) != 0)
 return (0);
 
-if (pthread_attr_setstacksize(attr, 262144) != 0) {
+#if defined OPENBSD
+stacksize = 262144;
+#else
+stacksize = 100 * PTHREAD_STACK_MIN;
+#endif
+if (pthread_attr_setstacksize(attr, stacksize) != 0) {
 pthread_attr_destroy(attr);
 return (0);
 }
@@ -278,7 +285,7 @@ static oslThread osl_thread_create_Impl (
 
 if ((nRet = pthread_create (
 (pImpl-m_hThread),
-#if defined(OPENBSD)
+#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
 attr,
 #else
 PTHREAD_ATTR_DEFAULT,
@@ -295,7 +302,7 @@ static oslThread osl_thread_create_Impl (
 return (0);
 }
 
-#if defined(OPENBSD)
+#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
 pthread_attr_destroy(attr);
 #endif
 
commit 00468b48e8678d819a8e34be8c1e256ce36c1396
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 08:55:48 2014 +0200

Work around Clang -fsanitize=address inline asm error

same as 08947735f9cc4b7bd69676c9dd4d1700e8e3b15b for gcc_linux_x86-64

Change-Id: I28d138dd13adc9a3e09d46befe69ac86ab1fffb6

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
index 3b6cd4a..971ca8a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
@@ -57,10 +57,27 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 if ( nGPR  x86_64::MAX_GPR_REGS )
 nGPR = x86_64::MAX_GPR_REGS;
 
+// Work around -fsanitize=address inline assembly requires more registers
+// than available error:
+struct Data {
+sal_uInt64 pMethod;
+sal_uInt64 * pGPR;
+double * pFPR;
+sal_uInt64 nFPR;
+// Return values:
+sal_uInt64 rax;
+sal_uInt64 rdx;
+double xmm0;
+double xmm1;
+} data;
+data.pGPR = pGPR;
+data.pFPR = pFPR;
+data.nFPR = nFPR;
+
 // Get pointer to method
 sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
 pMethod += 8 * nVtableIndex;
-pMethod = *((sal_uInt64 *)pMethod);
+data.pMethod = *((sal_uInt64 *)pMethod);
 
 // Load parameters to stack, if necessary
 if ( nStack )
@@ -71,16 +88,10 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 std::memcpy( pCallStack, pStack, nStackBytes );
 }
 
-// Return values
-sal_uInt64 rax;
-sal_uInt64 rdx;
-double xmm0;
-double xmm1;
-
 asm volatile (
 
 // Fill the xmm registers
-movq %6, %%rax\n\t
+movq 16%0, %%rax\n\t
 
 movsd   (%%rax), %%xmm0\n\t
 movsd  8(%%rax), %%xmm1\n\t
@@ -92,7 +103,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 movsd 56(%%rax), %%xmm7\n\t
 
 // Fill the general purpose registers
-movq %5, %%rax\n\t
+movq 8%0, %%rax\n\t
 
 movq(%%rax), %%rdi\n\t
 movq   8(%%rax), %%rsi\n\t
@@ -102,45 +113,45 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 movq  40(%%rax), %%r9\n\t
 
 // Perform the call
-movq %4, %%r11\n\t
-movq %7, %%rax\n\t
+movq 0%0, %%r11\n\t
+movq 24%0, %%rax\n\t
 call *%%r11\n\t
 
 // Fill the return values
-movq   %%rax, %0\n\t
-movq   

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

[Muthu Subramanian]

 oox/source/drawingml/textcharacterpropertiescontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8f4cacb4b8c5a9d7d05fe4979e048e237ed4426
Author: Muthu Subramanian sumu...@collabora.com
Date:   Fri Mar 14 15:31:53 2014 +0530

n#862510: Ignore baseline attributes with zero.

Change-Id: I1adc46e62c82c23645ccad0e11d5a7cb07114539
(cherry picked from commit 19abfaffe74b925e4428943d14187a7008797982)
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 6887cda..8217cac 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -52,7 +52,7 @@ 
TextCharacterPropertiesContext::TextCharacterPropertiesContext(
 mrTextCharacterProperties.moUnderline = rAttribs.getToken( XML_u );
 if ( rAttribs.hasAttribute( XML_strike ) )
 mrTextCharacterProperties.moStrikeout = rAttribs.getToken( XML_strike 
);
-if ( rAttribs.hasAttribute( XML_baseline ) )
+if ( rAttribs.hasAttribute( XML_baseline )  rAttribs.getInteger( 
XML_baseline ).get() != 0 )
 mrTextCharacterProperties.moBaseline = rAttribs.getInteger( 
XML_baseline );
 
 if ( rAttribs.hasAttribute( XML_b ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Bug 58187

[Ulrich Kitzinger]

Thanks for your hints, they are both promising.
  ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sd/source/ui/func/fuparagr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bbbe324de18d0032be12918ea55fb43f051c10a4
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 20 09:35:13 2014 +0100

Related: fdo#78151 fix 'pIds unsorted' warning

Change-Id: I00c533a25a851d8bf57f1b0758e98915d2291ee9
(cherry picked from commit 52871279e9811d437ebe881e30b6c76208c84e65)
Reviewed-on: https://gerrit.libreoffice.org/9413
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index e3ee565..eacfa4e 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -137,15 +137,15 @@ void FuParagraph::DoExecute( SfxRequest rReq )
 // invalidate slots
 static sal_uInt16 SidArray[] = {
 SID_ATTR_TABSTOP,
-SID_ATTR_PARA_LINESPACE,
-SID_ATTR_PARA_ULSPACE,
 SID_ATTR_PARA_ADJUST_LEFT,
 SID_ATTR_PARA_ADJUST_RIGHT,
 SID_ATTR_PARA_ADJUST_CENTER,
 SID_ATTR_PARA_ADJUST_BLOCK,
+SID_ATTR_PARA_LINESPACE,
 SID_ATTR_PARA_LINESPACE_10,
 SID_ATTR_PARA_LINESPACE_15,
 SID_ATTR_PARA_LINESPACE_20,
+SID_ATTR_PARA_ULSPACE,
 SID_ATTR_PARA_LRSPACE,
 SID_ATTR_PARA_LEFT_TO_RIGHT,
 SID_ATTR_PARA_RIGHT_TO_LEFT,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 cui/source/tabpages/paragrph.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a989b693f6836a17fba4b60b5f06d5117bdb67c4
Author: Michael Stahl mst...@redhat.com
Date:   Tue May 20 11:18:55 2014 +0200

(related: fdo#62176) Revert reset min/max values in paragraph ...

... dialog before setting the actual value

This prevents handling negative first-line indent in Impress, for which
it is necessary that the values are set before the limits.

This reverts commit 3d7ff1e907713d8ed53a1e193641a2f16de3c38b.

Change-Id: I47807d7d49716acab3657de1da64c6e9a99fc44d
(cherry picked from commit 35199df7b7af9d9dd3e98eb5f1b24ac1d407345c)
Reviewed-on: https://gerrit.libreoffice.org/9415
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5854608..f8e7db1 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -429,8 +429,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet )
 SetFieldUnit( *m_pLineDistAtMetricBox, eFUnit );
 }
 
-ELRLoseFocusHdl( NULL ); // reset min/max values
-
 sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE );
 SfxItemState eItemState = rSet.GetItemState( _nWhich );
 
@@ -588,6 +586,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet 
)
 }
 }
 
+// this sets the min/max limits; do this _after_ setting the values,
+// because for Impress the min of first-line indent depends on value of
+// left-indent!
+ELRLoseFocusHdl( NULL );
 m_pAutoCB-SaveValue();
 m_pContextualCB-SaveValue();
 m_pLineDist-SaveValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: suggestion for adding sdk/lib to pluginapp.bin or libuno_sal.so symlink in ure/lib

[Stephan Bergmann]

On 05/21/2014 07:13 AM, Richard PALO wrote:

S=/var/tmp/pkgsrc/misc/libreoffice4/work/libreoffice-4.2.4.2 
I=$S/instdir  W=$S/workdir   g++-Wl,-z,origin
'-Wl,-rpath,$ORIGIN:$ORIGIN/../ure-link/lib' -L$I/ure/lib -L$I/program
-z nodefs   $W/CxxObject/extensions/source/plugin/unx/npwrap.o
$W/CxxObject/extensions/source/plugin/unx/npnapi.o -Wl,--start-group
  $W/LinkTarget/StaticLibrary/libplugcon.a  -lm -lnsl -lsocket  -lXt
-lXext -lX11 -ldl  -L/opt/local/lib -Wl,-R/opt/local/lib -lgthread-2.0
-lpthread -lthread -Wl,-R/opt/local/lib -lglib-2.0 -lintl
-L/opt/local/lib -Wl,-R/opt/local/lib -lgtk-x11-2.0 -Wl,-R/opt/local/lib
-lgdk-x11-2.0 -Wl,-R/opt/local/lib -lpangocairo-1.0 -Wl,-R/opt/local/lib
-latk-1.0 -Wl,-R/opt/local/lib -lcairo -Wl,-R/opt/local/lib -lgio-2.0
-Wl,-R/opt/local/lib -lpangoft2-1.0 -Wl,-R/opt/local/lib -lpango-1.0
-Wl,-R/opt/local/lib -lfontconfig -Wl,-R/opt/local/lib -lfreetype
-Wl,-R/opt/local/lib -lgdk_pixbuf_xlib-2.0 -Wl,-R/opt/local/lib
-lgmodule-2.0 -lpthread -lthread -Wl,-R/opt/local/lib -lgdk_pixbuf-2.0
-Wl,-R/opt/local/lib -lgobject-2.0 -Wl,-R/opt/local/lib -lglib-2.0
-lintl  -L/opt/local/lib -Wl,-R/opt/local/lib -lgtk-x11-2.0
-Wl,-R/opt/local/lib -lgdk-x11-2.0 -Wl,-R/opt/local/lib -lpangocairo-1.0
-Wl,-R/opt/local/lib -latk-1.0 -Wl,-R/opt/local/lib -lcairo
-Wl,-R/opt/local/lib -lgdk_pixbuf-2.0 -Wl,-R/opt/local/lib -lgio-2.0
-Wl,-R/opt/local/lib -lpangoft2-1.0 -Wl,-R/opt/local/lib -lpango-1.0
-Wl,-R/opt/local/lib -lgobject-2.0 -Wl,-R/opt/local/lib -lglib-2.0
-lintl -Wl,-R/opt/local/lib -lfontconfig -Wl,-R/opt/local/lib -lfreetype
  -Wl,--end-group -Wl,--no-as-needed -luno_sal -o $I/program/pluginapp.bin

ld: fatal: library -luno_sal: not found
=

Either 'sdk/lib' needs to be added as a runpath-link (which works fine
manually) or a symlink to libuno_sal.so.3 would need to be created in
'ure/lib' as that path is already used.


-L$I/sdk/lib should be on the above command line (and is on Linux) via 
-L$(INSTDIR)/$(SDKDIRNAME)/lib in the definition of 
gb_LinkTarget_get_linksearchpath_for_layer in 
solenv/gbuild/platform/com_GCC_class.mk.  No idea why that does not work 
for you on SunOS.


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

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

[Michael Meeks]

 sc/source/core/data/document.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7732f806dfcc9375757e7ccbe1ca3c1d194af266
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue May 20 08:13:53 2014 +0100

ODS load perf: avoid excessive calls to uppercase to compare tab names.

Change-Id: I37b9e49607c8c51f10bc8ff8fc342b02fdb8b7e1

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index d72e7db..97c10ca 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -237,7 +237,16 @@ bool ScDocument::GetCodeName( SCTAB nTab, OUString rName 
) const
 
 bool ScDocument::GetTable( const OUString rName, SCTAB rTab ) const
 {
-OUString aUpperName = ScGlobal::pCharClass-uppercase(rName);
+OUString aUpperName;
+static OUString aCacheName, aCacheUpperName;
+
+if (aCacheName != rName)
+{
+aCacheName = rName;
+// surprisingly slow ...
+aCacheUpperName = ScGlobal::pCharClass-uppercase(rName);
+}
+aUpperName = aCacheUpperName;
 
 for (SCTAB i=0; i static_castSCTAB(maTabs.size()); i++)
 if (maTabs[i])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 formula/source/core/api/token.cxx |   18 ++
 include/formula/tokenarray.hxx|1 +
 sc/inc/tokenarray.hxx |3 +++
 sc/source/core/tool/token.cxx |   12 
 sc/source/filter/xml/xmlcelli.cxx |   13 +++--
 5 files changed, 41 insertions(+), 6 deletions(-)

New commits:
commit c07b8dedf7b1d0ddb2c97368e1634432974632db
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon May 19 20:23:07 2014 +0100

ODS load perf: transfer ownership of the ScTokenArray to save cycles.

Add API to wnsure we don't end up allocating 32k bytes of tokens
for each ScFormulaToken, as happens when you Add a token to a new
empty ScTokenArray.

Change-Id: Ib12a3065eb513243a2146ebb009fbaa650385dd9

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index c5d7da7..30b0e16 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -687,6 +687,24 @@ void FormulaTokenArray::Assign( const FormulaTokenArray r 
)
 }
 }
 
+/// Optimisiation for efficiently creating StringXML placeholders
+void FormulaTokenArray::Assign( sal_uInt16 nCode, FormulaToken **pTokens )
+{
+assert( nLen = 0 );
+assert( pCode == NULL );
+
+nLen = nCode;
+pCode = new FormulaToken*[ nLen ];
+
+for( sal_uInt16 i = 0; i  nLen; i++ )
+{
+FormulaToken *t = pTokens[ i ];
+assert( t-GetOpCode() == ocStringXML );
+pCode[ i ] = t;
+t-IncRef();
+}
+}
+
 FormulaTokenArray FormulaTokenArray::operator=( const FormulaTokenArray rArr 
)
 {
 Clear();
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 5654a31..dcc8dc9 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -82,6 +82,7 @@ protected:
 
 protected:
 voidAssign( const FormulaTokenArray );
+voidAssign( sal_uInt16 nCode, FormulaToken **pTokens );
 
 /// Also used by the compiler. The token MUST had been allocated with new!
 FormulaToken*   Add( FormulaToken* );
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index c2191a8..9538819 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -110,6 +110,9 @@ public:
 NULL if there is no pCode (which actually would be caller's fault). */
 formula::FormulaToken* MergeRangeReference( const ScAddress  rPos );
 
+/// Assign XML string placeholder to the array
+void AssignXMLString( const OUString rText, const OUString rFormulaNmsp 
);
+
 /// Assignment with references to ScToken entries (not copied!)
 ScTokenArray operator=( const ScTokenArray );
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4f4cbf6..4ac537f 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2083,6 +2083,18 @@ FormulaToken* ScTokenArray::AddColRowName( const 
ScSingleRefData rRef )
 return Add( new ScSingleRefToken( rRef, ocColRowName ) );
 }
 
+void ScTokenArray::AssignXMLString( const OUString rText, const OUString 
rFormulaNmsp )
+{
+sal_uInt16 nTokens = 1;
+FormulaToken *aTokens[2];
+
+aTokens[0] = new FormulaStringOpToken( ocStringXML, rText );
+if( !rFormulaNmsp.isEmpty() )
+aTokens[ nTokens++ ] = new FormulaStringOpToken( ocStringXML, 
rFormulaNmsp );
+
+Assign( nTokens, aTokens );
+}
+
 bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW nExtend,
 const ScAddress rPos, ScDirection eDir )
 {
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index b09f90c..4e4c552 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1362,7 +1362,6 @@ void ScXMLTableRowCellContext::PutFormulaCell( const 
ScAddress rCellPos )
 ScDocumentImport rDoc = rXMLImport.GetDoc();
 
 OUString aText = maFormula-first;
-OUString aFormulaNmsp = maFormula-second;
 
 ::boost::scoped_ptrScExternalRefManager::ApiGuard pExtRefGuard (
 new ScExternalRefManager::ApiGuard(pDoc));
@@ -1372,13 +1371,15 @@ void ScXMLTableRowCellContext::PutFormulaCell( const 
ScAddress rCellPos )
 if ( aText[0] == '='  aText.getLength()  1 )
 {
 // temporary formula string as string tokens
-boost::scoped_ptrScTokenArray pCode(new ScTokenArray);
-pCode-AddStringXML( aText );
-if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL)  
!aFormulaNmsp.isEmpty() )
-pCode-AddStringXML( aFormulaNmsp );
+ScTokenArray *pCode = new ScTokenArray();
+
+OUString aFormulaNmsp = maFormula-second;
+if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
+aFormulaNmsp = OUString();
+pCode-AssignXMLString( aText, aFormulaNmsp );
 
 rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
-ScFormulaCell* pNewCell = 

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

[Tushar Bende]

 sw/qa/extras/ooxmlexport/data/fdo78469.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   10 +++---
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
 sw/source/filter/ww8/docxsdrexport.cxx   |   18 ++
 sw/source/filter/ww8/docxsdrexport.hxx   |3 +++
 6 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit 1fc9923b194da3ba346f0f0583c130b4284642ba
Author: Tushar Bende tushar.be...@synerzip.com
Date:   Fri May 16 15:06:41 2014 +0530

fdo#78469 FileCorrupt:During export LO was adding wrong tags inside 
w:sdtPr

Description :
Docx file corrupt after roundtrip.
Root cause: For some documents During export LO was not checking for the 
content of sdt and Even if sdt contains Drawing object
LO was writing text data related tags w:text/  w:dataBinding in 
w:sdtPr,This was the reason for corruption.

To Fix this checking is there is any Drawing Object in run if yes skip 
writing w:dataBinding tag in w:sdtPr
And if sdt content is Text and Drawing both do not write Text or 
Picture as these tags will again result in corruption.

Presently, while writing the sdtContent tag LO does not check for the 
content type due to which LO ends up adding the dataBinding along with the
Drawing/AlternateContent which is incorrect according ecma ECMA-376, Second 
Edition, Part 1 : 17.5.2.6. This cause in file corruption.

Added a check to restrict the aforementioned.

Reviewed on:
https://gerrit.libreoffice.org/9371

Change-Id: Id31437db0309b0a2159389a4a9a1f5e13c1ac3a5

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78469.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78469.docx
new file mode 100644
index 000..7ae4d71
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78469.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f69396f..22b144e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3408,6 +3408,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78599,fdo78599.docx)
 assertXPath ( pXmlDoc, 
/w:document/w:body/w:p[1]/w:hyperlink/w:r[6]/w:fldChar, fldCharType, end 
);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo78469, fdo78469.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+if (!pXmlDoc)
+   return;
+// make sure dataBinding  text tags not presernt in sdtcontent
+assertXPath(pXmlDoc, 
/w:hdr[1]/w:tbl[1]/w:tr[1]/w:tc[2]/w:p[1]/w:sdt[2]/w:sdtPr[1]/w:dataBinding[1],0);
+assertXPath(pXmlDoc, 
/w:hdr[1]/w:tbl[1]/w:tr[1]/w:tc[2]/w:p[1]/w:sdt[2]/w:sdtPr[1]/w:text[1],0);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testfdo78300,fdo78300.docx)
 {
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6608149..9e3bcd7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -372,6 +372,9 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer-endElementNS( XML_w, XML_p );
 
 WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren, 
m_pParagraphSdtPrDataBindingAttrs );
+//sdtcontent is written so Set m_bParagraphHasDrawing to false
+m_rExport.SdrExporter().setParagraphHasDrawing( false );
+m_bRunTextIsOn = false;
 m_pSerializer-mergeTopMarks();
 
 // Check for end of cell, rows, tables here
@@ -411,10 +414,10 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32 
nSdtPrToken, ::sax_fastparse
 m_pSerializer-singleElement( nSdtPrToken,
   FSNS(XML_w, XML_val), 
OString::number( rand() ),
   FSEND );
-else if( nSdtPrToken  0 )
+else if( (nSdtPrToken  0)  !(m_bRunTextIsOn  
m_rExport.SdrExporter().IsParagraphHasDrawing()))
 m_pSerializer-singleElement( nSdtPrToken, FSEND );
 
-if( pSdtPrDataBindingAttrs )
+if(( pSdtPrDataBindingAttrs )  
!m_rExport.SdrExporter().IsParagraphHasDrawing())
 {
 XFastAttributeListRef xAttrList( pSdtPrDataBindingAttrs );
 m_pSerializer-singleElementNS( XML_w, XML_dataBinding, xAttrList 
);
@@ -1655,7 +1658,7 @@ void DocxAttributeOutput::RunText( const OUString rText, 
rtl_TextEncoding /*eCh
 {
 m_closeHyperlinkInPreviousRun = true;
 }
-
+m_bRunTextIsOn = true;
 // one text can be split into more w:tblah/w:t's by line breaks etc.
 const sal_Unicode *pBegin = rText.getStr();
 const sal_Unicode *pEnd = pBegin + rText.getLength();
@@ -7388,6 +7391,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_pRedlineData( NULL ),
   m_nRedlineId( 0 ),
   m_bOpenedSectPr( false ),
+  

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

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.cxx |5 -
 sw/source/filter/ww8/docxsdrexport.hxx |1 -
 2 files changed, 6 deletions(-)

New commits:
commit 0fc4bd96749dd799593625d07c274e3e4f31b6ec
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed May 21 11:21:18 2014 +0200

unused DocxSdrExport::setDrawingOpen()

Change-Id: I8a5d36325edda8c475c4ad5874ec83c444bf2b50

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 9da244f..6f26ae7 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -250,11 +250,6 @@ bool DocxSdrExport::IsDrawingOpen()
 return m_pImpl-m_bDrawingOpen;
 }
 
-void DocxSdrExport::setDrawingOpen(bool bDrawingOpen)
-{
-m_pImpl-m_bDrawingOpen = bDrawingOpen;
-}
-
 bool DocxSdrExport::IsParagraphHasDrawing()
 {
 return m_pImpl-m_bParagraphHasDrawing;
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx 
b/sw/source/filter/ww8/docxsdrexport.hxx
index ebc3c97..d88a204 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -65,7 +65,6 @@ public:
 bool getFrameBtLr();
 
 bool IsDrawingOpen();
-void setDrawingOpen(bool bDrawingOpen);
 bool IsParagraphHasDrawing();
 void setParagraphHasDrawing(bool bParagraphHasDrawing);
 sax_fastparser::FastAttributeList* getFlyFillAttrList();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 extras/source/wordbook/technical.dic |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit cae2376f6fb8451d7b6a9e68edf4b97627d8fde4
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 21 11:21:28 2014 +0200

extras: add some more words to technical.dic

Change-Id: Ie337f8d1b24c8e7c9c422a13b11705f8eeaffdcc

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index deb7db7..3f88b46 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -8,6 +8,8 @@ Acrobat
 Add-in
 Adobe
 Advanced
+AIX=
+Amiga=
 AMD
 Android
 AppArmor
@@ -23,16 +25,19 @@ AutoVue=
 Badger
 Base=
 Base24=
+BeOS=
 Bing
 Bitcoin
 BorderManager
 Breezy
+BSD=
 CADView=
 Calc=
 Canon
 Canonical
 Capgemini
 Carefx
+CentOS=
 Chrome
 Cisco=
 Clickstream=
@@ -68,6 +73,7 @@ Evolution
 Exadata=
 Facebook
 Fawn
+Fedora=
 Feisty
 Firebird
 Firefox
@@ -96,6 +102,7 @@ Hi-Fi
 Hitachi
 Hoary
 HP
+HP/UX=
 HTML
 Ibex
 IBM
@@ -125,6 +132,7 @@ LibreOffice=
 Linux
 Lucid
 Lynx
+Macintosh=
 Malone
 ManageWise
 MasterCard
@@ -172,6 +180,7 @@ POP3
 PostgreSQL
 PPPoE
 Quanta
+RHEL=
 Rosetta
 RosettaNet=
 rpm
@@ -189,6 +198,7 @@ Skype
 SLED
 SLES
 SMTP
+Solaris=
 Sony
 Soyuz
 Spamassassin
@@ -198,6 +208,7 @@ StarOffice
 StorageTek=
 Sun=
 SunHSI=
+SunOS=
 SunSAI=
 SUSE
 TeliaSonera
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [SOLVED] Re: Wrong copy paste in ucbcmds.cxx? (ucb module)

[Stephan Bergmann]

On 05/20/2014 08:13 PM, julien2412 wrote:

I pushed the fix on master (see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f332958999cc38ad778ac381cc67d249e9bd918a)
I didn't gerrit review on 4.2 since it's not related to a known bug but if
you want to, I can.


I don't think it would be worth it.

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

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

[Rajashri]

 sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   19 
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx|2 
 sw/source/filter/ww8/docxattributeoutput.cxx   |   41 
++
 sw/source/filter/ww8/docxattributeoutput.hxx   |3 
 sw/source/filter/ww8/docxsdrexport.cxx |   10 --
 6 files changed, 67 insertions(+), 8 deletions(-)

New commits:
commit b349d2483e1fe64316d87b55d0b3b4c8f2293e2e
Author: Rajashri rajashri.udh...@synerzip.com
Date:   Sat May 17 18:53:52 2014 +0530

fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing tool

A file contains a 2007 word art within a drawing tool.
In Original file, the xml structure is as below:
sample xml:
p r ac drawing txbx txbxContent .. pict /pict 
/txbxContent/txbx /drawing /ac /r /p
LO was preserving this as :
p r ac drawing txbx txbxContent .. drawing txbx 
txbxContent ..
/txbxContent/txbx /drawing .. /txbxContent/txbx /drawing 
/ac /r /p
Now after this fix, If there is a custom shape within a text box, then 
we should postpone it and write it in
a separate run.
This approach is followed on the fact that LO writes nested TextBoxes 
in separate run.

NOTE1 :Due to this fix, xpath related to the below UT needs to be 
updated.
testFdo76249 in ooxmlsdrexport.cxx

NOTE2: In docxsdrexport.cxx : 'm_bIsInDMLTextFrame' is no more required.
For adding LockedCanvas, we only need to check if the property exists 
in the property set.
Therefoew removing the above bool variable.

Reviewed on:
https://gerrit.libreoffice.org/9392

Change-Id: I00e94712e912ad1977fcb65a945fefb927795d77

diff --git a/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx 
b/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx
new file mode 100644
index 000..c860828
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 22b144e..7a69e67 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3437,6 +3437,25 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78651, fdo78651.docx)
 // ensure that there are only two tables
 assertXPath(pXmlDoc, //w:tbl, 2);
 }
+DECLARE_OOXMLEXPORT_TEST(testWordArtWithinDraingtool, 
testWordArtWithinDraingtool.docx)
+{
+/*   * Within a file, there is a 2007 wordArt enclosed in a drawing tool
+ * LO was exporting it as below:
+ * Sample XML as in Original file:
+ * p r ac drawing txbx txbxContent ..  pict /pict 
/txbxContent/txbx /drawing /ac /r /p
+ *  After RT :
+ * p r ac drawing txbx txbxContent ..  drawing txbx 
txbxContent ..  /txbxContent/txbx /drawing .. /txbxContent/txbx 
/drawing /ac /r /p
+ *  Expected : As there is nesting of a 2007 Word Art within a draing 
tool, then can be separated in two different runs.
+ * */
+
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+   return;
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Fallback[1]/w:pict[1]/v:rect[1]/v:textbox[1]/w:txbxContent[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[4]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+}
 
 #endif
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 21eff8e..fc5c8d7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1017,7 +1017,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, fdo76249.docx)
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
 if (!pXmlDoc)
return;
-assertXPath(pXmlDoc, 
//mc:Choice/w:drawing//w:txbxContent//w:drawing//lc:lockedCanvas, 1);
+assertXPath(pXmlDoc, 
//mc:Choice[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/lc:lockedCanvas[1],1);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo76979, fdo76979.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9e3bcd7..96602c3 100644
--- 

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

[Jan Holesovsky]

 vcl/source/opengl/OpenGLContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58cb649dbe1bfbbd254fb8c9ac8c7526880b70cc
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon May 19 15:36:06 2014 +0200

Don't disable painting.

Change-Id: Ia7d8a49af756a642c393f47b7dc342b8e48b5eda

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 9370aae..649269d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -605,7 +605,7 @@ bool OpenGLContext::initWindow()
 m_pChildWindow-EnableEraseBackground( false );
 m_pChildWindow-SetControlForeground();
 m_pChildWindow-SetControlBackground();
-m_pChildWindow-EnablePaint(false);
+//m_pChildWindow-EnablePaint(false);
 
 const SystemEnvData* sysData(m_pChildWindow-GetSystemData());
 m_aGLWin.hWnd = sysData-hWnd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/sal/log-areas.dox  |1 +
 include/vcl/fntstyle.hxx   |5 -
 include/vcl/font.hxx   |2 +-
 include/vcl/metric.hxx |   17 -
 vcl/source/outdev/font.cxx |2 ++
 5 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit c1dbed8ac63ffc3c9112c88b05398caaaca52dc7
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 13:25:53 2014 +0300

Use more specific tag

Change-Id: Ife10cae3f0bd7dd294c74799412528f2596369c8

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 857302a..826872d 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -373,6 +373,7 @@ certain functionality.
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
+@li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.harfbuzz - HarfBuzz text layout
 @li @c vcl.headless - bitmap-based backend
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 008ad17..ef1f760 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -201,7 +201,7 @@ FontMetric OutputDevice::GetFontMetric() const
 aMetric.mpImplMetric-mnLineHeight  = ImplDevicePixelToLogicHeight( 
pMetric-mnAscent+pMetric-mnDescent+mnEmphasisAscent+mnEmphasisDescent );
 aMetric.mpImplMetric-mnSlant   = ImplDevicePixelToLogicHeight( 
pMetric-mnSlant );
 
-SAL_INFO(vcl.gdi, OutputDevice::GetFontMetric:  aMetric);
+SAL_INFO(vcl.gdi.fontmetric, OutputDevice::GetFontMetric:  aMetric);
 
 return aMetric;
 }
commit 02dcdb10111b9c5f644cbded01c6da688e807dac
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 13:25:30 2014 +0300

Log also the size

Change-Id: I391fbc092b05600b0a4c2107e3934e1fb7334554

diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index d9649ba..5e0b134 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -25,6 +25,7 @@
 #include vcl/dllapi.h
 #include i18nlangtag/languagetag.hxx
 #include tools/color.hxx
+#include tools/gen.hxx
 #include vcl/vclenum.hxx
 #include vcl/fntstyle.hxx
 
@@ -33,7 +34,6 @@ class SvStream;
 
 class Impl_Font;
 class ImplFontAttributes;
-class Size;
 
 class VCL_DLLPUBLIC Font
 {
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index f1be383..8e0957a 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -76,13 +76,13 @@ public:
 { return !operator==( rMetric ); }
 };
 
-
 template typename charT, typename traits 
 inline std::basic_ostreamcharT, traits  operator (
 std::basic_ostreamcharT, traits  stream, const FontMetric rMetric )
 {
 stream  {
 name=  \  rMetric.GetName()  \
+,size=(  rMetric.GetSize().Width()  ,  
rMetric.GetSize().Height()  )
 ,ascent=  rMetric.GetAscent()
 ,descent=  rMetric.GetDescent()
 ,intLeading=  rMetric.GetIntLeading()
commit e2565690b5d1814d21c1df9bfeefe971e0265738
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 12:06:58 2014 +0300

Bin ENUM_FONTRELIEF_DECLARED crack

We don't test or define it anywhere else so the header guard for the file
itself is enough.

Change-Id: I15a81b50ab3250a9c792a1b86a4b15f49ec224d1

diff --git a/include/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx
index 643d5d2..e2fc652 100644
--- a/include/vcl/fntstyle.hxx
+++ b/include/vcl/fntstyle.hxx
@@ -22,13 +22,8 @@
 
 #include sal/types.h
 
-#ifndef ENUM_FONTRELIEF_DECLARED
-#define ENUM_FONTRELIEF_DECLARED
-
 enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, 
FontRelief_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
 
-#endif
-
 typedef sal_uInt8 FontKerning;
 #define KERNING_FONTSPECIFIC((FontKerning)0x01)
 #define KERNING_ASIAN   ((FontKerning)0x02)
commit 566e47a19ded7c4864c0b1b4a6372a69bc22cc54
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 11:43:14 2014 +0300

Add a SAL_INFO

Change-Id: I3eb6a1f7dab30346a68050f37d31c082336ab7b6

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 541df8ef..008ad17 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -201,6 +201,8 @@ FontMetric OutputDevice::GetFontMetric() const
 aMetric.mpImplMetric-mnLineHeight  = ImplDevicePixelToLogicHeight( 
pMetric-mnAscent+pMetric-mnDescent+mnEmphasisAscent+mnEmphasisDescent );
 aMetric.mpImplMetric-mnSlant   = ImplDevicePixelToLogicHeight( 
pMetric-mnSlant );
 
+SAL_INFO(vcl.gdi, OutputDevice::GetFontMetric:  aMetric);
+
 return aMetric;
 }
 
commit 6da81bb513399fe2008b002417bdfb4de68ea341
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 11:43:00 2014 +0300

Add debugging output operator for FontMetric

Change-Id: I8df204b01a73454396561052f10784c71f10d081

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 27a8498..f1be383 100644
--- a/include/vcl/metric.hxx
+++ 

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/fdo77725.docx |binary
 1 file changed

New commits:
commit 612e0c647ec9ef504a6ec1913c02b0d166d9aedc
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed May 21 12:18:59 2014 +0200

fdo#77725 make testcase minimal

Loading 54 pages to check a single footnote is a waste of time.

Change-Id: Ic68d1d29e26e3d66973e5fca65c8958b953c78e0

diff --git a/sw/qa/extras/ooxmlexport/data/fdo77725.docx 
b/sw/qa/extras/ooxmlexport/data/fdo77725.docx
index 7813459..b06a4b4 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo77725.docx and 
b/sw/qa/extras/ooxmlexport/data/fdo77725.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/source/outdev/font.cxx |   38 ++
 1 file changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 224fd0a946f2f30c2e97a6a72f4e1d6b62795afb
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 12:02:24 2014 +0300

Bin code that died in 2010 in d4dbc31173487a97e4b022f0bb9dae25440856a8

Change-Id: I5b88b7c66c1c3a3c68e6a837d10e7477cb7ae8fe

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ef1f760..9e40712 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -231,42 +231,8 @@ bool OutputDevice::GetFontCharMap( FontCharMap 
rFontCharMap ) const
 if( !mpFontEntry )
 return false;
 
-#ifdef ENABLE_IFC_CACHE // a little font charmap cache helps considerably
-static const int NMAXITEMS = 16;
-static int nUsedItems = 0, nCurItem = 0;
-
-struct CharMapCacheItem { const PhysicalFontFace* mpFontData; FontCharMap 
maCharMap; };
-static CharMapCacheItem aCache[ NMAXITEMS ];
-
-const PhysicalFontFace* pFontData = mpFontEntry-maFontSelData.mpFontData;
-
-int i;
-for( i = nUsedItems; --i = 0; )
-if( pFontData == aCache[i].mpFontData )
-break;
-if( i = 0 ) // found in cache
-{
-rFontCharMap.Reset( aCache[i].maCharMap.mpImpl );
-}
-else // need to cache
-#endif // ENABLE_IFC_CACHE
-{
-const ImplFontCharMap* pNewMap = mpGraphics-GetImplFontCharMap();
-rFontCharMap.Reset( pNewMap );
-
-#ifdef ENABLE_IFC_CACHE
-// manage cache round-robin and insert data
-CharMapCacheItem rItem = aCache[ nCurItem ];
-rItem.mpFontData = pFontData;
-rItem.maCharMap.Reset( pNewMap );
-
-if( ++nCurItem = NMAXITEMS )
-nCurItem = 0;
-
-if( ++nUsedItems = NMAXITEMS )
-nUsedItems = NMAXITEMS;
-#endif // ENABLE_IFC_CACHE
-}
+const ImplFontCharMap* pNewMap = mpGraphics-GetImplFontCharMap();
+rFontCharMap.Reset( pNewMap );
 
 if( rFontCharMap.IsDefaultMap() )
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 extras/source/wordbook/technical.dic |   26 --
 1 file changed, 8 insertions(+), 18 deletions(-)

New commits:
commit 6f126ed6a7f375c26bfc44cb9256c0a03ad99b7b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed May 21 12:39:32 2014 +0200

remove obsolete Ubuntu names (pre 10.04 LTS)

Change-Id: I427e4318eab9ed50db882176e5542b5cb63d298b

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 9416d90..2349c9e 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -22,14 +22,12 @@ AppXRay=
 Argus=
 Asus
 AutoVue=
-Badger
 Base=
 Base24=
 BeOS=
 Bing
 Bitcoin
 BorderManager
-Breezy
 BSD=
 CADView=
 Calc=
@@ -48,7 +46,6 @@ ConsoleOne
 ConText=
 COREid=
 Corporation
-Dapper
 dBase
 Debian
 debootstrap
@@ -59,12 +56,9 @@ Docuflex=
 Documaker=
 Document
 dpkg
-Drake
 Draw=
-Edgy
 eDirectory
 Edubuntu
-Eft
 eGuide
 Electronics
 Etch
@@ -72,9 +66,7 @@ Ethernet
 Evolution
 Exadata=
 Facebook
-Fawn
 Fedora=
-Feisty
 Firebird
 Firefox
 FLAC
@@ -85,7 +77,6 @@ FreeBSD
 Fujitsu
 gcc
 gcj
-Gibbon
 GIF
 gij
 GNOME
@@ -93,18 +84,14 @@ GNU
 Google
 GPS
 GroupWise
-Gutsy
 Hardy
-Hedgehog
 Heron
 Hewlett-Packard
 Hi-Fi
 Hitachi
-Hoary
 HP
 HP/UX=
 HTML
-Ibex
 IBM
 iChain
 Identi.ca
@@ -112,17 +99,12 @@ iFolder
 iManager
 Impress=
 Intel
-Intrepid
 iOS
 iPrint
-Jackalope
-Jaunty
 JavaScript
 JPEG
-Karmic
 KDE
 Kerberos
-Koala
 Kubuntu
 Launchpad
 LDAP
commit c37fdd65021ab1f64aa05f83fd62fcf97088cc95
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed May 21 12:34:20 2014 +0200

add current Ubuntu release names

Change-Id: Ia84e758ca598d506c9bdae524afff0421f68be81

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 3f88b46..9416d90 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -171,6 +171,7 @@ Opera
 Optronics
 Oracle=
 Panasonic
+Pangolin
 PayPal
 PeopleSoft=
 Plug-in
@@ -178,16 +179,19 @@ PNG
 PolyServe
 POP3
 PostgreSQL
+Precise
 PPPoE
 Quanta
 RHEL=
 Rosetta
 RosettaNet=
 rpm
+Salamander
 Samba
 Samsung
 SAP
 Sarge
+Saucy
 Satmetrix=
 SecretStore
 SecureLogin
@@ -211,14 +215,18 @@ SunHSI=
 SunOS=
 SunSAI=
 SUSE
+Tahr
 TeliaSonera
 The
 Thunderbird
 Toshiba
 TrueType
+Trusty
 Twitter
 Ubuntu
 uname
+Unicorn
+Utopic
 URL
 Visa
 VoIP=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 extras/source/wordbook/technical.dic |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e1d90b31f640f5ddd781b13f53c6f61dc85b68ec
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed May 21 12:43:57 2014 +0200

add Debian Jessie

Change-Id: I94473904747593714998ed159a304417060d691d

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 2349c9e..699cf73 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -102,6 +102,7 @@ Intel
 iOS
 iPrint
 JavaScript
+Jessie
 JPEG
 KDE
 Kerberos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/source/core/api/token.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 636581bf87e2a792672845d7c945f1b22a22ffdb
Author: Eike Rathke er...@redhat.com
Date:   Wed May 21 12:45:24 2014 +0200

most certainly == was meant

Change-Id: I1b0833daa576cd8603421e1036b8773badc8c775

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 30b0e16..5309a40 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -690,7 +690,7 @@ void FormulaTokenArray::Assign( const FormulaTokenArray r )
 /// Optimisiation for efficiently creating StringXML placeholders
 void FormulaTokenArray::Assign( sal_uInt16 nCode, FormulaToken **pTokens )
 {
-assert( nLen = 0 );
+assert( nLen == 0 );
 assert( pCode == NULL );
 
 nLen = nCode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 extras/source/wordbook/technical.dic |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 46f1a5a7de28c75a8e977909d7f6e91a22875e0c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed May 21 12:47:36 2014 +0200

also add Unity and Systemd

Change-Id: I941c1f651f7b1a4478c50a9047993da881ebfd70

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 699cf73..e255bc4 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -198,6 +198,7 @@ SunHSI=
 SunOS=
 SunSAI=
 SUSE
+Systemd
 Tahr
 TeliaSonera
 The
@@ -209,6 +210,7 @@ Twitter
 Ubuntu
 uname
 Unicorn
+Unity
 Utopic
 URL
 Visa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 connectivity/source/commontools/dbtools2.cxx |2 +-
 dbaccess/source/core/api/RowSetCache.cxx |2 +-
 formula/source/core/api/token.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f824604b5c1b480bf6680935362eb1d4617187c9
Author: Noel Grandin n...@peralex.com
Date:   Wed May 21 13:13:23 2014 +0200

fix spelling

Change-Id: I1a4d66a78549ea49649a6bed92acb44dbd8b13e2

diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index 318f572..d18fa20 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -889,7 +889,7 @@ bool isEmbeddedInDatabase( const Reference XInterface  
_rxComponent, Referenc
 }
 catch(Exception)
 {
-// not intereseted in
+// not interested in
 }
 return bIsEmbedded;
 }
diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 8abdbe5..18de7b7 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1589,7 +1589,7 @@ bool ORowSetCache::checkJoin(const Reference 
XConnection _xConnection,
 // we found only one element so it must some kind of join here
 OSQLParseNode* pJoin = 
pTableRefCommalist-getByRule(::connectivity::OSQLParseNode::qualified_join);
 if(pJoin)
-{ // we are only intereseted in qualified joins like RIGHT or LEFT
+{ // we are only interested in qualified joins like RIGHT or LEFT
 OSQLParseNode* pJoinType= pJoin-getChild(1);
 OSQLParseNode* pOuterType   = NULL;
 if(SQL_ISRULE(pJoinType,join_type)  pJoinType-count() == 2)
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 5309a40..8da6dce 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -687,7 +687,7 @@ void FormulaTokenArray::Assign( const FormulaTokenArray r )
 }
 }
 
-/// Optimisiation for efficiently creating StringXML placeholders
+/// Optimisation for efficiently creating StringXML placeholders
 void FormulaTokenArray::Assign( sal_uInt16 nCode, FormulaToken **pTokens )
 {
 assert( nLen == 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx|   16 ++
 i18nlangtag/source/languagetag/languagetag.cxx |   40 +
 include/i18nlangtag/languagetag.hxx|   16 ++
 3 files changed, 72 insertions(+)

New commits:
commit b8e8c9c471ba6974886dd624630144ef2edccb2c
Author: Eike Rathke er...@redhat.com
Date:   Wed May 21 14:14:56 2014 +0200

add unit test for static isValidBcp47() method

Change-Id: Ib234fb1d14087236d337dfe351aea941945e718c

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 93506fb..b86e263 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -586,6 +586,22 @@ void TestLanguageTag::testAllTags()
 CPPUNIT_ASSERT( uab.isIsoLocale() == false );
 CPPUNIT_ASSERT( uab.isIsoODF() == false );
 }
+
+// test static isValidBcp47() method
+{
+OUString aCanonicalized;
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( en-US, aCanonicalized) 
 aCanonicalized == en-US );
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( x-foobar, 
aCanonicalized)  aCanonicalized == x-foobar );
+CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( unreg-and-bad, 
aCanonicalized) );
+#if USE_LIBLANGTAG
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( de-Latn-DE, 
aCanonicalized)  aCanonicalized == de-DE );
+/* TODO: at least some (those we know) grandfathered tags should be
+ * recognized by the replacement code. */
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( en-GB-oed, 
aCanonicalized)  aCanonicalized == en-GB-oed );
+#else
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( de-Latn-DE, 
aCanonicalized)  aCanonicalized == de-Latn-DE );
+#endif
+}
 }
 
 static bool checkMapping( const OUString rStr1, const OUString rStr2 )
commit a6e6cc49bfbf594aa59804ee0d9751d5ff19caba
Author: Eike Rathke er...@redhat.com
Date:   Wed May 21 14:13:23 2014 +0200

add static LanguageTag::isValidBcp47()

Change-Id: I2c646b3e2f13a6fccc845ce8eb82fccee154f3c6

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 33816b3..8a96bde 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2685,4 +2685,44 @@ com::sun::star::lang::Locale 
LanguageTag::convertToLocaleWithFallback( const OUS
 return LanguageTag( rBcp47).makeFallback().getLocale( true);
 }
 
+
+// static
+bool LanguageTag::isValidBcp47( const OUString rString, OUString* 
o_pCanonicalized )
+{
+struct guard
+{
+lt_tag_t* mpLangtag;
+guard()
+{
+theDataRef::get().incRef();
+mpLangtag = lt_tag_new();
+}
+~guard()
+{
+lt_tag_unref( mpLangtag);
+theDataRef::get().decRef();
+}
+} aVar;
+
+myLtError aError;
+
+if (lt_tag_parse( aVar.mpLangtag, OUStringToOString( rString, 
RTL_TEXTENCODING_UTF8).getStr(), aError.p))
+{
+char* pTag = lt_tag_canonicalize( aVar.mpLangtag, aError.p);
+SAL_WARN_IF( !pTag, i18nlangtag, LanguageTag:isValidBcp47: could 
not canonicalize '  rString  ');
+if (pTag)
+{
+if (o_pCanonicalized)
+*o_pCanonicalized = OUString::createFromAscii( pTag);
+free( pTag);
+return true;
+}
+}
+else
+{
+SAL_INFO( i18nlangtag, LanguageTag:isValidBcp47: could not parse ' 
 rString  ');
+}
+return false;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index dcb95c6..0e12235 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -228,6 +228,8 @@ public:
 /** If this is a valid BCP 47 language tag.
 
 Always resolves an empty tag to the system locale.
+
+@seealsostatic bool isValidBcp47(const OUString)
  */
 boolisValidBcp47() const;
 
@@ -479,6 +481,20 @@ public:
  */
 static com::sun::star::lang::Locale convertToLocaleWithFallback( const 
OUString rBcp47 );
 
+/** If rString represents a valid BCP 47 language tag.
+
+Never resolves an empty tag to the system locale, in fact an empty
+string is invalid here. Does not create an instance to be registered
+with a conversion to Locale or LanguageType.
+
+@param  o_pCanonicalized
+If given and rString is a valid BCP 47 language tag, the
+canonicalized form is assigned, which may differ from the
+original string even if that was a valid tag. If rString is not
+a valid tag, nothing is assigned.
+ */
+static bool isValidBcp47( const OUString rString, OUString* 
o_pCanonicalized = NULL );
+
 /** If nLang is a 

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

[Markus Mohrhard]

 chart2/source/view/charttypes/GL3DBarChart.cxx |4 +--
 chart2/source/view/inc/GL3DRenderer.hxx|4 +--
 chart2/source/view/main/GL3DRenderer.cxx   |9 --
 include/vcl/opengl/OpenGLHelper.hxx|4 +--
 vcl/source/opengl/OpenGLHelper.cxx |   33 ++---
 5 files changed, 26 insertions(+), 28 deletions(-)

New commits:
commit 2bbcf97eb35b98da33f3aaba67cd7abc1a265c69
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:23:07 2014 +0200

fix my issues with the offscreen rendering

Change-Id: I4a2ed8a20890119220d63a6768f13365a7b5f97d

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index d36a008..5e21945 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -221,11 +221,11 @@ void GL3DBarChart::clickedAt(const Point rPos)
 {
 sal_uInt32 nId = 1;
 {
-PickingModeSetter(mpRenderer.get());
+PickingModeSetter aPickingModeSetter(mpRenderer.get());
 render();
 nId = mpRenderer-GetPixelColorFromPoint(rPos.X(), rPos.Y());
 }
-if (mpCamera)
+if (mpCamera  nId != COL_WHITE)
 mpCamera-zoom(nId);
 }
 
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
index b08e90e..c2d7b87 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -366,8 +366,8 @@ private:
 SceneBox m_SenceBox;
 
 GLuint mnPickingFbo;
-GLuint mnPickingRbo;
-GLuint mnPickingTexture;
+GLuint mnPickingRboDepth;
+GLuint mnPickingRboColor;
 };
 
 }
diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index cf75ea6..d248016 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -112,8 +112,8 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
 glDeleteBuffers(1, m_VertexBuffer);
 
 glDeleteFramebuffers(1, mnPickingFbo);
-glDeleteRenderbuffers(1, mnPickingRbo);
-glDeleteTextures(1, mnPickingTexture);
+glDeleteRenderbuffers(1, mnPickingRboDepth);
+glDeleteRenderbuffers(1, mnPickingRboColor);
 }
 
 void OpenGL3DRenderer::ShaderResources::LoadShaders()
@@ -253,7 +253,7 @@ void OpenGL3DRenderer::init()
 glBufferData(GL_ARRAY_BUFFER, sizeof(squareVertices), squareVertices, 
GL_STATIC_DRAW);
 glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo, 
mnPickingRbo, mnPickingTexture);
+OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo, 
mnPickingRboDepth, mnPickingRboColor);
 
 CHECK_GL_ERROR();
 Init3DUniformBlock();
@@ -1601,6 +1601,9 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]);
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
+static sal_Int32 i = 0;
+OUString aFileName = OUString(/home/moggi/Documents/work/shader) + 
OUString::number(i) + .png;
+OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
 
diff --git a/include/vcl/opengl/OpenGLHelper.hxx 
b/include/vcl/opengl/OpenGLHelper.hxx
index 70b1d2a..475bd72 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -32,10 +32,10 @@ public:
 
 /**
  * The caller is responsible for deleting the buffer objects identified by
- * nFramebufferId, nRenderbufferId and nTexturebufferId
+ * nFramebufferId, nRenderbufferDepthId and nRenderbufferColorId
  */
 static void createFramebuffer(long nWidth, long nHeight,
-GLuint nFramebufferId, GLuint nRenderbufferId, GLuint 
nTexturebufferId);
+GLuint nFramebufferId, GLuint nRenderbufferTextId, GLuint 
nRenderbufferColorId);
 };
 
 VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const 
glm::mat4 rMatrix);
diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index ad2506d..50d5799 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -269,36 +269,31 @@ std::ostream operator(std::ostream rStrm, const 
glm::mat4 rMatrix)
 }
 
 void OpenGLHelper::createFramebuffer(long nWidth, long nHeight,
-GLuint nFramebufferId, GLuint nRenderbufferId, GLuint 
nTexturebufferId)
+GLuint nFramebufferId, GLuint nRenderbufferDepthId, GLuint 
nRenderbufferColorId)
 {
-// create a renderbuffer
-glGenRenderbuffers(1, nRenderbufferId);
-glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferId);
+// create a renderbuffer for depth attachment
+glGenRenderbuffers(1, nRenderbufferDepthId);
+glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferDepthId);
 glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, nWidth, 

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source include/vcl vcl/source

[Markus Mohrhard]

 chart2/source/view/charttypes/GL3DBarChart.cxx |4 +--
 chart2/source/view/inc/GL3DRenderer.hxx|4 +--
 chart2/source/view/main/GL3DRenderer.cxx   |9 --
 include/vcl/opengl/OpenGLHelper.hxx|4 +--
 vcl/source/opengl/OpenGLHelper.cxx |   33 ++---
 5 files changed, 26 insertions(+), 28 deletions(-)

New commits:
commit 12dd1c3999f7784aba438df38d55c5a8bd2cad3e
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:23:07 2014 +0200

fix my issues with the offscreen rendering

Change-Id: I4a2ed8a20890119220d63a6768f13365a7b5f97d

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index d36a008..5e21945 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -221,11 +221,11 @@ void GL3DBarChart::clickedAt(const Point rPos)
 {
 sal_uInt32 nId = 1;
 {
-PickingModeSetter(mpRenderer.get());
+PickingModeSetter aPickingModeSetter(mpRenderer.get());
 render();
 nId = mpRenderer-GetPixelColorFromPoint(rPos.X(), rPos.Y());
 }
-if (mpCamera)
+if (mpCamera  nId != COL_WHITE)
 mpCamera-zoom(nId);
 }
 
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
index b08e90e..c2d7b87 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -366,8 +366,8 @@ private:
 SceneBox m_SenceBox;
 
 GLuint mnPickingFbo;
-GLuint mnPickingRbo;
-GLuint mnPickingTexture;
+GLuint mnPickingRboDepth;
+GLuint mnPickingRboColor;
 };
 
 }
diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index cf75ea6..d248016 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -112,8 +112,8 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
 glDeleteBuffers(1, m_VertexBuffer);
 
 glDeleteFramebuffers(1, mnPickingFbo);
-glDeleteRenderbuffers(1, mnPickingRbo);
-glDeleteTextures(1, mnPickingTexture);
+glDeleteRenderbuffers(1, mnPickingRboDepth);
+glDeleteRenderbuffers(1, mnPickingRboColor);
 }
 
 void OpenGL3DRenderer::ShaderResources::LoadShaders()
@@ -253,7 +253,7 @@ void OpenGL3DRenderer::init()
 glBufferData(GL_ARRAY_BUFFER, sizeof(squareVertices), squareVertices, 
GL_STATIC_DRAW);
 glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo, 
mnPickingRbo, mnPickingTexture);
+OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo, 
mnPickingRboDepth, mnPickingRboColor);
 
 CHECK_GL_ERROR();
 Init3DUniformBlock();
@@ -1601,6 +1601,9 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]);
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
+static sal_Int32 i = 0;
+OUString aFileName = OUString(/home/moggi/Documents/work/shader) + 
OUString::number(i) + .png;
+OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
 
diff --git a/include/vcl/opengl/OpenGLHelper.hxx 
b/include/vcl/opengl/OpenGLHelper.hxx
index 70b1d2a..475bd72 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -32,10 +32,10 @@ public:
 
 /**
  * The caller is responsible for deleting the buffer objects identified by
- * nFramebufferId, nRenderbufferId and nTexturebufferId
+ * nFramebufferId, nRenderbufferDepthId and nRenderbufferColorId
  */
 static void createFramebuffer(long nWidth, long nHeight,
-GLuint nFramebufferId, GLuint nRenderbufferId, GLuint 
nTexturebufferId);
+GLuint nFramebufferId, GLuint nRenderbufferTextId, GLuint 
nRenderbufferColorId);
 };
 
 VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const 
glm::mat4 rMatrix);
diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index ad2506d..50d5799 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -269,36 +269,31 @@ std::ostream operator(std::ostream rStrm, const 
glm::mat4 rMatrix)
 }
 
 void OpenGLHelper::createFramebuffer(long nWidth, long nHeight,
-GLuint nFramebufferId, GLuint nRenderbufferId, GLuint 
nTexturebufferId)
+GLuint nFramebufferId, GLuint nRenderbufferDepthId, GLuint 
nRenderbufferColorId)
 {
-// create a renderbuffer
-glGenRenderbuffers(1, nRenderbufferId);
-glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferId);
+// create a renderbuffer for depth attachment
+glGenRenderbuffers(1, nRenderbufferDepthId);
+glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferDepthId);
 glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, nWidth, 

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

[Caolán McNamara]

 desktop/Library_deploymentgui.mk  |1 
 desktop/source/deployment/gui/descedit.cxx|   74 --
 desktop/source/deployment/gui/descedit.hxx|   48 ---
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |5 -
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx |3 
 desktop/uiconfig/ui/updatedialog.ui   |   23 +
 extras/source/glade/libreoffice-catalog.xml.in|3 
 7 files changed, 10 insertions(+), 147 deletions(-)

New commits:
commit ca4a3819475da1eb6115d83b1e8e33ae4e011261
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 13:45:12 2014 +0100

lets drop the custom DescriptionEdit widget

Change-Id: Id08b364b828ccacd5c54276daf605ec4ff3fdb0a

diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 2a13cc6..ec0a836 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -56,7 +56,6 @@ endif
 $(eval $(call 
gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
 
 $(eval $(call gb_Library_add_exception_objects,deploymentgui,\
-desktop/source/deployment/gui/descedit \
 desktop/source/deployment/gui/dp_gui_autoscrolledit \
 desktop/source/deployment/gui/dp_gui_dependencydialog \
 desktop/source/deployment/gui/dp_gui_dialog2 \
diff --git a/desktop/source/deployment/gui/descedit.cxx 
b/desktop/source/deployment/gui/descedit.cxx
deleted file mode 100644
index a7fb8b4..000
--- a/desktop/source/deployment/gui/descedit.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include vcl/builder.hxx
-#include vcl/scrbar.hxx
-#include vcl/txtattr.hxx
-#include vcl/xtextedt.hxx
-
-#include descedit.hxx
-
-#include dp_gui.hrc
-
-using dp_gui::DescriptionEdit;
-
-// DescriptionEdit ---
-
-DescriptionEdit::DescriptionEdit( Window* pParent) :
-
-ExtMultiLineEdit( pParent),
-
-m_bIsVerticalScrollBarHidden( true )
-
-{
-Init();
-}
-
-
-extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDescriptionEdit(Window* 
pParent, VclBuilder::stringmap )
-{
-return new DescriptionEdit(pParent);
-}
-
-
-void DescriptionEdit::Init()
-{
-Clear();
-// no tabstop
-SetStyle( ( GetStyle()  ~WB_TABSTOP ) | WB_NOTABSTOP );
-// read-only
-SetReadOnly();
-// no cursor
-EnableCursor( false );
-}
-
-
-
-void DescriptionEdit::Clear()
-{
-SetText( OUString() );
-
-m_bIsVerticalScrollBarHidden = true;
-ScrollBar*  pVScrBar = GetVScrollBar();
-if ( pVScrBar )
-pVScrBar-Hide();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/descedit.hxx 
b/desktop/source/deployment/gui/descedit.hxx
deleted file mode 100644
index da2ee7d..000
--- a/desktop/source/deployment/gui/descedit.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
-
-#include svtools/svmedit2.hxx
-
-/// @HTML
-
-namespace dp_gui
-{
-
-class DescriptionEdit : public ExtMultiLineEdit
-{
-   

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 3 commits - formula/source include/formula sc/inc sc/source

[Eike Rathke]

 formula/source/core/api/token.cxx |   18 ++
 include/formula/tokenarray.hxx|1 +
 sc/inc/tokenarray.hxx |3 +++
 sc/source/core/data/document.cxx  |   11 ++-
 sc/source/core/tool/token.cxx |   12 
 sc/source/filter/xml/xmlcelli.cxx |   13 +++--
 6 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit a792b94fc56cb0992162e610bee7e5dbd9bd5cec
Author: Eike Rathke er...@redhat.com
Date:   Wed May 21 12:45:24 2014 +0200

most certainly == was meant

Change-Id: I1b0833daa576cd8603421e1036b8773badc8c775

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 30b0e16..5309a40 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -690,7 +690,7 @@ void FormulaTokenArray::Assign( const FormulaTokenArray r )
 /// Optimisiation for efficiently creating StringXML placeholders
 void FormulaTokenArray::Assign( sal_uInt16 nCode, FormulaToken **pTokens )
 {
-assert( nLen = 0 );
+assert( nLen == 0 );
 assert( pCode == NULL );
 
 nLen = nCode;
commit e1a120b434f42906ac066635d009f765e3eecb4a
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon May 19 20:23:07 2014 +0100

ODS load perf: transfer ownership of the ScTokenArray to save cycles.

Add API to wnsure we don't end up allocating 32k bytes of tokens
for each ScFormulaToken, as happens when you Add a token to a new
empty ScTokenArray.

Change-Id: Ib12a3065eb513243a2146ebb009fbaa650385dd9

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index c5d7da7..30b0e16 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -687,6 +687,24 @@ void FormulaTokenArray::Assign( const FormulaTokenArray r 
)
 }
 }
 
+/// Optimisiation for efficiently creating StringXML placeholders
+void FormulaTokenArray::Assign( sal_uInt16 nCode, FormulaToken **pTokens )
+{
+assert( nLen = 0 );
+assert( pCode == NULL );
+
+nLen = nCode;
+pCode = new FormulaToken*[ nLen ];
+
+for( sal_uInt16 i = 0; i  nLen; i++ )
+{
+FormulaToken *t = pTokens[ i ];
+assert( t-GetOpCode() == ocStringXML );
+pCode[ i ] = t;
+t-IncRef();
+}
+}
+
 FormulaTokenArray FormulaTokenArray::operator=( const FormulaTokenArray rArr 
)
 {
 Clear();
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 5654a31..dcc8dc9 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -82,6 +82,7 @@ protected:
 
 protected:
 voidAssign( const FormulaTokenArray );
+voidAssign( sal_uInt16 nCode, FormulaToken **pTokens );
 
 /// Also used by the compiler. The token MUST had been allocated with new!
 FormulaToken*   Add( FormulaToken* );
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index c2191a8..9538819 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -110,6 +110,9 @@ public:
 NULL if there is no pCode (which actually would be caller's fault). */
 formula::FormulaToken* MergeRangeReference( const ScAddress  rPos );
 
+/// Assign XML string placeholder to the array
+void AssignXMLString( const OUString rText, const OUString rFormulaNmsp 
);
+
 /// Assignment with references to ScToken entries (not copied!)
 ScTokenArray operator=( const ScTokenArray );
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4f4cbf6..4ac537f 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2083,6 +2083,18 @@ FormulaToken* ScTokenArray::AddColRowName( const 
ScSingleRefData rRef )
 return Add( new ScSingleRefToken( rRef, ocColRowName ) );
 }
 
+void ScTokenArray::AssignXMLString( const OUString rText, const OUString 
rFormulaNmsp )
+{
+sal_uInt16 nTokens = 1;
+FormulaToken *aTokens[2];
+
+aTokens[0] = new FormulaStringOpToken( ocStringXML, rText );
+if( !rFormulaNmsp.isEmpty() )
+aTokens[ nTokens++ ] = new FormulaStringOpToken( ocStringXML, 
rFormulaNmsp );
+
+Assign( nTokens, aTokens );
+}
+
 bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW nExtend,
 const ScAddress rPos, ScDirection eDir )
 {
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index b09f90c..4e4c552 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1362,7 +1362,6 @@ void ScXMLTableRowCellContext::PutFormulaCell( const 
ScAddress rCellPos )
 ScDocumentImport rDoc = rXMLImport.GetDoc();
 
 OUString aText = maFormula-first;
-OUString aFormulaNmsp = maFormula-second;
 
 ::boost::scoped_ptrScExternalRefManager::ApiGuard pExtRefGuard (
 new ScExternalRefManager::ApiGuard(pDoc));
@@ -1372,13 +1371,15 @@ void ScXMLTableRowCellContext::PutFormulaCell( const 
ScAddress 

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

[Caolán McNamara]

 helpers/help_hid.lst  |   10 --
 source/text/shared/01/extensionupdate.xhp |8 
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 2ef15cb93840390d9927f64bddb958ad699cb792
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 13:53:15 2014 +0100

update help ids for update extensions .ui conversion

Change-Id: If0ffb1b7eaebd8fc30f66e26c1170708b72c495a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2aa45ee..22c4081 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -972,11 +972,7 @@ HID_DBWIZ_FINISH,39058,
 HID_DBWIZ_NEXT,39056,
 HID_DBWIZ_PREVIOUS,39055,
 HID_DB_SELECTION_TLB,54845,
-HID_DEPLOYMENT_GUI_UPDATE,42786,
 HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787,
-HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES,42790,
-HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER,42788,
-HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES,42789,
 HID_DIALOG_HANGULHANJA,39883,
 HID_DID_SAVE_PACKED_XML,33368,
 HID_DLGCONVERT_CBBACK,34675,
@@ -5160,7 +5156,6 @@ dbaccess_TabPage_TP_MIGRATE,851476480,
 dbaccess_TabPage_TP_PREPARE,851443712,
 dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096,
 dbaccess_TabPage_TP_SUMMARY,851492864,
-desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106674693,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
@@ -5169,14 +5164,9 @@ desktop_Edit_TP_USER_ED_USER_INITIALS,586123283,
 desktop_Edit_TP_USER_ED_USER_LAST,586123281,
 desktop_ListBox_RID_DLG_DEPENDENCIES_RID_DLG_DEPENDENCIES_LIST,1106529794,
 desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208,
-desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
-desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231,
 desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
 desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180256268,
 
desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180256269,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CHECK_UPDATES,1106694669,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CLOSE,1106694666,
-desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282,
 desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
diff --git a/source/text/shared/01/extensionupdate.xhp 
b/source/text/shared/01/extensionupdate.xhp
index c627538..a34d16b 100644
--- a/source/text/shared/01/extensionupdate.xhp
+++ b/source/text/shared/01/extensionupdate.xhp
@@ -24,14 +24,14 @@
 /topic
 /meta
 body
-bookmark xml-lang=en-US branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATE 
id=bm_id5684377 localize=false/
+bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/UpdateDialog 
id=bm_id5684377 localize=false/
 bookmark xml-lang=en-US 
branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL id=bm_id7576525 
localize=false/
 paragraph id=hd_id9688100 role=heading xml-lang=en-US 
level=1Extension Update/paragraph
 paragraph id=par_id5084688 role=paragraph xml-lang=en-USahelp 
hid=.Click the emphCheck for Updates/emph button in the link 
href=text/shared/01/packagemanager.xhpExtension Manager/link to check for 
online updates for all installed extensions. To check for online updates for 
only the selected extension, right-click to open the context menu, then choose 
emphUpdate/emph./ahelp/paragraph
 section id=howtogetembed 
href=text/shared/00/0406.xhp#packagemanager_eu/
 /sectioncommentinsert hidden text for Exclude from this update/from all 
updates/include again, see i115834 - not needed because no Help ID 
assigned/comment
 paragraph id=par_id6401257 role=paragraph xml-lang=en-USWhen you click 
the item type=menuitemCheck for Updates/item button or choose the item 
type=menuitemUpdate/item command, the Extension Update dialog is displayed 
and the check for availability of updates starts immediately./paragraph
-bookmark xml-lang=en-US 
branch=hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS 
id=bm_id7764824 localize=false/
+bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/DESCRIPTIONS 
id=bm_id7764824 localize=false/
 paragraph id=par_id5841242 role=paragraph xml-lang=en-USahelp 
hid=.While checking for updates, you see a progress indicator. Wait for some 
messages to show up in the dialog, or click Cancel to abort the update 
check./ahelp/paragraph
 paragraph id=par_id6794030 role=paragraph xml-lang=en-USIf no updates 
are available, the message in the dialog tells you there are no updates. Close 
the dialog./paragraph
 paragraph id=par_id7096774 role=paragraph xml-lang=en-USIf updates are 
available, the updates can either be installed automatically, or you must 
respond with some action:/paragraph
@@ -46,14 +46,14 @@
 listitem
 paragraph id=par_id791039 role=paragraph xml-lang=en-USA 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 705c26a6553da5343405062c89a7c3b92aa4abd8
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 13:53:15 2014 +0100

Updated core
Project: help  2ef15cb93840390d9927f64bddb958ad699cb792

diff --git a/helpcontent2 b/helpcontent2
index fdfcaa9..2ef15cb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fdfcaa991224f6ac15fdc778e0a301b9285208eb
+Subproject commit 2ef15cb93840390d9927f64bddb958ad699cb792
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/charttypes/GL3DBarChart.cxx |   21 +++--
 chart2/source/view/main/3DChartObjects.cxx |5 +++--
 2 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit f9e8ab0ae7bc7d6eff6fe7ae9d0faa4f06ea84e3
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:48:44 2014 +0200

improve the text rendering a bit

Less scaling means more beautiful text

Change-Id: I787244a5f7a472a14f463729f8f434a4969a6285

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index c2ec371..542711a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -44,11 +44,11 @@ GL3DBarChart::~GL3DBarChart()
 
 namespace {
 
-const float TEXT_HEIGHT = 10.0f;
+const float TEXT_HEIGHT = 15.0f;
 
 float calculateTextWidth(const OUString rText)
 {
-return rText.getLength() * 5.0;
+return rText.getLength() * 7.5;
 }
 
 }
diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
index e67c25d..6edb68f 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -73,14 +73,15 @@ Text::Text(OpenGL3DRenderer* pRenderer, const OUString 
rStr, sal_uInt32 nId):
 // Convert OUString to BitmapEx.
 VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
 Font aFont = aDevice.GetFont();
+aFont.SetSize(Size(0, 96));
 aFont.SetColor(COL_BLACK);
 aDevice.SetFont(aFont);
 aDevice.Erase();
-aDevice.SetOutputSizePixel(Size(20,12));
+aDevice.SetOutputSizePixel(Size(160,96));
 aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice.DrawText(Point(0,0), rStr);
 
-maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(20,12)));
+maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(160,96)));
 }
 
 void Text::render()
commit 197e3741898a7a08d29f24f25177742a11961bc1
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:36:03 2014 +0200

we need to set text size in woorld coordinates

Change-Id: If77133080851a3b2d700ac54c9722f560e71f26e

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 5e21945..c2ec371 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -42,6 +42,17 @@ GL3DBarChart::~GL3DBarChart()
 mrWindow.setRenderer(NULL);
 }
 
+namespace {
+
+const float TEXT_HEIGHT = 10.0f;
+
+float calculateTextWidth(const OUString rText)
+{
+return rText.getLength() * 5.0;
+}
+
+}
+
 void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries 
rDataSeriesContainer,
 ExplicitCategoriesProvider rCatProvider)
 {
@@ -88,13 +99,12 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 
 maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName, 
nId++));
 opengl3D::Text* p = static_castopengl3D::Text*(maShapes.back());
-Size aTextSize = p-getSize();
 glm::vec3 aTopLeft, aTopRight, aBottomRight;
-aTopLeft.x = aTextSize.getWidth() * -1.0;
+aTopLeft.x = calculateTextWidth(aSeriesName) * -1.0;
 aTopLeft.y = nYPos;
 aTopRight.y = nYPos;
 aBottomRight = aTopRight;
-aBottomRight.y += aTextSize.getHeight();
+aBottomRight.y += TEXT_HEIGHT;
 p-setPosition(aTopLeft, aTopRight, aBottomRight);
 
 sal_Int32 nColor = aSeriesColor[nSeriesIndex % 
SAL_N_ELEMENTS(aSeriesColor)].GetColor();
@@ -164,13 +174,12 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 
 maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aCats[i], 
nId++));
 opengl3D::Text* p = static_castopengl3D::Text*(maShapes.back());
-Size aTextSize = p-getSize();
 aTopLeft.x = nXPos;
 aTopLeft.y = nYPos;
 aTopRight = aTopLeft;
-aTopRight.x += aTextSize.getWidth();
+aTopRight.x += calculateTextWidth(aCats[i]);
 aBottomRight = aTopRight;
-aBottomRight.y += aTextSize.getHeight();
+aBottomRight.y += TEXT_HEIGHT;
 p-setPosition(aTopLeft, aTopRight, aBottomRight);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/charttypes/GL3DBarChart.cxx |   21 +++--
 chart2/source/view/main/3DChartObjects.cxx |5 +++--
 2 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 1225fc104708d0d3b10233e19008f9a923ff5f90
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:48:44 2014 +0200

improve the text rendering a bit

Less scaling means more beautiful text

Change-Id: I787244a5f7a472a14f463729f8f434a4969a6285

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index c2ec371..542711a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -44,11 +44,11 @@ GL3DBarChart::~GL3DBarChart()
 
 namespace {
 
-const float TEXT_HEIGHT = 10.0f;
+const float TEXT_HEIGHT = 15.0f;
 
 float calculateTextWidth(const OUString rText)
 {
-return rText.getLength() * 5.0;
+return rText.getLength() * 7.5;
 }
 
 }
diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
index e67c25d..6edb68f 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -73,14 +73,15 @@ Text::Text(OpenGL3DRenderer* pRenderer, const OUString 
rStr, sal_uInt32 nId):
 // Convert OUString to BitmapEx.
 VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
 Font aFont = aDevice.GetFont();
+aFont.SetSize(Size(0, 96));
 aFont.SetColor(COL_BLACK);
 aDevice.SetFont(aFont);
 aDevice.Erase();
-aDevice.SetOutputSizePixel(Size(20,12));
+aDevice.SetOutputSizePixel(Size(160,96));
 aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice.DrawText(Point(0,0), rStr);
 
-maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(20,12)));
+maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(160,96)));
 }
 
 void Text::render()
commit addc7e821fae471f2228af668791a19ee386fe30
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 14:36:03 2014 +0200

we need to set text size in woorld coordinates

Change-Id: If77133080851a3b2d700ac54c9722f560e71f26e

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 5e21945..c2ec371 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -42,6 +42,17 @@ GL3DBarChart::~GL3DBarChart()
 mrWindow.setRenderer(NULL);
 }
 
+namespace {
+
+const float TEXT_HEIGHT = 10.0f;
+
+float calculateTextWidth(const OUString rText)
+{
+return rText.getLength() * 5.0;
+}
+
+}
+
 void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries 
rDataSeriesContainer,
 ExplicitCategoriesProvider rCatProvider)
 {
@@ -88,13 +99,12 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 
 maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName, 
nId++));
 opengl3D::Text* p = static_castopengl3D::Text*(maShapes.back());
-Size aTextSize = p-getSize();
 glm::vec3 aTopLeft, aTopRight, aBottomRight;
-aTopLeft.x = aTextSize.getWidth() * -1.0;
+aTopLeft.x = calculateTextWidth(aSeriesName) * -1.0;
 aTopLeft.y = nYPos;
 aTopRight.y = nYPos;
 aBottomRight = aTopRight;
-aBottomRight.y += aTextSize.getHeight();
+aBottomRight.y += TEXT_HEIGHT;
 p-setPosition(aTopLeft, aTopRight, aBottomRight);
 
 sal_Int32 nColor = aSeriesColor[nSeriesIndex % 
SAL_N_ELEMENTS(aSeriesColor)].GetColor();
@@ -164,13 +174,12 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 
 maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aCats[i], 
nId++));
 opengl3D::Text* p = static_castopengl3D::Text*(maShapes.back());
-Size aTextSize = p-getSize();
 aTopLeft.x = nXPos;
 aTopLeft.y = nYPos;
 aTopRight = aTopLeft;
-aTopRight.x += aTextSize.getWidth();
+aTopRight.x += calculateTextWidth(aCats[i]);
 aBottomRight = aTopRight;
-aBottomRight.y += aTextSize.getHeight();
+aBottomRight.y += TEXT_HEIGHT;
 p-setPosition(aTopLeft, aTopRight, aBottomRight);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 desktop/source/inc/helpid.hrc |4 
 1 file changed, 4 deletions(-)

New commits:
commit b1439cf5de00d9af4b766347b749fed894ad796b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 13:48:53 2014 +0100

drop unused helpids

Change-Id: I35fd20220a206fbe9cbc9eed9670b59e4051ae11

diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index eec32c3..8efa1fe 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
-#define HID_DEPLOYMENT_GUI_UPDATE  
DESKTOP_HID_DEPLOYMENT_GUI_UPDATE
 #define HID_DEPLOYMENT_GUI_UPDATEINSTALL   
DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL
-#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER
DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER
-#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES 
DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES
-#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES
DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES
 
 #define HID_EXTENSION_MANAGER_LISTBOX  
DESKTOP_HID_EXTENSION_MANAGER_LISTBOX
 #define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS  
DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - postprocess/CustomTarget_registry.mk

[Maxim Monastirsky]

 postprocess/CustomTarget_registry.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0c16a3cea9845c37b5cc73da44e8a55d6ad30eea
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Mon May 19 08:53:16 2014 +0300

fdo#78815 Fix report builder toolbox controller

Change-Id: Iecbf84b29500729e228d22c8e50b119d1fb471c5
(cherry picked from commit 214de0e5124b44df0f37fdf89271a527667590dc)
Reviewed-on: https://gerrit.libreoffice.org/9422
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index afa7065..6f190da 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -396,7 +396,8 @@ postprocess_FILES_reportbuilder := \
$(postprocess_MOD)/org/openoffice/Setup-reportbuilder.xcu \
$(postprocess_MOD)/org/openoffice/Office/Accelerators-reportbuilder.xcu 
\
$(postprocess_MOD)/org/openoffice/Office/DataAccess-reportbuilder.xcu \
-   $(postprocess_MOD)/org/openoffice/Office/Embedding-reportbuilder.xcu
+   $(postprocess_MOD)/org/openoffice/Office/Embedding-reportbuilder.xcu \
+   $(postprocess_MOD)/org/openoffice/Office/UI/Controller-reportbuilder.xcu
 endif
 
 postprocess_DEPS_writer := main
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/source/core/uibase/app/docstyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e142ad49cee072e88ab47d6caa64adfa6df7d9fa
Author: Noel Grandin n...@peralex.com
Date:   Wed May 21 14:55:15 2014 +0200

cid#708875 Unused pointer value

Change-Id: I0cf85027a84482fd504b753bfc32ceb1c07241b4

diff --git a/sw/source/core/uibase/app/docstyle.cxx 
b/sw/source/core/uibase/app/docstyle.cxx
index 500bc59..848649c 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -1338,7 +1338,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet rSet,
 sal_uInt16 nPoolId = 
SwStyleNameMapper::GetPoolIdFromUIName( sNumRule, 
nsSwGetPoolIdFromName::GET_POOLID_NUMRULE );
 if( USHRT_MAX != nPoolId ) // It's a standard 
numbering rule
 {
-pRule = rDoc.GetNumRuleFromPool( nPoolId ); // 
Create numbering rule (physical)
+rDoc.GetNumRuleFromPool( nPoolId ); // Create 
numbering rule (physical)
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/apache-commons RepositoryExternal.mk swext/Extension_wiki-publisher.mk

[Douglas Mencken]

 RepositoryExternal.mk|   14 
+++--
 config_host.mk.in|1 
 configure.ac |   28 
--
 download.lst |   10 ++-
 external/apache-commons/ExternalProject_apache_commons_httpclient.mk |5 +
 swext/Extension_wiki-publisher.mk|   10 ++-
 6 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit 7e4708739dd7a4d9db3a093a9f36d95f0192e639
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Tue May 20 12:55:56 2014 -0400

care for Java 1.5 support in external packages

apache commons-lang 3.3.1 and commons-codec 1.9 are for use
only with JDK 1.6 and higher

see commits:
  1731f6e692bb0a07a2bca4b1b190163f209d2b9e bump apache-commons-lang to 
3.3.1
  3dad9b1019bebcc6db63a424afa146e007f768d2 bump apache-commons-codec to 
1.9

Change-Id: I3e71f6474becafe6c91836bbac5c6a8b7ca3442c
Reviewed-on: https://gerrit.libreoffice.org/9312
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e1a3a9e..2db4c38 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3252,14 +3252,17 @@ $(eval $(call 
gb_Helper_register_jars_for_install,OOO,reportbuilder,\
 ))
 endif
 $(eval $(call gb_Helper_register_jars,OXT,\
-   commons-codec-1.9 \
+   $(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9,commons-codec-1.6) \
commons-httpclient-3.1 \
-   commons-lang3-3.3.1.jar \
+   $(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4) \
 ))
 
 define gb_Jar__use_commons-codec
 $(call gb_Jar_use_external_project,$(1),apache_commons_codec)
-$(call gb_Jar_use_external_jar,$(1),$(call 
gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar,commons-codec-1.9.jar)
+$(call gb_Jar_use_external_jar,$(1),$(call 
gb_UnpackedTarball_get_dir,apache_commons_codec)\
+$(if $(filter 
TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6.jar),\
+$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar)\
+)
 endef
 define gb_ExternalProject__use_commons-codec
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
@@ -3275,7 +3278,10 @@ endef
 
 define gb_Jar__use_commons-lang
 $(call gb_Jar_use_external_project,$(1),apache_commons_lang)
-$(call gb_Jar_use_external_jar,$(1),$(call 
gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.jar,commons-lang3-3.3.1.jar)
+$(call gb_Jar_use_external_jar,$(1),$(call 
gb_UnpackedTarball_get_dir,apache_commons_lang)\
+$(if $(filter 
TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar),\
+$(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar)\
+)
 endef
 define gb_ExternalProject__use_commons-lang
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
diff --git a/config_host.mk.in b/config_host.mk.in
index ca57978..b287539 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -247,6 +247,7 @@ export HAVE_GCC_PRAGMA_OPERATOR=@HAVE_GCC_PRAGMA_OPERATOR@
 export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
 export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
+export HAVE_JAVA6=@HAVE_JAVA6@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export 
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
diff --git a/configure.ac b/configure.ac
index 96259be..ad9be02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6874,6 +6874,7 @@ if test $ENABLE_JAVA != ; then
 fi
 fi
 
+HAVE_JAVA6=
 dnl ===
 dnl Checks for JDK.
 dnl ===
@@ -6907,6 +6908,9 @@ if test $ENABLE_JAVA != ; then
 if test $_jdk_ver -lt 10500; then
 AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
 fi
+if test $_jdk_ver -ge 10600; then
+HAVE_JAVA6=TRUE
+fi
 
 AC_MSG_RESULT([checked (IBM JDK $_jdk)])
 
@@ -6930,6 +6934,9 @@ you must use the --with-jdk-home configure option 
explicitly])
 if test $_jdk_ver -gt 10600; then
 JAVA_CLASSPATH_NOT_SET=1
 fi
+if test $_jdk_ver -ge 10600; then
+HAVE_JAVA6=TRUE
+fi
 
 AC_MSG_RESULT([checked (JDK $_jdk)])
 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n s,//*bin//*java,,p`
@@ -6944,6 +6951,7 @@ else
 dnl Java disabled
 JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi

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

[Michael Stahl]

 include/svx/relfld.hxx|3 ++-
 include/vcl/builder.hxx   |2 ++
 svx/source/dialog/relfld.cxx  |   13 ++---
 vcl/source/window/builder.cxx |6 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit ae25bede31aba18d7fa0ed90050f6e82f0507514
Author: Michael Stahl mst...@redhat.com
Date:   Tue May 20 16:20:42 2014 +0200

SvxRelativeField: set the unit from the passed stringmap

In the Paragraph Indents  Spacing tab there are fields with unit:
object class=svxlo-SvxRelativeField id=spinED_LEFTINDENT:0cm

But the unit is effectively ignored, and the resulting SvxRelativeField
with FUNIT_NONE and  max somehow results in 0.18cm max when the
dialog sets cm as unit.

(cherry picked from commit 68bc8af6b6c4d0399bd10ed450d81aa2f17931a1)

Conflicts:
svx/source/dialog/relfld.cxx

Change-Id: I6001c93079fd7d899f1e119913b29ea4898b1c34
Reviewed-on: https://gerrit.libreoffice.org/9416
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 80fa2c4..c9fbe41 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_RELFLD_HXX
 #define INCLUDED_SVX_RELFLD_HXX
 
+#include tools/fldunit.hxx
 #include vcl/field.hxx
 #include svx/svxdllapi.h
 
@@ -39,7 +40,7 @@ protected:
 voidModify();
 
 public:
-SvxRelativeField( Window* pParent, WinBits nBits);
+SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit eUnit);
 
 voidEnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax 
= 150,
 sal_uInt16 nStep = 5 );
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 8cd25a0..e975534 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -13,6 +13,7 @@
 #include typeinfo
 #include osl/module.hxx
 #include tools/resmgr.hxx
+#include tools/fldunit.hxx
 #include vcl/dllapi.h
 #include vcl/window.hxx
 #include xmlreader/xmlreader.hxx
@@ -293,6 +294,7 @@ public:
 static OString convertMnemonicMarkup(const OString rIn);
 
 static OString extractCustomProperty(stringmap rMap);
+static FieldUnit detectUnit(OString const);
 
 static bool extractDropdown(stringmap rMap);
 
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 67a4a59..52479b5 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -22,21 +22,28 @@
 
 // ---
 
-SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits) :
+SvxRelativeField::SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit 
const eUnit)
+:
 MetricField( pParent, nBits)
 {
 bNegativeEnabled = sal_False;
 bRelativeMode = sal_False;
 bRelative = sal_False;
 
+SetUnit(eUnit);
 SetDecimalDigits( 2 );
 SetMin( 0 );
 SetMax(  );
 }
 
-extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window 
*pParent, VclBuilder::stringmap )
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
+makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap  rMap)
 {
-return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | 
WB_LEFT | WB_GROUP);
+OString const custom(VclBuilder::extractCustomProperty(rMap));
+FieldUnit const eUnit(VclBuilder::detectUnit(custom));
+SvxRelativeField *const pRet = new SvxRelativeField(pParent,
+WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP, eUnit);
+return pRet;
 }
 // ---
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 577eb86..d97d1d6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -884,6 +884,12 @@ namespace
 }
 }
 
+FieldUnit VclBuilder::detectUnit(OString const rString)
+{
+OString const unit(extractUnit(rString));
+return detectMetricUnit(unit);
+}
+
 void VclBuilder::ensureDefaultWidthChars(VclBuilder::stringmap rMap)
 {
 OString sWidthChars(width-chars);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 avmedia/source/framework/modeltools.cxx |   20 ++--
 sd/source/ui/view/sdview4.cxx   |6 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit d1711bb430b68e2a0ac2eb86efc998cf6a152b4a
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Tue May 20 16:46:43 2014 +0200

glTF embedding: handle missing image on a better way

Using empty tree leads to empty image url which
cause problem.

Change-Id: If815ce588fb303905035185404ede93fa424fcba

diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 2366dc7..66a95b3 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -25,6 +25,7 @@
 #include boost/property_tree/ptree.hpp
 #include boost/property_tree/json_parser.hpp
 #include boost/foreach.hpp
+#include boost/optional.hpp
 
 #ifdef ENABLE_COLLADA2GLTF
 #include COLLADA2GLTFWriter.h
@@ -71,7 +72,7 @@ static void lcl_EmbedExternals(const OUString rSourceURL, 
uno::Referenceembed:
 
 // Parse json, read externals' URI and modify this relative URI's so they 
remain valid in the new context.
 std::vectorstd::string vExternals;
-ptree aTree, aEmptyTree;
+ptree aTree;
 try
 {
 json_parser::read_json( sUrl, aTree );
@@ -85,12 +86,19 @@ static void lcl_EmbedExternals(const OUString rSourceURL, 
uno::Referenceembed:
 aTree.put(buffers. + rVal.first + 
.path.,sBufferUri.substr(sBufferUri.find_last_of('/')+1));
 }
 // Images for textures
-BOOST_FOREACH(ptree::value_type rVal,aTree.get_child(images, 
aEmptyTree))
+boost::optional ptree  aImages = aTree.get_child_optional(images);
+if( aImages )
 {
-const std::string sImageUri(rVal.second.getstd::string(path));
-vExternals.push_back(sImageUri);
-// Change path: make it contain only a file name
-aTree.put(images. + rVal.first + 
.path.,sImageUri.substr(sImageUri.find_last_of('/')+1));
+BOOST_FOREACH(ptree::value_type rVal,aImages.get())
+{
+const std::string 
sImageUri(rVal.second.getstd::string(path));
+if( !sImageUri.empty() )
+{
+vExternals.push_back(sImageUri);
+// Change path: make it contain only a file name
+aTree.put(images. + rVal.first + 
.path.,sImageUri.substr(sImageUri.find_last_of('/')+1));
+}
+}
 }
 // Shaders (contains names only)
 BOOST_FOREACH(ptree::value_type rVal,aTree.get_child(programs))
commit ee734562dfb36ed1025bfe8a4bfd4eece2c53533
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon May 19 18:39:02 2014 +0200

glTF objects: set playback loop by default

Change-Id: I17f5636196ba2b14f46f805ce013af5e6bede9a8

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 2802435..c14465d 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -307,7 +307,11 @@ SdrMediaObj* View::Insert3DModelURL(
 if (!bRet) { return 0; }
 }
 
-return InsertMediaObj( sRealURL, application/vnd.gltf+json, rAction, 
rPos, rSize );
+SdrMediaObj* pRetObject = InsertMediaObj( sRealURL, 
application/vnd.gltf+json, rAction, rPos, rSize );
+avmedia::MediaItem aItem = pRetObject-getMediaProperties();
+aItem.setLoop(true);
+pRetObject-setMediaProperties(aItem);
+return pRetObject;
 }
 
 SdrMediaObj* View::InsertMediaObj( const OUString rMediaURL, const OUString 
rMimeType, sal_Int8 rAction,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 18 commits - filter/source include/tools sfx2/source svx/source tools/source vcl/source vcl/unx

[Stephan Bergmann]

 filter/source/svg/svgfilter.cxx   |4 +-
 filter/source/svg/svgimport.cxx   |4 +-
 include/tools/zcodec.hxx  |   61 +++---
 sfx2/source/doc/docmacromode.cxx  |2 -
 svx/source/xml/xmlgrhlp.cxx   |2 -
 tools/source/zcodec/zcodec.cxx|   59 
 vcl/source/filter/graphicfilter.cxx   |8 ++--
 vcl/source/gdi/pdfwriter_impl.cxx |   19 +-
 vcl/source/gdi/pngread.cxx|   16 +++-
 vcl/source/gdi/pngwrite.cxx   |   33 +++---
 vcl/unx/generic/printer/ppdparser.cxx |   12 +-
 11 files changed, 77 insertions(+), 143 deletions(-)

New commits:
commit 1b0402f87c9b17fef2141130bfaa1798ece6ba0d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 14:55:40 2014 +0200

Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 2108d19..4d4ae52 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -342,7 +342,7 @@ namespace sfx2
 if( aElement == aStdLibName || aElement == 
aVBAProject )
 {
 Reference  XNameAccess  xLib;
-Any aAny = xContainer-getByName( aStdLibName 
);
+Any aAny = xContainer-getByName( aElement );
 aAny = xLib;
 if ( xLib.is()  xLib-hasElements() )
 return true;
commit 4d2113250fa7ed62fe2c53ed0f76e3de5875cb81
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 14:33:20 2014 +0200

ZCodec::UpdateCRC is private

Change-Id: I2103f8a323d0454bdd1c779aadb99889ae1cf6e5

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 97f3ad0..5dc6723 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -50,6 +50,8 @@ private:
 voidImplInitBuf( bool nIOFlag );
 voidImplWriteBack();
 
+voidUpdateCRC( sal_uInt8* pSource, long nDatSize );
+
 public:
 ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf 
= 0x8000UL );
 ~ZCodec();
@@ -67,7 +69,6 @@ public:
 voidSetBreak( sal_uIntPtr );
 sal_uIntPtr GetBreak();
 voidSetCRC( sal_uIntPtr nCurrentCRC );
-sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, 
long nDatSize );
 sal_uIntPtr GetCRC();
 };
 
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index a672e76..23abb0b 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -159,7 +159,7 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm )
 mnInToRead -= nInToRead;
 
 if ( mbUpdateCrc )
-mnCRC = UpdateCRC( mnCRC, mpInBuf, nInToRead );
+UpdateCRC( mpInBuf, nInToRead );
 
 }
 err = inflate( PZSTREAM, Z_NO_FLUSH );
@@ -228,7 +228,7 @@ long ZCodec::Read( SvStream rIStm, sal_uInt8* pData, 
sal_uIntPtr nSize )
 mnInToRead -= nInToRead;
 
 if ( mbUpdateCrc )
-mnCRC = UpdateCRC( mnCRC, mpInBuf, nInToRead );
+UpdateCRC( mpInBuf, nInToRead );
 
 }
 err = inflate( PZSTREAM, Z_NO_FLUSH );
@@ -282,7 +282,7 @@ long ZCodec::ReadAsynchron( SvStream rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 mnInToRead -= nInToRead;
 
 if ( mbUpdateCrc )
-mnCRC = UpdateCRC( mnCRC, mpInBuf, nInToRead );
+UpdateCRC( mpInBuf, nInToRead );
 
 }
 err = inflate( PZSTREAM, Z_NO_FLUSH );
@@ -309,7 +309,7 @@ void ZCodec::ImplWriteBack()
 if ( nAvail )
 {
 if ( mbInit  2  mbUpdateCrc )
-mnCRC = UpdateCRC( mnCRC, mpOutBuf, nAvail );
+UpdateCRC( mpOutBuf, nAvail );
 mpOStm-Write( PZSTREAM-next_out = mpOutBuf, nAvail );
 PZSTREAM-avail_out = mnOutBufSize;
 }
@@ -408,9 +408,9 @@ void ZCodec::ImplInitBuf ( bool nIOFlag )
 }
 }
 
-sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, 
long nDatSize)
+void ZCodec::UpdateCRC ( sal_uInt8* pSource, long nDatSize)
 {
-return rtl_crc32( nLatestCRC, pSource, nDatSize );
+mnCRC = rtl_crc32( mnCRC, pSource, nDatSize );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b928cfb512800e6bf947490a42af2e4ce6d6d6f2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 14:30:59 2014 +0200

Remove unused ZCodec::IsFinished

Change-Id: I9741daf288c11dc8e0f0ad2f64e934e814c3ef8a

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 4644433..97f3ad0 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -56,7 +56,6 @@ 

[Libreoffice-commits] core.git: 5 commits - avmedia/source download.lst external/libgltf vcl/source

[Jan Holesovsky]

 avmedia/source/framework/modeltools.cxx  |6 
 avmedia/source/opengl/oglframegrabber.cxx|2 
 avmedia/source/opengl/oglwindow.cxx  |   10 -
 download.lst |2 
 external/libgltf/StaticLibrary_libgltf.mk|3 
 external/libgltf/UnpackedTarball_libgltf.mk  |   11 -
 external/libgltf/patches/avoid_c++11_copy_filestream.patch   |   12 -
 external/libgltf/patches/constify_for_temporaries.patch  |   24 --
 external/libgltf/patches/disable_fps.patch   |   31 +++
 external/libgltf/patches/extern-C.patch  |   20 --
 external/libgltf/patches/fmod_error_handling.patch   |   22 --
 external/libgltf/patches/get_bitmap_new_syntax.patch |   69 ---
 external/libgltf/patches/include_path_freetype.patch |7 
 external/libgltf/patches/include_path_glew.patch |   19 +-
 external/libgltf/patches/remove_extra_include.patch  |   11 -
 external/libgltf/patches/shader_charbuffer_used_as_cstring.patch |   94 
--
 external/libgltf/patches/typedef_used_as_struct.patch|   14 -
 external/libgltf/patches/unneeded_context_handling.patch |   18 -
 external/libgltf/patches/win_only_variables.patch|   13 -
 vcl/source/opengl/OpenGLContext.cxx  |2 
 20 files changed, 59 insertions(+), 331 deletions(-)

New commits:
commit 663c6800ca8789e1830ced9c93dadb84223e1c57
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue May 20 09:37:47 2014 +0200

collada2gltf: Ignore case of the extension.

Change-Id: If7f39a1a0537c561373137e6a9dcdb22b48037f0

diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 66a95b3..c3fa11e 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -148,7 +148,9 @@ bool Embed3DModel( const uno::Referenceframe::XModel 
xModel,
 {
 OUString sSource = rSourceURL;
 #ifdef ENABLE_COLLADA2GLTF
-if (rSourceURL.endsWith(.dae) || rSourceURL.endsWith(.kmz))
+const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(.dae);
+const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(.kmz);
+if (bIsDAE || bIsKMZ)
 {
 OUString sName;
 
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
 sName);
@@ -160,7 +162,7 @@ bool Embed3DModel( const uno::Referenceframe::XModel 
xModel,
 std::shared_ptr GLTF::GLTFAsset asset(new GLTF::GLTFAsset());
 asset-setInputFilePath(sSourcePath);
 
-if (rSourceURL.endsWith(.kmz))
+if (bIsKMZ)
 {
 std::string strDaeFilePath = 
GLTF::Kmz2Collada()(asset-getInputFilePath());
 if (strDaeFilePath == )
commit 2fa2e6db1c897d3605aca7da6b42a0b3b9155763
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue May 20 01:05:12 2014 +0200

gltf: Send delta when rotating, not absolute value.

Change-Id: I2453132fedc9a38f43c3de4b110459ba7771d085

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index a3e5623..7bdc9f7 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -300,13 +300,19 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 if(pMouseEvt  pMouseEvt-IsLeft())
 {
 const Point aCurPos = pMouseEvt-GetPosPixel();
+float fSensitivity = std::min(m_pHandle-viewport.width, 
m_pHandle-viewport.height);
+if (fSensitivity == 0.0)
+fSensitivity = 1.0;
+else
+fSensitivity = 540.0 / fSensitivity;
 
 long nDeltaX = m_aLastMousePos.X()-aCurPos.X();
 long nDeltaY = aCurPos.Y()-m_aLastMousePos.Y();
-static const float fSensitivity = 1.0;
 // TODO: It seems this method just moves the camera but not rotate 
it.
 
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,0.0);
 update();
+
+m_aLastMousePos = aCurPos;
 }
 }
 return 0;
commit f72d85e6fadfc66b80313d662ce3a938ed59aecf
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon May 19 22:04:25 2014 +0200

Avoid blinking when doing operations in the spreadsheets.

Change-Id: I31d24ef32ef4bb9ea4b57d596cccd269d07d91ec

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 649269d..fb3bd72 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -601,7 +601,7 @@ bool OpenGLContext::initWindow()
 if( m_pChildWindow )
 {
 m_pChildWindow-SetMouseTransparent( true );
-m_pChildWindow-SetParentClipMode( PARENTCLIPMODE_NOCLIP );
+

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

[Tor Lillqvist]

 vcl/inc/generic/glyphcache.hxx |   54 +++--
 1 file changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 6e38357d5d8aee5204f8671ec7f363d769b4329c
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 15:25:29 2014 +0300

Cosmetics

Change-Id: I4ad71bd3538b1d5b033802469b16dd35df5b9724

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 7cd7bba..c0eb98d 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -20,48 +20,36 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 #define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
-#include vcl/dllapi.h
+#include config_graphite.h
 
-class GlyphCache;
-class GlyphMetric;
-class GlyphData;
-class ServerFont;
-class GlyphCachePeer;
-class ServerFontLayoutEngine;
-class ServerFontLayout;
-class ImplFontOptions;
-class PhysicalFontCollection;
+#include ft2build.h
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include tools/gen.hxx
-#include basebmp/bitmapdevice.hxx
-#include boost/unordered_map.hpp
-#include boost/unordered_set.hpp
 #include boost/shared_ptr.hpp
-#include com/sun/star/i18n/XBreakIterator.hpp
-
-namespace basegfx { class B2DPolyPolygon; }
+#include boost/unordered_map.hpp
 
-class RawBitmap;
+#include basebmp/bitmapdevice.hxx
+#include com/sun/star/i18n/XBreakIterator.hpp
+#include tools/gen.hxx
+#include vcl/dllapi.h
 
 #include outfont.hxx
 #include impfont.hxx
-
-class ServerFontLayout;
 #include sallayout.hxx
 
-#include config_graphite.h
-#if ENABLE_GRAPHITE
+class FtFontInfo;
+class GlyphCachePeer;
+class GlyphData;
 class GraphiteFaceWrapper;
-#endif
-
-#include ft2build.h
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-namespace vcl
-{
-struct FontCapabilities;
-}
+class ImplFontOptions;
+class PhysicalFontCollection;
+class RawBitmap;
+class ServerFont;
+class ServerFontLayout;
+class ServerFontLayoutEngine;
+namespace basegfx { class B2DPolyPolygon; }
+namespace vcl { struct FontCapabilities; }
 
 class VCL_DLLPUBLIC GlyphCache
 {
@@ -173,8 +161,6 @@ private:
 mutable longmnLruValue;
 };
 
-class FtFontInfo;
-
 class VCL_DLLPUBLIC ServerFont
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/main/3DChartObjects.cxx |8 ++--
 chart2/source/view/main/GL3DRenderer.cxx   |1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 31e32d3624971ba7dc9e17b7c78effd6c3c59ffa
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:04:43 2014 +0200

remove debug output

Change-Id: Ib77911177ec4d2f5b1f7c7ff75db30b6104f0682

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index d248016..e26cafe 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1602,7 +1602,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
 static sal_Int32 i = 0;
-OUString aFileName = OUString(/home/moggi/Documents/work/shader) + 
OUString::number(i) + .png;
 OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
commit 6fd54c8e34de3a24604be428fc68ea255167a88c
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:03:59 2014 +0200

improve the text rendering a little bit more

Change-Id: I7662b77df94c439678d17fe31e611272d1802981

diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
index 6edb68f..d9c0724 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -75,13 +75,17 @@ Text::Text(OpenGL3DRenderer* pRenderer, const OUString 
rStr, sal_uInt32 nId):
 Font aFont = aDevice.GetFont();
 aFont.SetSize(Size(0, 96));
 aFont.SetColor(COL_BLACK);
+::Rectangle aRect;
 aDevice.SetFont(aFont);
 aDevice.Erase();
-aDevice.SetOutputSizePixel(Size(160,96));
+aDevice.GetTextBoundRect(aRect, rStr);
+Size aSize = aRect.GetSize();
+aSize.Height() *= 2;
+aDevice.SetOutputSizePixel(aSize);
 aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice.DrawText(Point(0,0), rStr);
 
-maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(160,96)));
+maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), aSize));
 }
 
 void Text::render()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/3DChartObjects.cxx |8 ++--
 chart2/source/view/main/GL3DRenderer.cxx   |1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5b9a2e6503995b1776fe1ae4ec5a0d62f7a2243a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:04:43 2014 +0200

remove debug output

Change-Id: Ib77911177ec4d2f5b1f7c7ff75db30b6104f0682

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index d248016..e26cafe 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1602,7 +1602,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
 static sal_Int32 i = 0;
-OUString aFileName = OUString(/home/moggi/Documents/work/shader) + 
OUString::number(i) + .png;
 OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
commit 99d569c0e2ac4c2f3e5e97f78daf60f83d96fdad
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:03:59 2014 +0200

improve the text rendering a little bit more

Change-Id: I7662b77df94c439678d17fe31e611272d1802981

diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
index 6edb68f..d9c0724 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -75,13 +75,17 @@ Text::Text(OpenGL3DRenderer* pRenderer, const OUString 
rStr, sal_uInt32 nId):
 Font aFont = aDevice.GetFont();
 aFont.SetSize(Size(0, 96));
 aFont.SetColor(COL_BLACK);
+::Rectangle aRect;
 aDevice.SetFont(aFont);
 aDevice.Erase();
-aDevice.SetOutputSizePixel(Size(160,96));
+aDevice.GetTextBoundRect(aRect, rStr);
+Size aSize = aRect.GetSize();
+aSize.Height() *= 2;
+aDevice.SetOutputSizePixel(aSize);
 aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice.DrawText(Point(0,0), rStr);
 
-maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), Size(160,96)));
+maText = BitmapEx(aDevice.GetBitmapEx(Point(0,0), aSize));
 }
 
 void Text::render()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/main/GL3DRenderer.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 08bc9faedbc7dc82addbb1031120093d64443d58
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:11:02 2014 +0200

remove second part of the debug output

Change-Id: Ie691746b4621a90d2b7abbfbc75367780574032f

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index e26cafe..d686009 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1602,7 +1602,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
 static sal_Int32 i = 0;
-OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/GL3DRenderer.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ccb7ca6903f1bf2b79b8d72ad0795c3dc77f0770
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 21 16:11:02 2014 +0200

remove second part of the debug output

Change-Id: Ie691746b4621a90d2b7abbfbc75367780574032f

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index e26cafe..d686009 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1602,7 +1602,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
 static sal_Int32 i = 0;
-OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
 return aColor.GetColor();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 chart2/source/view/main/GL3DRenderer.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 67444a92e4168414a973e68488f84615a7d03e4d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 16:21:26 2014 +0200

-Werror,-Wunused-variable

Change-Id: Ie7919740e7e95eb53f7a719e3dc2b114c6fd3862

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index d686009..d6c1dff 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1601,7 +1601,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long 
nX, long nY)
 boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]);
 glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
 Color aColor(buf[3], buf[2], buf[1], buf[0]);
-static sal_Int32 i = 0;
 return aColor.GetColor();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/source/ui/view/drawview.cxx |   53 ++---
 1 file changed, 29 insertions(+), 24 deletions(-)

New commits:
commit 583619b77195256149cbb47d71f09b204bca7c7c
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 15:02:28 2014 +0100

don't crash on formatting outline level 10 in master view

There are only 9 outline level styles, but we are allowed
(for some nutball reason) to create 10 levels, trying
to change the format of level 10 will then crash when
trying to apply its formatting to the non-existent
underlying style

Change-Id: Ic240322f98d832bc59edb502dd6d4988aa022481

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index af9f4de..18a181f 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -197,35 +197,40 @@ bool DrawView::SetAttributes(const SfxItemSet rSet,
 OUString aName = rPage.GetLayoutName() +   +
 OUString::number((nDepth = 0) ? 1 : nDepth + 1);
 SfxStyleSheet* pSheet = 
(SfxStyleSheet*)pStShPool-Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
-DBG_ASSERT(pSheet, StyleSheet not found);
-
-SfxItemSet aTempSet( pSheet-GetItemSet() );
-aTempSet.Put( rSet );
-aTempSet.ClearInvalidItems();
-
-if( nDepth  0  aTempSet.GetItemState( 
EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+//We have no stylesheet if we access outline level 10
+//in the master preview, there is no true style backing
+//that entry
+SAL_WARN_IF(!pSheet, sd, StyleSheet   aName   
not found);
+if (pSheet)
 {
-// no SvxNumBulletItem in outline level 1 to 8!
-aTempSet.ClearItem( EE_PARA_NUMBULLET );
-}
+SfxItemSet aTempSet( pSheet-GetItemSet() );
+aTempSet.Put( rSet );
+aTempSet.ClearInvalidItems();
 
-// Undo-Action
-StyleSheetUndoAction* pAction = new 
StyleSheetUndoAction(mrDoc, pSheet, aTempSet);
-mpDocSh-GetUndoManager()-AddUndoAction(pAction);
+if( nDepth  0  aTempSet.GetItemState( 
EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+{
+// no SvxNumBulletItem in outline level 1 to 8!
+aTempSet.ClearItem( EE_PARA_NUMBULLET );
+}
 
-pSheet-GetItemSet().Put(aTempSet);
-pSheet-Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
+// Undo-Action
+StyleSheetUndoAction* pAction = new 
StyleSheetUndoAction(mrDoc, pSheet, aTempSet);
+mpDocSh-GetUndoManager()-AddUndoAction(pAction);
 
-// now also broadcast any child sheets
-sal_Int16 nChild;
-for( nChild = nDepth + 1; nChild  9; nChild++ )
-{
-OUString aSheetName = rPage.GetLayoutName() +   +
-OUString::number((nChild = 0) ? 1 : nChild + 
1);
-SfxStyleSheet* pOutlSheet = static_cast 
SfxStyleSheet* (pStShPool-Find(aSheetName, SD_STYLE_FAMILY_MASTERPAGE));
+pSheet-GetItemSet().Put(aTempSet);
+
pSheet-Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
 
-if( pOutlSheet )
-
pOutlSheet-Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
+// now also broadcast any child sheets
+sal_Int16 nChild;
+for( nChild = nDepth + 1; nChild  9; nChild++ )
+{
+OUString aSheetName = rPage.GetLayoutName() + 
  +
+OUString::number((nChild = 0) ? 1 : 
nChild + 1);
+SfxStyleSheet* pOutlSheet = static_cast 
SfxStyleSheet* (pStShPool-Find(aSheetName, SD_STYLE_FAMILY_MASTERPAGE));
+
+if( pOutlSheet )
+
pOutlSheet-Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
+}
 }
 
 ++iter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sfx2/source

[Stephan Bergmann]

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

New commits:
commit c126f210bb62143eea6263e37dedcb2fba24cade
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 14:55:40 2014 +0200

Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 7082bc4..00efbfb 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -342,7 +342,7 @@ namespace sfx2
 if( aElement == aStdLibName || aElement == 
aVBAProject )
 {
 Reference  XNameAccess  xLib;
-Any aAny = xContainer-getByName( aStdLibName 
);
+Any aAny = xContainer-getByName( aElement );
 aAny = xLib;
 if ( xLib.is()  xLib-hasElements() )
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/textbox' - sw/source

[Miklos Vajna]

 sw/source/core/unocore/unoobj2.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit caa94e48e5e23c1d3fc07828aa16e5b3211d63b1
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed May 21 15:21:34 2014 +0200

SwXParaFrameEnumeration: ignore textboxes

Change-Id: I20278c8764d97b45c20fcb7caf1615dd6f79d5e7

diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index cc43ec6..4660ce1 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -27,6 +27,7 @@
 #include frmfmt.hxx
 #include doc.hxx
 #include IDocumentUndoRedo.hxx
+#include textboxhelper.hxx
 #include ndtxt.hxx
 #include ndnotxt.hxx
 #include unocrsr.hxx
@@ -181,10 +182,17 @@ void CollectFrameAtNode( SwClient rClnt, const 
SwNodeIndex rIdx,
 {
 const SwSortedObjs *pObjs = pCFrm-GetDrawObjs();
 if( pObjs )
+{
+std::listSwFrmFmt* aTextBoxes = 
SwTextBoxHelper::findTextBoxes(pDoc);
 for( sal_uInt16 i = 0; i  pObjs-Count(); ++i )
 {
 SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
 SwFrmFmt rFmt = pAnchoredObj-GetFrmFmt();
+
+// Filter out textboxes, which are not interesting at an UNO 
level.
+if (std::find(aTextBoxes.begin(), aTextBoxes.end(), rFmt) != 
aTextBoxes.end())
+continue;
+
 if ( rFmt.GetAnchor().GetAnchorId() == nChkType )
 {
 // create SwDepend and insert into array
@@ -199,6 +207,7 @@ void CollectFrameAtNode( SwClient rClnt, const 
SwNodeIndex rIdx,
 rFrames.push_back(entry);
 }
 }
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sfx2/source

[Stephan Bergmann]

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

New commits:
commit eeac58b5261e80ded0381e2be7f1fa3e6f0e9bb4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 14:55:40 2014 +0200

Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 39d2b6d..8f87197 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -343,7 +343,7 @@ namespace sfx2
 if( aElement == aStdLibName || aElement == 
aVBAProject )
 {
 Reference  XNameAccess  xLib;
-Any aAny = xContainer-getByName( aStdLibName 
);
+Any aAny = xContainer-getByName( aElement );
 aAny = xLib;
 if ( xLib.is()  xLib-hasElements() )
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4af55670fa1f2653e4a64031cc09d51b5ccc8f6
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed May 21 16:49:36 2014 +0200

try to fix Mac build

Change-Id: Id36f801cdf72d7654958b9d9837590990fdf161b

diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index fc5c8d7..2dde9d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1017,7 +1017,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, fdo76249.docx)
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
 if (!pXmlDoc)
return;
-assertXPath(pXmlDoc, 
//mc:Choice[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/lc:lockedCanvas[1],1);
+assertXPath(pXmlDoc, 
/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Fallback[1]/w:pict[1]/v:rect[1]/v:textbox[1]/w:txbxContent[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/lc:lockedCanvas[1],1);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo76979, fdo76979.docx)
___
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

[Stephan Bergmann]

 include/tools/zcodec.hxx   |   10 ++
 tools/source/zcodec/zcodec.cxx |  152 +++--
 2 files changed, 79 insertions(+), 83 deletions(-)

New commits:
commit 1c92fbf4fd73a8b0ad6b79b84fa67b7e24c948a1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 17:03:41 2014 +0200

Replace ZCodec::mbInit with sane enum

...and document how the member functions are supposed to be called from 
client
code.

Change-Id: Ia4847945e4a361c43a0ed001e3e78e901c9abcad

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 5dc6723..fe13970 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -27,10 +27,16 @@
 
 class SvStream;
 
+// The overall client call protocol is one of:
+// * BeginCompression, Compress, EndCompression
+// * BeginCompression, Decompress, EndCompression
+// * BeginCompression, Write*, EndCompression
+// * BeginCompression, Read*, EndCompression
+// * BeginCompression, ReadAsynchron*, EndCompression
 class TOOLS_DLLPUBLIC ZCodec
 {
-private:
-sal_uIntPtr mbInit;
+enum State { STATE_INIT, STATE_DECOMPRESS, STATE_COMPRESS };
+State   meState;
 boolmbStatus;
 boolmbFinish;
 SvStream*   mpIStm;
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 23abb0b..2a0b88d 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -38,7 +38,7 @@
 static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
 
 ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr nOutBufSize )
-: mbInit(0)
+: meState(STATE_INIT)
 , mbStatus(false)
 , mbFinish(false)
 , mpIStm(NULL)
@@ -63,7 +63,7 @@ ZCodec::~ZCodec()
 
 void ZCodec::BeginCompression( int nCompressLevel, bool updateCrc, bool gzLib )
 {
-mbInit = 0;
+assert(meState == STATE_INIT);
 mbStatus = true;
 mbFinish = false;
 mpIStm = mpOStm = NULL;
@@ -83,9 +83,9 @@ long ZCodec::EndCompression()
 {
 long retvalue = 0;
 
-if ( mbInit != 0 )
+if (meState != STATE_INIT)
 {
-if ( mbInit  2 )   // 1-decompress, 3-compress
+if (meState == STATE_COMPRESS)
 {
 do
 {
@@ -105,6 +105,7 @@ long ZCodec::EndCompression()
 }
 delete[] mpOutBuf;
 delete[] mpInBuf;
+meState = STATE_INIT;
 }
 return ( mbStatus ) ? retvalue : -1;
 }
@@ -113,13 +114,11 @@ long ZCodec::Compress( SvStream rIStm, SvStream rOStm )
 {
 long nOldTotal_In = PZSTREAM-total_in;
 
-if ( mbInit == 0 )
-{
-mpIStm = rIStm;
-mpOStm = rOStm;
-ImplInitBuf( false );
-mpInBuf = new sal_uInt8[ mnInBufSize ];
-}
+assert(meState == STATE_INIT);
+mpIStm = rIStm;
+mpOStm = rOStm;
+ImplInitBuf( false );
+mpInBuf = new sal_uInt8[ mnInBufSize ];
 while (( PZSTREAM-avail_in = mpIStm-Read( PZSTREAM-next_in = mpInBuf, 
mnInBufSize )) != 0 )
 {
 if ( PZSTREAM-avail_out == 0 )
@@ -139,16 +138,11 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm 
)
 sal_uIntPtr nInToRead;
 longnOldTotal_Out = PZSTREAM-total_out;
 
-if ( mbFinish )
-return PZSTREAM-total_out - nOldTotal_Out;
-
-if ( mbInit == 0 )
-{
-mpIStm = rIStm;
-mpOStm = rOStm;
-ImplInitBuf( true );
-PZSTREAM-next_out = mpOutBuf = new sal_uInt8[ PZSTREAM-avail_out = 
mnOutBufSize ];
-}
+assert(meState == STATE_INIT);
+mpIStm = rIStm;
+mpOStm = rOStm;
+ImplInitBuf( true );
+PZSTREAM-next_out = mpOutBuf = new sal_uInt8[ PZSTREAM-avail_out = 
mnOutBufSize ];
 do
 {
 if ( PZSTREAM-avail_out == 0 ) ImplWriteBack();
@@ -173,14 +167,12 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm 
)
 while ( ( err != Z_STREAM_END)   ( PZSTREAM-avail_in || mnInToRead ) );
 ImplWriteBack();
 
-if ( err == Z_STREAM_END )
-mbFinish = true;
 return ( mbStatus ) ? (long)(PZSTREAM-total_out - nOldTotal_Out) : -1;
 }
 
 long ZCodec::Write( SvStream rOStm, const sal_uInt8* pData, sal_uIntPtr nSize 
)
 {
-if ( mbInit == 0 )
+if (meState == STATE_INIT)
 {
 mpOStm = rOStm;
 ImplInitBuf( false );
@@ -212,7 +204,7 @@ long ZCodec::Read( SvStream rIStm, sal_uInt8* pData, 
sal_uIntPtr nSize )
 return 0;   // PZSTREAM-total_out;
 
 mpIStm = rIStm;
-if ( mbInit == 0 )
+if (meState == STATE_INIT)
 {
 ImplInitBuf( true );
 }
@@ -256,7 +248,7 @@ long ZCodec::ReadAsynchron( SvStream rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 if ( mbFinish )
 return 0;   // PZSTREAM-total_out;
 
-if ( mbInit == 0 )
+if (meState == STATE_INIT)
 {
 mpIStm = rIStm;
 ImplInitBuf( true );
@@ -308,7 +300,7 @@ void ZCodec::ImplWriteBack()
 
 if ( nAvail )
 {
-if ( mbInit  2  mbUpdateCrc )
+if (meState == STATE_COMPRESS 

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

[Stephan Bergmann]

 vcl/source/gdi/pdfwriter_impl.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7aed3a008967a817ff3d58fb4bdf1c417fdbe8c0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 17:06:08 2014 +0200

Remove spurious assert(false)

...inadvertently left over debug code

Change-Id: I4bb9ee37ee7fd5d7e4e7f91afbcc036ba5802880

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 4e7687c..3e083e2 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2091,7 +2091,6 @@ bool PDFWriterImpl::compressStream( SvMemoryStream* 
pStream )
 pCodec.BeginCompression();
 pCodec.Write( aStream, (const sal_uInt8*)pStream-GetData(), nEndPos );
 pCodec.EndCompression();
-assert(false);
 nEndPos = aStream.Tell();
 pStream-Seek( STREAM_SEEK_TO_BEGIN );
 aStream.Seek( STREAM_SEEK_TO_BEGIN );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/compiler.hxx  |2 
 sc/source/core/tool/compiler.cxx |  106 ---
 2 files changed, 35 insertions(+), 73 deletions(-)

New commits:
commit a51459b960bfb4d726598712c00ff3d3c8139c4e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 11:14:44 2014 -0400

Avoid unnecessary cloning of ScRawToken during token check.

Change-Id: Ia980054437394ef48f7df655411f81d20b9cfa32

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 527ad76..a720d1c5 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -317,7 +317,7 @@ private:
 sal_Unicode cSymbol[MAXSTRLEN]; // current Symbol
 OUStringaFormula;   // formula source code
 sal_Int32   nSrcPos;// tokenizer position 
(source code)
-mutable ScRawTokenRef pRawToken;
+mutable ScRawToken maRawToken;
 
 const CharClass*pCharClass; // which character classification 
is used for parseAnyToken
 sal_uInt16  mnPredetectedReference; // reference when reading ODF, 
0 (none), 1 (single) or 2 (double)
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 751b98b..1be643f 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2334,7 +2334,6 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
 bool bFound = (iLook != mxSymbols-getHashMap()-end());
 if (bFound)
 {
-ScRawToken aToken;
 OpCode eOp = iLook-second;
 if (bInArray)
 {
@@ -2343,8 +2342,7 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
 else if (rName.equals(mxSymbols-getSymbol(ocArrayRowSep)))
 eOp = ocArrayRowSep;
 }
-aToken.SetOpCode(eOp);
-pRawToken = aToken.Clone();
+maRawToken.SetOpCode(eOp);
 }
 else if (mxSymbols-isODFF())
 {
@@ -2372,9 +2370,7 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
 {
 if (rName.equalsIgnoreAsciiCaseAscii( aOdffAliases[i].pName))
 {
-ScRawToken aToken;
-aToken.SetOpCode( aOdffAliases[i].eOp);
-pRawToken = aToken.Clone();
+maRawToken.SetOpCode( aOdffAliases[i].eOp);
 bFound = true;
 break;  // for
 }
@@ -2407,9 +2403,7 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
 // Old (deprecated) addins first for legacy.
 if (ScGlobal::GetFuncCollection()-findByName(cSymbol))
 {
-ScRawToken aToken;
-aToken.SetExternal( cSymbol );
-pRawToken = aToken.Clone();
+maRawToken.SetExternal( cSymbol );
 }
 else
 // bLocalFirst=false for (English) upper full original name
@@ -2419,14 +2413,12 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
 }
 if (!aIntName.isEmpty())
 {
-ScRawToken aToken;
-aToken.SetExternal( aIntName.getStr() ); // international name
-pRawToken = aToken.Clone();
+maRawToken.SetExternal( aIntName.getStr() ); // international 
name
 bFound = true;
 }
 }
 OpCode eOp;
-if (bFound  ((eOp = pRawToken-GetOpCode()) == ocSub || eOp == ocNegSub))
+if (bFound  ((eOp = maRawToken.GetOpCode()) == ocSub || eOp == ocNegSub))
 {
 bool bShouldBeNegSub =
 (eLastOp == ocOpen || eLastOp == ocSep || eLastOp == ocNegSub ||
@@ -2434,10 +2426,10 @@ bool ScCompiler::IsOpCode( const OUString rName, bool 
bInArray )
  eLastOp == ocArrayOpen ||
  eLastOp == ocArrayColSep || eLastOp == ocArrayRowSep);
 if (bShouldBeNegSub  eOp == ocSub)
-pRawToken-NewOpCode( ocNegSub );
+maRawToken.NewOpCode( ocNegSub );
 //! if ocNegSub had ForceArray we'd have to set it here
 else if (!bShouldBeNegSub  eOp == ocNegSub)
-pRawToken-NewOpCode( ocSub );
+maRawToken.NewOpCode( ocSub );
 }
 return bFound;
 }
@@ -2452,9 +2444,7 @@ bool ScCompiler::IsOpCode2( const OUString rName )
 
 if (bFound)
 {
-ScRawToken aToken;
-aToken.SetOpCode( (OpCode) --i );
-pRawToken = aToken.Clone();
+maRawToken.SetOpCode( (OpCode) --i );
 }
 return bFound;
 }
@@ -2489,9 +2479,7 @@ bool ScCompiler::IsValue( const OUString rSym )
 if( nType == NUMBERFORMAT_TEXT )
 // HACK: number too big!
 SetError( errIllegalArgument );
-ScRawToken aToken;
-aToken.SetDouble( fVal );
-pRawToken = aToken.Clone();
+maRawToken.SetDouble( fVal );
 return true;
 }
 
@@ -2510,11 +2498,9 @@ bool ScCompiler::IsString()
 if ( bQuote )
 {
 cSymbol[nLen] = '\0';
-

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

[Caolán McNamara]

 sd/source/ui/view/drawview.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit bbfa7a65cf6c92326b9e54bf1ff6019b4fb65f67
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 16:15:16 2014 +0100

crash because iterator position wasn't changed in stl conversion

regression from e0284f4bba59912e1c49cb36936e041e891a5833

Here's the original code using the pre stl iterators.

if( !pPara  nDepth  0   rSet.GetItemState( EE_PARA_NUMBULLET ) == 
SFX_ITEM_ON 
pOutliner-GetDepth( (sal_uInt16) pOutliner-GetAbsPos( (Paragraph*) 
pList-First() ) )  0 )
pPara = pOutliner-GetParagraph( 0 );  // Put NumBulletItem in outline 
level 1

Hidden in there is a pList-First() which only gets called if the prior
conditions are true.  pList-First() resets the index of the internal pList
iterator position of pList to 0 i.e. the next call to pList-Prev will now 
return 0.

The equivalent in the post-stl-conversion code is to jump the 
reverse_iterator
iter to the last position in the reverse view.

Create a level 10 entry in master view, select level 10, and use the bullets
and numbering dropdown from the side panel to see this crash

Change-Id: I52c22ea52020feb0fb75924f63ebe225be462071

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 18a181f..54208aa 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -236,9 +236,18 @@ bool DrawView::SetAttributes(const SfxItemSet rSet,
 ++iter;
 pPara = iter != aSelList.rend() ? *iter : NULL;
 
-if( !pPara  nDepth  0   rSet.GetItemState( 
EE_PARA_NUMBULLET ) == SFX_ITEM_ON 
-pOutliner-GetDepth( 
pOutliner-GetAbsPos(*(aSelList.begin())) )  0 )
-pPara = pOutliner-GetParagraph( 0 );  // Put 
NumBulletItem in outline level 1
+bool bJumpToLevel1 = false;
+if( !pPara  nDepth  0  rSet.GetItemState( 
EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
+bJumpToLevel1 = true;
+
+if (bJumpToLevel1)
+{
+iter = aSelList.rend();
+--iter;
+
+if 
(pOutliner-GetDepth(pOutliner-GetAbsPos(*iter))  0)
+pPara = pOutliner-GetParagraph( 0 );  // Put 
NumBulletItem in outline level 1
+}
 }
 
 mpDocSh-SetWaitCursor( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/tools/zcodec.hxx   |3 -
 tools/source/zcodec/zcodec.cxx |  120 -
 2 files changed, 62 insertions(+), 61 deletions(-)

New commits:
commit 66351a678e558c2a9bd81eebab19c1f44c0381d3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 17:35:27 2014 +0200

Split ZCodec::ImplInitBuf into InitCompress, InitDecompress

Change-Id: I2714b1f1dadc74f8501203bc8b0722c56c9c5fb9

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index fe13970..b93f796 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -53,7 +53,8 @@ class TOOLS_DLLPUBLIC ZCodec
 boolmbGzLib;
 void*   mpsC_Stream;
 
-voidImplInitBuf( bool nIOFlag );
+voidInitCompress();
+voidInitDecompress();
 voidImplWriteBack();
 
 voidUpdateCRC( sal_uInt8* pSource, long nDatSize );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index da52d8b..1adbca8 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -117,7 +117,7 @@ long ZCodec::Compress( SvStream rIStm, SvStream rOStm )
 assert(meState == STATE_INIT);
 mpIStm = rIStm;
 mpOStm = rOStm;
-ImplInitBuf( false );
+InitCompress();
 mpInBuf = new sal_uInt8[ mnInBufSize ];
 while (( PZSTREAM-avail_in = mpIStm-Read( PZSTREAM-next_in = mpInBuf, 
mnInBufSize )) != 0 )
 {
@@ -141,7 +141,7 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm )
 assert(meState == STATE_INIT);
 mpIStm = rIStm;
 mpOStm = rOStm;
-ImplInitBuf( true );
+InitDecompress();
 PZSTREAM-next_out = mpOutBuf = new sal_uInt8[ PZSTREAM-avail_out = 
mnOutBufSize ];
 do
 {
@@ -175,7 +175,7 @@ long ZCodec::Write( SvStream rOStm, const sal_uInt8* 
pData, sal_uIntPtr nSize )
 if (meState == STATE_INIT)
 {
 mpOStm = rOStm;
-ImplInitBuf( false );
+InitCompress();
 }
 assert(rOStm == mpOStm);
 
@@ -207,7 +207,7 @@ long ZCodec::Read( SvStream rIStm, sal_uInt8* pData, 
sal_uIntPtr nSize )
 mpIStm = rIStm;
 if (meState == STATE_INIT)
 {
-ImplInitBuf( true );
+InitDecompress();
 }
 PZSTREAM-avail_out = nSize;
 PZSTREAM-next_out = pData;
@@ -252,7 +252,7 @@ long ZCodec::ReadAsynchron( SvStream rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 if (meState == STATE_INIT)
 {
 mpIStm = rIStm;
-ImplInitBuf( true );
+InitDecompress();
 }
 PZSTREAM-avail_out = nSize;
 PZSTREAM-next_out = pData;
@@ -328,75 +328,74 @@ sal_uIntPtr ZCodec::GetCRC()
 return mnCRC;
 }
 
-void ZCodec::ImplInitBuf ( bool nIOFlag )
+void ZCodec::InitCompress()
 {
 assert(meState == STATE_INIT);
-if ( nIOFlag )
+meState = STATE_COMPRESS;
+mbStatus = deflateInit2_(
+PZSTREAM, mnCompressLevel, Z_DEFLATED, MAX_WBITS, MAX_MEM_LEVEL,
+Z_DEFAULT_STRATEGY, ZLIB_VERSION, sizeof (z_stream)) = 0;
+mpOutBuf = new sal_uInt8[mnOutBufSize];
+PZSTREAM-next_out = mpOutBuf;
+PZSTREAM-avail_out = mnOutBufSize;
+}
+
+void ZCodec::InitDecompress()
+{
+assert(meState == STATE_INIT);
+meState = STATE_DECOMPRESS;
+if ( mbStatus   mbGzLib )
 {
-meState = STATE_DECOMPRESS;
-if ( mbStatus   mbGzLib )
+sal_uInt8 n1, n2, j, nMethod, nFlags;
+for ( int i = 0; i  2; i++ )   // gz - magic number
 {
-sal_uInt8 n1, n2, j, nMethod, nFlags;
-for ( int i = 0; i  2; i++ )   // gz - magic number
-{
-mpIStm-ReadUChar( j );
-if ( j != gz_magic[ i ] )
-mbStatus = false;
-}
-mpIStm-ReadUChar( nMethod );
-mpIStm-ReadUChar( nFlags );
-if ( nMethod != Z_DEFLATED )
+mpIStm-ReadUChar( j );
+if ( j != gz_magic[ i ] )
 mbStatus = false;
-if ( ( nFlags  GZ_RESERVED ) != 0 )
-mbStatus = false;
-/* Discard time, xflags and OS code: */
-mpIStm-SeekRel( 6 );
-/* skip the extra field */
-if ( nFlags  GZ_EXTRA_FIELD )
-{
-mpIStm-ReadUChar( n1 ).ReadUChar( n2 );
-mpIStm-SeekRel( n1 + ( n2  8 ) );
-}
-/* skip the original file name */
-if ( nFlags  GZ_ORIG_NAME)
-{
-do
-{
-mpIStm-ReadUChar( j );
-}
-while ( j  !mpIStm-IsEof() );
-}
-/* skip the .gz file comment */
-if ( nFlags  GZ_COMMENT )
+}
+mpIStm-ReadUChar( nMethod );
+mpIStm-ReadUChar( nFlags );
+if ( nMethod != Z_DEFLATED )
+mbStatus = false;
+if ( ( nFlags  GZ_RESERVED ) != 0 )
+mbStatus = false;
+/* Discard 

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk

[Christian Lohmaier]

 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a95d12b547e2635e10aa074fe42f12a0ea151163
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 17:37:33 2014 +0200

fdo#70596 dependency problem with debian packages for master/dev builds

debian packages don't cope with release number of 0, so use release 1
for debian master/dev-packages

Change-Id: Id91926322d13bddad3a39faccfee4e131d8956b0

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 2af27ac..16b841c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(foreach pkgformat,$(5),\
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
-u $(instsetoo_OUT) \
-   -buildid $(LIBO_VERSION_PATCH) \
+   -buildid $(if $(filter 
deb0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
-msitemplate $(dir $@)msi_templates \
-msilanguage $(dir $@)win_ulffiles \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit f9d3abef3300e68b0ac69d789dc0babaee82b644
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 15:28:15 2014 +0200

Updated core
Project: translations  b1ee9c9e1542b856cfe2412c6dffeeb5a353810a

diff --git a/translations b/translations
index eb6ea5d..b1ee9c9 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit eb6ea5dcf7183a496e02d21024fc05b141c5c65e
+Subproject commit b1ee9c9e1542b856cfe2412c6dffeeb5a353810a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source download.lst external/libgltf

[Jan Holesovsky]

 avmedia/source/opengl/oglframegrabber.cxx|4 
 avmedia/source/opengl/oglplayer.cxx  |3 
 avmedia/source/opengl/oglwindow.cxx  |   12 -
 download.lst |2 
 external/libgltf/UnpackedTarball_libgltf.mk  |1 
 external/libgltf/patches/disable_fps_and_timer.patch |  124 +++
 6 files changed, 135 insertions(+), 11 deletions(-)

New commits:
commit 1d8ce469ba1ffb162e74a3669824022ac5716fee
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue May 20 22:00:19 2014 +0200

libgltf: Updated version.

Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb

diff --git a/avmedia/source/opengl/oglframegrabber.cxx 
b/avmedia/source/opengl/oglframegrabber.cxx
index 9db1f1b..e92cd86 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -33,11 +33,11 @@ OGLFrameGrabber::~OGLFrameGrabber()
 {
 }
 
-uno::Reference css::graphic::XGraphic  SAL_CALL OGLFrameGrabber::grabFrame( 
double fMediaTime )
+uno::Reference css::graphic::XGraphic  SAL_CALL OGLFrameGrabber::grabFrame( 
double /*fMediaTime*/ )
 throw ( uno::RuntimeException, std::exception )
 {
 boost::scoped_arraysal_uInt8 pBuffer(new 
sal_uInt8[m_pHandle-viewport.width * m_pHandle-viewport.height * 4]);
-gltf_renderer_get_bitmap(m_pHandle, 1, fMediaTime, (char*)pBuffer.get(), 
GL_BGRA);
+gltf_renderer_get_bitmap(m_pHandle, 1, (char*)pBuffer.get(), GL_BGRA);
 BitmapEx aBitmap = 
OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(), 
m_pHandle-viewport.width, m_pHandle-viewport.height);
 return Graphic( aBitmap ).GetXGraphic();
 }
diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index 83f5221..323242a 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -30,8 +30,7 @@ OGLPlayer::OGLPlayer()
 
 OGLPlayer::~OGLPlayer()
 {
-// Comment out while it causes segmentation fault
-// gltf_renderer_release(m_pHandle);
+gltf_renderer_release(m_pHandle);
 }
 
 static bool lcl_LoadFile( glTFFile* io_pFile, const OUString rURL)
diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index 7bdc9f7..6f39b0e 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -32,9 +32,9 @@ OGLWindow::~OGLWindow()
 void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, 
std::exception)
 {
 m_pContext-makeCurrent();
-gltf_prepare_renderer(m_pHandle-viewport);
+gltf_prepare_renderer(m_pHandle);
 gltf_renderer(m_pHandle);
-gltf_complete_renderer();
+gltf_complete_renderer(m_pHandle);
 m_pContext-swapBuffers();
 }
 
@@ -257,8 +257,8 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 glm::vec3 vEye;
 glm::vec3 vView;
 glm::vec3 vUp;
-gltf_get_camera_pos(vEye,vView,vUp);
-float fModelSize =(float)gltf_get_model_size();
+gltf_get_camera_pos(m_pHandle, vEye,vView,vUp);
+float fModelSize =(float)gltf_get_model_size(m_pHandle);
 
 glm::vec3 vMove = vView-vEye;
 vMove = glm::normalize(vMove);
@@ -277,7 +277,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 if(nCode == KEY_W)vMoveBy -= vMup*(0.001f*fModelSize);
 if(nCode == KEY_S)vMoveBy += vMup*(0.001f*fModelSize);
 }
-gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,0.0);
+gltf_renderer_move_camera(m_pHandle, vMoveBy.x, vMoveBy.y, 
vMoveBy.z, 0.0);
 update();
 }
 }
@@ -309,7 +309,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 long nDeltaX = m_aLastMousePos.X()-aCurPos.X();
 long nDeltaY = aCurPos.Y()-m_aLastMousePos.Y();
 // TODO: It seems this method just moves the camera but not rotate 
it.
-
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,0.0);
+gltf_renderer_rotate_camera(m_pHandle, 
(float)nDeltaX*fSensitivity, (float)nDeltaY*fSensitivity, 0.0, 0.0);
 update();
 
 m_aLastMousePos = aCurPos;
diff --git a/download.lst b/download.lst
index a17ca5e..20921ad 100644
--- a/download.lst
+++ b/download.lst
@@ -82,7 +82,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-export LIBGLTF_TARBALL := 02faa5e385c7083fc1e9cfbe71470e1f-libgltf.tar.bz2
+export LIBGLTF_TARBALL := 510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2
 export LIBLANGTAG_TARBALL := 

[Libreoffice-commits] core.git: avmedia/source download.lst external/libgltf

[Jan Holesovsky]

 avmedia/source/opengl/oglframegrabber.cxx|4 
 avmedia/source/opengl/oglplayer.cxx  |3 
 avmedia/source/opengl/oglwindow.cxx  |   12 -
 download.lst |2 
 external/libgltf/UnpackedTarball_libgltf.mk  |2 
 external/libgltf/patches/disable_fps.patch   |   31 
 external/libgltf/patches/disable_fps_and_timer.patch |  124 +++
 7 files changed, 135 insertions(+), 43 deletions(-)

New commits:
commit 1554fc9611e44d55eacc577bfed51d0f9c1c3a25
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue May 20 22:00:19 2014 +0200

libgltf: Updated version.

Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb

diff --git a/avmedia/source/opengl/oglframegrabber.cxx 
b/avmedia/source/opengl/oglframegrabber.cxx
index 9db1f1b..e92cd86 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -33,11 +33,11 @@ OGLFrameGrabber::~OGLFrameGrabber()
 {
 }
 
-uno::Reference css::graphic::XGraphic  SAL_CALL OGLFrameGrabber::grabFrame( 
double fMediaTime )
+uno::Reference css::graphic::XGraphic  SAL_CALL OGLFrameGrabber::grabFrame( 
double /*fMediaTime*/ )
 throw ( uno::RuntimeException, std::exception )
 {
 boost::scoped_arraysal_uInt8 pBuffer(new 
sal_uInt8[m_pHandle-viewport.width * m_pHandle-viewport.height * 4]);
-gltf_renderer_get_bitmap(m_pHandle, 1, fMediaTime, (char*)pBuffer.get(), 
GL_BGRA);
+gltf_renderer_get_bitmap(m_pHandle, 1, (char*)pBuffer.get(), GL_BGRA);
 BitmapEx aBitmap = 
OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(), 
m_pHandle-viewport.width, m_pHandle-viewport.height);
 return Graphic( aBitmap ).GetXGraphic();
 }
diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index 83f5221..323242a 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -30,8 +30,7 @@ OGLPlayer::OGLPlayer()
 
 OGLPlayer::~OGLPlayer()
 {
-// Comment out while it causes segmentation fault
-// gltf_renderer_release(m_pHandle);
+gltf_renderer_release(m_pHandle);
 }
 
 static bool lcl_LoadFile( glTFFile* io_pFile, const OUString rURL)
diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index 7bdc9f7..6f39b0e 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -32,9 +32,9 @@ OGLWindow::~OGLWindow()
 void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, 
std::exception)
 {
 m_pContext-makeCurrent();
-gltf_prepare_renderer(m_pHandle-viewport);
+gltf_prepare_renderer(m_pHandle);
 gltf_renderer(m_pHandle);
-gltf_complete_renderer();
+gltf_complete_renderer(m_pHandle);
 m_pContext-swapBuffers();
 }
 
@@ -257,8 +257,8 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 glm::vec3 vEye;
 glm::vec3 vView;
 glm::vec3 vUp;
-gltf_get_camera_pos(vEye,vView,vUp);
-float fModelSize =(float)gltf_get_model_size();
+gltf_get_camera_pos(m_pHandle, vEye,vView,vUp);
+float fModelSize =(float)gltf_get_model_size(m_pHandle);
 
 glm::vec3 vMove = vView-vEye;
 vMove = glm::normalize(vMove);
@@ -277,7 +277,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 if(nCode == KEY_W)vMoveBy -= vMup*(0.001f*fModelSize);
 if(nCode == KEY_S)vMoveBy += vMup*(0.001f*fModelSize);
 }
-gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,0.0);
+gltf_renderer_move_camera(m_pHandle, vMoveBy.x, vMoveBy.y, 
vMoveBy.z, 0.0);
 update();
 }
 }
@@ -309,7 +309,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 long nDeltaX = m_aLastMousePos.X()-aCurPos.X();
 long nDeltaY = aCurPos.Y()-m_aLastMousePos.Y();
 // TODO: It seems this method just moves the camera but not rotate 
it.
-
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,0.0);
+gltf_renderer_rotate_camera(m_pHandle, 
(float)nDeltaX*fSensitivity, (float)nDeltaY*fSensitivity, 0.0, 0.0);
 update();
 
 m_aLastMousePos = aCurPos;
diff --git a/download.lst b/download.lst
index 0d960ce..ccbb7f3 100644
--- a/download.lst
+++ b/download.lst
@@ -88,7 +88,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-export LIBGLTF_TARBALL := 02faa5e385c7083fc1e9cfbe71470e1f-libgltf.tar.bz2
+export LIBGLTF_TARBALL := 

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

[Eike Rathke]

 include/svx/langbox.hxx   |3 +++
 svx/source/dialog/langbox.cxx |   20 
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit cf53a5d4938f6f64bd6d3fe70dd9b555c9d30d0f
Author: Eike Rathke er...@redhat.com
Date:   Wed May 21 17:53:53 2014 +0200

we have GetEntryPos(), use it

Change-Id: Iebb19951efa81817793a155164862076d1198e6e

diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index dc872d8..410b240 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -101,6 +101,7 @@ protected:
 SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) 
const = 0;
 SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, 
bool bSelect ) = 0;
 SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos 
) const = 0;
+SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData ) 
const = 0;
 SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const = 0;
 SVX_DLLPRIVATE virtual void ImplSetNoSelection() = 0;
 SVX_DLLPRIVATE virtual void ImplHide() = 0;
@@ -127,6 +128,7 @@ private:
 SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) 
const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, 
bool bSelect ) SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos 
) const SAL_OVERRIDE;
+SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData ) 
const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE;
@@ -155,6 +157,7 @@ private:
 SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) 
const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, 
bool bSelect ) SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos 
) const SAL_OVERRIDE;
+SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData ) 
const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 8d93417..92f5cb6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -448,14 +448,7 @@ bool SvxLanguageBoxBase::IsLanguageSelected( const 
LanguageType eLangType ) cons
 
 sal_Int32 SvxLanguageBoxBase::ImplTypeToPos( LanguageType eType ) const
 {
-sal_Int32 nPos   = LISTBOX_ENTRY_NOTFOUND;
-sal_Int32 nCount = ImplGetEntryCount();
-
-for ( sal_Int32 i=0; nPos == LISTBOX_ENTRY_NOTFOUND  inCount; i++ )
-if ( eType == LanguageType((sal_uIntPtr)ImplGetEntryData(i)) )
-nPos = i;
-
-return nPos;
+return ImplGetEntryPos( (void*)(sal_uIntPtr)eType);
 }
 
 
@@ -627,6 +620,17 @@ bool SvxLanguageComboBox::ImplIsEntryPosSelected( 
sal_Int32 nPos ) const
 }
 
 
+sal_Int32 SvxLanguageBox::ImplGetEntryPos( const void* pData ) const
+{
+return GetEntryPos( pData);
+}
+
+sal_Int32 SvxLanguageComboBox::ImplGetEntryPos( const void* pData ) const
+{
+return GetEntryPos( pData);
+}
+
+
 sal_Int32 SvxLanguageBox::ImplGetEntryCount() const
 {
 return GetEntryCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/tools/zcodec.hxx   |3 --
 tools/source/zcodec/zcodec.cxx |   45 ++---
 2 files changed, 21 insertions(+), 27 deletions(-)

New commits:
commit 8f97326bdd3f42fc82aa5e1989fd03b0af1daf64
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 18:22:27 2014 +0200

So ZCodec::ReadAsynchron was wrong in using a persistent mpIStm after all

The fun thing is that with the (only) call-site to ReadAsynchron in
PNGReaderImpl::ImplReadIDAT (vcl/source/gdi/pngread.cxx) passing in rIStm
references to stack-allocated SvMemoryStream instances, mpIStm could point 
to an
old, destroyed instance from a previous call, but which would have been 
located
at exactly the same stack address as the currently passed in rIStm, so the 
wrong
mpIStm-Read call would effectively behaved exactly the same as a correct
rIStm.Read call.

This went unnoticed since the beginning until AddressSanitizer's
UseAfterReturn check came along...

Change-Id: I7c75ed2d36a4c24c111d88eff647816bd2c5dbca

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index c7424ab..63a5ec2 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -39,7 +39,6 @@ class TOOLS_DLLPUBLIC ZCodec
 State   meState;
 boolmbStatus;
 boolmbFinish;
-SvStream*   mpIStm;
 sal_uInt8*  mpInBuf;
 sal_uIntPtr mnInBufSize;
 sal_uIntPtr mnInToRead;
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 47c97dc..2e9ad1f 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -41,7 +41,6 @@ ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr 
nOutBufSize )
 : meState(STATE_INIT)
 , mbStatus(false)
 , mbFinish(false)
-, mpIStm(NULL)
 , mpInBuf(NULL)
 , mnInBufSize(nInBufSize)
 , mnInToRead(0)
@@ -66,7 +65,7 @@ void ZCodec::BeginCompression( int nCompressLevel, bool 
updateCrc, bool gzLib )
 assert(meState == STATE_INIT);
 mbStatus = true;
 mbFinish = false;
-mpIStm = mpOStm = NULL;
+mpOStm = NULL;
 mnInToRead = 0x;
 mpInBuf = mpOutBuf = NULL;
 PZSTREAM-total_out = PZSTREAM-total_in = 0;
@@ -249,7 +248,6 @@ long ZCodec::ReadAsynchron( SvStream rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 if (meState == STATE_INIT)
 {
 InitDecompress(rIStm);
-mpIStm = rIStm;
 }
 PZSTREAM-avail_out = nSize;
 PZSTREAM-next_out = pData;
@@ -267,7 +265,7 @@ long ZCodec::ReadAsynchron( SvStream rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 break;
 }
 
-PZSTREAM-avail_in = mpIStm-Read (
+PZSTREAM-avail_in = rIStm.Read (
 PZSTREAM-next_in = mpInBuf, nInToRead);
 mnInToRead -= nInToRead;
 
commit c5a603ce2469ef6a23023ff276ccd24ca316f6c2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 18:07:14 2014 +0200

ZCodec::mpIStm is apparently(?) effectively only used by ReadAsynchron

...(which can be called multiple times in a row).  But which actually looks
wrong...

Change-Id: I2e4914e6fed8ced383e430699dd462add9da8c08

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index b93f796..c7424ab 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -54,7 +54,7 @@ class TOOLS_DLLPUBLIC ZCodec
 void*   mpsC_Stream;
 
 voidInitCompress();
-voidInitDecompress();
+voidInitDecompress(SvStream  inStream);
 voidImplWriteBack();
 
 voidUpdateCRC( sal_uInt8* pSource, long nDatSize );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 1adbca8..47c97dc 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -115,11 +115,10 @@ long ZCodec::Compress( SvStream rIStm, SvStream rOStm )
 long nOldTotal_In = PZSTREAM-total_in;
 
 assert(meState == STATE_INIT);
-mpIStm = rIStm;
 mpOStm = rOStm;
 InitCompress();
 mpInBuf = new sal_uInt8[ mnInBufSize ];
-while (( PZSTREAM-avail_in = mpIStm-Read( PZSTREAM-next_in = mpInBuf, 
mnInBufSize )) != 0 )
+while (( PZSTREAM-avail_in = rIStm.Read( PZSTREAM-next_in = mpInBuf, 
mnInBufSize )) != 0 )
 {
 if ( PZSTREAM-avail_out == 0 )
 ImplWriteBack();
@@ -139,9 +138,8 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm )
 longnOldTotal_Out = PZSTREAM-total_out;
 
 assert(meState == STATE_INIT);
-mpIStm = rIStm;
 mpOStm = rOStm;
-InitDecompress();
+InitDecompress(rIStm);
 PZSTREAM-next_out = mpOutBuf = new sal_uInt8[ PZSTREAM-avail_out = 
mnOutBufSize ];
 do
 {
@@ -149,7 +147,7 @@ long ZCodec::Decompress( SvStream rIStm, SvStream rOStm )
 if ( PZSTREAM-avail_in == 0  mnInToRead )
 {
 nInToRead = ( mnInBufSize  

[Libreoffice-commits] core.git: swext/Extension_wiki-publisher.mk

[Christian Lohmaier]

 swext/Extension_wiki-publisher.mk |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c15927f20d4727c3b8de68497b6949e72f9e6e9e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 18:57:55 2014 +0200

the addfile rule doesn't like to continue on a new line

breaks the build otherwise on the baseline

Change-Id: I7a357bc9b541c86746ce3000af429ee024efeec1

diff --git a/swext/Extension_wiki-publisher.mk 
b/swext/Extension_wiki-publisher.mk
index a3d5b2b..3ed270e 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -22,13 +22,11 @@ $(eval $(call 
gb_Extension_use_external_project,wiki-publisher,apache_commons_co
 $(eval $(call 
gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
 $(eval $(call 
gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
 
-$(eval $(call gb_Extension_add_file,wiki-publisher,\
-$(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\
+$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\
 $(call gb_UnpackedTarball_get_dir,apache_commons_codec)$(if $(filter 
TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6-SNAPSHOT.jar)\
 ))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call 
gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,\
-$(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\
+$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter 
TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\
 $(call gb_UnpackedTarball_get_dir,apache_commons_lang)$(if $(filter 
TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar)\
 ))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,commons-logging-1.1.3.jar,$(call 
gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-3'

[Christian Lohmaier]

New branch 'libreoffice-4-3' available with the following commits:
commit 6d9aad7a841d6585b0d5a9644df50905e6ea490c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:12:40 2014 +0200

bump product version to 4.3.0.0.beta1+

Change-Id: Iaabe667c33cba5f90eb3f6b1c8ea6f36220a

commit 2ca316971f2e50fff94267bda23d32735b694431
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:05:22 2014 +0200

Branch libreoffice-4-3

This is 'libreoffice-4-3' - the stable branch for the 4.3.x releases.
The commit rules are different according to the development phase:

+ 4.3.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.3.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: Idf8be761c6f0366c16e7d9f395ac8b93a0cd1ad8

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

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

[Christian Lohmaier]

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

New commits:
commit dea4a3b9d7182700abeb4dc756a24a9e8dea8474
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:16:44 2014 +0200

bump product version to 4.4.0.0.alpha0+

Change-Id: Ic309dbcc49a423bce10e9ea711e8ba0702552816

diff --git a/configure.ac b/configure.ac
index ad9be02..3591406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.3.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.0.0.beta1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.0.0.beta1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:11 -0700

Tag libreoffice-4.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfN4zAAoJEPQ0oe+v7q6jPOsP/jmiSSNkLtSHMcGNbd9sOCJ3
RAdxsyDC9ik0ZnDVpB5d3/+WCxhJ70FKqNkvZ5QhhBvKWhFGwHH6zLJa3Hi6hL2b
MrBiwyRJxvko8xNMeBKi9RLr3D+IT1H4qS0eu5OIzz85iM8gEdonkCGiwrkCSUfy
3C24ixASFxysG5ELqRPRGeIlUvrWy+KG8e1ASj5d9Y1MmRwW4WCJIbMYN75tzbhx
WZojHyFEC7UdYuK6YOFfl+rcv/mtZt0Vqwk3ndEXXpzvoAGx1ZISfHrbt+qV1rrn
47aIpAlnIawMSxt3YC6P+8HBn7LZJIuDjEcGVSwWFK+4By0taxzGQ8PezfRUJcrA
A3faL3EBO6xAUgWXvnytlYSXAx4fX/dNxOAvv51h4SBOQP8Vnd0FuZhVsrtgranl
hk4jzPJ/0o/pw11zJlvAih2s9HR1S1X5XmVQ9v5mIrMrOjhAHUJm6/3K71wRJ0EM
slbKtxLiaYL6M66xUY5IZl1WpipJ1GxFaPIgWH1mTQLuT9pyJWFEWiPQDckErl7N
BMLECOA3TmYS7HWo0mP7bbAeede0LRSFiRJc52PGGTY4TcViygkXJKIcm6AwbYH9
HTo+54v6OWTb1lSGdDVxxJCe6oz7HeWL4ULbfHkfgm3Ge1k5vzJZe+rK2ImW3Mc0
rfB6AIVhsQ8gg7e2lcRh
=ZjDK
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.0.0.beta1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.0.0.beta1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:11 -0700

Tag libreoffice-4.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfN4uAAoJEPQ0oe+v7q6juI4P/RpeJ953QOl1/TxKp6S5Sxbi
291CRSneczP/0KYJxI0SZ+Ks6yClzHscgUsz5hAyQvpGHmXa4Tud8R022d6WuNJY
DQIgzQVL5m/bsR9aGMJWd52UGjLtWiIBQpLb3phVLobAmV9pZfukinSunrM3w/3o
jbug09H/Gp5D8kias0vJNlniYCGB49vVIv8omrYq2yHwJppt4aKMxKZl4fp95OSv
mcMkhvEOr1jLAtJSMDSB/Z1hmbT6NZ4U050hY6VaCRw6IguVgbWQ9ygIiBdQBmii
TalWV7F0NlHMnoam6/ZGOewEq0Yn6ci+LtRLJi5XluRc/91YXrSFebJ1Q7xkO2ue
3VIspbgiVjh05a5HQ9FL3CL1np/SNTwYGPpT4q8aDshpecmiDpBKSwdgtSSqAlNY
rLLjUm8CCtbB1mEK9h2TDFheLRuKCbJupjlPENSDSVSf5yc02VReNhm1Mdfh/zIp
HIsTTTuG8cF7I1t4erSp87vMZyviblDKmHUS54Qn3cZJvlcKn4kzpdmmqnuHUk8M
Fg3uoOOTk8RNiJLFQtJ4gZv10KU+6qbgpbz39aqeM/fUsYe16+taeZ4gcGGUsOH7
qX7avKV1sUZm7d0v4I7TSAPL2+ehpoDM7tw6UV1q1sh4Ybg+waxUZhu1BtD5qaT7
2O/+2olSUneaclD8zSR4
=12cM
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.0.0.beta1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.0.0.beta1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:11 -0700

Tag libreoffice-4.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfN47AAoJEPQ0oe+v7q6j9hAP/3oa2s1fNiIMMujCKcZ4HpWc
+NUA1rbs5mjtQCUqjaevDhUtv+xhd+sOUDwg3w0XIXMVaIguOTzyxguM6DNV+3Cs
8nXIc5NMuM2WuCgzy61ZVbUNUSbF8JoEbHz4eOrkq/GFy+ItnC3K7hjqRdPcYVH6
2ZdN+OgZ/sSxgfczT7yP5DrvZyL4izzyfMcuMcagCcQprJtaswXj81ws1kTFq8+Q
gtcjy6INbn7T8KKw7ddJAttowPQGcjmre9Evkk/FkNSNPxLzBpOB4r/uv2uBRnfL
7TwMnH6J7wY3tdaV2LIk1UeepDpQz+5Kxj404A2/KIjRbEEb9px49fBhmGhLzavX
FmWGSk1Nn3ykM1tzBjR92xfXHzZWdMZXoNyXI8vNLpzReayOBsOmVdElqsvGEYI5
DH9mOOBhKIDrSPGgTFpGzNdkCVgEflAcAs208T2eDRunqLyxyBbRcBf66XdGQLth
r5uPj6FlTJ6Q8vXBBBOOF4sf6rt/j0vKCJvQ0ZmXW2XKfDb2URevT6W9OUA1KLHM
3Zi5RvjvN5EF8rZf0b8Jgr2aJoqcQKTDkHG3U+9scuwt5OU+aohBR0ITUQp6ulVF
bps4xTXxndCHIEmMWSFrEPbOItCZYvDAkLagSQjtsTbgR/Fnl/ty5rWN67YE6E83
TLJIOs+KNA3ZP/UWs6h6
=w9MJ
-END PGP SIGNATURE-

Changes since sdremote-2.0.0-9927:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.0.0.beta1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.0.0.beta1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:11 -0700

Tag libreoffice-4.3.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfN43AAoJEPQ0oe+v7q6j6kMQAIc0EfdDYYMJLCPxDgzqZn+p
tmmvsgq++0PphL25xR3XZ+QpEkScsn6160X97N3e0M/J/fA5OmQbpO0r/vDRUS4C
57Hf7vYCMZtApp2AXXwl56Jw2VNkTpkxkYKsGpJbFcEFsFVgiCAWleCwfZQQXQSs
/6sCKkIubUrnKkXm4Olvsk4LhUP7dcDkQMVaoLHswRTZYlLGhmTAKhk5fnhoyLaR
6HNkaxmtx0s0iAh/XOCcJqnFGnLsEKD1jV0K/IVTDzRvG9VDCfsyeKAMf1CSUMF1
kmmiPy7sRMez+UMfoVn5hqL1ASJrQg4JfJnXLBpHCPwEAttuqt967zoLYaDBTCaE
RIphT48eN0foWkfTNen9pQ+CK5dRSWDK+jxb5Dha3vfHw73ad17HZFaMbvC/AYAC
7eHgd1CYTIKGU4SNw0Dqa1ndcd6q70VOBA6sDHgEZCwxdkTUIYXS+3Cfn28oVUnV
iM7S+rFRGX2QsSVzJZ6+E0Le/t/nPUK7MDI80TZB5bqK4ptPy/C7ocGrs+XODbGg
WKYhKcDurLn7YUjF3/FMabjkFF3UDNTigUgZtS729Icrst5FuE+y26BX749KUrPb
SUjA+VL+ODsHV8STG6Zh3a26aCqItT/BOZsnyPiO6hQBBaY1F2mReNXC1MmHNMsj
XP9dRCZld2fD5qeRdCIK
=2REl
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-3'

[Christian Lohmaier]

New branch 'libreoffice-4-3' available with the following commits:
commit e64fa5fdd03819f3a38272940f4613240561
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:10:20 2014 +0200

Version 4.3.0.0.beta1, tag libreoffice-4.3.0.0.beta1

Change-Id: I7a9aa547f26321fb148dd4831a60c966917e6780

commit 02a9b0e2b5302d572fb08fd76f83d15e7851afe8
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:04:56 2014 +0200

Branch libreoffice-4-3

This is 'libreoffice-4-3' - the stable branch for the 4.3.x releases.
The commit rules are different according to the development phase:

+ 4.3.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.3.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I43c36d2af280c67a1c89147b994368cc72098d09

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-3'

[Christian Lohmaier]

New branch 'libreoffice-4-3' available with the following commits:
commit 5259da8c28e483881a8a3f276fc4fd7179baafa7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:10:20 2014 +0200

Version 4.3.0.0.beta1, tag libreoffice-4.3.0.0.beta1

Change-Id: Ie2c69de3f11aff7469bc691d66071f1c512d1e44

commit 6c2c46db3641281b7f7a89a6e079fe2d4f5b0808
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:04:57 2014 +0200

Branch libreoffice-4-3

This is 'libreoffice-4-3' - the stable branch for the 4.3.x releases.
The commit rules are different according to the development phase:

+ 4.3.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.3.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: Ib48567aa8e6a1869ae17bce6dbae22ae40cd4700

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-3'

[Christian Lohmaier]

New branch 'libreoffice-4-3' available with the following commits:
commit a2bcaea4b328260a5a15cf7cb23f8fde0a8760b1
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:10:20 2014 +0200

Version 4.3.0.0.beta1, tag libreoffice-4.3.0.0.beta1

Change-Id: Ic344bd64704e84a53dcded531265792675f3a653

commit 5abbb92955feb9b88be7dd5edd665b5cc1838448
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 19:04:56 2014 +0200

Branch libreoffice-4-3

This is 'libreoffice-4-3' - the stable branch for the 4.3.x releases.
The commit rules are different according to the development phase:

+ 4.3.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.3.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I7256a3538bd38c896cb6ead5a69f63dd8f29a088

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

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

[Christian Lohmaier]

Tag 'libreoffice-4-3-branch-point' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:22 -0700

Tag libreoffice-4-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfODXAAoJEPQ0oe+v7q6jJDgQALD1PNNQRnf7PRcfvuhS0xAY
++oWJE2gFpdnUF8JCOU/gCJG4Q27bzjDPcDXw1EyF7Wvj3TjYV4KXpyqwSiD3PY/
xqxMEmACbFXqFeGoEPe00rVxrOrkMBzvycIdlvh4bwreBk9aNwRQJX/5L+lifS66
ZhHa9cu8FtTnatI7J7qDhBxKnuvD6R3C9iyRkImt21ioO+zK3kHDGZb6VohmeR+j
d54sd+ni1aXrJIKHOhB/B/o6avmGYkwR8kWu70jXgpKL5ZmYiGvpkfJYBi7y5rxi
4KpRMEsSHudlFrJRjis/cGcMRHZFfqak9VOWVLCVh5InU2Y7hy/8JnYXA7SyjFoF
hG5E9gYreXJngd6dPaq7ma6Dqzjm/jPMExCnZ3qPxK8ejRHHmgUb5aiELCgKVn98
67iRy4pGSPgLF5mIdXMRat4r0b4/IWQGAlXjPWOsK++9aApMxXZ+SoWrG5Aj8Ayt
FjMpJxO2jqGNYErWZxKGHPbZyfSFTpy6v3l+5kjPxFRMeuDOFDcZtyfqGlbH043+
kUQC7aRy3knME2PyPTsQvVh/6cE8hdgX4F/B816i+6Rm2664lFBeTkTvcx9SOfB3
RtOKSgPovBTFLGnayWLvd3QcVaMwoku4R09xhNMg2oQg8oN4VodX5q2hHLeB1uJr
vSu7xJNq81adnMY/+EJr
=eQdi
-END PGP SIGNATURE-

Changes since sdremote-2.0.0-9924:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

Tag 'libreoffice-4-3-branch-point' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:22 -0700

Tag libreoffice-4-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfODQAAoJEPQ0oe+v7q6j20wP/RyNOgegsd2Ov7HyuspRYgn0
j/tQ/zELvNpKjBCLaCGCUOup/2QRQsmY5IS0f7Uk5pXnjKQ0vBu5CAlGJnmm4ShO
+Vlw2F34TcCfBT7/CgHrn4oPXL7ddhf6BS22U9oq78fB/rIqYgxcocUrnbBE2hCg
uMXs2g4aPTzs8t2ElUMyT5kHgWsDGejt1AP5+5dE3AO9Yu3b7kuvGC0qi2HPgxK8
SwpRQaOyaIpB6fQ4vGkpibmteuoa0/mYVHKc/UviQl87RoTFEoQa5US2Yi0KB98x
UwYM0cMGK5cDUeln5gqWArYgxG8d7a35ack2dBCL54mE1a6RVDQC46s2OvIHdfLZ
dxmQ7k6dCdn6HXMkkoeeRkAtFNYmzYpgE2MP7dKc70A1SFbTIYue3MK/vJRAhwsf
V9pvU334Nc8j8CfgAvTQvkwk7lZt1NjCx1jD8M+mPaLeR75kD6cjlOGb8E2xUYOE
oF0df2IQ71jiTD3evdTMLCMMJUpsARx4qEwGq4J0spsLt1yj9E3CRSKJ4GG++jSt
tpqAbtNYDorSULUlv6DzF4aWiiCY3jwBtoap/4KAmm+3p0uoIpic26O0FKLEO8kJ
ATtv2cicHjTQoK8qD4FuRjAOiy2nW5+QNUtQXeM/Z9B8Tb5aZ7zeX4wTY3V2X1gv
HN0RxBhe6wle5aZzySFR
=XKbX
-END PGP SIGNATURE-

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

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

[David Tardon]

Tag 'libreoffice-4-3-branch-point' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:22 -0700

Tag libreoffice-4-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfODMAAoJEPQ0oe+v7q6jwr8P/ii8itCGyxFJY6wDjU58ivH3
kZenx1sNtYWB65bmmr7gAs1irD7SVaDYE5NITGAlnb1wXUO4hTwCJJGtLcT6oRgB
t/4n8ypMB/1zN1mchMgK74NzL5HfZzpgXoRjhOLMnGnM/WmcsuXUbYfJWoeOV4Xf
159nYWoFeBsqIS72IkR9MUAim8ptuiIKXhnWoC1yPkJTnTXy22ExEJWgAUnYpb3w
yGkcXZe3uJUflYv9lodHVcKezMrH43OIKkVyI5HjyxeXkq9T8v/18Wz1YWixtjtG
4qGJZMZCViaBH0qdwtfFLfhNuIUde2l7ug3m6GRGdak41lQeILeDTRU/FwNqa8nR
U55bVXksNH9IQowgf/H88n8Oe2ybity+Y27m1plndrPtFjAHpVRymlMlaLi4ZlqX
DjE1g8BEaoKeSTXvqZovZUD1ZhJOxYhhj6sCPerq1nbSxTyXK6QDNYwHZSC1GOt6
SwrY9GtKhSXZbMssrz9gj+2c9fXoUHjLtgEwldTgOuAqO/TMlcd53h6fNMlPddFD
gMqTGWPwYoJV8taojq4AVGrQPKz0yrnbiWQ4wj30Rmxtj+yH0GDuAruCC1oVMiUz
w5Gu0ymMUfkyJcXphgAhcur3+uQhBWNDIuHq/3KmCwygX/J9F4hj1pLANacfyzxV
AmIRPBmPBU1ECFou/Flb
=/Iaf
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4-3-branch-point' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-05-21 18:22 -0700

Tag libreoffice-4-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTfODUAAoJEPQ0oe+v7q6jfPkP/i34uStjSXdilvDQcdJnu4cb
emzCnfWqtlzCxad1DG+jJIb6C6cIAREn4E+tMuRfLDZSVRUFfwWanWwlTjMufMSt
HELNomWiQuoICzm25Q6Vupz3MEoUzFb8ELSdS8elCph5luR9YT4xGyNfxJQOhPDG
elIOARz7OAtamEs2KfxxRjvZYyJoA1sjp9cJvR/0aBniGb1ZY66YUxoOvjs0Idkp
d5EY7Zl3ow8fnho1opmoT2+Rm8nyWeAJLYmzJPTC3qBZ1DEkvJGJNkEJa1fquAQE
3Jah3z1SS+DXTRJcN9zw6iSlIzMQ87TslzZ4jrcjt0crlKQC2uD+mXzZ0XrYELn8
jYYI7R3F1q7QfUNiKJ81zZ4AcMKi6J9eLgraCBkHu+lDXEbdMdJXpKvwv9AwwUIt
f92mkIO8x6wQDe/qELuM97DSArVogNeVsvlhtGW5k/Hoycj/mc4/5lmAuZ5NND7z
hVCsP9KYwSrA9inWYshL6WR0CB0gh2nnn/wSAxgTr83GM7aUdYggtQKM1oPL0hQS
hXJmn90eO1I+Jret0S3EngGMiGTljN+XTV8rshkazCiajDJRf4WY+4SAIfmtUW9W
iko8XY210Gs0lE1UtMi2P0sZiaGcBpQf5mZ6Nj63M/vi3j0HJNS/ecOQFE7sD/Qu
XYgcpUKGytQHPsqhrkiE
=QUmn
-END PGP SIGNATURE-

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

 Depends on||60589

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

 Depends on|60589   |

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

[Tomaž Vajngerl]

 sfx2/source/appl/sfxpicklist.cxx|2 +-
 sw/source/core/uibase/app/docsh.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f9f8e05dcb572bff6e8d719f9dcef8fb1e0f2c7
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Wed May 21 15:01:48 2014 +0200

speed-up writer conversion in headless mode

Change-Id: Ie5ccd62608c0643e3c8f019aea136ba74b282274

diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 0cfa9b7..19c1c31 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -196,7 +196,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* 
pDocSh )
 OUString aThumbnail;
 // don't generate thumbnail when in headless mode, or on non-desktop (?)
 #if HAVE_FEATURE_DESKTOP
-if (!pDocSh-IsModified()  !Application::IsHeadlessModeRequested())
+if (!pDocSh-IsModified()  !Application::IsHeadlessModeEnabled())
 {
 // not modified = the document matches what is in the shell
 boost::shared_ptrGDIMetaFile pMetaFile = 
pDocSh-GetPreviewMetaFile();
diff --git a/sw/source/core/uibase/app/docsh.cxx 
b/sw/source/core/uibase/app/docsh.cxx
index 23abaf7..fbe60dd 100644
--- a/sw/source/core/uibase/app/docsh.cxx
+++ b/sw/source/core/uibase/app/docsh.cxx
@@ -710,7 +710,7 @@ bool SwDocShell::ConvertTo( SfxMedium rMedium )
 const OUString aFileName( rMedium.GetName() );
 
 // No View, so the whole Document!
-if ( pWrtShell )
+if ( pWrtShell  !Application::IsHeadlessModeEnabled() )
 {
 SwWait aWait( *this, true );
 // #i106906#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sc/uiconfig/scalc/ui/subtotalgrppage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c0e47e37834d138daf4fecd154881ef5740c9fb
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed May 21 20:56:47 2014 +0200

typo: VarP (Sample) - VarP (Population)

Change-Id: Iaa80388952ac38a088874629688d9cf8a5fd456d

diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui 
b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index 57b7548..bb8cc39 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -36,7 +36,7 @@
 col id=0 translatable=yesVar (Sample)/col
   /row
   row
-col id=0 translatable=yesVarP (Sample)/col
+col id=0 translatable=yesVarP (Population)/col
   /row
 /data
   /object
___
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/uiconfig

[Andras Timar]

 sc/uiconfig/scalc/ui/subtotalgrppage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c987b86fd1b668a6e237042d323a0c3962d716bd
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed May 21 20:56:47 2014 +0200

typo: VarP (Sample) - VarP (Population)

Change-Id: Iaa80388952ac38a088874629688d9cf8a5fd456d
(cherry picked from commit 6c0e47e37834d138daf4fecd154881ef5740c9fb)
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui 
b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index 57b7548..bb8cc39 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -36,7 +36,7 @@
 col id=0 translatable=yesVar (Sample)/col
   /row
   row
-col id=0 translatable=yesVarP (Sample)/col
+col id=0 translatable=yesVarP (Population)/col
   /row
 /data
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sc/source/ui/docshell/externalrefmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 51a211ca1957280cda4de1679538e1f5fe25404e
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 21:53:07 2014 +0300

WaE: overriding virtual function declaration not marked 'SAL_OVERRIDE'

Change-Id: I9251488743ec3801367600455ef9a22ad876d2d3

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 38f900b..9c89c00 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2653,7 +2653,7 @@ public:
 RefCacheFiller( svl::SharedStringPool rStrPool, ScExternalRefCache 
rRefCache, sal_uInt16 nFileId ) :
 mrStrPool(rStrPool), mrRefCache(rRefCache), mnFileId(nFileId), 
mpCurCol(NULL) {}
 
-virtual void startColumn( ScColumn* pCol )
+virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE
 {
 mpCurCol = pCol;
 if (!mpCurCol)
@@ -2663,7 +2663,7 @@ public:
 mpRefTab = mrRefCache.getCacheTable(mnFileId, mpCurCol-GetTab());
 }
 
-virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal )
+virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE
 {
 if (!mpCurCol || !bVal)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 70805, which changed state.

Bug 70805 Summary: chart mangling
https://bugs.freedesktop.org/show_bug.cgi?id=70805

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

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

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

[Stephan Bergmann]

 external/clucene/UnpackedTarball_clucene.mk |1 +
 external/clucene/patches/clucene-asan.patch |   26 ++
 2 files changed, 27 insertions(+)

New commits:
commit c01904f91f76b771362ab9fb71289feba1e342f6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 21 21:26:36 2014 +0200

external/clucene: Avoid InitOrderFiasco

...as reported by AddressSanitizer, where 
src/core/CLucene/index/IndexWriter.cpp
initializes IndexWriter::MAX_TERM_LENGTH with the value of
DocumentsWriter::MAX_TERM_LENGTH before the latter is initialized in
src/core/CLucene/index/DocumentsWriter.cpp.  But turns out that
IndexWriter::MAX_TERM_LENGTH is completely unused.

Change-Id: Ica01186584ec05a989a13dc58823f4751e8724e2

diff --git a/external/clucene/UnpackedTarball_clucene.mk 
b/external/clucene/UnpackedTarball_clucene.mk
index efa7747..d059241 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
external/clucene/patches/clucene-git1-win64.patch \
external/clucene/patches/clucene-ub.patch \
external/clucene/patches/clucene-mutex.patch \
+   external/clucene/patches/clucene-asan.patch \
 ))
 
 ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/clucene-asan.patch 
b/external/clucene/patches/clucene-asan.patch
new file mode 100644
index 000..51adfad
--- /dev/null
+++ b/external/clucene/patches/clucene-asan.patch
@@ -0,0 +1,26 @@
+--- src/core/CLucene/index/IndexWriter.cpp
 src/core/CLucene/index/IndexWriter.cpp
+@@ -53,7 +53,6 @@
+ 
+ DEFINE_MUTEX(IndexWriter::MESSAGE_ID_LOCK)
+ int32_t IndexWriter::MESSAGE_ID = 0;
+-const int32_t IndexWriter::MAX_TERM_LENGTH = DocumentsWriter::MAX_TERM_LENGTH;
+ 
+ class IndexWriter::Internal{
+ public:
+--- src/core/CLucene/index/IndexWriter.h
 src/core/CLucene/index/IndexWriter.h
+@@ -384,13 +384,6 @@
+*/
+   static const int32_t DEFAULT_MAX_MERGE_DOCS;
+ 
+-  /**
+-   * Absolute hard maximum length for a term.  If a term
+-   * arrives from the analyzer longer than this length, it
+-   * is skipped and a message is printed to infoStream, if
+-   * set (see {@link #setInfoStream}).
+-   */
+-  static const int32_t MAX_TERM_LENGTH;
+ 
+ 
+   /* Determines how often segment indices are merged by addDocument().  With
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 configure.ac |   23 +--
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit e854b7d188616ba8e13e157e921d23854d3aa06d
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 23:01:33 2014 +0300

Make using libc++ non-optional on OS X, always use when possible

Change-Id: I76da768e035176c6469d9473364e9e2c9086ecae

diff --git a/configure.ac b/configure.ac
index 3591406..e90b20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1306,12 +1306,6 @@ AC_ARG_WITH(macosx-bundle-identifier,
  org.libreoffice.script (script, huh?).]),
 ,with_macosx_bundle_identifier=org.libreoffice.script)
 
-AC_ARG_ENABLE(libc++,
-AS_HELP_STRING([--enable-libc++],
-[Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only 
effective
- if --with-macosx-version-min-required is 10.7 or later.]),
-,)
-
 AC_ARG_ENABLE(ios-simulator,
 AS_HELP_STRING([--enable-ios-simulator],
 [Build for the iOS Simulator, not iOS device.]),
@@ -2891,17 +2885,11 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what compiler to use])
 case $with_macosx_sdk in
 10.5)
-if test $enable_libc__ = yes; then
-AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
-fi
 CC=${gccprefix}gcc-4.2 $arch 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
 CXX=${gccprefix}g++-4.2 $arch 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
 ;;
 10.6)
-if test $enable_libc__ = yes; then
-AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
-fi
 # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain 
Lion)?
 if test $(echo $MACOSX_SDK_PATH | cut -c1-23) = 
/Applications/Xcode.app; then
 CC=`xcrun -find gcc` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
@@ -2914,10 +2902,7 @@ if test $_os = Darwin; then
 LIBTOOL=libtool
 ;;
 10.7|10.8|10.9)
-if test $enable_libc__ = yes; then
-if test $with_macosx_version_min_required = 10.6; then
-AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
-fi
+if test $with_macosx_version_min_required != 10.6; then
 # Use libc++ instead of libstdc++ when possible
 stdlib=-stdlib=libc++
 fi
@@ -3118,14 +3103,8 @@ if test $_os = iOS; then
 XCODE_CLANG_CXX_LIBRARY=libstdc++
 case $ios_sdk in
 6.*)
-if test $enable_libc__ = yes; then
-AC_MSG_ERROR([--enable-libc++ requires using Xcode 5 and iOS SDK 7 
or newer it seems])
-fi
 ;;
 *)
-if test $enable_libc__ = no; then
-AC_MSG_ERROR([--disable-libc++ not allowed])
-fi
 XCODE_CLANG_CXX_LIBRARY=libc++
 ;;
 esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

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

New commits:
commit 8be75a2dc5a39a92354ec4f2d6fba55420cf7120
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 21 23:32:39 2014 +0300

Bin Do not use for the TDF build warning

Change-Id: I465e23dbe1d84a411c65500875a8821a116ecd2b

diff --git a/configure.ac b/configure.ac
index e90b20a..d407a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2861,20 +2861,6 @@ if test $_os = Darwin; then
 ;;
 esac
 ;;
-10.6)
-case $with_macosx_sdk in
-10.6)
-;;
-*)
-AC_MSG_WARN([Building with a SDK  10.6 possibly breaks 10.6 
compatibility. Do not use for the TDF build])
-add_warning Building with a SDK  10.6 possibly breaks 10.6 
compatibility. Do not use for the TDF build
-;;
-esac
-;;
-*)
-AC_MSG_WARN([Building with a minimum version requirement  10.6 
breaks 10.6 compatibility. Do not use for the TDF build])
-add_warning Building with a minimum version requirement  10.6 
breaks 10.6 compatibility. Do not use for the TDF build
-;;
 esac
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'tinderbox' - local_conf/TreeData.pm

[Christian Lohmaier]

 local_conf/TreeData.pm |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d01fba37102ef1993db5ae2d76af62d3695eb32a
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 22:46:14 2014 +0200

libreoffice-4-3 branch

diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index d95ab57..91f0ce8 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -243,6 +243,12 @@ $VERSION = '#tinder_version#';
branch = 'libreoffice-4-2',
VCS  = 'GIT',
   },
+'libreoffice-4-3' =  {
+   root = 
'git://anongit.freedesktop.org/git/libreoffice/core',
+   module = 'all',
+   branch = 'libreoffice-4-3',
+   VCS  = 'GIT',
+  },
);
 
 # We group trees into sets so that individual managers can get a page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #146 from Francisco franciscoadriansanc...@gmail.com ---
May I suggest bug 78369?

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

Re: l10n process, en_US version, Help files

[Mat M]

Hello

Old thread revival !

Le Fri, 13 Dec 2013 10:01:05 +0100, Sophie gautier.sop...@gmail.com a  
écrit:


* And... fixing !
Easy hacks or l10n sessions to fix that are both valid choices. We may
want to automate finding occurrences of text in the code. We began with
fdo#39439, but further steps are required.


did you submit your work, is it now integrated?


So... I started with hrc and src files to end with .ui files, so it took  
longer than expected.
I managed to deliver the small site to openshift. It was painful but  
learning as well.

So you can test it here: http://lionss-codeornot.rhcloud.com/

Because of all the changes and the inital request, I am not sure this is  
what you expect.

Don't mind to provide use cases so I can improve my work.

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

LibreOffice 4.3~beta1 bibisect

[Bjoern Michaelsen]

Hi all, 

On Thu, May 15, 2014 at 02:12:23PM +0200, Bjoern Michaelsen wrote:
 When we hit LibreOffice 4.3 branchpoint (around the beta), I plan to update
 again and merge the stuff into a 43all repository, but for now you should be
 able to do a good amount of bibisecting on master with this already.

All the build are finished, but I havent merged ranges yet. Still you will find
the missing 38 builds right up to the branch point in the 43beta1only repo:

https://wiki.documentfoundation.org/QA/HowToBibisect#Versions

This download is only 700MB -- so hardly much bigger than the usual full 
install,
you might consider it for the upcoming bug hunting session.

I will now merge those and upload a 43all and 43only repo replacing the current
42all and 42only ones ...

Best,

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

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

[Takeshi Abe]

 sd/source/ui/func/fuparagr.cxx |7 ++-
 sd/source/ui/func/fuprlout.cxx |4 ++--
 sd/source/ui/func/fuprobjs.cxx |5 +++--
 sd/source/ui/func/fuscale.cxx  |   17 +++--
 sd/source/ui/func/fusldlg.cxx  |4 ++--
 sd/source/ui/func/fusnapln.cxx |5 +++--
 sd/source/ui/func/futempl.cxx  |   13 +
 sd/source/ui/func/futxtatt.cxx |7 ++-
 sd/source/ui/func/fuvect.cxx   |4 ++--
 9 files changed, 28 insertions(+), 38 deletions(-)

New commits:
commit 2c61edfdf57dabbd86ecc440444b6b00443f916a
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu May 22 00:36:41 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: Ic88b22895c2eb4144d31f22a0f7bc98971873262

diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index de0dc0e..08db2fb 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -34,6 +34,7 @@
 #include drawdoc.hxx
 #include sdabstdlg.hxx
 #include sdattr.hrc
+#include boost/scoped_ptr.hpp
 
 namespace sd {
 
@@ -90,7 +91,7 @@ void FuParagraph::DoExecute( SfxRequest rReq )
 }
 
 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-SfxAbstractTabDialog* pDlg = pFact ? 
pFact-CreateSdParagraphTabDlg(NULL, aNewAttr ) : 0;
+boost::scoped_ptrSfxAbstractTabDialog pDlg(pFact ? 
pFact-CreateSdParagraphTabDlg(NULL, aNewAttr ) : 0);
 if (!pDlg)
 return;
 
@@ -107,12 +108,8 @@ void FuParagraph::DoExecute( SfxRequest rReq )
 break;
 
 default:
-{
-delete pDlg;
-}
 return; // Cancel
 }
-delete( pDlg );
 }
 mpView-SetAttributes( *pArgs );
 
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 10f5830..702a10f 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -51,6 +51,7 @@
 #include editeng/outliner.hxx
 #include editeng/editdata.hxx
 #include sdabstdlg.hxx
+#include boost/scoped_ptr.hpp
 
 namespace sd
 {
@@ -148,7 +149,7 @@ void FuPresentationLayout::DoExecute( SfxRequest rReq )
 else
 {
 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-AbstractSdPresLayoutDlg* pDlg = pFact ? 
pFact-CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0;
+boost::scoped_ptrAbstractSdPresLayoutDlg pDlg(pFact ? 
pFact-CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0);
 
 sal_uInt16 nResult = pDlg ? pDlg-Execute() : 
static_castshort(RET_CANCEL);
 
@@ -171,7 +172,6 @@ void FuPresentationLayout::DoExecute( SfxRequest rReq )
 default:
 bError = true;
 }
-delete pDlg;
 }
 
 if (!bError)
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index a200955..57536ef 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -41,6 +41,8 @@
 #include prlayout.hxx
 #include unchss.hxx
 #include sdabstdlg.hxx
+#include boost/scoped_ptr.hpp
+
 namespace sd {
 
 TYPEINIT1( FuPresentationObjects, FuPoor );
@@ -142,7 +144,7 @@ void FuPresentationObjects::DoExecute( SfxRequest )
 SfxStyleSheetBase rStyleSheet = *pStyleSheet;
 
 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-SfxAbstractTabDialog* pDlg = pFact ? 
pFact-CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), 
rStyleSheet, ePO, pStyleSheetPool ) : 0;
+boost::scoped_ptrSfxAbstractTabDialog pDlg(pFact ? 
pFact-CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), 
rStyleSheet, ePO, pStyleSheetPool ) : 0);
 if( pDlg  (pDlg-Execute() == RET_OK) )
 {
 const SfxItemSet* pOutSet = pDlg-GetOutputItemSet();
@@ -155,7 +157,6 @@ void FuPresentationObjects::DoExecute( SfxRequest )
 pStyleSheet-GetItemSet().Put( *pOutSet );
 ( (SfxStyleSheet*) pStyleSheet )-Broadcast( SfxSimpleHint( 
SFX_HINT_DATACHANGED ) );
 }
-delete( pDlg );
 }
 }
 }
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 957eb00..04c8718 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -39,6 +39,7 @@
 #include sfx2/zoomitem.hxx
 #include sfx2/request.hxx
 #include svx/svxdlg.hxx
+#include boost/scoped_ptr.hpp
 
 namespace sd {
 
@@ -70,7 +71,7 @@ void FuScale::DoExecute( SfxRequest rReq )
 if( !pArgs )
 {
 SfxItemSet aNewAttr( mpDoc-GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
-SvxZoomItem* pZoomItem;
+boost::scoped_ptrSvxZoomItem pZoomItem;
 sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL;
 
 nValue = (sal_Int16) mpWindow-GetZoom();
@@ -79,11 +80,11 @@ void FuScale::DoExecute( SfxRequest rReq )
 if( mpViewShell  mpViewShell-ISA( DrawViewShell ) 
 static_castDrawViewShell*(mpViewShell)-IsZoomOnPage() )
 {
- 

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

[Kohei Yoshida]

 sc/source/ui/dbgui/PivotLayoutDialog.cxx   |9 -
 sc/source/ui/inc/PivotLayoutDialog.hxx |2 --
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   16 
 3 files changed, 27 deletions(-)

New commits:
commit 251507d0974418ebefce302e45dbb291c87e56da
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 21:32:59 2014 -0400

Keep only Apply and Close.

Change-Id: I963419baec24d7599ddb3e481738cbe6ec4e0a69

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx 
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 4b74fca..8c667dd 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,7 +93,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
 get(mpCheckTotalRows,   check-total-rows);
 get(mpCheckDrillToDetail,   check-drill-to-details);
 
-get(mpButtonOk, ok);
 get(mpButtonApply,  apply);
 get(mpButtonClose,  close);
 
@@ -147,7 +146,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
 mpDestinationButton-SetLoseFocusHdl(aLink);
 
 // Buttons
-mpButtonOk-SetClickHdl(   LINK(this, ScPivotLayoutDialog, OkClicked));
 mpButtonClose-SetClickHdl(LINK(this, ScPivotLayoutDialog, CloseClicked));
 mpButtonApply-SetClickHdl(LINK(this, ScPivotLayoutDialog, ApplyClicked));
 
@@ -608,13 +606,6 @@ void 
ScPivotLayoutDialog::PushDataFieldNames(std::vectorScDPName rDataFieldNa
 return mpListBoxData-PushDataFieldNames(rDataFieldNames);
 }
 
-IMPL_LINK( ScPivotLayoutDialog, OkClicked, PushButton*, /*pButton*/ )
-{
-if (ApplyChanges())
-CloseClicked(NULL);
-return 0;
-}
-
 IMPL_LINK( ScPivotLayoutDialog, ApplyClicked, PushButton*, /*pButton*/ )
 {
 ApplyChanges();
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx 
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index aae1038..71c9666 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,14 +82,12 @@ private:
 formula::RefButton* mpDestinationButton;
 
 PushButton*  mpButtonApply;
-OKButton*mpButtonOk;
 CloseButton* mpButtonClose;
 
 formula::RefEdit*   mpActiveEdit;
 ScAddress::Details  maAddressDetails;
 boolmbDialogLostFocus;
 
-DECL_LINK(OkClicked,  PushButton*);
 DECL_LINK(CloseClicked,   PushButton*);
 DECL_LINK(ApplyClicked,   PushButton*);
 DECL_LINK(GetFocusHandler,Control*);
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 3af1f19..565e627 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -18,22 +18,6 @@
 property name=can_focusFalse/property
 property name=layout_styleend/property
 child
-  object class=GtkButton id=ok
-property name=labelgtk-ok/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=can_defaultTrue/property
-property name=has_defaultTrue/property
-property name=receives_defaultTrue/property
-property name=use_stockTrue/property
-  /object
-  packing
-property name=expandTrue/property
-property name=fillTrue/property
-property name=position0/property
-  /packing
-/child
-child
   object class=GtkButton id=apply
 property name=labelgtk-apply/property
 property name=visibleTrue/property
___
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 sc/uiconfig

[Kohei Yoshida]

 sc/source/ui/dbgui/PivotLayoutDialog.cxx   |9 -
 sc/source/ui/inc/PivotLayoutDialog.hxx |2 --
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   16 
 3 files changed, 27 deletions(-)

New commits:
commit 28ab89377ed5f973bef2e07c1a708d97d916d5b7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 21:32:59 2014 -0400

Keep only Apply and Close.

Change-Id: I963419baec24d7599ddb3e481738cbe6ec4e0a69
(cherry picked from commit 251507d0974418ebefce302e45dbb291c87e56da)

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx 
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 4b74fca..8c667dd 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,7 +93,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
 get(mpCheckTotalRows,   check-total-rows);
 get(mpCheckDrillToDetail,   check-drill-to-details);
 
-get(mpButtonOk, ok);
 get(mpButtonApply,  apply);
 get(mpButtonClose,  close);
 
@@ -147,7 +146,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
 mpDestinationButton-SetLoseFocusHdl(aLink);
 
 // Buttons
-mpButtonOk-SetClickHdl(   LINK(this, ScPivotLayoutDialog, OkClicked));
 mpButtonClose-SetClickHdl(LINK(this, ScPivotLayoutDialog, CloseClicked));
 mpButtonApply-SetClickHdl(LINK(this, ScPivotLayoutDialog, ApplyClicked));
 
@@ -608,13 +606,6 @@ void 
ScPivotLayoutDialog::PushDataFieldNames(std::vectorScDPName rDataFieldNa
 return mpListBoxData-PushDataFieldNames(rDataFieldNames);
 }
 
-IMPL_LINK( ScPivotLayoutDialog, OkClicked, PushButton*, /*pButton*/ )
-{
-if (ApplyChanges())
-CloseClicked(NULL);
-return 0;
-}
-
 IMPL_LINK( ScPivotLayoutDialog, ApplyClicked, PushButton*, /*pButton*/ )
 {
 ApplyChanges();
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx 
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index aae1038..71c9666 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,14 +82,12 @@ private:
 formula::RefButton* mpDestinationButton;
 
 PushButton*  mpButtonApply;
-OKButton*mpButtonOk;
 CloseButton* mpButtonClose;
 
 formula::RefEdit*   mpActiveEdit;
 ScAddress::Details  maAddressDetails;
 boolmbDialogLostFocus;
 
-DECL_LINK(OkClicked,  PushButton*);
 DECL_LINK(CloseClicked,   PushButton*);
 DECL_LINK(ApplyClicked,   PushButton*);
 DECL_LINK(GetFocusHandler,Control*);
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 3af1f19..565e627 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -18,22 +18,6 @@
 property name=can_focusFalse/property
 property name=layout_styleend/property
 child
-  object class=GtkButton id=ok
-property name=labelgtk-ok/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=can_defaultTrue/property
-property name=has_defaultTrue/property
-property name=receives_defaultTrue/property
-property name=use_stockTrue/property
-  /object
-  packing
-property name=expandTrue/property
-property name=fillTrue/property
-property name=position0/property
-  /packing
-/child
-child
   object class=GtkButton id=apply
 property name=labelgtk-apply/property
 property name=visibleTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx  |   19 -
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx |   19 -
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |   19 -
 sc/source/ui/inc/SamplingDialog.hxx|5 --
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx   |4 --
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx   |5 --
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui   |   20 
+-
 sc/uiconfig/scalc/ui/correlationdialog.ui  |   20 
+-
 sc/uiconfig/scalc/ui/covariancedialog.ui   |   20 
+-
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui|   20 
+-
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |   20 
+-
 sc/uiconfig/scalc/ui/movingaveragedialog.ui|   20 
+-
 sc/uiconfig/scalc/ui/samplingdialog.ui |   20 
+-
 sc/uiconfig/scalc/ui/ttestdialog.ui|   20 
+-
 14 files changed, 17 insertions(+), 214 deletions(-)

New commits:
commit f79fa791ce3d5b18b1b159546d2f6fb594a364d4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 22:01:04 2014 -0400

Modify these stats dialogs to have OK and Cancel pair.

Change-Id: I5707aea9965e0d288d4a0e742f5d3cccf08107eb

diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx 
b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 24eb99d..4c2529b 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -57,8 +57,6 @@ ScSamplingDialog::ScSamplingDialog(
 get(mpPeriodicMethodRadio, periodic-method-radio);
 
 get(mpButtonOk, ok);
-get(mpButtonApply,  apply);
-get(mpButtonClose,  close);
 
 Init();
 GetRangeFromSelection();
@@ -67,10 +65,7 @@ ScSamplingDialog::ScSamplingDialog(
 void ScSamplingDialog::Init()
 {
 mpButtonOk-SetClickHdl( LINK( this, ScSamplingDialog, OkClicked ) );
-mpButtonClose-SetClickHdl( LINK( this, ScSamplingDialog, CloseClicked ) );
-mpButtonApply-SetClickHdl( LINK( this, ScSamplingDialog, ApplyClicked ) );
 mpButtonOk-Enable(false);
-mpButtonApply-Enable(false);
 
 Link aLink = LINK( this, ScSamplingDialog, GetFocusHandler );
 mpInputRangeEdit-SetGetFocusHdl( aLink );
@@ -159,7 +154,6 @@ void ScSamplingDialog::SetReference( const ScRange 
rReferenceRange, ScDocument*
 
 // Enable OK, Cancel if output range is set
 mpButtonOk-Enable(!mpOutputRangeEdit-GetText().isEmpty());
-mpButtonApply-Enable(!mpOutputRangeEdit-GetText().isEmpty());
 }
 }
 }
@@ -279,20 +273,7 @@ void ScSamplingDialog::PerformSampling()
 
 IMPL_LINK( ScSamplingDialog, OkClicked, PushButton*, /*pButton*/ )
 {
-ApplyClicked(NULL);
-CloseClicked(NULL);
-return 0;
-}
-
-
-IMPL_LINK( ScSamplingDialog, ApplyClicked, PushButton*, /*pButton*/ )
-{
 PerformSampling();
-return 0;
-}
-
-IMPL_LINK( ScSamplingDialog, CloseClicked, PushButton*, /*pButton*/ )
-{
 Close();
 return 0;
 }
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx 
b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 5d2518b..d8e835a 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -78,8 +78,6 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
 mpOutputRangeButton-SetReferences(this, mpOutputRangeEdit);
 
 get(mpButtonOk, ok);
-get(mpButtonApply,  apply);
-get(mpButtonClose,  close);
 
 get(mpGroupByColumnsRadio,   groupedby-columns-radio);
 get(mpGroupByRowsRadio,  groupedby-rows-radio);
@@ -94,10 +92,7 @@ 
ScStatisticsInputOutputDialog::~ScStatisticsInputOutputDialog()
 void ScStatisticsInputOutputDialog::Init()
 {
 mpButtonOk-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
OkClicked ) );
-mpButtonClose-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
CloseClicked ) );
-mpButtonApply-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
ApplyClicked ) );
 mpButtonOk-Enable(false);
-mpButtonApply-Enable(false);
 
 Link aLink = LINK( this, ScStatisticsInputOutputDialog, GetFocusHandler );
 mpInputRangeEdit-SetGetFocusHdl( aLink );
@@ -167,27 +162,13 @@ void ScStatisticsInputOutputDialog::SetReference( const 
ScRange rReferenceRange
 
 // Enable OK, Cancel if output range is set
 mpButtonOk-Enable(!mpOutputRangeEdit-GetText().isEmpty());
-mpButtonApply-Enable(!mpOutputRangeEdit-GetText().isEmpty());
 }
 }
 }
 
 IMPL_LINK( ScStatisticsInputOutputDialog, OkClicked, PushButton*, /*pButton*/ )
 {
-ApplyClicked(NULL);
-CloseClicked(NULL);
-return 0;
-}
-
-

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

[Kohei Yoshida]

 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx  |   19 -
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx |   19 -
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |   19 -
 sc/source/ui/inc/SamplingDialog.hxx|5 --
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx   |4 --
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx   |5 --
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui   |   20 
+-
 sc/uiconfig/scalc/ui/correlationdialog.ui  |   20 
+-
 sc/uiconfig/scalc/ui/covariancedialog.ui   |   20 
+-
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui|   20 
+-
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |   20 
+-
 sc/uiconfig/scalc/ui/movingaveragedialog.ui|   20 
+-
 sc/uiconfig/scalc/ui/samplingdialog.ui |   20 
+-
 sc/uiconfig/scalc/ui/ttestdialog.ui|   20 
+-
 14 files changed, 17 insertions(+), 214 deletions(-)

New commits:
commit be0e866c3b272513aae0ec3847e76a6e44a5c63c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 22:01:04 2014 -0400

Modify these stats dialogs to have OK and Cancel pair.

Change-Id: I5707aea9965e0d288d4a0e742f5d3cccf08107eb
(cherry picked from commit f79fa791ce3d5b18b1b159546d2f6fb594a364d4)

diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx 
b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 24eb99d..4c2529b 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -57,8 +57,6 @@ ScSamplingDialog::ScSamplingDialog(
 get(mpPeriodicMethodRadio, periodic-method-radio);
 
 get(mpButtonOk, ok);
-get(mpButtonApply,  apply);
-get(mpButtonClose,  close);
 
 Init();
 GetRangeFromSelection();
@@ -67,10 +65,7 @@ ScSamplingDialog::ScSamplingDialog(
 void ScSamplingDialog::Init()
 {
 mpButtonOk-SetClickHdl( LINK( this, ScSamplingDialog, OkClicked ) );
-mpButtonClose-SetClickHdl( LINK( this, ScSamplingDialog, CloseClicked ) );
-mpButtonApply-SetClickHdl( LINK( this, ScSamplingDialog, ApplyClicked ) );
 mpButtonOk-Enable(false);
-mpButtonApply-Enable(false);
 
 Link aLink = LINK( this, ScSamplingDialog, GetFocusHandler );
 mpInputRangeEdit-SetGetFocusHdl( aLink );
@@ -159,7 +154,6 @@ void ScSamplingDialog::SetReference( const ScRange 
rReferenceRange, ScDocument*
 
 // Enable OK, Cancel if output range is set
 mpButtonOk-Enable(!mpOutputRangeEdit-GetText().isEmpty());
-mpButtonApply-Enable(!mpOutputRangeEdit-GetText().isEmpty());
 }
 }
 }
@@ -279,20 +273,7 @@ void ScSamplingDialog::PerformSampling()
 
 IMPL_LINK( ScSamplingDialog, OkClicked, PushButton*, /*pButton*/ )
 {
-ApplyClicked(NULL);
-CloseClicked(NULL);
-return 0;
-}
-
-
-IMPL_LINK( ScSamplingDialog, ApplyClicked, PushButton*, /*pButton*/ )
-{
 PerformSampling();
-return 0;
-}
-
-IMPL_LINK( ScSamplingDialog, CloseClicked, PushButton*, /*pButton*/ )
-{
 Close();
 return 0;
 }
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx 
b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 5d2518b..d8e835a 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -78,8 +78,6 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
 mpOutputRangeButton-SetReferences(this, mpOutputRangeEdit);
 
 get(mpButtonOk, ok);
-get(mpButtonApply,  apply);
-get(mpButtonClose,  close);
 
 get(mpGroupByColumnsRadio,   groupedby-columns-radio);
 get(mpGroupByRowsRadio,  groupedby-rows-radio);
@@ -94,10 +92,7 @@ 
ScStatisticsInputOutputDialog::~ScStatisticsInputOutputDialog()
 void ScStatisticsInputOutputDialog::Init()
 {
 mpButtonOk-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
OkClicked ) );
-mpButtonClose-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
CloseClicked ) );
-mpButtonApply-SetClickHdl( LINK( this, ScStatisticsInputOutputDialog, 
ApplyClicked ) );
 mpButtonOk-Enable(false);
-mpButtonApply-Enable(false);
 
 Link aLink = LINK( this, ScStatisticsInputOutputDialog, GetFocusHandler );
 mpInputRangeEdit-SetGetFocusHdl( aLink );
@@ -167,27 +162,13 @@ void ScStatisticsInputOutputDialog::SetReference( const 
ScRange rReferenceRange
 
 // Enable OK, Cancel if output range is set
 mpButtonOk-Enable(!mpOutputRangeEdit-GetText().isEmpty());
-mpButtonApply-Enable(!mpOutputRangeEdit-GetText().isEmpty());
 }
 }
 }
 
 IMPL_LINK( ScStatisticsInputOutputDialog, OkClicked, PushButton*, /*pButton*/ )
 {
-

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

[Kohei Yoshida]

 sc/source/ui/StatisticsDialogs/FTestDialog.cxx   |4 +++-
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc |6 --
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.src |   10 ++
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx   |4 +++-
 sc/uiconfig/scalc/ui/ttestdialog.ui  |1 -
 5 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 05d7608616351cb6f5a9e06398c545813947006c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed May 21 22:13:53 2014 -0400

Label t-test and F-test for their respective dialogs.

Change-Id: I8afab424c051453005432c5291af49eb208dd22c

diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 4070376..6f07778 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -42,7 +42,9 @@ ScFTestDialog::ScFTestDialog(
 ScStatisticsTwoVariableDialog(
 pSfxBindings, pChildWindow, pParent, pViewData,
 TTestDialog, modules/scalc/ui/ttestdialog.ui )
-{}
+{
+SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST));
+}
 
 ScFTestDialog::~ScFTestDialog()
 {}
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc 
b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
index f07332e9..3cbed42 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
@@ -53,8 +53,10 @@
 #define STR_COVARIANCE_UNDO_NAME63
 #define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME 64
 #define STR_MOVING_AVERAGE_UNDO_NAME65
-#define STR_TTEST_UNDO_NAME 66
-#define STR_FTEST_UNDO_NAME 67
+#define STR_TTEST   66
+#define STR_FTEST   67
+#define STR_TTEST_UNDO_NAME 68
+#define STR_FTEST_UNDO_NAME 69
 
 #define STR_COLUMN_LABEL_TEMPLATE   70
 #define STR_ROW_LABEL_TEMPLATE  71
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src 
b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
index 702f54f..b084019 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
@@ -268,6 +268,16 @@ Resource RID_STATISTICS_DLGS
 Text [ en-US ] = Sampling;
 };
 
+String STR_TTEST
+{
+Text [ en-US ] = t-test;
+};
+
+String STR_FTEST
+{
+Text [ en-US ] = F-test;
+};
+
 String STR_TTEST_UNDO_NAME
 {
 Text [ en-US ] = t-test;
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 228063d..9e335c9 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -42,7 +42,9 @@ ScTTestDialog::ScTTestDialog(
 ScStatisticsTwoVariableDialog(
 pSfxBindings, pChildWindow, pParent, pViewData,
 TTestDialog, modules/scalc/ui/ttestdialog.ui )
-{}
+{
+SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST));
+}
 
 ScTTestDialog::~ScTTestDialog()
 {}
diff --git a/sc/uiconfig/scalc/ui/ttestdialog.ui 
b/sc/uiconfig/scalc/ui/ttestdialog.ui
index 4fd3dec..86ba27d 100644
--- a/sc/uiconfig/scalc/ui/ttestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ttestdialog.ui
@@ -6,7 +6,6 @@
   object class=GtkDialog id=TTestDialog
 property name=can_focusFalse/property
 property name=border_width5/property
-property name=title translatable=yesMoving Average/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits