date:20130711

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - include/xmloff reportdesign/source sc/source xmloff/source

2013-07-11 Thread Luboš Luňák

 include/xmloff/txtimp.hxx |   11 ++
 include/xmloff/txtimppr.hxx   |6 ---
 reportdesign/source/filter/xml/xmlStyleImport.cxx |4 +-
 sc/source/filter/xml/xmlstyli.cxx |2 -
 xmloff/source/core/xmlimp.cxx |1 
 xmloff/source/style/xmlnumi.cxx   |2 -
 xmloff/source/text/txtimp.cxx |   38 --
 xmloff/source/text/txtimppr.cxx   |   16 ++---
 8 files changed, 21 insertions(+), 59 deletions(-)

New commits:
commit b84347d905a5fb4c04077ace924744c82c76cce3
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Jul 10 17:33:15 2013 +0200

fix reading fonts from .odp using style::font-name (fdo#65338)

b40bcde076f9fabf24810d2520e878d604d99637 made writing .odp use 
style:font-name
and office:font-face-decls, instead of using fo:font-family . But the 
reading
back was broken, as xFontDecls is not set
in XMLTextImportPropertyMapper::handleSpecialItem(), so the font data was
ignored. And xFontDecls was not set because it's set while reading
office:font-face-decls, which is at the top of the xml document, but even
before the xml is parsed, the call to SdXMLImport::setTargetDocument() calls
GetShapeImport(), which creates XMLShapeImportHelper instance, which calls
XMLTextImportHelper::CreateParaExtPropMapper(), and 
XMLTextImportPropertyMapper
is created with rImport.GetFontDecls() still being NULL at that point.

And it actually doesn't seem to make any sense to just pass around all
the pointers to XMLFontStylesContext, as eventually it's always just the one
from SvXMLImport. So simply dump all that and make the one single place
that actually uses it (i.e. 
XMLTextImportPropertyMapper::handleSpecialItem())
refer directly to SvXMLImport::GetFontDecls().

Change-Id: Ib1b3e4b1bcaf87ca3e4703d1cc1563ad6b3f9ce7
Reviewed-on: https://gerrit.libreoffice.org/4816
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit cc3293b94ab58b196bc2786eb4012d64351e8fa4)
Reviewed-on: https://gerrit.libreoffice.org/4820
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 0fc68b5..c15bd8b 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -409,9 +409,6 @@ public:
 
 void SetAutoStyles( SvXMLStylesContext *pStyles );
 
-void SetFontDecls( XMLFontStylesContext *pFontDecls );
-const XMLFontStylesContext *GetFontDecls() const;
-
 SvXMLImportContext *CreateTextChildContext(
 SvXMLImport rImport,
 sal_uInt16 nPrefix, const OUString rLocalName,
@@ -557,10 +554,10 @@ public:
 GetRubyImportPropertySetMapper() const;
 
 static SvXMLImportPropertyMapper *CreateShapeExtPropMapper(SvXMLImport);
-static SvXMLImportPropertyMapper *CreateParaExtPropMapper(SvXMLImport, 
XMLFontStylesContext *pFontDecls = NULL);
-static SvXMLImportPropertyMapper* 
CreateParaDefaultExtPropMapper(SvXMLImport, XMLFontStylesContext* pFontDecls = 
NULL);
-static SvXMLImportPropertyMapper* 
CreateTableDefaultExtPropMapper(SvXMLImport, XMLFontStylesContext* pFontDecls 
= NULL);
-static SvXMLImportPropertyMapper* 
CreateTableRowDefaultExtPropMapper(SvXMLImport, XMLFontStylesContext* 
pFontDecls = NULL);
+static SvXMLImportPropertyMapper *CreateParaExtPropMapper(SvXMLImport);
+static SvXMLImportPropertyMapper* 
CreateParaDefaultExtPropMapper(SvXMLImport);
+static SvXMLImportPropertyMapper* 
CreateTableDefaultExtPropMapper(SvXMLImport);
+static SvXMLImportPropertyMapper* 
CreateTableRowDefaultExtPropMapper(SvXMLImport);
 
 SvI18NMap GetRenameMap();
 
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index ae58bdd..0bae7ed 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -28,7 +28,6 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public 
SvXMLImportPropertyM
 {
 sal_Int32 nSizeTypeIndex;
 sal_Int32 nWidthTypeIndex;
-SvXMLImportContextRef xFontDecls;
 
 void FontFinished(
 XMLPropertyState *pFontFamilyNameState,
@@ -58,12 +57,9 @@ protected:
 public:
 XMLTextImportPropertyMapper(
 const UniReference XMLPropertySetMapper  rMapper,
-SvXMLImport rImport,
-XMLFontStylesContext *pFontDecls = 0 );
+SvXMLImport rImport );
 virtual ~XMLTextImportPropertyMapper();
 
-void SetFontDecls( XMLFontStylesContext *pFontDecls );
-
 /** This method is called when all attributes have benn processed. It may 
be used to remove items that are incomplete */
 virtual void finished(
 ::std::vector XMLPropertyState  rProperties,
diff --git

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-07-11 Thread bugzilla-daemon

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

Bug 60270 depends on bug 65338, which changed state.

Bug 65338 Summary: FILESAVE doesn't retain font settings of style: after save 
(as) and again opening of presentation, font is changed
https://bugs.freedesktop.org/show_bug.cgi?id=65338

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

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

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

2013-07-11 Thread Mark Wielaard

 cppcanvas/source/mtfrenderer/emfplus.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit cb14b1e56d2aab70d28afca8bf039a27f89671c8
Author: Mark Wielaard m...@klomp.org
Date:   Sun Jul 7 22:09:37 2013 +0200

Fix memory leak in EMFPPen.

Delete dashPattern, compoundArray, customStartCap and customEndCap
arrays if they were created in the destructor.

Change-Id: I5f3821b1ab0ac31a9cd4bc402c04090585953573
Reviewed-on: https://gerrit.libreoffice.org/4821
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index d3b58aa..a8b08d2 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -604,6 +604,18 @@ namespace cppcanvas
 public:
 EMFPPen () : EMFPBrush ()
 {
+dashPattern = NULL;
+compoundArray = NULL;
+customStartCap = NULL;
+customEndCap = NULL;
+}
+
+~EMFPPen ()
+{
+delete[] dashPattern;
+delete[] compoundArray;
+delete[] customStartCap;
+delete[] customEndCap;
 }
 
 void SetStrokeAttributes (rendering::StrokeAttributes 
rStrokeAttributes, ImplRenderer rR, const OutDevState rState)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source

2013-07-11 Thread Minh Ngo

 avmedia/source/vlc/vlcplayer.cxx |   46 ---
 avmedia/source/vlc/vlcwindow.hxx |1 
 2 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit 8f83e797f65b1b4a38f3866c43d59bfecdd7746b
Author: Minh Ngo nlmin...@gmail.com
Date:   Thu Jul 11 08:29:29 2013 +0300

Binding a video frame into a LibreOffice's widget

Change-Id: Iebf5b9f8cc83e7d2a96f105b07b6fe0eaf8b2678

diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 3c8453b..0a15a72 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -1,3 +1,6 @@
+#include vcl/syschild.hxx
+#include vcl/sysdata.hxx
+
 #include vlcplayer.hxx
 #include vlcwindow.hxx
 #include vlcframegrabber.hxx
@@ -22,7 +25,7 @@ const int MS_IN_SEC = 1000; // Millisec in sec
 
 namespace
 {
-libvlc_media_t* initMedia( const rtl::OUString url, 
boost::shared_ptrlibvlc_instance_t instance )
+libvlc_media_t* InitMedia( const rtl::OUString url, 
boost::shared_ptrlibvlc_instance_t instance )
 {
 rtl::OString dest;
 url.convertToString(dest, RTL_TEXTENCODING_UTF8, 0);
@@ -34,7 +37,7 @@ VLCPlayer::VLCPlayer( const rtl::OUString url )
 : VLC_Base(m_aMutex)
 , mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ), 
VLC_ARGS ), libvlc_release )
 , mPlayer( libvlc_media_player_new(mInstance.get()), 
libvlc_media_player_release )
-, mMedia( initMedia( url, mInstance), libvlc_media_release )
+, mMedia( InitMedia( url, mInstance), libvlc_media_release )
 {
 libvlc_media_player_set_media( mPlayer.get(), mMedia.get() );
 }
@@ -119,10 +122,47 @@ css::awt::Size SAL_CALL 
VLCPlayer::getPreferredPlayerWindowSize()
 return css::awt::Size( 1, 1 );
 }
 
+namespace
+{
+// TODO: Move this function to the common space for avoiding duplication 
with
+// gstreamer/gstwindow::createPlayerWindow functionality
+int GetWindowID( const uno::Sequence uno::Any  arguments )
+{
+if (arguments.getLength() = 2)
+return -1;
+
+sal_IntPtr pIntPtr = 0;
+
+arguments[ 2 ] = pIntPtr;
+
+SystemChildWindow *pParentWindow = reinterpret_cast 
SystemChildWindow* ( pIntPtr );
+
+const SystemEnvData* pEnvData = pParentWindow ? 
pParentWindow-GetSystemData() : NULL;
+
+if (pEnvData == NULL)
+return -1;
+
+// Explicit converts from long to int
+const int id = static_castint( pEnvData-aWindow );
+
+return id;
+}
+}
+
 uno::Reference css::media::XPlayerWindow  SAL_CALL 
VLCPlayer::createPlayerWindow( const uno::Sequence uno::Any  aArguments )
 {
 ::osl::MutexGuard aGuard(m_aMutex);
-return uno::Reference css::media::XPlayerWindow (new VLCWindow( *this ));
+
+VLCWindow * const window = new VLCWindow( *this );
+
+const int winID = GetWindowID( aArguments );
+
+if (winID != -1)
+{
+libvlc_media_player_set_xwindow( mPlayer.get(), winID );
+}
+
+return uno::Reference css::media::XPlayerWindow ( window );
 }
 
 uno::Reference css::media::XFrameGrabber  SAL_CALL 
VLCPlayer::createFrameGrabber()
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 3449e2c..268be6f 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -31,6 +31,7 @@ class VLCWindow : public ::cppu::WeakImplHelper2  
::com::sun::star::media::XPla
 VLCPlayer mPlayer;
 public:
 SAL_CALL VLCWindow(VLCPlayer player);
+
 void SAL_CALL update();
 ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel );
 css::media::ZoomLevel SAL_CALL getZoomLevel();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Jan Holesovsky

 sc/qa/unit/ucalc_sharedformula.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 5d6bfead080f31c421c4b236e3d6f2a9e8118b97
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Jul 11 07:36:06 2013 +0200

Fix Windows build.

Change-Id: I943171b14610f8a9e6561a60f4a3297e26e32f14

diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index 7093985..7934483 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -243,8 +243,8 @@ void Test::testSharedFormulasCopyPaste()
 ScAddress aPos(1, 8, 0); // B9
 ScFormulaCell* pFC = m_pDoc-GetFormulaCell(aPos);
 CPPUNIT_ASSERT_MESSAGE(B9 should be a formula cell., pFC);
-CPPUNIT_ASSERT_EQUAL(0, pFC-GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(10, pFC-GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(10), pFC-GetSharedLength());
 
 // Copy formulas in B6:B9 to the clipboard doc.
 ScRange aSrcRange(1,5,0,1,8,0); // B6:B9
@@ -252,8 +252,8 @@ void Test::testSharedFormulasCopyPaste()
 copyToClip(m_pDoc, aSrcRange, aClipDoc);
 pFC = aClipDoc.GetFormulaCell(aPos);
 CPPUNIT_ASSERT_MESSAGE(B9 in the clip doc should be a formula cell., 
pFC);
-CPPUNIT_ASSERT_EQUAL(5, pFC-GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(4, pFC-GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(5), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(4), pFC-GetSharedLength());
 
 // Paste them to C2:C10.
 ScRange aDestRange(2,1,0,2,9,0);
@@ -264,8 +264,8 @@ void Test::testSharedFormulasCopyPaste()
 aPos.SetRow(1);
 pFC = m_pDoc-GetFormulaCell(aPos);
 CPPUNIT_ASSERT_MESSAGE(C2 should be a formula cell., pFC);
-CPPUNIT_ASSERT_EQUAL(1, pFC-GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(9, pFC-GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(1), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(9), pFC-GetSharedLength());
 
 ScRange aRange(1,0,0,1,9,0); // B1:B10
 ScDocument* pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
@@ -280,8 +280,8 @@ void Test::testSharedFormulasCopyPaste()
 aPos.SetRow(i);
 pFC = pUndoDoc-GetFormulaCell(aPos);
 CPPUNIT_ASSERT_MESSAGE(Must be a formula cell., pFC);
-CPPUNIT_ASSERT_EQUAL(0, pFC-GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(10, pFC-GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(10), pFC-GetSharedLength());
 }
 
 // Overwrite B1:B10.
@@ -300,8 +300,8 @@ void Test::testSharedFormulasCopyPaste()
 aPos.SetRow(i);
 pFC = m_pDoc-GetFormulaCell(aPos);
 CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC);
-CPPUNIT_ASSERT_EQUAL(0, pFC-GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(10, pFC-GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(10), pFC-GetSharedLength());
 }
 
 m_pDoc-DeleteTab(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - firebird/ExternalProject_firebird.mk

2013-07-11 Thread Andrzej J . R . Hunt

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

New commits:
commit ef45930e5c2bb0129c4af63e2c912db676f18384
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 10 12:30:45 2013 +0100

Modify DYLD_LIBRARY_PATH for firebrid to build on Mac OS.

Change-Id: Iae45d39a9a1ce76b0af74c317c5990b3674a7ca6
Reviewed-on: https://gerrit.libreoffice.org/4806
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/firebird/ExternalProject_firebird.mk 
b/firebird/ExternalProject_firebird.mk
index 8853eca..aa4c597 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -43,7 +43,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(OUTDIR)/lib \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
 export LD_LIBRARY_PATH=$(OUTDIR)/lib:$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
-export PATH=$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell 
cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib) \
+export DYLD_LIBRARY_PATH=$(OUTDIR)/lib:$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
+   $(if $(filter WNT,$(OS)), export PATH=$(PATH):$(shell 
cygpath $(OUTDIR)/lib):$(shell cygpath $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)) \
 ./configure \
--without-editline \
--disable-superserver \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo 37341 MAXRECURSION reached in ScFormulaCell::Interpret

2013-07-11 Thread Winfried Donkers

Hi,

Presently I'm looking at bug fdo 37341, which reports calc to hang when Goal 
Seek (sc/source/core/tool/interpr2.cxx, ScInterpreter::ScBackSolver()) is used.
The cause of the problem is not that too many iterations are needed, but that 
MAXRECURSION in sc/source/core/data/formulacell.cxx, ScFormulaCell::Interpret() 
is reached.
Increasing MAXRECURSION 'solves' the problem.

I think increasing MAXRECURSION from its present value (400) to 800 is no 
problem. 10 years ago its value was 500 and in the past 1 years the available 
memory has been more than doubled.
But that does not really solve the problem, it only shifts the point where the 
problem will show.
Shouldn't a global error (or at least warning)  be generated when MAXRECURSION 
is reached? After all, the result of ScFormulaCell::Interpret() is not correct 
in that case.
Unfortunately, I can't quite grasp the recursion/interation process in 
ScFormulaCell::Interpret(), so I can't generate the appropiate error.

Do you have any suggestions about how to properly solve this?
To me just increasing MAXRECURSION to 800 is a dirty hack.



Winfried

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

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

2013-07-11 Thread Tor Lillqvist

 sc/source/core/opencl/openclwrapper.cxx |7 ++-
 sc/source/core/opencl/openclwrapper.hxx |3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9dfb46ae335c46bdf4b2e9df52cc443519230705
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 10:05:55 2013 +0300

WaE: comparison of integers of different signs

Change-Id: I59577fbe8c3a59bb56d32a6c441a3b655f97a753

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 1e0719b..26c4c80 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2096,7 +2096,7 @@ static cl_mem allocateDoubleBuffer(KernelEnv rEnv, const 
double *_pValues,
 nElements * sizeof(double), NULL, pStatus);
 fp_t *pValues = (fp_t 
*)clEnqueueMapBuffer(rEnv.mpkCmdQueue,xValues,CL_TRUE,CL_MAP_WRITE,0,
nElements * 
sizeof(fp_t),0,NULL,NULL,NULL);
-for(int i=0;inElements;i++)
+for(size_t i=0;inElements;i++)
 pValues[i] = (fp_t)_pValues[i];
 
 clEnqueueUnmapMemObject(rEnv.mpkCmdQueue,xValues,pValues,0,NULL,NULL);
@@ -2173,7 +2173,7 @@ double *OclCalc::OclSimpleDeltaOperation(OpCode eOp, 
const double *pOpArray,
 fp_t *pOutput = (fp_t 
*)clEnqueueMapBuffer(kEnv.mpkCmdQueue,outputCl,CL_TRUE,

CL_MAP_READ,0,nElements*sizeof(fp_t),
0,NULL,NULL,NULL);
-for(int i = 0; i  nElements; i++)
+for(size_t i = 0; i  nElements; i++)
 pResult[i] = (double)pOutput[i];
 
 clEnqueueUnmapMemObject(kEnv.mpkCmdQueue,outputCl,pOutput,0,NULL,NULL);
commit f7d2e3e08ca9de9424f58d9600ec88077d1a196f
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 10:03:17 2013 +0300

Again, bin no-op call of clGetCommandQueueInfo(CL_QUEUE_THREAD_HANDLE_AMD)

Besides, CL_QUEUE_THREAD_HANDLE_AMD is not defined any more in
openclwrappers.hxx.

Change-Id: I11fd3d9ea873cf8c9d62b3c2653cfb5e0bf4a437

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 0c94721..1e0719b 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -743,9 +743,6 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
 }
 }
 
-status = clGetCommandQueueInfo(gpuInfo-mpCmdQueue,
-CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL);
-
 return 0;
 
 }
commit a69e8fc686c4e6ec996ba91e61e3021e8f9e0d60
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 10:01:27 2013 +0300

Apple still has cl.h in a different path, fix conflict mis-resolution

Change-Id: I436e46d52659b28a3ecf5ad1a6366b0a79f062c4

diff --git a/sc/source/core/opencl/openclwrapper.hxx 
b/sc/source/core/opencl/openclwrapper.hxx
index 62ad389..d83b7c8 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -14,7 +14,11 @@
 #include formula/opcode.hxx
 #include sal/detail/log.h
 #include cassert
+#ifdef __APPLE__
+#include OpenCL/cl.h
+#else
 #include CL/cl.h
+#endif
 
 #if defined(_MSC_VER)
 #ifndef strcasecmp
commit cf1de6b8ceb3eb5b4b25af6167df62468ecefb3f
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 09:58:25 2013 +0300

Remove superfluous #endif

Change-Id: I5fcf215e7d044711f593f1c8099c0fad13d22141

diff --git a/sc/source/core/opencl/openclwrapper.hxx 
b/sc/source/core/opencl/openclwrapper.hxx
index fe62554..62ad389 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -15,7 +15,6 @@
 #include sal/detail/log.h
 #include cassert
 #include CL/cl.h
-#endif
 
 #if defined(_MSC_VER)
 #ifndef strcasecmp
commit cf04b77f08f3729201597f0acd82fc53e31795cd
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 09:57:59 2013 +0300

chmod -x

Change-Id: I5f8bdd55e361e97e21e61cf28a48548477a7522a

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/oclkernels.hxx 
b/sc/source/core/opencl/oclkernels.hxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/opencl/openclwrapper.hxx 
b/sc/source/core/opencl/openclwrapper.hxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread David Tardon

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 70376f610a7eb876739829e1f362bc94b21cb82f
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 11 09:25:16 2013 +0200

rhbz#980387 fix filter selection from file ext.

... for filters that have more than one extension associated with them
(e.g., JPEG).

Change-Id: Ic6b16d3b4aa17580404d02a9fb7b087b9aa52fc2

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 389e3f3..d237b86 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -36,6 +36,7 @@
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/ControlActions.hpp
 #include com/sun/star/uno/Any.hxx
+#include comphelper/string.hxx
 #include osl/mutex.hxx
 #include unx/gtk/gtkinst.hxx
 
@@ -790,6 +791,25 @@ uno::SequenceOUString SAL_CALL 
SalGtkFilePicker::getFiles() throw( uno::Runtim
 return aFiles;
 }
 
+namespace
+{
+
+bool lcl_matchFilter( const rtl::OUString rFilter, const rtl::OUString rExt )
+{
+const int nCount = comphelper::string::getTokenCount( rFilter, ';' );
+
+for ( int n = 0; n != nCount; ++n )
+{
+const rtl::OUString aToken = comphelper::string::getToken( rFilter, n, 
';' );
+if ( aToken == rExt )
+return true;
+}
+
+return false;
+}
+
+}
+
 uno::SequenceOUString SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( 
uno::RuntimeException )
 {
 SolarMutexGuard g;
@@ -852,7 +872,7 @@ uno::SequenceOUString SAL_CALL 
SalGtkFilePicker::getSelectedFiles() throw( uno
   ++aListIter
 )
 {
-if( aListIter-getFilter().equalsIgnoreAsciiCase( 
aStarDot+sExtension ) )
+if( lcl_matchFilter( aListIter-getFilter(), 
aStarDot+sExtension ) )
 {
 if( aNewFilter.isEmpty() )
 aNewFilter = aListIter-getTitle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - offapi/type_reference

2013-07-11 Thread Stephan Bergmann

 offapi/type_reference/offapi.rdb |binary
 1 file changed

New commits:
commit bd115a62bb3d1b741a035ace9d9c2608acd95c47
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 09:44:03 2013 +0200

fdo#66718: Remove XSystemClipboard from reference rdb again

...this had inadvertently been missing from
60455c972b09ca02b18660c6fb3dafc03b30b2b5 fdo#66718: Revert 'fdo#46808, 
Adapt
SystemClipboard UNO service to new style.'

Change-Id: Ibfab9a06d21301da5bd2fa8a5bbc77ffe3fab8ff

diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb
index 0d73ab1..f2d883f 100644
Binary files a/offapi/type_reference/offapi.rdb and 
b/offapi/type_reference/offapi.rdb differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Csikós Tamás

 sw/UIConfig_swriter.mk   |1 
 sw/source/ui/config/optpage.cxx  |  257 +++-
 sw/source/ui/inc/optpage.hxx |   51 +--
 sw/uiconfig/swriter/ui/optredlinepage.ui |  474 +++
 4 files changed, 614 insertions(+), 169 deletions(-)

New commits:
commit b67b78abb57b7d5580dd1e31b86c2c623db528f6
Author: CsikÃ³s TamÃ¡s csks.t...@gmail.com
Date:   Wed Jul 10 16:23:11 2013 +0200

modern .ui for optpage/redlineoptionstabpage

Change-Id: I848f6cdd11755d9f169e973515d6defc4f3ac420
Reviewed-on: https://gerrit.libreoffice.org/4814
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c528f47..43fc6a0 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
+sw/uiconfig/swriter/ui/optredlinepage \
sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 4aef2e1..25e25ed 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1655,78 +1655,63 @@ namespace
 
 SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
 const SfxItemSet rSet )
-: SfxTabPage(pParent, SW_RES(TP_REDLINE_OPT), rSet),
+: SfxTabPage(pParent, OptRedLinePage, 
modules/swriter/ui/optredlinepage.ui , rSet)
+//,sAuthor ( SW_RES( STR_AUTHOR )),
+//sNone   ( SW_RES( STR_NOTHING ))
 
-aInsertFL(  this, SW_RES( FL_TE )),
-
-aInsertFT(  this, SW_RES( FT_CHG_INSERT )),
-aInsertAttrFT(  this, SW_RES( FT_INS_ATTR )),
-aInsertLB(  this, SW_RES( LB_INS_ATTR )),
-aInsertColorFT( this, SW_RES( FT_INS_COL  )),
-aInsertColorLB( this, SW_RES( LB_INS_COL  )),
-aInsertedPreviewWN( this, SW_RES( WIN_INS )),
-
-aDeletedFT( this, SW_RES( FT_CHG_DELETE )),
-aDeletedAttrFT( this, SW_RES( FT_DEL_ATTR )),
-aDeletedLB( this, SW_RES( LB_DEL_ATTR )),
-aDeletedColorFT(this, SW_RES( FT_DEL_COL  )),
-aDeletedColorLB(this, SW_RES( LB_DEL_COL  )),
-aDeletedPreviewWN(  this, SW_RES( WIN_DEL )),
+{
 
-aChangedFT( this, SW_RES( FT_CHG_CHANGE )),
-aChangedAttrFT( this, SW_RES( FT_CHG_ATTR )),
-aChangedLB( this, SW_RES( LB_CHG_ATTR )),
-aChangedColorFT(this, SW_RES( FT_CHG_COL  )),
-aChangedColorLB(this, SW_RES( LB_CHG_COL  )),
-aChangedPreviewWN(  this, SW_RES( WIN_CHG )),
+get(pInsertLB,insert);
+get(pInsertColorLB,insertcolor);
+get(pInsertedPreviewWN,insertedpreview);
 
-aChangedFL  ( this, SW_RES( FL_LC )),
+get(pDeletedLB,deleted);
+get(pDeletedColorLB,deletedcolor);
+get(pDeletedPreviewWN,deletedpreview);
 
-aMarkPosFT  ( this, SW_RES( FT_MARKPOS )),
-aMarkPosLB  ( this, SW_RES( LB_MARKPOS )),
-aMarkColorFT( this, SW_RES( FT_LC_COL )),
-aMarkColorLB( this, SW_RES( LB_LC_COL )),
-aMarkPreviewWN  ( this, SW_RES( WIN_MARK )),
+get(pChangedLB,changed);
+get(pChangedColorLB,changedcolor);
+get(pChangedPreviewWN,changedpreview);
 
-sAuthor ( SW_RES( STR_AUTHOR )),
-sNone   ( SW_RES( STR_NOTHING ))
+get(pMarkPosLB,markpos);
+get(pMarkColorLB,markcolor);
+get(pMarkPreviewWN,markpreview);
 
-{
-FreeResource();
-
-for(sal_uInt16 i = 0; i  aInsertLB.GetEntryCount(); i++)
+//FreeResource();
+/*
+for(sal_uInt16 i = 0; i  pInsertLB-GetEntryCount(); i++)
 {
-String sEntry(aInsertLB.GetEntry(i));
-aDeletedLB.InsertEntry(sEntry);
-aChangedLB.InsertEntry(sEntry);
-};
-
+String sEntry(pInsertLB-GetEntry(i));
+pDeletedLB-InsertEntry(sEntry);
+pChangedLB-InsertEntry(sEntry);
+};*/
+/*
 // remove strikethrough from insert and change and underline + double
 // underline from delete
-aInsertLB.RemoveEntry(5);
-aChangedLB.RemoveEntry(5);
-aDeletedLB.RemoveEntry(4);
-aDeletedLB.RemoveEntry(3);
+pInsertLB-RemoveEntry(5);
+pChangedLB-RemoveEntry(5);
+pDeletedLB-RemoveEntry(4);
+pDeletedLB-RemoveEntry(3);*/
 
 Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
-aInsertLB.SetSelectHdl( aLk );
-aDeletedLB.SetSelectHdl( aLk );
-aChangedLB.SetSelectHdl( aLk );
+pInsertLB-SetSelectHdl( aLk );
+pDeletedLB-SetSelectHdl( aLk );
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - eb/8648bbad952a948a50daa4968e86e95580a713

2013-07-11 Thread Caolán McNamara

 eb/8648bbad952a948a50daa4968e86e95580a713 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b9b36f78d58ec027b2a15f1bac85be3ea6a0f78f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:06:18 2013 +0100

Notes added by 'git notes add'

diff --git a/eb/8648bbad952a948a50daa4968e86e95580a713 
b/eb/8648bbad952a948a50daa4968e86e95580a713
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/eb/8648bbad952a948a50daa4968e86e95580a713
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5c/da41a1f28f10b630067fa34d74a51ece904f48

2013-07-11 Thread Caolán McNamara

 5c/da41a1f28f10b630067fa34d74a51ece904f48 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b99cd8dceb3464c01577bc3946ccc39d97874f1c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:08:07 2013 +0100

Notes added by 'git notes add'

diff --git a/5c/da41a1f28f10b630067fa34d74a51ece904f48 
b/5c/da41a1f28f10b630067fa34d74a51ece904f48
new file mode 100644
index 000..12807d0
--- /dev/null
+++ b/5c/da41a1f28f10b630067fa34d74a51ece904f48
@@ -0,0 +1 @@
+prefer: 9e98f12db714b8a1a8cc64234bb4eea26e936166
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/fdo66773.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   19 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   13 +
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
 4 files changed, 35 insertions(+)

New commits:
commit 5bb9b70a66d7818844abfaa297893c095e03d24c
Author: Adam Co rattles2...@gmail.com
Date:   Wed Jul 10 16:43:51 2013 +0300

fdo#66773: fix for line spacing default

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

Change-Id: I7dafa709fd7dcd3df445277505468386c3f1cef2
Reviewed-on: https://gerrit.libreoffice.org/4810

diff --git a/sw/qa/extras/ooxmlexport/data/fdo66773.docx 
b/sw/qa/extras/ooxmlexport/data/fdo66773.docx
new file mode 100644
index 000..41f0abe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo66773.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6b65c90..4af6477 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -21,6 +21,8 @@
 #include com/sun/star/text/XTextViewCursorSupplier.hpp
 #include com/sun/star/text/XTextSection.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
+#include com/sun/star/style/LineSpacing.hpp
+#include com/sun/star/style/LineSpacingMode.hpp
 #include com/sun/star/view/XSelectionSupplier.hpp
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/ShadowFormat.hpp
@@ -90,6 +92,7 @@ public:
 void testFdo66543();
 void testN822175();
 void testFdo66688();
+void testFdo66773();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -152,6 +155,7 @@ void Test::run()
 {fdo66543.docx, Test::testFdo66543},
 {n822175.odt, Test::testN822175},
 {fdo66688.docx, Test::testFdo66688},
+{fdo66773.docx, Test::testFdo66773},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -914,6 +918,21 @@ void Test::testFdo66688()
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 80 ), getProperty sal_Int32 ( xFrame, 
BackColorTransparency ) );
 }
 
+void Test::testFdo66773()
+{
+// The problem was the line spacing was interpreted by Word as 'Multiple 
1.08' if no default settings were written.
+// Now after the 'docDefaults' section is written in styles.xml - there 
is no more problem.
+// (Word does not try to calculate some arbitrary value for line spacing).
+uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess 
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum = 
xParaEnumAccess-createEnumeration();
+CPPUNIT_ASSERT(xParaEnum-hasMoreElements());
+
+style::LineSpacing alineSpacing = 
getPropertystyle::LineSpacing(xParaEnum-nextElement(), ParaLineSpacing);
+CPPUNIT_ASSERT_EQUAL(style::LineSpacingMode::PROP, alineSpacing.Mode);
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(100), 
static_castsal_Int32(alineSpacing.Height));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bda961a..cab5cdf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2179,6 +2179,19 @@ void DocxAttributeOutput::StartStyles()
 m_pSerializer-startElementNS( XML_w, XML_styles,
 FSNS( XML_xmlns, XML_w ), 
http://schemas.openxmlformats.org/wordprocessingml/2006/main;,
 FSEND );
+
+DocDefaults();
+}
+
+void DocxAttributeOutput::DocDefaults( )
+{
+// To-Do : fill the 'w:docDefaults' node with actual data
+
+// Write the 'w:docDefaults' section here
+m_pSerializer-startElementNS( XML_w, XML_docDefaults, FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_rPrDefault, FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_pPrDefault, FSEND );
+m_pSerializer-endElementNS( XML_w, XML_docDefaults );
 }
 
 void DocxAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index a1132e9..c423275 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -192,6 +192,9 @@ public:
 /// Write default style.
 virtual void DefaultStyle( sal_uInt16 nStyle );
 
+/// Write Doc Defaults
+void DocDefaults( );
+
 /// Start of a style in the styles table.
 virtual void StartStyle( const String rName, bool bPapFmt,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 
nId,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - download.lst libvisio/libvisio-0.0.29-remove_whitespace.patch.1 libvisio/UnpackedTarball_libvisio.mk

2013-07-11 Thread Fridrich Štrba

 download.lst   |4 +-
 libvisio/UnpackedTarball_libvisio.mk   |4 --
 libvisio/libvisio-0.0.29-remove_whitespace.patch.1 |   32 -
 3 files changed, 2 insertions(+), 38 deletions(-)

New commits:
commit e44664b2c959fa3080181ddabc4b643b7ad9ce86
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 10 15:41:17 2013 +0200

Uploading new libvisio 0.0.30

with huge performance/memory consumption improvements
with NURBS and B-Splines

Change-Id: I5f338d6c70f948dd2192ec7147efdc1bdeef1e05
(cherry picked from commit 0f978a88c618af59e77aeba920093c5e67559c88)
Reviewed-on: https://gerrit.libreoffice.org/4811
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
(cherry picked from commit 55be2ef39353de434600fac0611747177ab9da30)
Reviewed-on: https://gerrit.libreoffice.org/4819
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/download.lst b/download.lst
index a5a37ca..3bf7104 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036
 export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2
-VISIO_MD5SUM := ca7a83bb2d81467e1f0222980cc08939
-export VISIO_TARBALL := libvisio-0.0.29.tar.bz2
+VISIO_MD5SUM := 9d9eb3ae6bee763c161228b2b12e25f8
+export VISIO_TARBALL := libvisio-0.0.30.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
diff --git a/libvisio/UnpackedTarball_libvisio.mk 
b/libvisio/UnpackedTarball_libvisio.mk
index 7e9ce61..e4c0561 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
-   libvisio/libvisio-0.0.29-remove_whitespace.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1 
b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
deleted file mode 100644
index 61dc118..000
--- a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
 a/src/lib/libvisio_utils.cpp
-+++ b/src/lib/libvisio_utils.cpp
-@@ -123,14 +123,15 @@ double libvisio::readDouble(WPXInputStream *input)
-   return tmpUnion.d;
- }
- 
--void libvisio::appendFromBase64(WPXBinaryData data, const unsigned char 
*base64String, size_t base64StringLength)
-+void libvisio::appendFromBase64(WPXBinaryData data, const unsigned char 
*base64Data, size_t base64DataLength)
- {
-+  std::string base64String((const char*)base64Data, base64DataLength);
-   typedef boost::archive::iterators::transform_width
-   boost::archive::iterators::binary_from_base64
--  boost::archive::iterators::remove_whitespace const char *  , 8, 6  
base64_decoder;
-+  boost::archive::iterators::remove_whitespace std::string::const_iterator  
, 8, 6  base64_decoder;
- 
-   std::vectorunsigned char buffer;
--  std::copy(base64_decoder(base64String), base64_decoder(base64String + 
base64StringLength), std::back_inserter(buffer));
-+  std::copy(base64_decoder(base64String.begin()), 
base64_decoder(base64String.end()), std::back_inserter(buffer));
- 
-   if (!buffer.empty())
- data.append(buffer[0], buffer.size());
 a/src/lib/libvisio_utils.h
-+++ b/src/lib/libvisio_utils.h
-@@ -98,7 +98,7 @@ uint64_t readU64(WPXInputStream *input);
- 
- double readDouble(WPXInputStream *input);
- 
--void appendFromBase64(WPXBinaryData data, const unsigned char *base64String, 
size_t base64StringLength);
-+void appendFromBase64(WPXBinaryData data, const unsigned char *base64Data, 
size_t base64DataLength);
- 
- const ::WPXString getColourString(const Colour c);
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Herbert Dürr

 cui/source/dialogs/cuifmsearch.cxx |8 
 cui/source/inc/cuifmsearch.hxx |1 +
 2 files changed, 9 insertions(+)

New commits:
commit f76173b517a17615241222f623e92f0f020dd2a8
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jul 10 12:16:11 2013 +

Resolves: #i122581# reestablish focus of the Record Search dialog...

to the search combobox

Patch by: Tsutomu Uchino hanya.r...@gmail.com

(cherry picked from commit 704bca1331d902281c3029aba65d57baa89d3731)

Change-Id: I5d454e164d2f33cebf5b5761ef3ce7ae1025c7c6

Return zero value from non-void function to prevent compiler warnings.

(cherry picked from commit 7986627ca418ec7c6fcaaa91367eda7f4b9aadaf)

Change-Id: I5d065ac9fc4272c28ffd418ce2043e01d41a2e14

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index a386b9c..a1c3e1f 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -245,6 +245,7 @@ void FmSearchDialog::Init(const OUString strVisibleFields, 
const OUString sIni
 
 m_cmbSearchText.SetModifyHdl(LINK(this, FmSearchDialog, 
OnSearchTextModified));
 m_cmbSearchText.EnableAutocomplete(sal_False);
+m_cmbSearchText.SetGetFocusHdl(LINK(this, FmSearchDialog, OnFocusGrabbed));
 
 m_cbUseFormat.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
 m_cbBackwards.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
@@ -437,6 +438,13 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
 }
 
 //
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+{
+m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+return 0;
+}
+
+//
 IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
 {
 (void) pBox; // avoid warning
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 3fcfa24..61c7386 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -172,6 +172,7 @@ private:
 DECL_LINK( OnPositionSelected, ListBox* );
 DECL_LINK( OnFieldSelected, ListBox* );
 
+DECL_LINK( OnFocusGrabbed, ComboBox* );
 DECL_LINK( OnCheckBoxToggled, CheckBox* );
 
 DECL_LINK( OnContextSelection, ListBox* );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Mark Wielaard

 filter/source/msfilter/msdffimp.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 81a608e930c29f6210524df939c7a1d8b1093069
Author: Mark Wielaard m...@klomp.org
Date:   Sun Jul 7 22:20:50 2013 +0200

Fix memory leak in SvxMSDffManager::CheckForConvertToSOObj.

Use boost::scoped_ptr for temporary SvMemoryStream.

Change-Id: I6235d7868bd20963aa5fdda32b1dd3b82cf0b182
Reviewed-on: https://gerrit.libreoffice.org/4760
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index e6d8d1e..58f455c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -136,6 +136,7 @@
 #include rtl/strbuf.hxx
 #include rtl/ustring.hxx
 #include boost/scoped_array.hpp
+#include boost/scoped_ptr.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
@@ -6838,17 +6839,17 @@ com::sun::star::uno::Reference  
com::sun::star::embed::XEmbeddedObject   SvxMS
 {
 //TODO/MBA: check if (and when) storage and stream will be destroyed!
 const SfxFilter* pFilter = 0;
-SvMemoryStream* pStream = new SvMemoryStream;
+::boost::scoped_ptrSvMemoryStream xMemStream (new SvMemoryStream);
 if ( pName )
 {
 // TODO/LATER: perhaps we need to retrieve VisArea and Metafile 
from the storage also
 SotStorageStreamRef xStr = rSrcStg.OpenSotStream( OUString( 
package_stream ), STREAM_STD_READ );
-*xStr  *pStream;
+*xStr  *xMemStream;
 }
 else
 {
 SfxFilterMatcher aMatch( sStarName );
-SotStorageRef xStorage = new SotStorage( sal_False, *pStream );
+SotStorageRef xStorage = new SotStorage( sal_False, *xMemStream );
 rSrcStg.CopyTo( xStorage );
 xStorage-Commit();
 xStorage.Clear();
@@ -6864,8 +6865,8 @@ com::sun::star::uno::Reference  
com::sun::star::embed::XEmbeddedObject   SvxMS
 aTmpName += OUString::number(nOleCount++);
 aTmpName += .bin;
 SvFileStream 
aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
-pStream-Seek(0);
-*pStream  aTmpStream;
+xMemStream-Seek(0);
+*xMemStream  aTmpStream;
 aTmpStream.Close();
 #endif
 if ( pName || pFilter )
@@ -6882,7 +6883,7 @@ com::sun::star::uno::Reference  
com::sun::star::embed::XEmbeddedObject   SvxMS
 
 uno::Sequence  beans::PropertyValue  aMedium( 
aFilterName.isEmpty() ? 2 : 3);
 aMedium[0].Name = OUString( InputStream );
-uno::Reference  io::XInputStream  xStream = new 
::utl::OSeekableInputStreamWrapper( *pStream );
+uno::Reference  io::XInputStream  xStream = new 
::utl::OSeekableInputStreamWrapper( *xMemStream );
 aMedium[0].Value = xStream;
 aMedium[1].Name = OUString( URL );
 aMedium[1].Value = OUString( private:stream );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 70/4bca1331d902281c3029aba65d57baa89d3731 79/86627ca418ec7c6fcaaa91367eda7f4b9aadaf

2013-07-11 Thread Caolán McNamara

 70/4bca1331d902281c3029aba65d57baa89d3731 |1 +
 79/86627ca418ec7c6fcaaa91367eda7f4b9aadaf |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 8e43795ba9e5880a65067636757fab973425ce25
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:23:31 2013 +0100

Notes added by 'git notes add'

diff --git a/79/86627ca418ec7c6fcaaa91367eda7f4b9aadaf 
b/79/86627ca418ec7c6fcaaa91367eda7f4b9aadaf
new file mode 100644
index 000..766c2dc
--- /dev/null
+++ b/79/86627ca418ec7c6fcaaa91367eda7f4b9aadaf
@@ -0,0 +1 @@
+merged as: f76173b517a17615241222f623e92f0f020dd2a8
commit 28bf691a3e41f5bdebb1207082bfd0b298b35cf4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:23:24 2013 +0100

Notes added by 'git notes add'

diff --git a/70/4bca1331d902281c3029aba65d57baa89d3731 
b/70/4bca1331d902281c3029aba65d57baa89d3731
new file mode 100644
index 000..766c2dc
--- /dev/null
+++ b/70/4bca1331d902281c3029aba65d57baa89d3731
@@ -0,0 +1 @@
+merged as: f76173b517a17615241222f623e92f0f020dd2a8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com toolkit/source vcl/source vcl/unx

2013-07-11 Thread Stephan Bergmann

 offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl  |   23 -
 offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl |2 
 toolkit/source/awt/vclxtoolkit.cxx  |5 -
 vcl/source/window/window.cxx|   42 
+-
 vcl/unx/generic/dtrans/X11_clipboard.cxx|6 -
 vcl/unx/generic/dtrans/X11_clipboard.hxx|5 -
 6 files changed, 27 insertions(+), 56 deletions(-)

New commits:
commit 73cdc655fb16fa229324d66eba01f0a3262314a4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 10:21:15 2013 +0200

fdo#66718: Demote SystemClipboard.createUnix to an internal hack

...see https://bugs.freedesktop.org/show_bug.cgi?id=66718#c8 for details.

Change-Id: I6e786ce21f41e51b480d0113ac0bd6a0013f4fb1

diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl 
b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index 0041471..9c5c780 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -20,35 +20,14 @@
 #ifndef __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 
-#include com/sun/star/awt/XDisplayConnection.idl
 #include com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
-#include com/sun/star/script/XInvocation.idl
-
 
 module com { module sun { module star { module datatransfer { module clipboard 
{
 
-
 /** The system clipboard service builds a bridge to the OS specific clipboard
 interfaces.
-
-br/br/pstrongNotes:/strong The Unix implementation needs to be 
instantiated with 2 Arguments:
-ul
-liA com::sun::star::awt::XDisplayConnection that provides the
-display to be used./li
-liA string that names the selection to be used/li
-/ul
-It is possible to use clipboards for different selections 
simultaneously./p
 */
-published service SystemClipboard : XSystemClipboard
-{
-createDefault();
-
-/** This method is only valid for unix systems (excluding MacOS) */
-createUnix([in] com::sun::star::awt::XDisplayConnection DisplayConnection,
-   [in] string ClipboardName,
-   [in] com::sun::star::script::XInvocation BmpConverter);
-};
-
+published service SystemClipboard : XSystemClipboard;
 
 }; }; }; }; };
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl 
b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
index 146db5b..1cb96db 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module datatransfer { 
module clipboard {
 /**
 Provides a unified interface for new-style service SystemClipboard.
 
-@since LibreOffice 4.1
+@since LibreOffice 4.2
 */
 published interface XSystemClipboard
 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 5be6f14..afe3eb1 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1315,10 +1315,9 @@ css::uno::Reference css::awt::XWindowPeer  
VCLXToolkit::ImplCreateWindow(
 {
 if( !mxClipboard.is() )
 {
-::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
 // remember clipboard here
-mxClipboard = ::com::sun::star::uno::Reference 
::com::sun::star::datatransfer::clipboard::XClipboard  (
-
::com::sun::star::datatransfer::clipboard::SystemClipboard::createDefault(xContext),
 ::com::sun::star::uno::UNO_QUERY );
+mxClipboard = 
css::datatransfer::clipboard::SystemClipboard::create(
+comphelper::getProcessComponentContext());
 }
 
 return mxClipboard;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9ad12cf..a0de356 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8480,20 +8480,15 @@ uno::Reference XClipboard  Window::GetClipboard()
 {
 try
 {
-uno::Reference XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
-ReferenceXSystemClipboard xSystemClipboard;
-#if defined(UNX)  !defined(MACOSX)  // unix clipboard needs to be 
initialized
-xSystemClipboard = SystemClipboard::createUnix( xContext, 
Application::GetDisplayConnection(), CLIPBOARD, vcl::createBmpConverter() );
-#else
-xSystemClipboard = SystemClipboard::createDefault(xContext);
-#endif
-mpWindowImpl-mpFrameData-mxClipboard.set( xSystemClipboard, 
UNO_QUERY );
+mpWindowImpl-mpFrameData-mxClipboard
+

[Libreoffice-commits] libvisio.git: configure.ac src/lib

2013-07-11 Thread Fridrich Štrba

 configure.ac   |7 ---
 src/lib/libvisio_utils.cpp |3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 128c47a9137baf121f39d63e3f89b699abc81d93
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 11 10:27:44 2013 +0200

Trying to use iterators without wrapping the data

diff --git a/configure.ac b/configure.ac
index 8af2f10..77bbe05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,11 +109,12 @@ AC_SUBST(ZLIB_LIBS)
 
 AC_CHECK_HEADERS(
boost/algorithm/string.hpp \
-   boost/optional.hpp \
-   boost/spirit/include/classic.hpp \
boost/archive/iterators/binary_from_base64.hpp \
boost/archive/iterators/remove_whitespace.hpp \
-   boost/archive/iterators/transform_width.hpp,
+   boost/archive/iterators/transform_width.hpp \
+   boost/optional.hpp \
+   boost/range/iterator_range.hpp \
+   boost/spirit/include/classic.hpp,
[],
[AC_MSG_ERROR(Required boost headers not found. install boost = 1.36)],
[]
diff --git a/src/lib/libvisio_utils.cpp b/src/lib/libvisio_utils.cpp
index ae3f237..9ad520c 100644
--- a/src/lib/libvisio_utils.cpp
+++ b/src/lib/libvisio_utils.cpp
@@ -35,6 +35,7 @@
 #include boost/archive/iterators/binary_from_base64.hpp
 #include boost/archive/iterators/remove_whitespace.hpp
 #include boost/archive/iterators/transform_width.hpp
+#include boost/range/iterator_range.hpp
 
 uint8_t libvisio::readU8(WPXInputStream *input)
 {
@@ -125,7 +126,7 @@ double libvisio::readDouble(WPXInputStream *input)
 
 void libvisio::appendFromBase64(WPXBinaryData data, const unsigned char 
*base64Data, size_t base64DataLength)
 {
-  std::string base64String((const char *)base64Data, base64DataLength);
+  boost::iterator_rangeconst char * base64String((const char *)base64Data, 
(const char *)base64Data + base64DataLength);
   typedef boost::archive::iterators::transform_width
   boost::archive::iterators::binary_from_base64
   boost::archive::iterators::remove_whitespace std::string::const_iterator  
, 8, 6  base64_decoder;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Caolán McNamara

 helpers/help_hid.lst |9 
 source/text/shared/optionen/01040700.xhp |   34 +++
 2 files changed, 17 insertions(+), 26 deletions(-)

New commits:
commit 2d7fe12895c38c0b4af2b466ba4c94d2247eef07
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:55:51 2013 +0100

update help ids for redline options page .ui conversion

Change-Id: I48d3248cfa99162a0ab484790f58543f7953b549

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d53281b..37ccdfe 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3021,7 +3021,6 @@ HID_QUERY_TABLENAME,38870,
 HID_REDLINE_ACCEPT,53219,
 HID_REDLINE_AUTOFMT_ACCEPT,53072,
 HID_REDLINE_CTRL,53226,
-HID_REDLINE_OPT,53217,
 HID_REFSELECTION_TOOLTIP,53077,
 HID_RELATIONDIALOG_LEFTFIELDCELL,38922,
 HID_RELATIONDIALOG_RIGHTFIELDCELL,38923,
@@ -8087,14 +8086,6 @@ sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680,
 sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260,
-sw_ListBox_TP_REDLINE_OPT_LB_CHG_ATTR,878874124,
-sw_ListBox_TP_REDLINE_OPT_LB_CHG_COL,878874126,
-sw_ListBox_TP_REDLINE_OPT_LB_DEL_ATTR,878874119,
-sw_ListBox_TP_REDLINE_OPT_LB_DEL_COL,878874121,
-sw_ListBox_TP_REDLINE_OPT_LB_INS_ATTR,878874114,
-sw_ListBox_TP_REDLINE_OPT_LB_INS_COL,878874116,
-sw_ListBox_TP_REDLINE_OPT_LB_LC_COL,878874132,
-sw_ListBox_TP_REDLINE_OPT_LB_MARKPOS,878874130,
 sw_ListBox_TP_SECTION_FTNENDNOTES_LB_END_NUMVIEW,879250980,
 sw_ListBox_TP_SECTION_FTNENDNOTES_LB_FTN_NUMVIEW,879250981,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801,
diff --git a/source/text/shared/optionen/01040700.xhp 
b/source/text/shared/optionen/01040700.xhp
index 441bee3..b77b175 100644
--- a/source/text/shared/optionen/01040700.xhp
+++ b/source/text/shared/optionen/01040700.xhp
@@ -28,9 +28,9 @@
/meta
body
   section id=aenderungen
-bookmark xml-lang=en-US branch=hid/SW_HID_REDLINE_OPT id=bm_id3149795 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/optredlinepage/OptRedLinePage id=bm_id3149795 
localize=false/
 paragraph xml-lang=en-US id=hd_id3153823 role=heading level=1 
l10n=U oldref=1link href=text/shared/optionen/01040700.xhp 
name=ChangesChanges/link/paragraph
- paragraph xml-lang=en-US id=par_id3149416 role=paragraph 
l10n=U oldref=2ahelp hid=HID_REDLINE_OPTDefines the appearance of 
changes in the document./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_id3149416 role=paragraph 
l10n=U oldref=2ahelp 
hid=modules/swriter/ui/optredlinepage/OptRedLinePageDefines the appearance 
of changes in the document./ahelp/paragraph
   /section
   paragraph xml-lang=en-US id=par_id3156153 role=paragraph l10n=U 
oldref=27To record or show changes in your text or spreadsheet document, 
choose link href=text/shared/01/0223.xhp name=Edit - 
ChangesemphEdit - Changes - Record/emph/link or emphEdit - Changes - 
Show/emph./paragraph
   section id=howtoget
@@ -38,35 +38,35 @@
   /section
   paragraph xml-lang=en-US id=hd_id3155419 role=heading level=2 
l10n=U oldref=3Text display/paragraph
   paragraph xml-lang=en-US id=par_id3144510 role=paragraph l10n=U 
oldref=4Defines the settings for displaying recorded changes. Select the 
type of change and the corresponding display attribute and color. The preview 
field shows the effect of the selected display options./paragraph
-bookmark xml-lang=en-US branch=hid/sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR 
id=bm_id3153896 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/optredlinepage/insert id=bm_id3153896 
localize=false/
 paragraph xml-lang=en-US id=hd_id3148550 role=heading level=3 l10n=U
  oldref=21Insertions / Attributes/paragraph
-  paragraph xml-lang=en-US id=par_id3154758 role=paragraph l10n=U 
oldref=22ahelp hid=SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTRSpecifies how 
changes in the document are displayed when text is inserted./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR 
id=bm_id3150358 localize=false/
+  paragraph xml-lang=en-US id=par_id3154758 role=paragraph l10n=U 
oldref=22ahelp hid=modules/swriter/ui/optredlinepage/insertSpecifies how 
changes in the document are displayed when text is inserted./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/optredlinepage/deleted id=bm_id3150358 
localize=false/
 paragraph xml-lang=en-US id=hd_id3152812 role=heading level=3 l10n=U
  oldref=23Deletions / Attributes/paragraph
-  paragraph xml-lang=en-US id=par_id3154365 role=paragraph l10n=U 
oldref=24ahelp hid=SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTRSpecifies how 
changes in the document are displayed when text is deleted. If you record text 
deletions, the text is displayed with the selected attribute (for example, 
strikethrough) and is not deleted./ahelp/paragraph

[Libreoffice-commits] core.git: helpcontent2

2013-07-11 Thread Caolán McNamara

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

New commits:
commit 7051a13fb036f17ce2cfff8f778aaf180404ac9d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 09:55:51 2013 +0100

Updated core
Project: help  2d7fe12895c38c0b4af2b466ba4c94d2247eef07

diff --git a/helpcontent2 b/helpcontent2
index 15a0007..2d7fe12 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 15a0007e4fef778ef6613e640868be043424ff4c
+Subproject commit 2d7fe12895c38c0b4af2b466ba4c94d2247eef07
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: lcov/coverage.sh

2013-07-11 Thread Miklos Vajna

 lcov/coverage.sh |5 +
 1 file changed, 5 insertions(+)

New commits:
commit fd828d3c74a3de04f24b5396571ed98171d7a43e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 11 10:57:28 2013 +0200

lcov: add sw_docxexport area

Change-Id: I37efc02dc269afc4124b67b0aa3958ade208403a

diff --git a/lcov/coverage.sh b/lcov/coverage.sh
index ce8c300..99bbdc5 100755
--- a/lcov/coverage.sh
+++ b/lcov/coverage.sh
@@ -32,6 +32,10 @@ coverage()
 parallelism=$(make -s cmd cmd='echo $(CHECK_PARALLELISM)'|tail -n 1)
 
 case $1 in
+sw_docxexport)
+# Writer DOCX export
+coverage sw source/filter/ww8 'docx*' sw CppunitTest_sw_ooxmlexport
+;;
 sw_rtfimport)
 # Writer RTF import
 coverage writerfilter source/rtftok '*' sw 'CppunitTest_sw_rtfimport 
CppunitTest_sw_rtfexport'
@@ -43,6 +47,7 @@ case $1 in
 *)
 echo Unknown code area. The currently supported ones are:
 echo
+echo sw_docxexport
 echo sw_rtfexport
 echo sw_rtfimport
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Tor Lillqvist

 sc/source/core/opencl/openclwrapper.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2812451c08ed222b57dd6e8d790ba4bada581719
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 11:43:57 2013 +0300

Re-do 5dff961ba5fab6d451d9d993e076d190a93be495: Don't look for just GPUs

Surely we want to use any available device, not just a GPU? If what we
want is to *prefer* GPUs, the code need to be changed then to work
like that.

Change-Id: Ic689c3ab914de3cb77e5af686f0c330a9257d8fb

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index e377dc1..f767479 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -191,7 +191,7 @@ int OpenclDevice::BinaryGenerated(const char * clFileName, 
FILE ** fhandle)
 FILE *fd = NULL;
 cl_uint numDevices=0;
 status = clGetDeviceIDs(gpuEnv.mpPlatformID, // platform
-CL_DEVICE_TYPE_GPU, // device_type
+CL_DEVICE_TYPE_ALL, // device_type
 0, // num_entries
 NULL, // devices ID
 numDevices);
@@ -670,7 +670,7 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
 gpuInfo-mpPlatformID = platforms[i];
 
 status = clGetDeviceIDs(gpuInfo-mpPlatformID, // platform
-CL_DEVICE_TYPE_GPU,// 
device_type
+CL_DEVICE_TYPE_ALL,// 
device_type
 0,   // 
num_entries
 NULL,   // devices
 numDevices);
@@ -700,12 +700,15 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
 gpuInfo-mpContext = clCreateContextFromType(cps, gpuInfo-mDevType, 
NULL,
 NULL, status);
 
+// If no GPU, check for CPU.
 if ((gpuInfo-mpContext == (cl_context) NULL)
 || (status != CL_SUCCESS)) {
 gpuInfo-mDevType = CL_DEVICE_TYPE_CPU;
 gpuInfo-mpContext = clCreateContextFromType(cps, 
gpuInfo-mDevType,
 NULL, NULL, status);
 }
+
+// If no GPU or CPU, check for a default type.
 if ((gpuInfo-mpContext == (cl_context) NULL)
 || (status != CL_SUCCESS)) {
 gpuInfo-mDevType = CL_DEVICE_TYPE_DEFAULT;
commit ca3c7595221073315661458fbabc08850c2b4e58
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 11:30:42 2013 +0300

Again: Use correct type for number of devices

The change from 7e00a3690edbf71d6c3e6c0670875485f65c567d was
(unintentionally, I hope) lost in a merge, it seems?

The number returned by clGetProgramInfo(..., CL_PROGRAM_NUM_DEVICES,
...) and clGetContextInfo(..., CL_CONTEXT_NUM_DEVICES, ...) is of type
cl_uint, not size_t. That makes a difference for 64-bit code.

Change-Id: I08257782ff70fbfecd5c74bde9c7b9597aed2105

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 26c4c80..e377dc1 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -238,7 +238,8 @@ int OpenclDevice::GeneratBinFromKernelSource(cl_program 
program,
 {
  unsigned int i = 0;
 cl_int status;
-size_t *binarySizes, numDevices;
+size_t *binarySizes;
+cl_uint numDevices;
 cl_device_id *mpArryDevsID;
 char **binaries, *str = NULL;
 
@@ -426,7 +427,7 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, const 
char *buildOption) {
 const char *source;
 size_t source_size[1];
 int b_error, binary_status, binaryExisted, idx;
-size_t numDevices;
+cl_uint numDevices;
 cl_device_id *mpArryDevsID;
 FILE *fd, *fd1;
 const char* filename = kernel.cl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - 2 commits - connectivity/Library_firebird_sdbc.mk connectivity/Library_firebird-sdbc.mk connectivity/Module_connectivity.mk connectivi

2013-07-11 Thread Andrzej J . R . Hunt

 Repository.mk   |  
  2 
 connectivity/Library_firebird-sdbc.mk   |  
 48 
 connectivity/Library_firebird_sdbc.mk   |  
 50 
 connectivity/Module_connectivity.mk |  
  4 
 connectivity/Rdb_firebird-sdbc.mk   |  
 14 -
 connectivity/Rdb_firebird_sdbc.mk   |  
 14 +
 connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu |  
 48 
 connectivity/source/drivers/firebird/FConnection.cxx|  
 24 +-
 connectivity/source/drivers/firebird/FConnection.hxx|  
  5 
 connectivity/source/drivers/firebird/FDatabaseMetaData.cxx  |  
  3 
 connectivity/source/drivers/firebird/FDriver.cxx|  
107 +-
 connectivity/source/drivers/firebird/FDriver.hxx|  
  4 
 connectivity/source/drivers/firebird/OTypeInfo.hxx  |  
100 -
 connectivity/source/drivers/firebird/firebird-sdbc.component|  
 16 -
 connectivity/source/drivers/firebird/firebird_sdbc.component|  
 16 +
 dbaccess/Library_dba.mk |  
  6 
 scp2/source/base/module_base.scp|  
  4 
 17 files changed, 267 insertions(+), 198 deletions(-)

New commits:
commit 8af4693b153a9b5b9469d41d5522cd70d1496d7f
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 10:14:58 2013 +0100

Create new fdb and/or extract from .odb as appropriate.

Change-Id: I99dd3300c2a7e903bc924b15c4fea2fd3ad4abb8

diff --git 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 003cb03..527640a 100644
--- 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -33,6 +33,54 @@
   --
 oor:component-data oor:name=Drivers 
oor:package=org.openoffice.Office.DataAccess 
xmlns:install=http://openoffice.org/2004/installation; 
xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
   node oor:name=Installed install:module=firebird
+node oor:name=sdbc:embedded:firebird oor:op=replace
+  prop oor:name=Driver
+valuecom.sun.star.comp.sdbc.FirebirdDriver/value
+  /prop
+  prop oor:name=DriverTypeDisplayName oor:type=xs:string
+value xml:lang=en-USFirebird/value
+  /prop
+  node oor:name=Properties
+!-- Don't use ODBC syntax for datetime literals and (full) outer 
joins,
+ as PostgreSQL does not support it,
+ but supports the _interior_ of these escapes just fine. --
+node oor:name=EscapeDateTime oor:op=replace
+  prop oor:name=Value oor:type=xs:boolean
+valuefalse/value
+  /prop
+/node
+!--   Confusingly, this corresponds to UseBracketedOuterJoinSyntax 
in the Features --
+node oor:name=EnableOuterJoinEscape oor:op=replace
+  prop oor:name=Value oor:type=xs:boolean
+valuefalse/value
+  /prop
+/node
+  /node
+  node oor:name=Features
+!-- These entries enable the Advanced Settings UI to change the 
settings
+ whose default is set in node Properties above;
+ as this is guaranteed not to work with PostgreSQL,
+ we don't let people shoot themselves in the foot and don't enable 
the UI. --
+  !--   node oor:name=EscapeDateTime oor:op=replace --
+  !-- prop oor:name=Value oor:type=xs:boolean --
+  !--   valuefalse/value --
+  !-- /prop --
+  !--   /node --
+!--   Confusingly, this corresponds to EnableOuterJoinEscape in the 
Properties --
+  !--   node oor:name=UseBracketedOuterJoinSyntax oor:op=replace --
+  !-- prop oor:name=Value oor:type=xs:boolean --
+  !--   valuefalse/value --
+  !-- /prop --
+  !--   /node --
+  /node
+  node oor:name=MetaData
+   node oor:name=Authentication oor:op=replace
+  prop oor:name=Value oor:type=xs:string
+valueUserPassword/value
+  /prop
+/node
+  /node
+/node
 node oor:name=sdbc:firebird:* oor:op=replace
   prop oor:name=Driver
 valuecom.sun.star.comp.sdbc.FirebirdDriver/value
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx 
b/connectivity/source/drivers/firebird/FConnection.cxx
index 5efd165..e72b87e 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++

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

2013-07-11 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/fdo58577.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   15 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 11 10:43:07 2013 +0200

fdo#58577 DOCX export: handle multiple textframes anchored to the same para

Also fixes ~SwIndexReg assertion on closing the document.

Change-Id: I7c1a9d3d646f2dacdbced2af355c076c1a1063ec

diff --git a/sw/qa/extras/ooxmlexport/data/fdo58577.odt 
b/sw/qa/extras/ooxmlexport/data/fdo58577.odt
new file mode 100644
index 000..4c8656d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo58577.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4af6477..9535083 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -93,6 +93,7 @@ public:
 void testN822175();
 void testFdo66688();
 void testFdo66773();
+void testFdo58577();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -156,6 +157,7 @@ void Test::run()
 {n822175.odt, Test::testN822175},
 {fdo66688.docx, Test::testFdo66688},
 {fdo66773.docx, Test::testFdo66773},
+{fdo58577.odt, Test::testFdo58577},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -933,6 +935,14 @@ void Test::testFdo66773()
 CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(100), 
static_castsal_Int32(alineSpacing.Height));
 }
 
+void Test::testFdo58577()
+{
+// The second frame was simply missing, so let's check if both frames were 
imported back.
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cab5cdf..9957ff4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -293,10 +293,13 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer-mergeTopMarks();
 
 // Write the anchored frame if any
-if ( m_pParentFrame )
+// Make a copy and clear the original early, as this method is called
+// recursively for in-frame paragraphs
+std::vectorsw::Frame aParentFrames = m_aParentFrames;
+m_aParentFrames.clear();
+for (size_t i = 0; i  aParentFrames.size(); ++i)
 {
-sw::Frame *pParentFrame = m_pParentFrame;
-m_pParentFrame = NULL;
+sw::Frame* pParentFrame = aParentFrames[i];
 
 const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( );
 const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
@@ -356,8 +359,6 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_rExport.RestoreData();
 
 m_rExport.mpParentFrame = NULL;
-
-delete pParentFrame;
 }
 
 m_pSerializer-endElementNS( XML_w, XML_p );
@@ -2772,7 +2773,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 case sw::Frame::eTxtBox:
 {
 // The frame output is postponed to the end of the anchor 
paragraph
-m_pParentFrame = new sw::Frame(rFrame);
+m_aParentFrames.push_back(sw::Frame(rFrame));
 }
 break;
 case sw::Frame::eOle:
@@ -5162,7 +5163,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_nTableDepth( 0 ),
   m_bParagraphOpened( false ),
   m_nColBreakStatus( COLBRK_NONE ),
-  m_pParentFrame( NULL ),
   m_bTextFrameSyntax( false ),
   m_closeHyperlinkInThisRun( false ),
   m_closeHyperlinkInPreviousRun( false ),
@@ -5192,7 +5192,6 @@ DocxAttributeOutput::~DocxAttributeOutput()
 delete m_pEndnotesList, m_pEndnotesList = NULL;
 
 delete m_pTableWrt, m_pTableWrt = NULL;
-delete m_pParentFrame;
 }
 
 DocxExport DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index c423275..06f12fa 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -642,7 +642,7 @@ private:
 // beginning of the next paragraph
 DocxColBreakStatus m_nColBreakStatus;
 
-sw::Frame *m_pParentFrame;
+std::vectorsw::Frame m_aParentFrames;
 bool

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

2013-07-11 Thread Caolán McNamara

 sc/inc/helpids.h   |2 
 sc/uiconfig/scalc/ui/tpviewpage.ui |  569 ++---
 2 files changed, 291 insertions(+), 280 deletions(-)

New commits:
commit c08b7d275b89b7d5d4a2a5ef66f54c726adf1661
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 10:26:37 2013 +0100

move string lists into GtkComboBoxTexts

Change-Id: Ib925eb978451c847bb2884bbc0a72449e72cbf0f

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index a57fd88..bb7e205 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -65,8 +65,6 @@
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
 
-#define HID_SCPAGE_CONTENT  
SC_HID_SCPAGE_CONTENT
-
 #define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
 
 #define HID_SC_GROUP_COLS   
SC_HID_SC_GROUP_COLS
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui 
b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 39847dd..9e498f7 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -1,345 +1,359 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkBox id=TpViewPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=spacing12/property
 property name=border_width6/property
+property name=spacing12/property
 child
-  object class=GtkBox id=box2
+  object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
-property name=vexpandTrue/property
-property name=orientationvertical/property
-property name=spacing12/property
 child
-  object class=GtkFrame id=frame1
+  object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
-property name=label_xalign0/property
-property name=shadow_typenone/property
+property name=vexpandTrue/property
+property name=orientationvertical/property
+property name=spacing12/property
 child
-  object class=GtkAlignment id=alignment1
+  object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
-property name=vexpandTrue/property
-property name=top_padding6/property
-property name=left_padding12/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
 child
-  object class=GtkGrid id=grid1
+  object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
-property name=row_spacing6/property
-property name=column_spacing12/property
+property name=vexpandTrue/property
+property name=top_padding6/property
+property name=left_padding12/property
 child
-  object class=GtkComboBox id=grid
+  object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-items
-  itemShow/item
-  itemShow on colored cells/item
-  itemHide/item
-/items
-  /object
-  packing
-property name=left_attach1/property
-property name=top_attach0/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=svxlo-ColorLB id=color
+property name=row_spacing6/property
+property name=column_spacing12/property
+child
+  object class=svxlo-ColorLB id=color
 property name=visibleTrue/property
 property name=can_focusFalse/property
   /object
-  packing
-property name=left_attach1/property
-

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

2013-07-11 Thread Caolán McNamara

 helpers/help_hid.lst |   21 ---
 source/text/shared/optionen/01060100.xhp |   83 +++
 2 files changed, 41 insertions(+), 63 deletions(-)

New commits:
commit 5a69c57b710e35b715e5a55a175caec58cd5f704
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 10:37:47 2013 +0100

update help ids for calc view options .ui conversion

Change-Id: I3baf372658c09a8b39a320b0c7d266d774545964

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 37ccdfe..d222fa6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3199,7 +3199,6 @@ HID_SCH_TRENDLINE_SHOW_R_SQUARED,63381,
 HID_SCH_WIN_DOCUMENT,63289,
 HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
-HID_SCPAGE_CONTENT,58892,
 HID_SCPAGE_SUBT_GROUP,58876,
 HID_SCPAGE_SUBT_GROUP1,58885,
 HID_SCPAGE_SUBT_GROUP2,58886,
@@ -6369,22 +6368,6 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_LOOKUP,957252627,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_MATCH,957252626,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_ANCHOR,958186521,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_ANNOT,958186519,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_CLIP,958186529,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_FORMULA,958186517,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_GRID,958186553,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_GUIDELINE,958186556,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_HSCROLL,958186548,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_NIL,958186518,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_OUTLINE,958186551,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_PAGEBREAKS,958186562,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_RFIND,958186571,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER,958186547,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM,958186531,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_TBLREG,958186550,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_VALUE,958186520,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_VSCROLL,958186549,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_CASE,956810262,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_FORMATS,956810273,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_PAGEBREAK,956810261,
@@ -6538,10 +6521,6 @@ sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
 sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478,
 sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_COPY_AREA,2567097862,
 sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_CRITERIA_AREA,2567097907,
-sc_ListBox_RID_SCPAGE_CONTENT_LB_COLOR,958189115,
-sc_ListBox_RID_SCPAGE_CONTENT_LB_DIAGRAM,958189086,
-sc_ListBox_RID_SCPAGE_CONTENT_LB_DRAW,958189088,
-sc_ListBox_RID_SCPAGE_CONTENT_LB_OBJGRF,958189084,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
diff --git a/source/text/shared/optionen/01060100.xhp 
b/source/text/shared/optionen/01060100.xhp
index e73cada..bee5135 100644
--- a/source/text/shared/optionen/01060100.xhp
+++ b/source/text/shared/optionen/01060100.xhp
@@ -54,9 +54,9 @@
  bookmark_valuetabs; displaying sheet tabs/bookmark_value
  bookmark_valueoutlines;outline symbols/bookmark_value
 /bookmarkcommentMW copied displaying;comments over to  Calc guide 
note_insert.xhp and deleted comments;displaying/comment
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_CONTENT 
id=bm_id3157898 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/scalc/ui/tpviewpage/TpViewPage 
id=bm_id3157898 localize=false/
 paragraph xml-lang=en-US id=hd_id3150445 role=heading level=1 
l10n=U oldref=1link href=text/shared/optionen/01060100.xhp 
name=ViewView/link/paragraph
- paragraph xml-lang=en-US id=par_id3153988 role=paragraph 
l10n=U oldref=2ahelp hid=HID_SCPAGE_CONTENTDefines which elements of 
the item type=productname%PRODUCTNAME/item Calc main window are 
displayed. You can also show or hide highlighting of values in 
tables./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_id3153988 role=paragraph 
l10n=U oldref=2ahelp hid=modules/scalc/ui/tpviewpage/TpViewPageDefines 
which elements of the item type=productname%PRODUCTNAME/item Calc main 
window are displayed. You can also show or hide highlighting of values in 
tables./ahelp/paragraph
   /section
   section id=howtoget
  embed href=text/shared/00/0406.xhp#tabelleinhalte/
@@ -64,95 +64,94 @@
   paragraph xml-lang=en-US id=hd_id3153682 role=heading level=2 
l10n=U
  oldref=28Visual aids/paragraph
   paragraph xml-lang=en-US id=par_id3153311 role=paragraph l10n=U 
oldref=29Specifies which lines are displayed./paragraph
-bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_GRID 
id=bm_id3148538 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/scalc/ui/tpviewpage/grid 
id=bm_id3148538 localize=false/
 paragraph xml-lang=en-US id=hd_id3147242 role=heading level=3 l10n=U
  oldref=30Grid lines/paragraph
-  paragraph xml-lang=en-US id=par_id3153088 role=paragraph l10n=U 
oldref=31ahelp

[Libreoffice-commits] core.git: helpcontent2

2013-07-11 Thread Caolán McNamara

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

New commits:
commit 12df7429f5506827b23fa023a9d6fe5b936037ce
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 10:37:47 2013 +0100

Updated core
Project: help  5a69c57b710e35b715e5a55a175caec58cd5f704

diff --git a/helpcontent2 b/helpcontent2
index 2d7fe12..5a69c57 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2d7fe12895c38c0b4af2b466ba4c94d2247eef07
+Subproject commit 5a69c57b710e35b715e5a55a175caec58cd5f704
___
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

2013-07-11 Thread bugzilla-daemon

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

Bug 60270 depends on bug 66718, which changed state.

Bug 66718 Summary: BASIC Clipboard API has lost functionality
https://bugs.freedesktop.org/show_bug.cgi?id=66718

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk

2013-07-11 Thread Manal Alhassoun

 chart2/AllLangResTarget_chartcontroller.mk   |1 
 chart2/UIConfig_chart2.mk|2 
 chart2/source/controller/dialogs/ResourceIds.hrc |1 
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx |   98 ++---
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc |   40 --
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src |   91 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx |   21 -
 chart2/uiconfig/ui/insertaxisdlg.ui  |  282 +++
 chart2/uiconfig/ui/insertgriddlg.ui  |  282 +++
 9 files changed, 614 insertions(+), 204 deletions(-)

New commits:
commit 40a32467139758d3f37445004caf50f19b6eeb6e
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Wed Jul 10 12:29:04 2013 +0300

insertgriddlg.ui and insertaxisdlg.ui widgets

Change-Id: Ib5b84806189b44ca1b4c74c958d0fafa86030c36
Reviewed-on: https://gerrit.libreoffice.org/4799
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 8e6d852..3532030 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/dlg_CreationWizard.src \
 chart2/source/controller/dialogs/dlg_DataEditor.src \
 chart2/source/controller/dialogs/dlg_DataSource.src \
-chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src \
 chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
 chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
 chart2/source/controller/dialogs/dlg_InsertLegend.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 48d1561..91d101b 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
+   chart2/uiconfig/ui/insertaxisdlg \
+   chart2/uiconfig/ui/insertgriddlg \
chart2/uiconfig/ui/smoothlinesdlg \
chart2/uiconfig/ui/steppedlinesdlg \
 ))
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc 
b/chart2/source/controller/dialogs/ResourceIds.hrc
index ed625bb..09aa8d2 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -28,7 +28,6 @@
 #define DLG_DIAGRAM_TYPE743
 #define DLG_CHART_WIZARD902
 #define DLG_DATA_SOURCE 901
-#define DLG_AXIS_OR_GRID839
 #define DLG_DATA_DESCR  836
 #define DLG_LEGEND  835
 #define DLG_TITLE   834
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx 
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index bc60d24..a31f514 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -18,7 +18,6 @@
  */
 
 #include dlg_InsertAxis_Grid.hxx
-#include dlg_InsertAxis_Grid.hrc
 
 #include ResId.hxx
 #include chartview/ChartSfxItemIds.hxx
@@ -53,72 +52,59 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 
 SchAxisDlg::SchAxisDlg( Window* pWindow
, const InsertAxisOrGridDialogData rInput, sal_Bool 
bAxisDlg )
-   :
-ModalDialog( pWindow, SchResId( DLG_AXIS_OR_GRID )),
-
-aFlPrimary( this, SchResId( FL_PRIMARY_AXIS )),
-aFlPrimaryGrid( this, SchResId( FL_PRIMARY_GRID )),
-aCbPrimaryX( this, SchResId( CB_X_PRIMARY )),
-aCbPrimaryY( this, SchResId( CB_Y_PRIMARY )),
-aCbPrimaryZ( this, SchResId( CB_Z_PRIMARY )),
-
-aFlSecondary( this, SchResId( FL_SECONDARY_AXIS )),
-aFlSecondaryGrid( this, SchResId( FL_SECONDARY_GRID )),
-aCbSecondaryX( this, SchResId( CB_X_SECONDARY )),
-aCbSecondaryY( this, SchResId( CB_Y_SECONDARY )),
-aCbSecondaryZ( this, SchResId( CB_Z_SECONDARY )),
-
-aPbOK( this, SchResId( BTN_OK )),
-aPbCancel( this, SchResId( BTN_CANCEL )),
-aPbHelp( this, SchResId( BTN_HELP ))
-
+: ModalDialog(pWindow,
+  bAxisDlg ?
+  OString(InsertAxisDialog) :
+  OString(InsertGridDialog),
+  bAxisDlg ?
+  OUString(modules/schart/ui/insertaxisdlg.ui) :
+  OUString(modules/schart/ui/insertgriddlg.ui))
 //rOutAttrs( rInAttrs )
 {
-FreeResource();
+get(m_pCbPrimaryX, primaryX);
+get(m_pCbPrimaryY, primaryY);
+get(m_pCbPrimaryZ, primaryZ);
+get(m_pCbSecondaryX, secondaryX);
+get(m_pCbSecondaryY, secondaryY);
+get(m_pCbSecondaryZ, secondaryZ);
+
 if(!bAxisDlg)
 {
 SetHelpId( HID_INSERT_GRIDS );
-SetText(

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

2013-07-11 Thread Caolán McNamara

 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx |   40 ---
 chart2/source/controller/inc/HelpIds.hrc |2 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx |2 
 chart2/uiconfig/ui/insertaxisdlg.ui  |   22 ++--
 chart2/uiconfig/ui/insertgriddlg.ui  |   22 ++--
 5 files changed, 26 insertions(+), 62 deletions(-)

New commits:
commit 1c7e0ba6cd9b1ce6a3e1c65460a3a0849bcb3189
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 10:49:11 2013 +0100

post .ui conversion we can remove explicit SetPosPixel and HelpIds

Change-Id: I2b7ff3e667ce1085676168e19a9c4ce7c404ac0b

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx 
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index a31f514..9b59ed4 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -50,16 +50,15 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 //
 //==
 
-SchAxisDlg::SchAxisDlg( Window* pWindow
-   , const InsertAxisOrGridDialogData rInput, sal_Bool 
bAxisDlg )
-: ModalDialog(pWindow,
-  bAxisDlg ?
-  OString(InsertAxisDialog) :
-  OString(InsertGridDialog),
-  bAxisDlg ?
-  OUString(modules/schart/ui/insertaxisdlg.ui) :
-  OUString(modules/schart/ui/insertgriddlg.ui))
-//rOutAttrs( rInAttrs )
+SchAxisDlg::SchAxisDlg(Window* pWindow,
+const InsertAxisOrGridDialogData rInput, bool bAxisDlg)
+: ModalDialog(pWindow,
+  bAxisDlg ?
+  OString(InsertAxisDialog) :
+  OString(InsertGridDialog),
+  bAxisDlg ?
+  OUString(modules/schart/ui/insertaxisdlg.ui) :
+  OUString(modules/schart/ui/insertgriddlg.ui))
 {
 get(m_pCbPrimaryX, primaryX);
 get(m_pCbPrimaryY, primaryY);
@@ -68,28 +67,11 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
 get(m_pCbSecondaryY, secondaryY);
 get(m_pCbSecondaryZ, secondaryZ);
 
-if(!bAxisDlg)
-{
-SetHelpId( HID_INSERT_GRIDS );
-
-m_pCbPrimaryX-SetHelpId( HID_SCH_CB_XGRID );
-m_pCbPrimaryY-SetHelpId( HID_SCH_CB_YGRID );
-m_pCbPrimaryZ-SetHelpId( HID_SCH_CB_ZGRID );
-m_pCbSecondaryX-SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
-m_pCbSecondaryY-SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
-m_pCbSecondaryZ-SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
-}
-else
+if (bAxisDlg)
 {
 
 //todo: remove if secondary z axis are possible somewhere
-{
-m_pCbSecondaryZ-Hide();
-
-Size aSize( GetSizePixel() );
-aSize.Height() -= ( m_pCbSecondaryZ-GetPosPixel().Y() - 
m_pCbSecondaryY-GetPosPixel().Y() );
-SetSizePixel(aSize);
-}
+m_pCbSecondaryZ-Hide();
 }
 
 m_pCbPrimaryX-Check( rInput.aExistenceList[0] );
diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index 26ee1c8..32d5f6a 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -139,8 +139,6 @@
 #define HID_SCH_STATISTIK_SHOW_POSITIVE 
CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE
 #define HID_SCH_STATISTIK_SHOW_NEGATIVE 
CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE
 
-#define HID_INSERT_GRIDS
CHART2_HID_INSERT_GRIDS
-
 #define HID_DIAGRAM_TYPE
CHART2_HID_DIAGRAM_TYPE
 #define HID_3D_VIEW 
CHART2_HID_3D_VIEW
 #define HID_DIAGRAM_DATA
CHART2_HID_DIAGRAM_DATA
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx 
b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 37c9589..868a657 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -56,7 +56,7 @@ protected:
 CheckBox* m_pCbSecondaryZ;
 
 public:
-SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData rInput, 
sal_Bool bAxisDlg=true );
+SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData rInput, bool 
bAxisDlg=true);
 virtual ~SchAxisDlg();
 
 void getResult( InsertAxisOrGridDialogData rOutput );
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui 
b/chart2/uiconfig/ui/insertaxisdlg.ui
index 9c686f4..3062d09 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -3,18 +3,18 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=InsertAxisDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
 property name=title translatable=yesAxes/property
 property name=type_hintdialog/property
 child

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-07-11 Thread bugzilla-daemon

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

Bug 60270 depends on bug 65338, which changed state.

Bug 65338 Summary: FILESAVE doesn't retain font settings of style: after save 
(as) and again opening of presentation, font is changed
https://bugs.freedesktop.org/show_bug.cgi?id=65338

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

2013-07-11 Thread David Tardon

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 262caa3bdefc8add38a0fa221099fb59b64b5b3d
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 11 09:25:16 2013 +0200

rhbz#980387 fix filter selection from file ext.

... for filters that have more than one extension associated with them
(e.g., JPEG).

Change-Id: Ic6b16d3b4aa17580404d02a9fb7b087b9aa52fc2
(cherry picked from commit 70376f610a7eb876739829e1f362bc94b21cb82f)
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4823
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 50ec20c..d854d46 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -36,6 +36,7 @@
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/ControlActions.hpp
 #include com/sun/star/uno/Any.hxx
+#include comphelper/string.hxx
 #include osl/mutex.hxx
 #include unx/gtk/gtkinst.hxx
 
@@ -790,6 +791,25 @@ uno::SequenceOUString SAL_CALL 
SalGtkFilePicker::getFiles() throw( uno::Runtim
 return aFiles;
 }
 
+namespace
+{
+
+bool lcl_matchFilter( const rtl::OUString rFilter, const rtl::OUString rExt )
+{
+const int nCount = comphelper::string::getTokenCount( rFilter, ';' );
+
+for ( int n = 0; n != nCount; ++n )
+{
+const rtl::OUString aToken = comphelper::string::getToken( rFilter, n, 
';' );
+if ( aToken == rExt )
+return true;
+}
+
+return false;
+}
+
+}
+
 uno::SequenceOUString SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( 
uno::RuntimeException )
 {
 SolarMutexGuard g;
@@ -852,7 +872,7 @@ uno::SequenceOUString SAL_CALL 
SalGtkFilePicker::getSelectedFiles() throw( uno
   ++aListIter
 )
 {
-if( aListIter-getFilter().equalsIgnoreAsciiCase( 
aStarDot+sExtension ) )
+if( lcl_matchFilter( aListIter-getFilter(), 
aStarDot+sExtension ) )
 {
 if( aNewFilter.isEmpty() )
 aNewFilter = aListIter-getTitle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-07-11 Thread bugzilla-daemon

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

Bug 6 depends on bug 58577, which changed state.

Bug 58577 Summary: Text frame lost when saved as OpenXML (.docx)
https://bugs.freedesktop.org/show_bug.cgi?id=58577

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cui/source instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo setup_native/source

2013-07-11 Thread Jürgen Schmidt

 cui/source/tabpages/swpossizetabpage.cxx|4 
+++-
 cui/source/tabpages/textattr.cxx|4 
+++-
 cui/source/tabpages/transfrm.cxx|6 
+-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp  |binary
 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp   |binary
 setup_native/source/win32/nsis/ooobitmap.bmp|binary
 setup_native/source/win32/nsis/ooosdkbanner.bmp |binary
 setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
 9 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit cf9b9953dd2e3a8a141dc1a6608a23c71029bdb7
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Thu Jul 11 10:03:55 2013 +

merge change from aoo400 branch, problem with bmp's

diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp 
b/setup_native/source/win32/nsis/ooobitmap.bmp
old mode 100755
new mode 100644
index b4a9ba7..da145cb
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and 
b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp 
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
old mode 100755
new mode 100644
index b2b462b..51f8892
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and 
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
commit cac2b0f26530cd1572f72ef6056d101830c63825
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Thu Jul 11 10:02:30 2013 +

merge change from aoo400 branch, problem with bmp's

diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index 97097ec..da145cb
Binary files 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ
diff --git 
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index b4a9ba7..da145cb
Binary files 
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index b2b462b..51f8892
Binary files 
a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbanner.bmp 
b/setup_native/source/win32/nsis/ooosdkbanner.bmp
old mode 100755
new mode 100644
index 24b76f5..f697d5d
Binary files a/setup_native/source/win32/nsis/ooosdkbanner.bmp and 
b/setup_native/source/win32/nsis/ooosdkbanner.bmp differ
commit 005cd2d436221519f74e54fb2373c7cbece6aed0
Author: Armin Le Grand a...@apache.org
Date:   Thu Jul 11 09:19:43 2013 +

i121917 secure SdrTextObj casts in cui

diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index 328f88c..8573ddc 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1932,7 +1932,9 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* 
pSdrView )
 SdrObjKind eKind = (SdrObjKind) pObj-GetObjIdentifier();
 if( ( pObj-GetObjInventor() == SdrInventor ) 
 ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || 
eKind==OBJ_OUTLINETEXT) 
-( (SdrTextObj*) pObj )-HasText() )
+// #121917# The original ((SdrTextObj*)pObj)-HasText() will fail 
badly with SdrVirtObjs from Writer
+0 != dynamic_cast const SdrTextObj* (pObj) 
+static_cast const SdrTextObj* (pObj)-HasText() )
 {
 DBG_ERROR(AutoWidth/AutoHeight should be enabled);
 }
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 606585d..3135c2e 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -547,7 +547,9 @@ void SvxTextAttrPage::Construct()
 case OBJ_OUTLINETEXT :
 case OBJ_CAPTION :
 {
-if ( ((SdrTextObj*)pObj)-HasText() )
+if( // #121917# The original 
((SdrTextObj*)pObj)-HasText() will fail badly with SdrVirtObjs from Writer
+0 != dynamic_cast const SdrTextObj* (pObj) 
+static_cast const SdrTextObj* (pObj)-HasText() )
 {
 // Konturfluss ist NICHT bei reinen Textobjekten

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - scp2/source

2013-07-11 Thread Andrzej J . R . Hunt

 scp2/source/firebird/file_firebird.scp   |   43 ++-
 scp2/source/firebird/module_firebird.scp |   10 +--
 2 files changed, 49 insertions(+), 4 deletions(-)

New commits:
commit caf488efb912b272698dd5193b6194468921b5fa
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 11:09:42 2013 +0100

Fix firebird lib installation location.

Change-Id: Ia7f649abbfe0793dd9389a415845fc1307206798

diff --git a/scp2/source/firebird/file_firebird.scp 
b/scp2/source/firebird/file_firebird.scp
index c5dba52..140d4e7 100644
--- a/scp2/source/firebird/file_firebird.scp
+++ b/scp2/source/firebird/file_firebird.scp
@@ -20,11 +20,52 @@
 
 #ifndef SYSTEM_FIREBIRD
 
-File gid_File_Firebird
+/*File gid_File_Firebird
 TXT_FILE_BODY;
 Dir = gid_Dir_Brand_Root;
 Name = firebird.filelist;
 Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End*/
+
+File gid_File_Firebird_Lib_252
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+#ifdef MACOSX
+   Name = STRING(CONCAT4(libfbembed,.,2.5.2,UNXSUFFIX));
+#else
+   Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2));
+#endif
+  #endif
+End
+
+File gid_File_Firebird_Lib_25
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+#ifdef MACOSX
+   Name = STRING(CONCAT4(libfbembed,.,2.5,UNXSUFFIX));
+#else
+   Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5));
+#endif
+  #endif
+End
+
+File gid_File_Firebird_Lib
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+#ifdef MACOSX
+   Name = STRING(CONCAT3(libfbembed,.,UNXSUFFIX));
+#else
+   Name = STRING(CONCAT2(libfbembed,UNXSUFFIX));
+#endif
+  #else
+   Name = ifbembed.dll;
+  #endif
 End
 
 #endif
diff --git a/scp2/source/firebird/module_firebird.scp 
b/scp2/source/firebird/module_firebird.scp
index 586f7df..7a37a16 100644
--- a/scp2/source/firebird/module_firebird.scp
+++ b/scp2/source/firebird/module_firebird.scp
@@ -24,10 +24,14 @@ Module gid_Module_Firebird
 PackageInfo = packinfo_office.txt;
 ParentID = gid_Module_Root_Brand;
 Dirs = ();
-Files = (gid_File_Lib_Firebird,
- gid_File_Firebird);
+Files = (
+#ifdef UNX
+File gid_File_Firebird_Lib_252,
+File gid_File_Firebird_Lib_25,
+#endif
+File gid_File_Firebird_Lib
+);
 Unixlinks = ();
 Styles = (HIDDEN_ROOT);
 End
-
 #endif
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-07-11 Thread Caolán McNamara

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

New commits:
commit 5c5e70f3ad29eddf6f39d037779dba31689b7ed7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:16:50 2013 +0100

Updated core
Project: help  bbffb8dbd5930c7b808fdd3887ffae4fe88ee6f0

diff --git a/helpcontent2 b/helpcontent2
index 5a69c57..bbffb8d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5a69c57b710e35b715e5a55a175caec58cd5f704
+Subproject commit bbffb8dbd5930c7b808fdd3887ffae4fe88ee6f0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Caolán McNamara

 helpers/help_hid.lst   |   14 --
 source/text/schart/01/0404.xhp |   31 ++-
 source/text/schart/01/0407.xhp |   28 +---
 3 files changed, 27 insertions(+), 46 deletions(-)

New commits:
commit bbffb8dbd5930c7b808fdd3887ffae4fe88ee6f0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:16:50 2013 +0100

update help ids for insert axes and grid chart dialogs .ui conversions

Change-Id: Ia2c49691e323ebb7b45367608d45d6f10f7b9f9a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d222fa6..39fae3a 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3105,18 +3105,6 @@ HID_SCH_ALIGNMENT,63284,
 HID_SCH_ALIGNMENT_CTR_DIAL,63315,
 HID_SCH_ALIGNMENT_DEGREES,63317,
 HID_SCH_ALIGNMENT_STACKED,63316,
-HID_SCH_CB_SECONDARY_XAXIS,63331,
-HID_SCH_CB_SECONDARY_XGRID,63337,
-HID_SCH_CB_SECONDARY_YAXIS,63332,
-HID_SCH_CB_SECONDARY_YGRID,63338,
-HID_SCH_CB_SECONDARY_ZAXIS,6,
-HID_SCH_CB_SECONDARY_ZGRID,63339,
-HID_SCH_CB_XAXIS,63328,
-HID_SCH_CB_XGRID,63334,
-HID_SCH_CB_YAXIS,63329,
-HID_SCH_CB_YGRID,63335,
-HID_SCH_CB_ZAXIS,63330,
-HID_SCH_CB_ZGRID,63336,
 HID_SCH_CHART_AUTO_FORMAT,63324,
 HID_SCH_CTL_DATA,63290,
 HID_SCH_CTL_TYPE,63293,
@@ -4933,7 +4921,6 @@ SID_INSERTPAGE_LAYOUT_MENU,27438,
 SID_INSERTPAGE_QUICK,27352,.uno:InsertPageQuick
 SID_INSERTTEXT,30360,
 SID_INSERT_AVMEDIA,6696,.uno:InsertAVMedia
-SID_INSERT_AXIS,30518,
 SID_INSERT_CHART_LEGEND,30516,
 SID_INSERT_CHECKBOX,10148,.uno:Checkbox
 SID_INSERT_COMBOBOX,10192,.uno:Combobox
@@ -4960,7 +4947,6 @@ SID_INSERT_FORMATTEDFIELD,10940,.uno:InsertFormattedField
 SID_INSERT_FORMULA,30314,
 SID_INSERT_FRAME,10240,.uno:InsertTextFrame
 SID_INSERT_GRAPHIC,10241,.uno:InsertGraphic
-SID_INSERT_GRIDS,30540,
 SID_INSERT_GROUPBOX,10189,.uno:Groupbox
 SID_INSERT_HFIXEDLINE,10928,.uno:HFixedLine
 SID_INSERT_HSCROLLBAR,10194,.uno:HScrollbar
diff --git a/source/text/schart/01/0404.xhp 
b/source/text/schart/01/0404.xhp
index e3a414a..80a58cc 100644
--- a/source/text/schart/01/0404.xhp
+++ b/source/text/schart/01/0404.xhp
@@ -37,30 +37,27 @@
 bookmark_valueaxes; better scaling/bookmark_value
 bookmark_valuesecondary axes in charts/bookmark_value
 /bookmarkcommentmw made secondary axes; a one level entry, deleted 
charts; showing secondary axes and generated one axes; enry out of two 
axes;showing... entries/comment
-bookmark xml-lang=en-US branch=hid/.uno:InsertMenuAxes id=bm_id3146121 
localize=false/paragraph role=heading id=hd_id3147428 xml-lang=en-US 
level=1 l10n=U oldref=1Axes/paragraph
+bookmark xml-lang=en-US branch=hid/.uno:InsertMenuAxes id=bm_id3146121 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/insertaxisdlg/InsertAxisDialog id=bm_id3146122 
localize=false/
+paragraph role=heading id=hd_id3147428 xml-lang=en-US level=1 
l10n=U oldref=1Axes/paragraph
 paragraph role=paragraph id=par_id3150330 xml-lang=en-US l10n=U 
oldref=2variable id=achsenahelp hid=.uno:InsertMenuAxesSpecifies the 
axes to be displayed in the chart./ahelp
 /variable/paragraph
 section id=howtoget
   embed href=text/schart/00/0004.xhp#efgaug/
 /section
 paragraph role=heading id=hd_id3156385 xml-lang=en-US level=2 
l10n=U oldref=46Major axis/paragraph
-!-- removed HID SCH_CHECKBOX_DLG_AXIS_CB_X_PRIMARY --
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CB_XAXIS 
id=bm_id8561357 localize=false/paragraph role=heading id=hd_id3146316 
xml-lang=en-US level=3 l10n=U oldref=5X axis/paragraph
-paragraph role=paragraph id=par_id3145230 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SCH_CHECKBOX_DLG_AXIS_CB_X_PRIMARYDisplays the X axis 
as a line with subdivisions./ahelp/paragraph
-!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_Y_PRIMARY --
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CB_YAXIS 
id=bm_id5721915 localize=false/paragraph role=heading id=hd_id3147003 
xml-lang=en-US level=3 l10n=U oldref=17Y axis/paragraph
-paragraph role=paragraph id=par_id3154020 xml-lang=en-US l10n=U 
oldref=18ahelp hid=SCH:CHECKBOX:DLG_AXIS:CB_Y_PRIMARYDisplays the Y axis 
as a line with subdivisions./ahelp/paragraph
-!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_Z_PRIMARY --
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CB_ZAXIS 
id=bm_id5266884 localize=false/paragraph role=heading id=hd_id3150345 
xml-lang=en-US level=3 l10n=U oldref=28Z axis/paragraph
-paragraph role=paragraph id=par_id3155113 xml-lang=en-US l10n=U 
oldref=29ahelp hid=SCH:CHECKBOX:DLG_AXIS:CB_Z_PRIMARYDisplays the Z axis 
as a line with subdivisions./ahelp This axis can only be displayed in 3D 
charts./paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/insertaxisdlg/primaryX id=bm_id8561357 
localize=false/paragraph role=heading id=hd_id3146316 xml-lang=en-US 
level=3 l10n=U oldref=5X axis/paragraph
+paragraph role=paragraph id=par_id3145230 xml-lang=en-US l10n=U 
oldref=6ahelp hid=modules/schart/ui/insertaxisdlg/primaryXDisplays the X 
axis as a line with

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

2013-07-11 Thread Caolán McNamara

 chart2/source/controller/inc/HelpIds.hrc |4 
 1 file changed, 4 deletions(-)

New commits:
commit 0c2af4a1c0603fac4f0fa1bc0a5036efe65e6ef2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:17:40 2013 +0100

drop some unused hids

Change-Id: I9061966e6c86acf94c9a34704567366315baf007

diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index 32d5f6a..35bed93 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -55,9 +55,6 @@
 #define HID_SCH_LB_BAR_GEOMETRY 
CHART2_HID_SCH_LB_BAR_GEOMETRY
 #define HID_SCH_DLG_RANGES  
CHART2_HID_SCH_DLG_RANGES
 
-#define HID_SCH_CB_XAXIS
CHART2_HID_SCH_CB_XAXIS
-#define HID_SCH_CB_YAXIS
CHART2_HID_SCH_CB_YAXIS
-#define HID_SCH_CB_ZAXIS
CHART2_HID_SCH_CB_ZAXIS
 #define HID_SCH_CB_SECONDARY_XAXIS  
CHART2_HID_SCH_CB_SECONDARY_XAXIS
 #define HID_SCH_CB_SECONDARY_YAXIS  
CHART2_HID_SCH_CB_SECONDARY_YAXIS
 #define HID_SCH_CB_SECONDARY_ZAXIS  
CHART2_HID_SCH_CB_SECONDARY_ZAXIS
@@ -142,7 +139,6 @@
 #define HID_DIAGRAM_TYPE
CHART2_HID_DIAGRAM_TYPE
 #define HID_3D_VIEW 
CHART2_HID_3D_VIEW
 #define HID_DIAGRAM_DATA
CHART2_HID_DIAGRAM_DATA
-#define HID_INSERT_AXIS 
CHART2_HID_INSERT_AXIS
 #define HID_INSERT_STATISTICS   
CHART2_HID_INSERT_STATISTICS
 #define HID_INSERT_TITLE
CHART2_HID_INSERT_TITLE
 #define HID_INSERT_CHART_LEGEND 
CHART2_HID_INSERT_CHART_LEGEND
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Avoid confusing wording in mails requesting a review

2013-07-11 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4828

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/gerrit-etc 
refs/changes/28/4828/1

Avoid confusing wording in mails requesting a review

Given that NewChange.vm is not only used when user A uploads his changeset
(with From: A (via Code Review)), but also when user B later adds user C to
that changeset's list of reviewers (with From: B (via Code Review)), the
words I have submitted a patch for review are misleading.  The new wording is
closer to that in mail/NewChange.vm.example, but hopefully still friendly
enough.

Change-Id: I37cc7801716b43693a2f14d28fc5c410b01d95d9
---
M mail/NewChange.vm
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/mail/NewChange.vm b/mail/NewChange.vm
index 34af52f..7608bee 100644
--- a/mail/NewChange.vm
+++ b/mail/NewChange.vm
@@ -34,7 +34,7 @@
 ##
 Hi,
 
-I have submitted a patch for review:
+I would like you to review the following patch:
 
 $email.changeUrl
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37cc7801716b43693a2f14d28fc5c410b01d95d9
Gerrit-PatchSet: 1
Gerrit-Project: gerrit-etc
Gerrit-Branch: master
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

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

2013-07-11 Thread Michael Stahl

 sw/source/ui/inc/navicont.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f3d3815af87ed27a8c809d282b1f0c913b0ceea2
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 10 21:32:12 2013 +0200

remove unused method

Change-Id: I04a33b37dd905e6aecb2423a0cd3d8ba355aded3

diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx
index 853ec2f..dd8865f 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/ui/inc/navicont.hxx
@@ -45,7 +45,6 @@ public:
 const String   GetURL() const  { return aUrl; }
 const String   GetDescription() const  { return aDescr; }
 sal_uInt16  GetDefaultDragType() const  { return nDefDrag; }
-longGetDocShell() const { return nDocSh; }
 voidCopy( TransferDataContainer rData ) const;
 sal_BoolPaste( TransferableDataHelper rData );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Caolán McNamara

 sc/uiconfig/scalc/ui/scgeneralpage.ui |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 21e45efa42932ec5fbf8d9fea4cb7e71edf08b9d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:31:02 2013 +0100

calc general page out of line with the rest

Change-Id: Ia0e13732266bf2864a3d9d1ceaeffe8eb429bff3

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 699d320..09e999a 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -120,7 +120,6 @@
   packing
 property name=expandFalse/property
 property name=fillTrue/property
-property name=padding6/property
 property name=position0/property
   /packing
 /child
@@ -248,7 +247,6 @@
   packing
 property name=expandFalse/property
 property name=fillTrue/property
-property name=padding6/property
 property name=position1/property
   /packing
 /child
@@ -453,7 +451,6 @@
   packing
 property name=expandFalse/property
 property name=fillTrue/property
-property name=padding6/property
 property name=position1/property
   /packing
 /child
___
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

2013-07-11 Thread bugzilla-daemon

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

Khaled Hosny khaledho...@eglug.org changed:

   What|Removed |Added

 Depends on||66577

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

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source

2013-07-11 Thread Jing Xian

 sc/source/core/opencl/formulagroupcl.cxx |   70 +--
 sc/source/core/opencl/oclkernels.hxx |   70 +++
 sc/source/core/opencl/openclwrapper.cxx  |   44 +--
 3 files changed, 121 insertions(+), 63 deletions(-)

New commits:
commit 6c89aa8345e57c8c0b68b47bb67ac32b7dc930bc
Author: Jing Xian jingx...@multicorewareinc.com
Date:   Thu Jul 11 11:35:54 2013 +0100

add min/max/delta kernels and misc. cleanup / bug fixing.

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index dee465e..8c2e236 100755
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -82,16 +82,19 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 memset(rResult,0,rowSize);
 float * fpOclSrcData = NULL; // Point to the input data from CPU
 uint * npOclStartPos = NULL; // The first position for calculation,for 
example,the A1 in (=MAX(A1:A100))
-uint * npOclEndPos = NULL; // The last position for calculation,for 
example, the A100 in (=MAX(A1:A100))
-float * fpLeftData = NULL; // Left input for binary 
operator(+,-,*,/),for example,(=leftData+rightData)
+uint * npOclEndPos   = NULL; // The last position for calculation,for 
example, the A100 in (=MAX(A1:A100))
+float * fpLeftData   = NULL; // Left input for binary 
operator(+,-,*,/),for example,(=leftData+rightData)
 float * fpRightData  = NULL; // Right input for binary 
operator(+,-,*,/),for example,(=leftData/rightData)
  // The rightData can't be zero for /
 static OclCalc ocl_calc;
-// Don't know how large the size will be applied previously, so create 
them as the rowSize or 65536
-// Don't know which formulae will be used previously, so create buffers 
for different formulae used probably
-ocl_calc.CreateBuffer(fpOclSrcData,npOclStartPos,npOclEndPos,rowSize);
-ocl_calc.CreateBuffer(fpLeftData,fpRightData,rowSize);
-//printf(pptrr is %d,%d,%d\n,fpOclSrcData,npOclStartPos,npOclEndPos);
+if(ocl_calc.GetOpenclState())
+{
+// Don't know how large the size will be applied previously, so create 
them as the rowSize or 65536
+// Don't know which formulae will be used previously, so create 
buffers for different formulae used probably
+ocl_calc.CreateBuffer(fpOclSrcData,npOclStartPos,npOclEndPos,rowSize);
+ocl_calc.CreateBuffer(fpLeftData,fpRightData,rowSize);
+//printf(pptrr is %d,%d,%d\n,fpOclSrcData,npOclStartPos,npOclEndPos);
+}
 
///
 
 // Until we implement group calculation for real, decompose the group into
@@ -123,10 +126,11 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 nRowEnd += i;
 size_t nRowSize = nRowEnd - nRowStart + 1;
 ScMatrixRef pMat(new ScMatrix(nColSize, nRowSize, 0.0));
-
-npOclStartPos[i] = nRowStart; // record the start position
-npOclEndPos[i] = nRowEnd;   // record the end position
-
+if(ocl_calc.GetOpenclState())
+{
+npOclStartPos[i] = nRowStart; // record the start 
position
+npOclEndPos[i]   = nRowEnd;   // record the end 
position
+}
 for (size_t nCol = 0; nCol  nColSize; ++nCol)
 {
 const double* pArray = rArrays[nCol];
@@ -135,12 +139,14 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 fprintf(stderr,Error: pArray is NULL!\n);
 return false;
 }
-
-for( size_t u=0; urowSize; u++ )
+if(ocl_calc.GetOpenclState())
 {
-// Many video cards can't support double type in 
kernel, so need transfer the double to float
-fpOclSrcData[u] = (float)pArray[u];
-//fprintf(stderr,fpOclSrcData[%d] is 
%f.\n,u,fpOclSrcData[u]);
+for( size_t u=nRowStart; u=nRowEnd; u++ )
+{
+// Many video cards can't support double type 
in kernel, so need transfer the double to float
+fpOclSrcData[u] = (float)pArray[u];
+//fprintf(stderr,fpOclSrcData[%d] is 
%f.\n,u,fpOclSrcData[u]);
+}
 }
 
 for (size_t nRow = 0; nRow  nRowSize; ++nRow)
@@ -165,22 +171,23 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 ScFormulaCell*

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - ca/c2b0f26530cd1572f72ef6056d101830c63825 cf/9b9953dd2e3a8a141dc1a6608a23c71029bdb7

2013-07-11 Thread Caolán McNamara

 ca/c2b0f26530cd1572f72ef6056d101830c63825 |1 +
 cf/9b9953dd2e3a8a141dc1a6608a23c71029bdb7 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a8db205f3ee5c97166831213a684c1092f43d24d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:38:48 2013 +0100

Notes added by 'git notes add'

diff --git a/ca/c2b0f26530cd1572f72ef6056d101830c63825 
b/ca/c2b0f26530cd1572f72ef6056d101830c63825
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/ca/c2b0f26530cd1572f72ef6056d101830c63825
@@ -0,0 +1 @@
+ignore: branding
commit bcd933e48e41c3b199f123f221eced7bfcdd0b19
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:38:40 2013 +0100

Notes added by 'git notes add'

diff --git a/cf/9b9953dd2e3a8a141dc1a6608a23c71029bdb7 
b/cf/9b9953dd2e3a8a141dc1a6608a23c71029bdb7
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/cf/9b9953dd2e3a8a141dc1a6608a23c71029bdb7
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/5cd2d436221519f74e54fb2373c7cbece6aed0

2013-07-11 Thread Caolán McNamara

 00/5cd2d436221519f74e54fb2373c7cbece6aed0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3feee57c7f3634cfe07dbadc199389de66b01a33
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 11:41:35 2013 +0100

Notes added by 'git notes add'

diff --git a/00/5cd2d436221519f74e54fb2373c7cbece6aed0 
b/00/5cd2d436221519f74e54fb2373c7cbece6aed0
new file mode 100644
index 000..7718f68
--- /dev/null
+++ b/00/5cd2d436221519f74e54fb2373c7cbece6aed0
@@ -0,0 +1 @@
+merged as: 8d92c5d1fa4216749c48e34e471f5362a0906a32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo 37341 MAXRECURSION reached in ScFormulaCell::Interpret

2013-07-11 Thread Eike Rathke

Hi Winfried,

On Thursday, 2013-07-11 08:02:13 +0200, Winfried Donkers wrote:

 Presently I'm looking at bug fdo 37341, which reports calc to hang when Goal 
 Seek (sc/source/core/tool/interpr2.cxx, ScInterpreter::ScBackSolver()) is 
 used.
 The cause of the problem is not that too many iterations are needed, but that 
 MAXRECURSION in sc/source/core/data/formulacell.cxx, 
 ScFormulaCell::Interpret() is reached.
 Increasing MAXRECURSION 'solves' the problem.

It may cure the symptom in this specific case, but does not solve the problem.

 I think increasing MAXRECURSION from its present value (400) to 800 is
 no problem. 10 years ago its value was 500 and in the past 1 years the
 available memory has been more than doubled.

You're misreading history ;-)

The past value can't be compared as the entire mechanism how recursions
are handled has changed. The previous 500 was that if there were more
than 500 recursions the entire calculation chain set an error at the
formula cells involved.

The new mechanism first attempts a recursion up to MAXRECURSION and if
it reaches the limit it unwinds the stack, remembers formula cells
involved and continues from the point it left to find the end of the
recursion and start calculation from that side. Increasing MAXRECURSION
would set the threshhold higher at the cost that if it is reached more
time would be wasted in calculating the recursion before detecting that
threshhold.

 Shouldn't a global error (or at least warning)  be generated when
 MAXRECURSION is reached? After all, the result of
 ScFormulaCell::Interpret() is not correct in that case.

I presume it is the combination of BackSolver iteration and recursion.
Setting an error if MAXRECURSION is reached is not appropriate.

 Unfortunately, I can't quite grasp the recursion/interation process in
 ScFormulaCell::Interpret(), so I can't generate the appropiate error.

That thing is a beast and time consuming to debug. To understand what it
does it would help to set MAXRECURSION to 5 or so and have a few more
simple recursing formula cells to step through. (A9:=A8 A8:=A7 ...)

Setting up a simple BackSolver scenario that kicks in badly with the
reduced limit might be equally challenging..

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpHoX9WjfuBw.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-07-11 Thread Miklos Vajna

 sw/source/filter/ww8/attributeoutputbase.hxx |2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |7 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx  |2 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx  |2 +-
 sw/source/filter/ww8/wrtw8nds.cxx|   12 ++--
 sw/source/filter/ww8/ww8atr.cxx  |2 +-
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 3a58a0f9d3600d0475e1a2c6595785cfcf5f362e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 11 13:02:43 2013 +0200

AttributeOutputBase::RunText: String - OUString

Change-Id: I413f0c4a270c5246dc87c5ff4f7042bc16330ed7

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index baad6ac..25ee2a0 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -176,7 +176,7 @@ public:
 virtual void WritePostitFieldEnd() {};
 
 /// Output text (inside a run).
-virtual void RunText( const String rText, rtl_TextEncoding eCharSet ) = 0;
+virtual void RunText( const OUString rText, rtl_TextEncoding eCharSet ) = 
0;
 
 /// Output text (without markup).
 virtual void RawText( const String rText, bool bForceUnicode, 
rtl_TextEncoding eCharSet ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9957ff4..d7697ca 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1133,18 +1133,17 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, 
sal_Int32 nTextToken,
 pSerializer-endElementNS( XML_w, nTextToken );
 }
 
-void DocxAttributeOutput::RunText( const String rText, rtl_TextEncoding 
/*eCharSet*/ )
+void DocxAttributeOutput::RunText( const OUString rText, rtl_TextEncoding 
/*eCharSet*/ )
 {
 if( m_closeHyperlinkInThisRun )
 {
 m_closeHyperlinkInPreviousRun = true;
 m_closeHyperlinkInThisRun = false;
 }
-OUString aText( rText );
 
 // one text can be split into more w:tblah/w:t's by line breaks etc.
-const sal_Unicode *pBegin = aText.getStr();
-const sal_Unicode *pEnd = pBegin + aText.getLength();
+const sal_Unicode *pBegin = rText.getStr();
+const sal_Unicode *pEnd = pBegin + rText.getLength();
 
 // the text run is usually XML_t, with the exception of the deleted text
 sal_Int32 nTextToken = XML_t;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 06f12fa..83913a6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -127,7 +127,7 @@ public:
 virtual void WritePostitFieldEnd();
 
 /// Output text (inside a run).
-virtual void RunText( const String rText, rtl_TextEncoding eCharSet = 
RTL_TEXTENCODING_UTF8 );
+virtual void RunText( const OUString rText, rtl_TextEncoding eCharSet = 
RTL_TEXTENCODING_UTF8 );
 
 /// Output text (without markup).
 virtual void RawText( const String rText, bool bForceUnicode, 
rtl_TextEncoding eCharSet );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9890f0b..bb88c28 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -415,7 +415,7 @@ void RtfAttributeOutput::EndRunProperties( const 
SwRedlineData* /*pRedlineData*/
 m_aRun-append(m_aStyles.makeStringAndClear());
 }
 
-void RtfAttributeOutput::RunText( const String rText, rtl_TextEncoding 
/*eCharSet*/ )
+void RtfAttributeOutput::RunText( const OUString rText, rtl_TextEncoding 
/*eCharSet*/ )
 {
 SAL_INFO(sw.rtf, OSL_THIS_FUNC  , rText:   rText);
 RawText( rText, 0, m_rExport.eCurrentEncoding );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index b13be12..ec5002f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -73,7 +73,7 @@ public:
 virtual void WritePostitFieldEnd() SAL_OVERRIDE;
 
 /// Output text (inside a run).
-virtual void RunText( const String rText, rtl_TextEncoding eCharSet = 
RTL_TEXTENCODING_UTF8 );
+virtual void RunText( const OUString rText, rtl_TextEncoding eCharSet = 
RTL_TEXTENCODING_UTF8 );
 
 // Access to (anyway) private buffers, used by the sdr exporter
 OStringBuffer RunText();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index e0d9140..fb0f24d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -988,7 +988,7 @@ void WW8AttributeOutput::EndRunProperties( const 
SwRedlineData* pRedlineData )
 m_rWW8Export.pO-clear();
 }
 
-void WW8AttributeOutput::RunText( const String rText,

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source

2013-07-11 Thread Michael Meeks

 sc/source/core/opencl/formulagroupcl.cxx |   22 --
 sc/source/core/opencl/openclwrapper.cxx  |   22 +++---
 2 files changed, 31 insertions(+), 13 deletions(-)

New commits:
commit 638bc7daacc359de2c3699d52da392e22bbdee77
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 12:19:18 2013 +0100

Prompt the user to delete cached kernels on failure

also fallback to S/W group calculation if necessary.

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8c2e236..0135c51 100755
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -299,6 +299,8 @@ public:
 }
 
 virtual ScMatrixRef inverseMatrix(const ScMatrix /* rMat */) { return 
ScMatrixRef(); }
+virtual bool interpretCL(ScDocument rDoc, const ScAddress rTopPos,
+ const ScFormulaCellGroupRef xGroup, 
ScTokenArray rCode);
 virtual bool interpret(ScDocument rDoc, const ScAddress rTopPos,
const ScFormulaCellGroupRef xGroup, ScTokenArray 
rCode);
 };
@@ -307,12 +309,9 @@ public:
 
 #include compiler.hxx
 
-// FIXME: really we should compile the formula and operate on the
-// RPN representation which -should- be more compact and have no Open / Close
-// or precedence issues; cf. rCode.FirstRPN() etc.
-bool FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const 
ScAddress rTopPos,
-   const 
ScFormulaCellGroupRef xGroup,
-   ScTokenArray rCode)
+bool FormulaGroupInterpreterGroundwater::interpretCL(ScDocument rDoc, const 
ScAddress rTopPos,
+ const 
ScFormulaCellGroupRef xGroup,
+ ScTokenArray rCode)
 {
 generateRPNCode(rDoc, rTopPos, rCode);
 
@@ -379,6 +378,17 @@ bool 
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
 return true;
 }
 
+bool FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const 
ScAddress rTopPos,
+   const 
ScFormulaCellGroupRef xGroup,
+   ScTokenArray rCode)
+{
+bool bComplete = interpretCL(rDoc, rTopPos, xGroup, rCode);
+if (!bComplete) // fallback to the (potentially) faster S/W formula group 
interpreter
+return FormulaGroupInterpreterSoftware::interpret(rDoc, rTopPos, 
xGroup, rCode);
+else
+return true;
+}
+
 namespace opencl {
 sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
 {
diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 781c838..7061f96 100755
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -480,6 +480,7 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, const 
char *buildOption) {
 sizeof(cl_device_id) * numDevices, mpArryDevsID, NULL);
 CHECK_OPENCL(status)
 
+fprintf(stderr, Create kernel from binary\n);
 gpuInfo-mpArryPrograms[idx] = 
clCreateProgramWithBinary(gpuInfo-mpContext,
 numDevices, mpArryDevsID, length, (const unsigned char**) 
binary,
 binary_status, status);
@@ -490,6 +491,7 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, const 
char *buildOption) {
 mpArryDevsID = NULL;
 } else {
 // create a CL program using the kernel source
+fprintf(stderr, Create kernel from source\n);
 gpuEnv.mpArryPrograms[idx] = 
clCreateProgramWithSource(gpuEnv.mpContext,
 1, source, source_size, status);
 CHECK_OPENCL(status);
@@ -504,21 +506,21 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, 
const char *buildOption) {
 printf(BuildProgram.\n);
 if (!gpuInfo-mnIsUserCreated) {
 status = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
gpuInfo-mpArryDevsID,
-buildOption, NULL, NULL);
+buildOption, NULL, NULL);
 } else {
 status = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
(gpuInfo-mpDevID),
-buildOption, NULL, NULL);
+buildOption, NULL, NULL);
 }
 
 if (status != CL_SUCCESS) {
 printf (BuildProgram error!\n);
 if (!gpuInfo-mnIsUserCreated) {
 status = clGetProgramBuildInfo(gpuInfo-mpArryPrograms[idx],
-gpuInfo-mpArryDevsID[0], CL_PROGRAM_BUILD_LOG, 0, NULL,
-length);
+   gpuInfo-mpArryDevsID[0], 
CL_PROGRAM_BUILD_LOG, 0, NULL,
+   length);
 } else {
 status = clGetProgramBuildInfo(gpuInfo-mpArryPrograms[idx],
-gpuInfo-mpDevID, CL_PROGRAM_BUILD_LOG, 0,

[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx

2013-07-11 Thread Stephan Bergmann

 include/vcl/salctype.hxx |8 -
 vcl/Library_vcl.mk   |1 
 vcl/inc/unx/salinst.h|2 
 vcl/source/gdi/bmpconv.cxx   |  209 ---
 vcl/source/window/window.cxx |   15 --
 vcl/unx/generic/dtrans/X11_selection.cxx |   34 -
 vcl/unx/generic/dtrans/X11_selection.hxx |3 
 vcl/unx/generic/dtrans/X11_service.cxx   |   52 ++-
 vcl/unx/generic/dtrans/bmp.cxx   |   87 ++--
 vcl/unx/generic/dtrans/bmp.hxx   |   20 --
 10 files changed, 74 insertions(+), 357 deletions(-)

New commits:
commit 31144904919cf386f7ef6941a2932bc00497ed13
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 13:22:02 2013 +0200

X11SalInstance::CreateClipboard is only ever used with the default $DISPLAY

Change-Id: Id9a407b9ee4419fc6342931b249eb00e70addfad

diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 3f8d06e..afe8e84 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -39,7 +39,7 @@ class SalXLib;
 class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance
 {
 private:
-boost::unordered_map OUString, boost::unordered_map Atom, 
com::sun::star::uno::Reference 
com::sun::star::datatransfer::clipboard::XClipboard  , OUStringHash  
m_aInstances;
+boost::unordered_map Atom, com::sun::star::uno::Reference 
com::sun::star::datatransfer::clipboard::XClipboard   m_aInstances;
 
 protected:
 SalXLib *mpXLib;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index dc450e3..2125cda 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8508,11 +8508,10 @@ uno::Reference XClipboard  
Window::GetPrimarySelection()
 uno::Reference XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 
 #if defined(UNX)  !defined(MACOSX)
-// A hack, making the primary selection available as an 
instance of
-// the SystemClipboard service on X11:
-css::uno::Sequencecss::uno::Any args(2);
-args[0] = Application::GetDisplayConnection();
-args[1] = OUString(PRIMARY);
+// A hack, making the primary selection available as an 
instance
+// of the SystemClipboard service on X11:
+css::uno::Sequencecss::uno::Any args(1);
+args[0] = OUString(PRIMARY);
 mpWindowImpl-mpFrameData-mxSelection.set(
 (xContext-getServiceManager()-
  createInstanceWithArgumentsAndContext(
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx 
b/vcl/unx/generic/dtrans/X11_service.cxx
index 2e8e0cd..59d7e45 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -61,47 +61,27 @@ Sequence OUString  SAL_CALL 
x11::Xdnd_dropTarget_getSupportedServiceNames()
 
 css::uno::Reference XInterface  X11SalInstance::CreateClipboard( const 
Sequence Any  arguments )
 {
-OUString aDisplayName;
-Atom nSelection;
-
-// extract display name from connection argument. An exception is thrown
-// by SelectionManager.initialize() if no display connection is given.
-if( arguments.getLength()  0 )
-{
-css::uno::Reference XDisplayConnection  xConn;
-arguments.getConstArray()[0] = xConn;
-
-if( xConn.is() )
-{
-Any aIdentifier = xConn-getIdentifier();
-aIdentifier = aDisplayName;
-}
+SelectionManager rManager = SelectionManager::get();
+css::uno::Sequencecss::uno::Any mgrArgs(1);
+mgrArgs[0] = Application::GetDisplayConnection();
+rManager.initialize(mgrArgs);
+
+OUString sel;
+if (arguments.getLength() == 0) {
+sel = CLIPBOARD;
+} else if (arguments.getLength() != 1 || !(arguments[0] = sel)) {
+throw css::lang::IllegalArgumentException(
+bad X11SalInstance::CreateClipboard arguments,
+css::uno::Referencecss::uno::XInterface(), -1);
 }
+Atom nSelection = rManager.getAtom(sel);
 
-SelectionManager rManager = SelectionManager::get( aDisplayName );
-rManager.initialize( arguments );
-
-// check if any other selection than clipboard selection is specified
-if( arguments.getLength()  1 )
-{
-OUString aSelectionName;
-
-arguments.getConstArray()[1] = aSelectionName;
-nSelection = rManager.getAtom( aSelectionName );
-}
-else
-{
-// default atom is clipboard selection
-nSelection = rManager.getAtom( OUString(CLIPBOARD) );
-}
-
-::boost::unordered_map Atom, css::uno::Reference XClipboard   rMap( 
m_aInstances[ aDisplayName ] );
-::boost::unordered_map Atom, css::uno::Reference XClipboard  
::iterator it = rMap.find( nSelection );
-if( it != rMap.end() )
+::boost::unordered_map Atom, css::uno::Reference XClipboard  
::iterator it =

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

2013-07-11 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/fdo58577.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   15 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 6a10a2940a82c7fb376fc1b5a7c940e0a849e15a
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 11 10:43:07 2013 +0200

fdo#58577 DOCX export: handle multiple textframes anchored to the same para

Also fixes ~SwIndexReg assertion on closing the document.

(cherry picked from commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f)

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

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

diff --git a/sw/qa/extras/ooxmlexport/data/fdo58577.odt 
b/sw/qa/extras/ooxmlexport/data/fdo58577.odt
new file mode 100644
index 000..4c8656d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo58577.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index dc5b215..4a58bf1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -71,6 +71,7 @@ public:
 void testFdo48557();
 void testI120928();
 void testN822175();
+void testFdo58577();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -119,6 +120,7 @@ void Test::run()
 {fdo48557.odt, Test::testFdo48557},
 {i120928.docx, Test::testI120928},
 {n822175.odt, Test::testN822175},
+{fdo58577.odt, Test::testFdo58577},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -684,6 +686,14 @@ void Test::testN822175()
 CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL, 
getPropertytext::WrapTextMode(xFrame, Surround));
 }
 
+void Test::testFdo58577()
+{
+// The second frame was simply missing, so let's check if both frames were 
imported back.
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 803fe03..153580c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -290,10 +290,13 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer-mergeTopMarks();
 
 // Write the anchored frame if any
-if ( m_pParentFrame )
+// Make a copy and clear the original early, as this method is called
+// recursively for in-frame paragraphs
+std::vectorsw::Frame aParentFrames = m_aParentFrames;
+m_aParentFrames.clear();
+for (size_t i = 0; i  aParentFrames.size(); ++i)
 {
-sw::Frame *pParentFrame = m_pParentFrame;
-m_pParentFrame = NULL;
+sw::Frame* pParentFrame = aParentFrames[i];
 
 const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( );
 const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
@@ -353,8 +356,6 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_rExport.RestoreData();
 
 m_rExport.mpParentFrame = NULL;
-
-delete pParentFrame;
 }
 
 m_pSerializer-endElementNS( XML_w, XML_p );
@@ -2601,7 +2602,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 case sw::Frame::eTxtBox:
 {
 // The frame output is postponed to the end of the anchor 
paragraph
-m_pParentFrame = new sw::Frame(rFrame);
+m_aParentFrames.push_back(sw::Frame(rFrame));
 }
 break;
 case sw::Frame::eOle:
@@ -4921,7 +4922,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_nTableDepth( 0 ),
   m_bParagraphOpened( false ),
   m_nColBreakStatus( COLBRK_NONE ),
-  m_pParentFrame( NULL ),
   m_bTextFrameSyntax( false ),
   m_closeHyperlinkInThisRun( false ),
   m_closeHyperlinkInPreviousRun( false ),
@@ -4951,7 +4951,6 @@ DocxAttributeOutput::~DocxAttributeOutput()
 delete m_pEndnotesList, m_pEndnotesList = NULL;
 
 delete m_pTableWrt, m_pTableWrt = NULL;
-delete m_pParentFrame;
 }
 
 DocxExport DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index d120f30..0854e46 100644
---

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

2013-07-11 Thread Ciorba Edmond

 include/svtools/htmlout.hxx|2 
 include/svx/xoutbmp.hxx|1 
 svtools/source/svhtml/htmlout.cxx  |8 -
 svx/source/xoutdev/_xoutbmp.cxx|   43 +
 sw/source/filter/html/css1atr.cxx  |  107 +++-
 sw/source/filter/html/htmlatr.cxx  |5 -
 sw/source/filter/html/htmlfly.cxx  |  161 +
 sw/source/filter/html/htmlnum.cxx  |5 -
 sw/source/filter/html/htmlplug.cxx |   23 -
 sw/source/filter/html/htmltabw.cxx |9 --
 sw/source/filter/html/wrthtml.cxx  |   60 ++---
 sw/source/filter/html/wrthtml.hxx  |   12 +-
 12 files changed, 149 insertions(+), 287 deletions(-)

New commits:
commit 5dd1b3da57862a6577717544dde56482add89170
Author: Ciorba Edmond edmond_cio...@yahoo.com
Date:   Wed Jul 3 16:14:45 2013 +0300

fdo#63211 - embed images in HTML export.

Change-Id: I585c85d2cee13ee8954623bd981cb372d78b7952

diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 33c76fe..90c3208 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -68,7 +68,7 @@ struct HTMLOutFuncs
 SVT_DLLPUBLIC static SvStream Out_Char( SvStream, sal_Unicode cChar,
 HTMLOutContext rContext,
 String *pNonConvertableChars = 0 );
-SVT_DLLPUBLIC static SvStream Out_String( SvStream, const String,
+SVT_DLLPUBLIC static SvStream Out_String( SvStream, const OUString,
 rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
 String *pNonConvertableChars = 0 );
 SVT_DLLPUBLIC static SvStream Out_Hex( SvStream, sal_uLong nHex, 
sal_uInt8 nLen,
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 0c614b9..3bb51cf 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -54,6 +54,7 @@ public:
 static sal_uInt16   WriteGraphic( const Graphic rGraphic, String 
rFileName,
   const String rFilterName, const 
sal_uIntPtr nFlags = 0L,
   const Size* pMtfSize_100TH_MM = NULL );
+static sal_uLongGraphicToBase64(const Graphic rGraphic,OUString 
rOUString);
 
 static sal_uInt16   ExportGraphic( const Graphic rGraphic, const 
INetURLObject rURL,
GraphicFilter rFilter, const 
sal_uInt16 nFormat,
diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index a23638f..f384c4b 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -532,14 +532,14 @@ SvStream HTMLOutFuncs::Out_Char( SvStream rStream, 
sal_Unicode c,
 return rStream;
 }
 
-SvStream HTMLOutFuncs::Out_String( SvStream rStream, const String rStr,
+SvStream HTMLOutFuncs::Out_String( SvStream rStream, const OUString rOUStr,
 rtl_TextEncoding eDestEnc,
 String *pNonConvertableChars )
 {
 HTMLOutContext aContext( eDestEnc );
-xub_StrLen nLen = rStr.Len();
-for( xub_StrLen n = 0; n  nLen; n++ )
-HTMLOutFuncs::Out_Char( rStream, rStr.GetChar( (xub_StrLen)n ),
+sal_Int32 nLen = rOUStr.getLength();
+for( sal_Int32 n = 0; n  nLen; n++ )
+HTMLOutFuncs::Out_Char( rStream, rOUStr[n],
 aContext, pNonConvertableChars );
 HTMLOutFuncs::FlushToAscii( rStream, aContext );
 return rStream;
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 535d6b3..40f9f7f 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -29,6 +29,9 @@
 #include vcl/dibtools.hxx
 #include vcl/FilterConfigItem.hxx
 #include vcl/graphicfilter.hxx
+#include vcl/cvtgrf.hxx
+#include sax/tools/converter.hxx
+#include svtools/htmlkywd.hxx
 
 #define FORMAT_BMP  OUString(bmp)
 #define FORMAT_GIF  OUString(gif)
@@ -314,6 +317,46 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic 
rGraphic, String rFileName,
 }
 }
 
+sal_uLong XOutBitmap::GraphicToBase64(const Graphic rGraphic, OUString 
rOUString)
+{
+SvMemoryStream aOStm;
+OUString aMimeType;
+GfxLink aLink = rGraphic.GetLink();
+sal_uLong aCvtType;
+switch(  aLink.GetType() )
+{
+case( GFX_LINK_TYPE_NATIVE_JPG ):
+aCvtType = CVT_JPG;
+aMimeType = image/jpeg;
+break;
+case( GFX_LINK_TYPE_NATIVE_PNG ):
+aCvtType = CVT_PNG;
+aMimeType = image/png;
+break;
+case( GFX_LINK_TYPE_NATIVE_SVG ):
+aCvtType = CVT_SVG;
+aMimeType = image/svg+xml;
+break;
+default:
+// save everything else (including gif) into png
+aCvtType = CVT_PNG;
+aMimeType = image/png;
+break;
+}
+sal_uLong nErr = GraphicConverter::Export(aOStm,rGraphic,aCvtType);
+if ( nErr )
+{
+SAL_WARN(svx,

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/introabout desktop/source instsetoo_native/util scp2/source

2013-07-11 Thread Andre Fischer

 default_images/introabout/intro.png  |binary
 desktop/source/splash/splash.cxx |   52 +++
 desktop/source/splash/splash.hxx |1 
 instsetoo_native/util/openoffice.lst |7 ++--
 scp2/source/ooo/common_brand.scp |9 ++
 5 files changed, 55 insertions(+), 14 deletions(-)

New commits:
commit 143b635b2a73e807fee1574ddaf1e12481d67a0d
Author: Andre Fischer a...@apache.org
Date:   Thu Jul 11 11:07:44 2013 +

122620: Tweeked the splash screen a little.

diff --git a/default_images/introabout/intro.png 
b/default_images/introabout/intro.png
index 80266b4..c8863f4 100755
Binary files a/default_images/introabout/intro.png and 
b/default_images/introabout/intro.png differ
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 7546e3e..d6cc4ec 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Reference 
XMultiServiceFactory  rSMgr)
 : IntroWindow()
 , _vdev(*((IntroWindow*)this))
 , _cProgressFrameColor(sal::static_int_cast ColorData (NOT_LOADED))
+, _bShowProgressFrame(true)
 , _cProgressBarColor(sal::static_int_cast ColorData (NOT_LOADED))
 , _bNativeProgress(true)
 , _iMax(100)
@@ -303,6 +304,8 @@ void SplashScreen::loadConfig()
 OUString( RTL_CONSTASCII_USTRINGPARAM( FullScreenSplash ) ) );
 OUString sNativeProgress = implReadBootstrapKey(
 OUString( RTL_CONSTASCII_USTRINGPARAM( NativeProgress ) ) );
+OUString sShowProgressFrame = implReadBootstrapKey(
+OUString( RTL_CONSTASCII_USTRINGPARAM( ShowProgressFrame ) ) );
 
 
 // Determine full screen splash mode
@@ -334,6 +337,11 @@ void SplashScreen::loadConfig()
 }
 }
 
+if (sShowProgressFrame.getLength()  0)
+{
+_bShowProgressFrame = sShowProgressFrame.toBoolean();
+}
+
 if ( sProgressBarColor.getLength() )
 {
 sal_uInt8 nRed = 0;
@@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangle)
 if (_bPaintBitmap)
 _vdev.DrawBitmapEx( Point(), _aIntroBmp );
 
-if (_bPaintProgress) {
+if (_bPaintProgress)
+{
 // draw progress...
-long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace);
-if (length  0) length = 0;
-
-// border
-_vdev.SetFillColor();
-_vdev.SetLineColor( _cProgressFrameColor );
-_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
-_vdev.SetFillColor( _cProgressBarColor );
-_vdev.SetLineColor();
-_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, 
_tlx+_barspace+length, _tly+_barheight-_barspace));
+long length = (_iProgress * _barwidth / _iMax);
+if (_bShowProgressFrame)
+length -= (2 * _barspace);
+if (length  0)
+length = 0;
+
+if (_bShowProgressFrame)
+{
+// border
+_vdev.SetFillColor();
+_vdev.SetLineColor( _cProgressFrameColor );
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, 
_tly+_barheight));
+_vdev.SetFillColor( _cProgressBarColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, 
_tlx+_barspace+length, _tly+_barheight-_barspace));
+_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, 
_tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
+}
+else
+{
+// Show flat progress bar without frame.
+
+// border
+_vdev.SetFillColor( _cProgressFrameColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, 
_tly+_barheight));
+
+_vdev.SetFillColor( _cProgressBarColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length, 
_tly+_barheight));
+}
+
 _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, 
_tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
 }
 Size aSize =  GetOutputSizePixel();
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index b312bef..7863d29 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -84,6 +84,7 @@ private:
 VirtualDevice   _vdev;
 BitmapEx_aIntroBmp;
 Color   _cProgressFrameColor;
+bool_bShowProgressFrame;
 Color   _cProgressBarColor;
 bool_bNativeProgress;
 OUString_sAppName;
diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 2de02be..815d657 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -20,10 +20,11 @@ Globals
 LIBRARYVERSION 10.0.0
 POOLPRODUCT 1
 PROGRESSBARCOLOR 14,133,205
-

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 27/cfcb1e9d103b3e49c1263b1fa59fee8b187b21 82/194a19ff4f29c8451c8e6ab6fe4f1b9d08df27 c9/f7a06e7798bcd5253844c49d210ea9345bd4b8

2013-07-11 Thread Caolán McNamara

 27/cfcb1e9d103b3e49c1263b1fa59fee8b187b21 |1 +
 82/194a19ff4f29c8451c8e6ab6fe4f1b9d08df27 |1 +
 c9/f7a06e7798bcd5253844c49d210ea9345bd4b8 |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 7f5b87e2fa7b241a3a36efba5846df608b71e3e6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:17:32 2013 +0100

Notes added by 'git notes add'

diff --git a/82/194a19ff4f29c8451c8e6ab6fe4f1b9d08df27 
b/82/194a19ff4f29c8451c8e6ab6fe4f1b9d08df27
new file mode 100644
index 000..bd3d69c
--- /dev/null
+++ b/82/194a19ff4f29c8451c8e6ab6fe4f1b9d08df27
@@ -0,0 +1 @@
+merged as: 805c6101b3427cc98b53f1c48f22f705206c384d
commit 868ce8c09eb5ebb1bbf66eed6561a30c35726bbc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:17:24 2013 +0100

Notes added by 'git notes add'

diff --git a/c9/f7a06e7798bcd5253844c49d210ea9345bd4b8 
b/c9/f7a06e7798bcd5253844c49d210ea9345bd4b8
new file mode 100644
index 000..bd3d69c
--- /dev/null
+++ b/c9/f7a06e7798bcd5253844c49d210ea9345bd4b8
@@ -0,0 +1 @@
+merged as: 805c6101b3427cc98b53f1c48f22f705206c384d
commit 43bb18f22d7fe70eecaa41b4a74e0fb4fe26fea7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:17:17 2013 +0100

Notes added by 'git notes add'

diff --git a/27/cfcb1e9d103b3e49c1263b1fa59fee8b187b21 
b/27/cfcb1e9d103b3e49c1263b1fa59fee8b187b21
new file mode 100644
index 000..bd3d69c
--- /dev/null
+++ b/27/cfcb1e9d103b3e49c1263b1fa59fee8b187b21
@@ -0,0 +1 @@
+merged as: 805c6101b3427cc98b53f1c48f22f705206c384d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/test include/toolkit odk/examples offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/tests swext/mediawiki sw/source toolkit/source UnoControls/i

2013-07-11 Thread Ariel Constenla-Haile

 UnoControls/inc/basecontrol.hxx
 |1 
 UnoControls/source/inc/progressmonitor.hxx 
 |1 
 desktop/test/deployment/active/Dispatch.java   
 |3 
 desktop/test/deployment/active/active_native.cxx   
 |2 
 desktop/test/deployment/active/active_python.py
 |3 
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java 
|3 
 desktop/test/deployment/passive/passive_native.cxx 
 |2 
 desktop/test/deployment/passive/passive_python.py  
 |3 
 include/toolkit/awt/vclxtoolkit.hxx
 |2 
 odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java   
 |4 
 odk/examples/DevelopersGuide/GUI/MessageBox.java   
 |5 
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx  
 |3 
 odk/examples/java/Inspector/Inspector.java 
 |3 
 offapi/UnoApi_offapi.mk
 |3 
 offapi/com/sun/star/awt/MessageBoxButtons.idl  
 |6 -
 offapi/com/sun/star/awt/MessageBoxCommand.idl  
 |   55 -
 offapi/com/sun/star/awt/MessageBoxResults.idl  
 |   58 ++
 offapi/com/sun/star/awt/MessageBoxType.idl 
 |   50 
 offapi/com/sun/star/awt/XMessageBox.idl
 |   35 +-
 offapi/com/sun/star/awt/XMessageBoxFactory.idl 
 |   53 +++--
 offapi/type_reference/offapi.rdb   
 |binary
 qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java   
 |2 
 sw/source/ui/envelp/labimp.hxx 
 |1 
 swext/mediawiki/src/com/sun/star/wiki/Helper.java  
 |7 -
 swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
 |4 
 toolkit/source/awt/vclxtoolkit.cxx 
 |   48 +++-
 26 files changed, 208 insertions(+), 149 deletions(-)

New commits:
commit 805c6101b3427cc98b53f1c48f22f705206c384d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Dec 24 08:07:25 2012 +

Resolves: #i121544# - Clean-up MessageBox API

(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21)

Conflicts:
desktop/test/deployment/active/active_native.cxx
desktop/test/deployment/passive/Dispatch.java
desktop/test/deployment/passive/passive_native.cxx
odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
odk/examples/DevelopersGuide/GUI/MessageBox.java
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
odk/examples/java/Inspector/Inspector.java
offapi/com/sun/star/awt/MessageBoxButtons.idl
offapi/com/sun/star/awt/MessageBoxResults.idl
offapi/com/sun/star/awt/XMessageBox.idl
offapi/com/sun/star/awt/XMessageBoxFactory.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
sdext/source/minimizer/unodialog.cxx
toolkit/inc/toolkit/awt/vclxtoolkit.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/layout/core/root.cxx

Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67

Related: #i121544# - Clean-up MessageBox API (post fix)

(cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8)

Conflicts:
sw/inc/pch/precompiled_sw.hxx

Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1

Related: #i121544# - Fix header guards

Found by: Tsutomu Uchino

(cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27)

Conflicts:
offapi/com/sun/star/awt/MessageBoxType.idl

Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 0aa633d..2ae330f 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -75,7 +75,6 @@
 #include com/sun/star/awt/XComboBox.hpp
 #include com/sun/star/awt/XControl.hpp
 #include com/sun/star/awt/XCheckBox.hpp
-#include com/sun/star/awt/MessageBoxCommand.hpp
 #include com/sun/star/awt/XLayoutConstrains.hpp
 #include com/sun/star/awt/XProgressBar.hpp
 #include com/sun/star/awt/XTopWindow.hpp
diff --git a/UnoControls/source/inc/progressmonitor.hxx 
b/UnoControls/source/inc/progressmonitor.hxx
index 163dc09..48bc2b9 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 14/3b635b2a73e807fee1574ddaf1e12481d67a0d

2013-07-11 Thread Caolán McNamara

 14/3b635b2a73e807fee1574ddaf1e12481d67a0d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d38e1f390e1ba1249a2540f4bdcb5d689680b58d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:18:26 2013 +0100

Notes added by 'git notes add'

diff --git a/14/3b635b2a73e807fee1574ddaf1e12481d67a0d 
b/14/3b635b2a73e807fee1574ddaf1e12481d67a0d
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/14/3b635b2a73e807fee1574ddaf1e12481d67a0d
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: languagetool/UnpackedTarball_languagetool.mk

2013-07-11 Thread Caolán McNamara

 languagetool/UnpackedTarball_languagetool.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a45f6814c9d02fa3e3deed250c4f154c805e6570
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:37:11 2013 +0100

patch for messagebox api change

Change-Id: I6317e24dc93eb23a3d762f714d132851d7d80354

diff --git a/languagetool/UnpackedTarball_languagetool.mk 
b/languagetool/UnpackedTarball_languagetool.mk
index 4b0f632..d16617a 100644
--- a/languagetool/UnpackedTarball_languagetool.mk
+++ b/languagetool/UnpackedTarball_languagetool.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_set_patchlevel,languagetool,3))
 $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\
 languagetool/JLanguageTool-1.7.0.patch \
 languagetool/JLanguageTool-1.4.0-no-hc.patch \
+languagetool/MessageBox-apichange.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread David Tardon

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 532025b2b9ef6b30ab7fbf7efc2b922fbc3ab971
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 11 09:25:16 2013 +0200

rhbz#980387 fix filter selection from file ext.

... for filters that have more than one extension associated with them
(e.g., JPEG).

(cherry picked from commit 70376f610a7eb876739829e1f362bc94b21cb82f)
Signed-off-by: David Tardon dtar...@redhat.com

Conflicts:
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx

Change-Id: Ic6b16d3b4aa17580404d02a9fb7b087b9aa52fc2
Reviewed-on: https://gerrit.libreoffice.org/4824
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index f2e1141..b952f30 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -33,6 +33,7 @@
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/ControlActions.hpp
 #include com/sun/star/uno/Any.hxx
+#include comphelper/string.hxx
 #include osl/mutex.hxx
 #include unx/gtk/gtkinst.hxx
 
@@ -794,6 +795,25 @@ uno::Sequencertl::OUString SAL_CALL 
SalGtkFilePicker::getFiles() throw( uno::R
 return aFiles;
 }
 
+namespace
+{
+
+bool lcl_matchFilter( const rtl::OUString rFilter, const rtl::OUString rExt )
+{
+const int nCount = comphelper::string::getTokenCount( rFilter, ';' );
+
+for ( int n = 0; n != nCount; ++n )
+{
+const rtl::OUString aToken = comphelper::string::getToken( rFilter, n, 
';' );
+if ( aToken == rExt )
+return true;
+}
+
+return false;
+}
+
+}
+
 uno::Sequencertl::OUString SAL_CALL SalGtkFilePicker::getSelectedFiles() 
throw( uno::RuntimeException )
 {
 SolarMutexGuard g;
@@ -856,7 +876,7 @@ uno::Sequencertl::OUString SAL_CALL 
SalGtkFilePicker::getSelectedFiles() throw
   ++aListIter
 )
 {
-if( aListIter-getFilter().equalsIgnoreAsciiCase( 
aStarDot+sExtension ) )
+if( lcl_matchFilter( aListIter-getFilter(), 
aStarDot+sExtension ) )
 {
 if( aNewFilter.isEmpty() )
 aNewFilter = aListIter-getTitle();
___
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 solenv/gbuild

2013-07-11 Thread Norbert Thiebaud

 config_host.mk.in   |1 -
 configure.ac|   16 ++--
 solenv/gbuild/platform/com_GCC_class.mk |   21 +
 3 files changed, 3 insertions(+), 35 deletions(-)

New commits:
commit d496bcdb770a61400abf4f67baae5103505f8a34
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed Jul 10 21:01:11 2013 -0500

we do not support any platform with bison  2.0 anymore

Change-Id: Ia2c1c6ed43c6a42fa1a65a22f4c8d68de216706c
Reviewed-on: https://gerrit.libreoffice.org/4822
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/config_host.mk.in b/config_host.mk.in
index 58d2a0e..8e14d7a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -15,7 +15,6 @@ export BUILDDIR=@BUILDDIR@
 @x_AFLAGS@ export AFLAGS=@AFLAGS@
 export ALLOC=@ALLOC@
 export ALL_LANGS=@ALL_LANGS@
-export ANCIENT_BISON=@ANCIENT_BISON@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
 export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
diff --git a/configure.ac b/configure.ac
index 69479c3..3db1813 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9219,29 +9219,17 @@ dnl ***
 dnl Checking for bison and flex
 dnl ***
 AC_PATH_PROG(BISON, bison)
-ANCIENT_BISON=NO
 if test -z $BISON; then
 AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
 AC_MSG_CHECKING([the bison version])
 _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 
's@ .*@@' -e 's@,.*@@'`
 _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
-# Accept newer than 1.875 or older(equal) than 1.75
-if test $_bison_longver -ge 1875 -o $_bison_longver -le 1075; then
-if test $_bison_version = 1.875; then
-AC_MSG_WARN([suspect ($BISON $_bison_version)])
-add_warning Suspect ($BISON $_bison_version) suggest upgrade
-else
-AC_MSG_RESULT([checked ($BISON $_bison_version)])
-fi
-else
-AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and 
older))])
-fi
+# Accept newer than 2.0
 if test $_bison_longver -lt 2000; then
-ANCIENT_BISON=YES
+AC_MSG_ERROR([failed ($BISON $_bison_version need 2.0+)])
 fi
 fi
-AC_SUBST(ANCIENT_BISON)
 
 AC_PATH_PROG(FLEX, flex)
 if test -z $FLEX; then
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 5464715..e16ad03 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -233,33 +233,14 @@ endef
 
 # YaccTarget class
 
-ifeq ($(ANCIENT_BISON),YES)
-#
-# There are ancient versions of bison out there, which do not handle
-# well .cxx extensions, nor do they support --defines=file. The
-# result is that the header is named foo.cxx.h instead of foo.hxx
-# so we queue a mv to rename the header accordingly.
-# One example is XCode versions 2.x, which are used on OSX ppc
-# machines.
-#
 define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1)  mv $(5).h $(4)  touch 
$(3) )
+   $(gb_YACC) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 
-else
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
-
-endef
-endif
-
 # ExternalProject class
 
 gb_ExternalProject_use_autoconf :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - dtrans/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk toolkit/source vcl/aqua vcl/source vcl/unx

2013-07-11 Thread Stephan Bergmann

 dtrans/source/win32/clipb/WinClipboard.cxx  |2 
 dtrans/source/win32/clipb/WinClipboard.hxx  |8 -
 offapi/UnoApi_offapi.mk |5 
 offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl  |   37 -
 offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl |   63 
--
 offapi/type_reference/offapi.rdb|binary
 toolkit/source/awt/vclxtoolkit.cxx  |   12 +
 vcl/aqua/source/dtrans/aqua_clipboard.cxx   |2 
 vcl/aqua/source/dtrans/aqua_clipboard.hxx   |6 
 vcl/source/components/dtranscomp.cxx|   12 +
 vcl/source/window/window.cxx|   41 --
 vcl/unx/generic/dtrans/X11_clipboard.cxx|8 -
 vcl/unx/generic/dtrans/X11_clipboard.hxx|   12 +
 13 files changed, 94 insertions(+), 114 deletions(-)

New commits:
commit 948dc44712f41c6a12342e4f44e0f2039f62744b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jul 10 16:40:30 2013 +0200

fdo#66718: Revert fdo#46808, Adapt SystemClipboard UNO service to new 
style

This reverts commit 2fe852386c9450014f84910b0a282d684f40b56a, see
https://bugs.freedesktop.org/show_bug.cgi?id=66718#c8 for details.  (On 
master
towards LO 4.2, this will be addressed differently, by modifying
2fe852386c9450014f84910b0a282d684f40b56a instead of reverting it, so this
libreoffice-4-1 commit is not a cherry-pick of any master commit.)

Conflicts:
dtrans/source/win32/clipb/WinClipboard.cxx
offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
offapi/type_reference/types.rdb
vcl/ios/source/dtrans/ios_clipboard.cxx
vcl/ios/source/dtrans/ios_clipboard.hxx
vcl/source/window/window.cxx

(cherry picked from commit 60455c972b09ca02b18660c6fb3dafc03b30b2b5, plus
bd115a62bb3d1b741a035ace9d9c2608acd95c47 fdo#66718: Remove XSystemClipboard
from reference rdb again)

Change-Id: Idb804196bc5693e4e8674d805edefd9d1ae7c178
Reviewed-on: https://gerrit.libreoffice.org/4817
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx 
b/dtrans/source/win32/clipb/WinClipboard.cxx
index 5a2c1e9..6f58744 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -59,7 +59,7 @@ namespace
 //
 /*XEventListener,*/
 CWinClipboard::CWinClipboard( const Reference XComponentContext  rxContext, 
const OUString aClipboardName ) :
-WeakComponentImplHelper3 XSystemClipboard, XFlushableClipboard, 
XServiceInfo ( m_aCbListenerMutex ),
+WeakComponentImplHelper4 XClipboardEx, XFlushableClipboard, 
XClipboardNotifier, XServiceInfo ( m_aCbListenerMutex ),
 m_xContext( rxContext )
 {
 m_pImpl.reset( new CWinClipbImpl( aClipboardName, this ) );
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx 
b/dtrans/source/win32/clipb/WinClipboard.hxx
index 608f9e9..3b36ae7 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -23,13 +23,12 @@
 
 #include rtl/ustring.hxx
 #include sal/types.h
-#include cppuhelper/compbase3.hxx
+#include cppuhelper/compbase4.hxx
 #include com/sun/star/datatransfer/XTransferable.hpp
 #include com/sun/star/datatransfer/clipboard/XClipboardEx.hpp
 #include com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp
 #include com/sun/star/datatransfer/clipboard/XClipboardListener.hpp
 #include com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp
-#include com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp
 #include com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/uno/XComponentContext.hpp
@@ -63,9 +62,10 @@ protected:
 
 class CWinClipboard :
 public CWinClipboardDummy,
-public cppu::WeakComponentImplHelper3
-::com::sun::star::datatransfer::clipboard::XSystemClipboard,
+public cppu::WeakComponentImplHelper4
+::com::sun::star::datatransfer::clipboard::XClipboardEx, \
 ::com::sun::star::datatransfer::clipboard::XFlushableClipboard,
+::com::sun::star::datatransfer::clipboard::XClipboardNotifier,
 ::com::sun::star::lang::XServiceInfo 
 {
 public:
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index db062c4..63ec527 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -105,9 +105,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransf
DataFormatTranslator \

[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source dbaccess/source include/svtools include/svx oox/source reportdesign/source sal/osl svtools/source svx/inc svx/source sw/source

2013-07-11 Thread Caolán McNamara

 chart2/source/controller/dialogs/DataBrowser.cxx  |2 +-
 chart2/source/controller/dialogs/DataBrowser.hxx  |2 +-
 cui/source/options/connpooloptions.cxx|6 +++---
 dbaccess/source/ui/control/RelationControl.cxx|6 +++---
 dbaccess/source/ui/control/TableGrantCtrl.cxx |2 +-
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 +-
 dbaccess/source/ui/inc/TableGrantCtrl.hxx |2 +-
 dbaccess/source/ui/inc/indexfieldscontrol.hxx |2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |4 ++--
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx   |2 +-
 dbaccess/source/ui/tabledesign/TEditControl.hxx   |2 +-
 include/svtools/accessibletableprovider.hxx   |2 +-
 include/svtools/brwbox.hxx|   14 +++---
 include/svtools/ctrltool.hxx  |6 +++---
 include/svtools/svtabbx.hxx   |2 +-
 include/svx/galctrl.hxx   |2 +-
 include/svx/gridctrl.hxx  |2 +-
 oox/source/helper/propertymap.cxx |8 
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |   10 +-
 sal/osl/w32/process.cxx   |2 +-
 svtools/source/brwbox/brwbox1.cxx |   14 +++---
 svtools/source/brwbox/brwbox3.cxx |6 +++---
 svtools/source/contnr/svtabbx.cxx |6 +++---
 svtools/source/control/ctrltool.cxx   |   10 --
 svx/inc/svdibrow.hxx  |2 +-
 svx/source/fmcomp/gridctrl.cxx|4 ++--
 svx/source/gallery2/galctrl.cxx   |4 ++--
 svx/source/svdraw/svdibrow.cxx|   18 --
 sw/source/ui/index/cnttab.cxx |4 ++--
 30 files changed, 73 insertions(+), 77 deletions(-)

New commits:
commit cf6a74af5340c2c4fbf270a95bad12479524d9d4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 13:52:33 2013 +0100

XubString-OUString

Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 86df2bb..6f9ced4 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -648,7 +648,7 @@ OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
 return OUString::valueOf(nRow + 1);
 }
 
-String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
+OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
 {
 OUString aResult;
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx 
b/chart2/source/controller/dialogs/DataBrowser.hxx
index a5bfad0..31f471e 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -78,7 +78,7 @@ public:
 @return
 the text out of the cell
 */
-virtual String  GetCellText(long nRow, sal_uInt16 nColId) const;
+virtual OUString  GetCellText(long nRow, sal_uInt16 nColId) const;
 
 /** returns the number in the given cell. If a cell is empty or contains a
 string, the result will be Nan
diff --git a/cui/source/options/connpooloptions.cxx 
b/cui/source/options/connpooloptions.cxx
index 0745f8f..bf64607 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -54,7 +54,7 @@ namespace offapp
 
 virtual void Init();
 void Update(const DriverPoolingSettings _rSettings);
-virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
+virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
 
 // the handler will be called with a 
DriverPoolingSettings::const_iterator as parameter,
 // or NULL if no valid current row exists
@@ -242,9 +242,9 @@ namespace offapp
 }
 
 //
-String DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const
+OUString DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) 
const
 {
-String sReturn;
+OUString sReturn;
 if (nRow  m_aSettings.size())
 {
 OSL_FAIL(DriverListControl::GetCellText: don't ask me for such 
rows!);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx 
b/dbaccess/source/ui/control/RelationControl.cxx
index d61d39e..4d6143d2 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -112,7 +112,7 @@ namespace dbaui
 virtual void PaintCell( OutputDevice rDev, const Rectangle rRect, 
sal_uInt16

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

2013-07-11 Thread Nourah . AlShoeibi

 vcl/inc/cupsmgr.hxx  |   14 +++
 vcl/inc/fontsubset.hxx   |   26 ++---
 vcl/inc/ilstbox.hxx  |   94 +++
 vcl/inc/impimagetree.hxx |8 ++--
 vcl/inc/printdlg.hxx |4 +-
 5 files changed, 73 insertions(+), 73 deletions(-)

New commits:
commit 00a26f824232d9dbf68cfbcbdd4b423da23ed4eb
Author: Nourah.AlShoeibi nourah.alshoe...@gmail.com
Date:   Thu Jul 11 12:03:19 2013 +0300

Modifying comments to meet Doxygen standards

Change-Id: I5f69285d571c08c40f2e8a7495363a7b97bbadb3
Reviewed-on: https://gerrit.libreoffice.org/4825
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 9a84b77..ac040b0 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -47,9 +47,9 @@ class CUPSManager : public PrinterInfoManager
 boost::unordered_map OUString, PPDContext, OUStringHash  
m_aDefaultContexts;
 
 OStringm_aUser;
-// this is a security risk, but the CUPS API demands
-// to deliver a pointer to a static buffer containing
-// the password, so this cannot be helped
+/** this is a security risk, but the CUPS API demands
+to deliver a pointer to a static buffer containing
+the password, so this cannot be helped*/
 OStringm_aPassword;
 
 osl::Mutex  m_aCUPSMutex;
@@ -67,13 +67,13 @@ class CUPSManager : public PrinterInfoManager
 void runDests();
 OString threadedCupsGetPPD(const char* pPrinter);
 public:
-// public for stub
+/// public for stub
 static void runDestThread(void* pMgr);
 
 static CUPSManager* tryLoadCUPS();
 
+/// wraps cupsGetPPD, so unlink after use !
 const PPDParser* createCUPSParser( const OUString rPrinter );
-// wraps cupsGetPPD, so unlink after use !
 
 const char* authenticateUser( const char* );
 
@@ -81,10 +81,10 @@ public:
 virtual int endSpool( const OUString rPrinterName, const OUString 
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner );
 virtual void setupJobContextData( JobData rData );
 
-// changes the info about a named printer
+/// changes the info about a named printer
 virtual void changePrinterInfo( const OUString rPrinter, const 
PrinterInfo rNewInfo );
 
-// check if the printer configuration has changed
+/// check if the printer configuration has changed
 virtual bool checkPrintersChanged( bool bWait );
 
 // members for administration (-padmin)
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index eeb920b..b5f62f2 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -26,7 +26,7 @@
 
 #include vcl/dllapi.h
 
-namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font
+namespace vcl { struct _TrueTypeFont; } /// SFT's idea of a TTF font
 
 class VCL_DLLPUBLIC FontSubsetInfo
 {
@@ -36,13 +36,13 @@ public:
 
 enum FontType {
 NO_FONT = 0,
-SFNT_TTF= 11, // SFNT container with TrueType glyphs
-SFNT_CFF= 12, // SFNT container with CFF-container
-TYPE1_PFA   = 13, // PSType1 Postscript Font Ascii
-TYPE1_PFB   = 14, // PSType1 Postscript Font Binary
-CFF_FONT= 15, // CFF-container with PSType2 glyphs
-TYPE3_FONT  = 16, // PSType3 Postscript font
-TYPE42_FONT = 17, // PSType42 wrapper for an SFNT_TTF
+SFNT_TTF= 11, /// SFNT container with TrueType glyphs
+SFNT_CFF= 12, /// SFNT container with CFF-container
+TYPE1_PFA   = 13, /// PSType1 Postscript Font Ascii
+TYPE1_PFB   = 14, /// PSType1 Postscript Font Binary
+CFF_FONT= 15, /// CFF-container with PSType2 glyphs
+TYPE3_FONT  = 16, /// PSType3 Postscript font
+TYPE42_FONT = 17, /// PSType42 wrapper for an SFNT_TTF
 ANY_SFNT= SFNT_TTF | SFNT_CFF,
 ANY_TYPE1   = TYPE1_PFA | TYPE1_PFB,
 ANY_FONT= 0xFF
@@ -58,23 +58,23 @@ public:
 int nReqGlyphCount, sal_Int32* pOutGlyphWidths = NULL );
 
 public: // TODO: make subsetter results private and provide accessor methods 
instead
-// subsetter-provided subset details needed by e.g. Postscript or PDF
+// subsetter-provided subset details needed by e.g. Postscript or PDF
 String  m_aPSName;
-int m_nAscent; // all metrics in PS font units
+int m_nAscent; /// all metrics in PS font units
 int m_nDescent;
 int m_nCapHeight;
 Rectangle   m_aFontBBox;
-FontTypem_nFontType;// font-type of subset result
+FontTypem_nFontType;/// font-type of subset result
 
 private:
 // input-font-specific details
 unsigned const char*mpInFontBytes;
 int

[Libreoffice-commits] core.git: odk/Package_examples.mk

2013-07-11 Thread Stephan Bergmann

 odk/Package_examples.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 37d9921797a3ad3be8257fbfee11326549fcd987
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 15:31:28 2013 +0200

odk/examples/python/toolpanel/CalcWindowState.xcu is still in use

...contrary to what f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c various .xcus 
are
gone now claims (thought it might ask for clean-up in light of
af572d9fbb744c9691abe465815d7927a9d11510 Related: #i121577# Allow setting
toolbar name in Addons.xcu).

Change-Id: I4ff75c3ddf5bce28330f7b99282d8e2e081de48b

diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index eac7f2d..90c2dd7 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -514,6 +514,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME
 java/ToDo/ToDo.java \
 java/ToDo/ToDo.ods \
 java/ToDo/XToDo.idl \
+python/toolpanel/CalcWindowState.xcu \
 python/toolpanel/Factory.xcu \
 python/toolpanel/META-INF/manifest.xml \
 python/toolpanel/Makefile \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread David Tardon

 scp2/source/base/module_base.scp   |2 +-
 scp2/source/calc/module_calc.scp   |2 +-
 scp2/source/gnome/module_gnome.scp |2 +-
 scp2/source/graphicfilter/module_graphicfilter.scp |2 +-
 scp2/source/impress/module_impress.scp |2 +-
 scp2/source/kde/module_kde.scp |3 +--
 scp2/source/math/module_math.scp   |2 +-
 scp2/source/onlineupdate/module_onlineupdate.scp   |2 +-
 scp2/source/ooo/module_hidden_ooo.scp  |2 +-
 scp2/source/ooo/ure.scp|2 +-
 scp2/source/tde/module_tde.scp |3 +--
 scp2/source/writer/module_writer.scp   |2 +-
 solenv/gbuild/AutoInstall.mk   |   16 ++--
 13 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit bd3aa6983796f9dedf85c446a0ce5e5505583809
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 11 12:23:39 2013 +0200

fdo#66072 do not end auto_*_ALL by a comma

Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939
Reviewed-on: https://gerrit.libreoffice.org/4829
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 4dfd886..7a46408 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Base_Bin
 Minimal = NO;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = (auto_base_ALL
+Files = (auto_base_ALL,
 gid_File_Share_Registry_Base_Xcd
 );
 End
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 35aafdf..191577a 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Calc_Bin
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = (auto_calc_ALL
+Files = (auto_calc_ALL,
 gid_File_Share_Registry_Calc_Xcd,
 gid_File_Lib_Lpsolve);
 End
diff --git a/scp2/source/gnome/module_gnome.scp 
b/scp2/source/gnome/module_gnome.scp
index 2b45bb1..57a05c4 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome
 #ifdef ENABLE_GNOMEVFS
 XpdCheckSolaris = SUNWgnome-vfs;
 #endif
-Files = (auto_gnome_ALL
+Files = (auto_gnome_ALL,
 #if (defined ENABLE_GNOMEVFS  defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
   gid_File_Share_Registry_Gnome_Xcd,
 #endif
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp 
b/scp2/source/graphicfilter/module_graphicfilter.scp
index 88ab156..47031d1 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt
 Sortkey = 600;
 ParentID = gid_Module_Optional;
 Default = YES;
-Files = (auto_graphicfilter_ALL
+Files = (auto_graphicfilter_ALL,
 gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/impress/module_impress.scp 
b/scp2/source/impress/module_impress.scp
index ebf90a2..d4ef187 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Impress_Bin
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = (auto_impress_ALL
+Files = (auto_impress_ALL,
 
gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
 gid_File_Share_Registry_Impress_Xcd,
 gid_File_sd_xml,
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index c82a094..6fa6155 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,6 +26,5 @@ Module gid_Module_Optional_Kde
 PackageInfo = packinfo_office.txt;
 MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
 Styles = ();
-Files = (auto_kde_ALL
-);
+Files = (auto_kde_ALL);
 End
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 0c01f98..d433178 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Math_Bin
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = (auto_math_ALL
+Files = (auto_math_ALL,

gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
 gid_File_Share_Registry_Math_Xcd,
 gid_File_Tmp_Userinstall_Math_Inf);
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp 
b/scp2/source/onlineupdate/module_onlineupdate.scp
index ecd0cda..a2afd3a 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -27,7 +27,7 @@

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

2013-07-11 Thread Tor Lillqvist

 include/sfx2/shell.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 7450f19f62194f79349fa6d3bdb9733d7110a143
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 15:59:18 2013 +0300

Bin pointless #ifndef _SFXSH_HXX

Change-Id: I5c08bf9a9db2d1509407589dfbecdde44577ccba

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index ddeb677..7b8fb55 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -162,12 +162,10 @@ protected:
 SfxShell();
 SfxShell( SfxViewShell *pViewSh );
 
-#ifndef _SFXSH_HXX
 SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
 SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings rBindings, sal_uInt16 
nId );
 SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
 SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
-#endif
 
 public:
 TYPEINFO();
@@ -253,11 +251,9 @@ public:
 */
 void BroadcastContextForActivation (const bool bIsActivated);
 
-#ifndef _SFXSH_HXX
 SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot rSlot );
 SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
 SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool 
bMDI);
-#endif
 };
 
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Stephan Bergmann

 odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java |   30 
+++---
 1 file changed, 9 insertions(+), 21 deletions(-)

New commits:
commit b62d8e6b081d90d3b6e503f5cde9e70e370d671c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 16:07:33 2013 +0200

Adapt example to use retrofitted UNO service ctors

Change-Id: I85bf8e3fe76ff107cc3e611cc1103ca1f27fc00f

diff --git a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java 
b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java
index 9ad119e..5dc01aa 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java
@@ -32,15 +32,16 @@
  *
  */
 
-import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.Desktop;
+import com.sun.star.frame.XDesktop2;
 import com.sun.star.datatransfer.DataFlavor;
 import com.sun.star.datatransfer.UnsupportedFlavorException;
 import com.sun.star.datatransfer.XTransferable;
 import com.sun.star.datatransfer.clipboard.XClipboard;
-import com.sun.star.datatransfer.clipboard.XClipboardNotifier;
+import com.sun.star.datatransfer.clipboard.SystemClipboard;
+import com.sun.star.datatransfer.clipboard.XSystemClipboard;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.AnyConverter;
 
@@ -59,18 +60,11 @@ public class Clipboard
 XComponentContext xOfficeContext =
 com.sun.star.comp.helper.Bootstrap.bootstrap();
 System.out.println(Connected to a running office ...);
-// get the service manager from the office context
-XMultiComponentFactory xServiceManager =
-xOfficeContext.getServiceManager();
 
 // create a new test document
-Object oDesktop = xServiceManager.createInstanceWithContext(
-com.sun.star.frame.Desktop, xOfficeContext);
-
-XComponentLoader xCompLoader 
=UnoRuntime.queryInterface(XComponentLoader.class, oDesktop);
-
+XDesktop2 xDesktop = Desktop.create(xOfficeContext);
 com.sun.star.lang.XComponent xComponent =
-xCompLoader.loadComponentFromURL(private:factory/swriter,
+xDesktop.loadComponentFromURL(private:factory/swriter,
 _blank, 0, new com.sun.star.beans.PropertyValue[0]);
 {
 XTextDocument xDoc =UnoRuntime.queryInterface(XTextDocument.class, 
xComponent);
@@ -93,21 +87,15 @@ public class Clipboard
 }
 // test document will be closed later
 
-Object oClipboard = xServiceManager.createInstanceWithContext(
-com.sun.star.datatransfer.clipboard.SystemClipboard,
-xOfficeContext);
-
-XClipboard xClipboard = 
UnoRuntime.queryInterface(XClipboard.class, oClipboard);
+XSystemClipboard xClipboard = 
SystemClipboard.create(xOfficeContext);
 
 //---
 // registering as clipboard listener
 //---
 
-XClipboardNotifier xClipNotifier = 
UnoRuntime.queryInterface(XClipboardNotifier.class, oClipboard);
-
 ClipboardListener aClipListener= new ClipboardListener();
 
-xClipNotifier.addClipboardListener(aClipListener);
+xClipboard.addClipboardListener(aClipListener);
 
 // Read ClipBoard
 readClipBoard(xClipboard);
@@ -145,7 +133,7 @@ public class Clipboard
 //---
 // unregistering as clipboard listener
 //---
-xClipNotifier.removeClipboardListener(aClipListener);
+xClipboard.removeClipboardListener(aClipListener);
 
 // close test document
 com.sun.star.util.XCloseable xCloseable = 
UnoRuntime.queryInterface(com.sun.star.util.XCloseable.class,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Andras Timar

 svx/source/xoutdev/_xoutbmp.cxx   |1 -
 sw/source/filter/html/htmlfly.cxx |6 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0b48a9b5e05e57306d7f3a32d2be01bb352b0d18
Author: Andras Timar ati...@suse.com
Date:   Thu Jul 11 15:17:15 2013 +0200

remove unused headers

Change-Id: I3345e6322a9aa25239df98033b8436ec377e197f

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 40f9f7f..bad0533 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -31,7 +31,6 @@
 #include vcl/graphicfilter.hxx
 #include vcl/cvtgrf.hxx
 #include sax/tools/converter.hxx
-#include svtools/htmlkywd.hxx
 
 #define FORMAT_BMP  OUString(bmp)
 #define FORMAT_GIF  OUString(gif)
commit e6fb87e6039de7d871563cd14b5b9d21129cd216
Author: Andras Timar ati...@suse.com
Date:   Thu Jul 11 15:15:08 2013 +0200

statement aligned as second statement in if body but not in a statement 
block

Change-Id: I0d691c75cc5477b3b0f9c6f6f2dc420a51751201

diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index 0bac1d7..fb7ac88 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1220,16 +1220,14 @@ Writer OutHTML_BulletImage( Writer rWrt,
 const Graphic* pGrf = pBrush-GetGraphic();
 if( pGrf )
 {
-const Graphic* aGraphic = pBrush-GetGraphic();
-sal_uLong nErr = XOutBitmap::GraphicToBase64(*aGraphic, 
aGraphicInBase64);
+sal_uLong nErr = XOutBitmap::GraphicToBase64(*pGrf, 
aGraphicInBase64);
 if( nErr )
 {
 rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
 }
-// Grafik als (JPG-)File speichern
 if( rHTMLWrt.GetOrigFileName() )
 rGrfName = *rHTMLWrt.GetOrigFileName();
-pLink = rGrfName;
+pLink = rGrfName;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Tor Lillqvist

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

New commits:
commit 74388d2fbdd3ffb7d319e74dd1a7c5592410aacd
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 11 17:13:01 2013 +0300

Handle --without-opencl-sdk or --with-opencl-sdk=no

Needed especially for OS X where building the OpenCL code is on by
default, in case you still want to bypass it (if it is broken).

Change-Id: I47584890869ef2b5a77e0cb68a110d49e1ff4755

diff --git a/configure.ac b/configure.ac
index 3db1813..3f9dbdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9818,7 +9818,7 @@ if test \( -z $with_opencl_sdk -o $with_opencl_sdk = 
yes \) -a $_os = Darwin
 OPENCL_CFLAGS=
 OPENCL_LIBS=-framework OpenCL
 AC_DEFINE(HAVE_FEATURE_OPENCL)
-elif test z$with_opencl_sdk = z; then
+elif test -z $with_opencl_sdk -o $with_opencl_sdk = no; then
 AC_MSG_RESULT([no])
 else
 if test -d $with_opencl_sdk/include; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Stephan Bergmann

 solenv/bin/modules/par2script/check.pm |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1e5cea126cbb014582f4395e85a8eca1ac63354f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 11 16:23:53 2013 +0200

Make an undefined Shortcut FileID a hard error

...so that regressions like the missing libjava_uno.jnilib in fdo#66703
REPORTBUILDER - report design wizard does not start on click (missing
libjava_uno.jnilib symlink) are found earlier in the future.  (It is 
unclear to
me why it had been demoted to a warning right from its inception in
5b6ee999707ef33bf8bbab6848f331df072543ae INTEGRATION: CWS native99 
(1.6.738);
FILE MERGED.)

Change-Id: I415477cff39b4a6b848701374c7f9dbb8ab2f6ba

diff --git a/solenv/bin/modules/par2script/check.pm 
b/solenv/bin/modules/par2script/check.pm
index 0ea1ec1..727cd7c 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -286,8 +286,7 @@ sub check_shortcut_assignments
 if (( exists($allshortcuts-{$shortcut}-{'FileID'}) ) 
 ( ! exists($allfiles-{$allshortcuts-{$shortcut}-{'FileID'}}) ))
 {
-# die \nERROR: FileID $allshortcuts-{$shortcut}-{'FileID'} has 
no definition at shortcut $shortcut !\n;
-print \n\tWARNING: FileID $allshortcuts-{$shortcut}-{'FileID'} 
has no definition at shortcut $shortcut !\n;
+die \nERROR: FileID $allshortcuts-{$shortcut}-{'FileID'} has no 
definition at shortcut $shortcut !\n;
 }
 
 if (( exists($allshortcuts-{$shortcut}-{'ShortcutID'}) ) 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cmis' - configure.ac ucb/source

2013-07-11 Thread Cédric Bosdonnat

 configure.ac  |2 +-
 ucb/source/ucp/cmis/auth_provider.hxx |2 +-
 ucb/source/ucp/cmis/cmis_content.cxx  |2 --
 ucb/source/ucp/cmis/cmis_content.hxx  |2 +-
 ucb/source/ucp/cmis/cmis_provider.hxx |2 +-
 ucb/source/ucp/cmis/cmis_repo_content.cxx |6 +++---
 ucb/source/ucp/cmis/cmis_repo_content.hxx |7 ---
 ucb/source/ucp/cmis/cmis_url.cxx  |2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit b27fc4cc51d9d8bdd177d1ebfa89952ca8864720
Author: CÃ©dric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jul 11 17:03:34 2013 +0200

Switched to use libcmis' future 0.4.0 code

This means that building with internal libcmis won't work. Make install
libcmis master code and use --with-system-libcmis to build after this
commit

Change-Id: I3df31b299cfc462436681bb36a62c626b3ce3dfe

diff --git a/configure.ac b/configure.ac
index 4f422ee..28e35e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7229,7 +7229,7 @@ 
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
 dnl ===
 dnl Check for system libcmis
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 = 0.3.1])
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 = 0.4.0])
 
 dnl ===
 dnl Check for system libwpd
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index 56ea2e8..bbc0398 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -12,7 +12,7 @@
 #ifndef AUTH_PROVIDER_HXX
 #define AUTH_PROVIDER_HXX
 
-#include libcmis/session.hxx
+#include libcmis/libcmis.hxx
 
 #include com/sun/star/ucb/XCommandEnvironment.hpp
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index cbce84b..9d4beeb 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -36,8 +36,6 @@
 #include com/sun/star/ucb/XCommandInfo.hpp
 #include com/sun/star/ucb/XDynamicResultSet.hpp
 
-#include libcmis/document.hxx
-
 #include comphelper/processfactory.hxx
 #include ucbhelper/cancelcommandexecution.hxx
 #include ucbhelper/content.hxx
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 56c9890..7728243 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -24,7 +24,7 @@
 #include com/sun/star/ucb/TransferInfo.hpp
 #include com/sun/star/ucb/XContentCreator.hpp
 #include ucbhelper/contenthelper.hxx
-#include libcmis/session-factory.hxx
+#include libcmis/libcmis.hxx
 
 #include list
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx 
b/ucb/source/ucp/cmis/cmis_provider.hxx
index aff705e..0dbe122 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -15,7 +15,7 @@
 
 #include com/sun/star/beans/Property.hpp
 #include ucbhelper/providerhelper.hxx
-#include libcmis/session.hxx
+#include libcmis/libcmis.hxx
 
 namespace cmis
 {
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx 
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index bc15d00..b2a0196 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -43,7 +43,7 @@ namespace cmis
 {
 RepoContent::RepoContent( const uno::Reference uno::XComponentContext  
rxContext,
 ContentProvider *pProvider, const uno::Reference 
ucb::XContentIdentifier  Identifier,
-list libcmis::RepositoryPtr  aRepos )
+vector libcmis::RepositoryPtr  aRepos )
 throw ( ucb::ContentCreationException )
 : ContentImplHelper( rxContext, pProvider, Identifier ),
 m_pProvider( pProvider ),
@@ -172,7 +172,7 @@ namespace cmis
 
 if ( !m_sRepositoryId.isEmpty() )
 {
-for ( list libcmis::RepositoryPtr ::iterator it = 
m_aRepositories.begin( );
+for ( vector libcmis::RepositoryPtr ::iterator it = 
m_aRepositories.begin( );
 it != m_aRepositories.end( )  NULL == repo.get( ); ++it )
 {
 if ( STD_TO_OUSTR( ( *it )-getId( ) ) == m_sRepositoryId )
@@ -352,7 +352,7 @@ namespace cmis
 
 if ( m_sRepositoryId.isEmpty( ) )
 {
-for ( list libcmis::RepositoryPtr ::iterator it = 
m_aRepositories.begin( );
+for ( vector libcmis::RepositoryPtr ::iterator it = 
m_aRepositories.begin( );
 it != m_aRepositories.end(); ++it )
 {
 URL aUrl( m_aURL );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx 
b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 0311f42..424cabc 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -23,8 +23,9 @@
 #include

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

2013-07-11 Thread Andras Timar

 sw/source/filter/html/htmlfly.cxx  |2 --
 sw/source/filter/html/htmlplug.cxx |2 --
 2 files changed, 4 deletions(-)

New commits:
commit 547affaf66ea063970438e321e98b0f788a3027c
Author: Andras Timar ati...@suse.com
Date:   Thu Jul 11 16:19:58 2013 +0200

remove unused headers

Change-Id: I84326c0c6df0a68f3fba5659144b01d5131a001b

diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index fb7ac88..d0426c3 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -53,8 +53,6 @@
 #include flypos.hxx
 #include docary.hxx
 #include ndgrf.hxx
-#include vcl/cvtgrf.hxx
-#include sax/tools/converter.hxx
 
 #include doc.hxx
 #include ndtxt.hxx
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index 90007cc..2d9b010 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -56,8 +56,6 @@
 
 #include comphelper/embeddedobjectcontainer.hxx
 #include comphelper/classids.hxx
-#include vcl/cvtgrf.hxx
-#include sax/tools/converter.hxx
 
 using namespace com::sun::star;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: 2 commits - src/lib

2013-07-11 Thread Fridrich Štrba

 src/lib/CDRContentCollector.cpp |   38 
 src/lib/CDRParser.cpp   |9 -
 src/lib/CDRPath.cpp |  325 
 src/lib/CDRPath.h   |1 
 4 files changed, 369 insertions(+), 4 deletions(-)

New commits:
commit 3d46ffb3840898d303777fee0f8900101eead9e2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 11 17:43:10 2013 +0200

Some fixes of parser

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 5dd33e2..e7722d5 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -1044,7 +1044,7 @@ void 
libcdr::CDRContentCollector::_lineProperties(WPXPropertyList propList)
 startMarker.writeOut(path, viewBox, width);
 propList.insert(draw:marker-start-viewbox, viewBox);
 propList.insert(draw:marker-start-path, path);
-propList.insert(draw:marker-start-width, width);
+// propList.insert(draw:marker-start-width, width);
   }
   if (!m_currentLineStyle.endMarker.empty())
   {
@@ -1061,7 +1061,7 @@ void 
libcdr::CDRContentCollector::_lineProperties(WPXPropertyList propList)
 endMarker.writeOut(path, viewBox, width);
 propList.insert(draw:marker-end-viewbox, viewBox);
 propList.insert(draw:marker-end-path, path);
-propList.insert(draw:marker-end-width, width);
+// propList.insert(draw:marker-end-width, width);
   }
 
 
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index c9bab09..ec76a21 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -1492,17 +1492,18 @@ void libcdr::CDRParser::readArrw(WPXInputStream *input, 
unsigned length)
   input-seek(4, WPX_SEEK_CUR);
   unsigned short pointNum = readU16(input);
   input-seek(4, WPX_SEEK_CUR);
-  std::vectorstd::pairdouble, double  points;
   std::vectorunsigned char pointTypes;
+  for (unsigned k=0; kpointNum; k++)
+pointTypes.push_back(readU8(input));
+  input-seek(1, WPX_SEEK_CUR);
+  std::vectorstd::pairdouble, double  points;
   for (unsigned j=0; jpointNum; j++)
   {
 std::pairdouble, double point;
-point.first = (double)readCoordinate(input);
 point.second = (double)readCoordinate(input);
+point.first = (double)readCoordinate(input);
 points.push_back(point);
   }
-  for (unsigned k=0; kpointNum; k++)
-pointTypes.push_back(readU8(input));
   CDRPath path;
   processPath(points, pointTypes, path);
   m_arrows[arrowId] = path;
commit 20179ba61a98c1b9896c751d847838383e968d23
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 11 17:12:32 2013 +0200

Some more code towards handling arrw

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index ee82c3a..5dd33e2 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -1026,8 +1026,46 @@ void 
libcdr::CDRContentCollector::_lineProperties(WPXPropertyList propList)
   propList.insert(svg:stroke-width, 0.0);
   propList.insert(svg:stroke-color, #00);
 }
+  }
 
+  // Deal with line markers (arrows, etc.)
+  if (!m_currentLineStyle.startMarker.empty())
+  {
+CDRPath startMarker(m_currentLineStyle.startMarker);
+startMarker.transform(m_currentTransforms);
+if (!m_groupTransforms.empty())
+  startMarker.transform(m_groupTransforms.top());
+CDRTransform tmpTrafo(1.0, 0.0, -m_page.offsetX, 0.0, 1.0, 
-m_page.offsetY);
+startMarker.transform(tmpTrafo);
+tmpTrafo = CDRTransform(1.0, 0.0, 0.0, 0.0, -1.0, m_page.height);
+startMarker.transform(tmpTrafo);
+WPXString path, viewBox;
+double width;
+startMarker.writeOut(path, viewBox, width);
+propList.insert(draw:marker-start-viewbox, viewBox);
+propList.insert(draw:marker-start-path, path);
+propList.insert(draw:marker-start-width, width);
   }
+  if (!m_currentLineStyle.endMarker.empty())
+  {
+CDRPath endMarker(m_currentLineStyle.endMarker);
+endMarker.transform(m_currentTransforms);
+if (!m_groupTransforms.empty())
+  endMarker.transform(m_groupTransforms.top());
+CDRTransform tmpTrafo(1.0, 0.0, -m_page.offsetX, 0.0, 1.0, 
-m_page.offsetY);
+endMarker.transform(tmpTrafo);
+tmpTrafo = CDRTransform(1.0, 0.0, 0.0, 0.0, -1.0, m_page.height);
+endMarker.transform(tmpTrafo);
+WPXString path, viewBox;
+double width;
+endMarker.writeOut(path, viewBox, width);
+propList.insert(draw:marker-end-viewbox, viewBox);
+propList.insert(draw:marker-end-path, path);
+propList.insert(draw:marker-end-width, width);
+  }
+
+
+
 }
 
 void libcdr::CDRContentCollector::_generateBitmapFromPattern(WPXBinaryData 
bitmap, const CDRPattern pattern, const CDRColor fgColor, const CDRColor 
bgColor)
diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp
index c9e86db..6446096 100644
--- a/src/lib/CDRPath.cpp
+++ b/src/lib/CDRPath.cpp
@@ -40,6 +40,206 @@
 #define DEBUG_SPLINES 0
 #endif
 
+namespace
+{
+
+static inline double getAngle(double bx, double by)
+{
+  return

[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source include/i18nlangtag scripting/Library_stringresource.mk scripting/source

2013-07-11 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   45 +
 include/i18nlangtag/languagetag.hxx|   31 +-
 scripting/Library_stringresource.mk|1 
 scripting/source/stringresource/stringresource.cxx |   31 --
 4 files changed, 85 insertions(+), 23 deletions(-)

New commits:
commit 38522416bd6a85f206b8c294726dd2e3d6a63567
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 17:41:59 2013 +0200

use LanguageTag::getMatchingFallback()

Change-Id: Ib6fd9581728bdd7c32ccec9ce538d9b4c5658b04

diff --git a/scripting/Library_stringresource.mk 
b/scripting/Library_stringresource.mk
index bd59637..daa6386 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_libraries,stringresource,\
cppuhelper \
sal \
tl \
+   i18nlangtag \
$(gb_UWINAPI) \
 ))
 
diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index c5c8b91..7a80699 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -36,6 +36,7 @@
 #include rtl/ustrbuf.hxx
 #include rtl/strbuf.hxx
 #include tools/urlobj.hxx
+#include i18nlangtag/languagetag.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -679,33 +680,21 @@ LocaleItem* StringResourceImpl::getItemForLocale
 return pRetItem;
 }
 
-// Returns the LocalItem for a given locale, if it exists, otherwise NULL
-// This method performes a closest match search, at least the language must 
match
+// Returns the LocaleItem for a given locale, if it exists, otherwise NULL.
+// This method performs a closest match search, at least the language must 
match.
 LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale 
locale )
 {
 LocaleItem* pRetItem = NULL;
 
-// Search for locale
-for( sal_Int32 iPass = 0 ; iPass = 2 ; ++iPass )
+::std::vector Locale  aLocales( m_aLocaleItemVector.size());
+for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
-for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
-{
-LocaleItem* pLocaleItem = *it;
-if( pLocaleItem )
-{
-Locale cmp_locale = pLocaleItem-m_locale;
-if( cmp_locale.Language == locale.Language 
-(iPass  1 || cmp_locale.Country  == locale.Country) 
-(iPass  0 || cmp_locale.Variant  == locale.Variant) )
-{
-pRetItem = pLocaleItem;
-break;
-}
-}
-}
-if( pRetItem )
-break;
+LocaleItem* pLocaleItem = *it;
+aLocales.push_back( pLocaleItem ? pLocaleItem-m_locale : Locale());
 }
+::std::vector Locale ::const_iterator iFound( 
LanguageTag::getMatchingFallback( aLocales, locale));
+if (iFound != aLocales.end())
+pRetItem = *(m_aLocaleItemVector.begin() + (iFound - 
aLocales.begin()));
 
 return pRetItem;
 }
commit 00de85cc75e3501a5597c2f293407b1b76fef429
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 16:46:20 2013 +0200

added getMatchingFallback()

Change-Id: I5805ab98049bd7dfd8ca1b58632f6c0115197bdd

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 13e25f8..4aefa79 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1312,4 +1312,49 @@ LanguageTag::Extraction LanguageTag::simpleExtract( 
const OUString rBcp47,
 }
 
 
+// static
+::std::vector com::sun::star::lang::Locale ::const_iterator 
LanguageTag::getMatchingFallback(
+const ::std::vector com::sun::star::lang::Locale   rList,
+const com::sun::star::lang::Locale  rReference )
+{
+if (rList.empty())
+return rList.end();
+
+::std::vector lang::Locale ::const_iterator it;
+
+// Try the simple case first without constructing fallbacks.
+for (it = rList.begin(); it != rList.end(); ++it)
+{
+if ((*it).Language == rReference.Language 
+(*it).Country  == rReference.Country  
+(*it).Variant  == rReference.Variant)
+return it;  // exact match
+}
+
+// Now for each reference fallback test the fallbacks of the list in order.
+::std::vector OUString  aFallbacks( LanguageTag( 
rReference).getFallbackStrings());
+aFallbacks.erase( aFallbacks.begin());  // first is full BCP47, we already 
checked that
+::std::vector ::std::vector OUString   aListFallbacks( rList.size());
+for (it = rList.begin(); it != rList.end(); ++it)
+{
+::std::vector OUString  aTmp( LanguageTag(

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

2013-07-11 Thread Lionel Elie Mamane

 connectivity/source/parse/sqliterator.cxx  |   47 ---
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   51 ++---
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx |   20 ++
 dbaccess/source/ui/dlg/directsql.cxx   |1 
 dbaccess/source/ui/dlg/queryorder.cxx  |   25 
 include/connectivity/sqliterator.hxx   |8 ++
 6 files changed, 106 insertions(+), 46 deletions(-)

New commits:
commit 33fe41cf45efb89f9a7629c5df5a6b4d5b7c0b76
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 17:42:31 2013 +0200

sort is ascending by default

Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index 95c6314..4dc4058 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1115,7 +1115,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const 
OSQLParseNode* pSelectNo
 OSQLParseNode * pOptAscDesc = pColumnRef-getParent()-getChild(1);
 OSL_ENSURE(pOptAscDesc != NULL,OSQLParseTreeIterator: error in 
parse tree!);
 
-sal_Bool bAscending = pOptAscDesc  SQL_ISTOKEN(pOptAscDesc,ASC);
+sal_Bool bAscending = ! (pOptAscDesc  
SQL_ISTOKEN(pOptAscDesc,DESC));
 setOrderByColumnName(sColumnName, aTableRange,bAscending);
 }
 else
commit b93b9e6d424faa7f6664a15b0507885f87745b01
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 17:04:42 2013 +0200

microoptimisation

Change-Id: I977fbd8387b069574d9818923ada54392d39347a

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 24c2076..58a5564 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -695,7 +695,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( 
SQLPart _ePart, const
 clearColumns( ParameterColumns );
 if ( _ePart == Order )
 clearColumns( OrderColumns );
-if ( _ePart == Group )
+else if ( _ePart == Group )
 clearColumns( GroupByColumns );
 
 // also, since the additive filter change, we need to rebuild our 
additive statement
commit 417925840e8697aaee8eb2f566d7e706bc8c379d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 16:53:45 2013 +0200

give right function name in debug messages

Change-Id: I7d82e34545a5aab657f3156b8c5b23c8a8531a11

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index af90f99..95c6314 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1903,7 +1903,7 @@ void OSQLParseTreeIterator::setGroupByColumnName(const 
OUString  rColumnName, O
 }
 
 #ifdef SQL_TEST_PARSETREEITERATOR
-cout  OSQLParseTreeIterator::setOrderByColumnName: 
+cout  OSQLParseTreeIterator::setGroupByColumnName: 
   (const char *) rColumnName  , 
   (const char *) rTableRange  , 
   (bAscending ? true : false)
commit 40370f759c403c5f07fb4d77680bd8f954e55231
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 16:53:23 2013 +0200

ORDER BY columns are prioritarily *SELECT* columns

as opposed to *table* columns,
and notwithstanding HSQLDB 1.8 (our embedded database) bugs.
Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL 
for DBMSs
(but quite common)

Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index 927dfa9..af90f99 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1868,7 +1868,9 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const 
OUString  rColumnName
 void OSQLParseTreeIterator::setOrderByColumnName(const OUString  rColumnName, 
OUString  rTableRange, sal_Bool bAscending)
 {
 SAL_INFO( connectivity.parse, parse ocke.jans...@sun.com 
OSQLParseTreeIterator::setOrderByColumnName );
-ReferenceXPropertySet xColumn = findColumn( rColumnName, rTableRange, 
false );
+ReferenceXPropertySet xColumn = findSelectColumn( rColumnName );
+if ( !xColumn.is() )
+xColumn = findColumn ( rColumnName, rTableRange, false );
 if ( xColumn.is() )
 m_aOrderColumns-get().push_back(new OOrderColumn( xColumn, 
rTableRange, isCaseSensitive(), bAscending ) );
 else
@@ -2046,6 +2048,30 @@ const OSQLParseNode* 
OSQLParseTreeIterator::getSimpleHavingTree() const
 }
 
 // 
-
+Reference XPropertySet  OSQLParseTreeIterator::findSelectColumn( const 
OUString  rColumnName )
+{
+SAL_INFO( connectivity.parse, parse

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - 2 commits - connectivity/source

2013-07-11 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/FConnection.cxx |  191 +--
 connectivity/source/drivers/firebird/FConnection.hxx |   22 +-
 connectivity/source/drivers/firebird/FDriver.cxx |   91 -
 connectivity/source/drivers/firebird/FDriver.hxx |3 
 4 files changed, 197 insertions(+), 110 deletions(-)

New commits:
commit 425878b7c236387c107cb09b793698f781fe7e5b
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 17:04:50 2013 +0100

Write embedded .fdb into Storage for OnSave  OnSaveAs.

Change-Id: I2534378c48253584904d11bf049d5d4a05c300dd

diff --git a/connectivity/source/drivers/firebird/FConnection.cxx 
b/connectivity/source/drivers/firebird/FConnection.cxx
index e9594f9..8c81847 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -64,6 +64,7 @@
 #include resource/sharedresources.hxx
 
 #include comphelper/processfactory.hxx
+#include comphelper/storagehelper.hxx
 #include unotools/tempfile.hxx
 #include unotools/ucbstreamhelper.hxx
 
@@ -498,9 +499,28 @@ void SAL_CALL OConnection::clearWarnings(  ) 
throw(SQLException, RuntimeExceptio
 void SAL_CALL OConnection::documentEventOccured( const DocumentEvent _Event )
 throw(RuntimeException)
 {
-if (_Event.EventName == onSave || _Event.EventName == onSaveAs)
+if (_Event.EventName == OnSave || _Event.EventName == OnSaveAs)
 {
-// TODO: write to storage
+if ( m_bIsEmbedded  m_xEmbeddedStorage.is() )
+{
+const OUString sDBName( firebird.fdb ); // Location within .odb 
container
+
+SAL_INFO(connectivity.firebird, Writing .fdb into .odb );
+
+Reference XStream  
xDBStream(m_xEmbeddedStorage-openStreamElement(sDBName,
+
ElementModes::WRITE));
+
+using namespace ::comphelper;
+Reference XComponentContext  xContext = 
comphelper::getProcessComponentContext();
+Reference XInputStream  xInputStream;
+if (xContext.is())
+xInputStream =
+OStorageHelper::GetInputStreamFromURL(m_aURL, 
xContext);
+if (xInputStream.is())
+OStorageHelper::CopyInputToOutput( xInputStream,
+xDBStream-getOutputStream());
+// TODO: ensure db is in safe state
+}
 }
 }
 // XEventListener
commit 521d0355602f35200f3750984e23221340c0e784
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 15:26:48 2013 +0100

Implement DocumentEventListener in firebird_sdbc driver.

Change-Id: I7e0c9abcb9822e673ba1e93c1d8bf4d177baae0f

diff --git a/connectivity/source/drivers/firebird/FConnection.cxx 
b/connectivity/source/drivers/firebird/FConnection.cxx
index e72b87e..e9594f9 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -39,20 +39,47 @@
 #include FDriver.hxx
 #include FStatement.hxx
 #include FPreparedStatement.hxx
+
+#include com/sun/star/document/XDocumentEventBroadcaster.hpp
+#include com/sun/star/embed/ElementModes.hpp
+#include com/sun/star/frame/Desktop.hpp
+#include com/sun/star/frame/FrameSearchFlag.hpp
+#include com/sun/star/frame/XController.hpp
+#include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/frame/XFrames.hpp
+#include com/sun/star/frame/XModel.hpp
+#include com/sun/star/io/TempFile.hpp
+#include com/sun/star/io/XStream.hpp
+#include com/sun/star/lang/DisposedException.hpp
+#include com/sun/star/lang/EventObject.hpp
 #include com/sun/star/sdbc/ColumnValue.hpp
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/sdbc/TransactionIsolation.hpp
-#include com/sun/star/lang/DisposedException.hpp
+#include com/sun/star/ucb/SimpleFileAccess.hpp
+#include com/sun/star/ucb/XSimpleFileAccess2.hpp
+
+#include connectivity/dbexception.hxx
+#include resource/common_res.hrc
+#include resource/hsqldb_res.hrc
+#include resource/sharedresources.hxx
+
+#include comphelper/processfactory.hxx
+#include unotools/tempfile.hxx
+#include unotools/ucbstreamhelper.hxx
 
 using namespace connectivity::firebird;
 using namespace connectivity;
 
-//--
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
+using namespace com::sun::star;
 using namespace com::sun::star::beans;
+using namespace com::sun::star::document;
+using namespace com::sun::star::embed;
+using namespace com::sun::star::frame;
+using namespace com::sun::star::io;
+using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
-// 

+using namespace com::sun::star::uno;
+
 OConnection::OConnection(FirebirdDriver*_pDriver)

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - lpsolve/lp_solve_5.5-windows.patch

2013-07-11 Thread Michael Meeks

 lpsolve/lp_solve_5.5-windows.patch |   94 ++---
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit dcca3daa6d893885242db9086b68d403fe55668e
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 17:18:28 2013 +0100

fdo#66826 - Add DOS CR/LR line endings to please patch 2.7 under cygwin

diff --git a/lpsolve/lp_solve_5.5-windows.patch 
b/lpsolve/lp_solve_5.5-windows.patch
index d7c44e6..70fb553 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -2,59 +2,59 @@
 --- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008
 ***
 *** 7,14 
-  
-  set c=gcc
-  
-! rem rc lpsolve.rc
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! rem rc lpsolve.rc
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 --- 7,14 
-  
-  set c=gcc
-  
-! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! windres lpsolve.rc lpsolve_res.obj
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 *** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun  4 00:15:24 2006
 --- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc   Fri Nov 23 16:34:22 2007
 ***
 *** 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include afxres.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include afxres.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include winresrc.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include winresrc.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- misc/lp_solve_5.5/lpsolve55/cvc6.bat
 +++ misc/build/lp_solve_5.5/lpsolve55/cvc6.bat
 @@ -14,15 +14,4 @@
- set c=cl
- 
--rc lpsolve.rc
-+rc %SOLARINC% lpsolve.rc
--%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% 
lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL 
-DWIN32

[Libreoffice-commits] libcdr.git: src/lib

2013-07-11 Thread Fridrich Štrba

 src/lib/CDRContentCollector.cpp |2 +-
 src/lib/CDRPath.cpp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd02faf784088b47c6aaabdc1bab2d5f7993a7da
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 11 18:17:53 2013 +0200

Some more trying to get the markers right-ish

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index e7722d5..af806ae 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -1054,7 +1054,7 @@ void 
libcdr::CDRContentCollector::_lineProperties(WPXPropertyList propList)
   endMarker.transform(m_groupTransforms.top());
 CDRTransform tmpTrafo(1.0, 0.0, -m_page.offsetX, 0.0, 1.0, 
-m_page.offsetY);
 endMarker.transform(tmpTrafo);
-tmpTrafo = CDRTransform(1.0, 0.0, 0.0, 0.0, -1.0, m_page.height);
+tmpTrafo = CDRTransform(-1.0, 0.0, 0.0, 0.0, -1.0, m_page.height);
 endMarker.transform(tmpTrafo);
 WPXString path, viewBox;
 double width;
diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp
index 6446096..9d529f1 100644
--- a/src/lib/CDRPath.cpp
+++ b/src/lib/CDRPath.cpp
@@ -777,7 +777,7 @@ void libcdr::CDRPath::writeOut(WPXString path, WPXString 
viewBox, double widt
   }
 
 
-  width = qx - px;
+  width = qy - py;
   viewBox.sprintf(%i %i %i %i, 0, 0, (unsigned)(2540*(qx - px)), 
(unsigned)(2540*(qy - py)));
 
   for(unsigned i = 0; i  vec.count(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lpsolve/lp_solve_5.5-windows.patch

2013-07-11 Thread Michael Meeks

 lpsolve/lp_solve_5.5-windows.patch |   94 ++---
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit d35cf5e19652989419aa598119ccd978307111fe
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 17:18:28 2013 +0100

fdo#66826 - Add DOS CR/LR line endings to please patch 2.7 under cygwin

diff --git a/lpsolve/lp_solve_5.5-windows.patch 
b/lpsolve/lp_solve_5.5-windows.patch
index d7c44e6..70fb553 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -2,59 +2,59 @@
 --- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008
 ***
 *** 7,14 
-  
-  set c=gcc
-  
-! rem rc lpsolve.rc
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! rem rc lpsolve.rc
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 --- 7,14 
-  
-  set c=gcc
-  
-! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! windres lpsolve.rc lpsolve_res.obj
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 *** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun  4 00:15:24 2006
 --- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc   Fri Nov 23 16:34:22 2007
 ***
 *** 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include afxres.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include afxres.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include winresrc.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include winresrc.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- misc/lp_solve_5.5/lpsolve55/cvc6.bat
 +++ misc/build/lp_solve_5.5/lpsolve55/cvc6.bat
 @@ -14,15 +14,4 @@
- set c=cl
- 
--rc lpsolve.rc
-+rc %SOLARINC% lpsolve.rc
--%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% 
lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL 
-DWIN32

[Libreoffice-commits] core.git: 9 commits - oox/source sfx2/source svl/source unodevtools/source unotools/source

2013-07-11 Thread Eike Rathke

 oox/source/core/xmlfilterbase.cxx |7 ++-
 sfx2/source/doc/SfxDocumentMetaData.cxx   |   16 +--
 sfx2/source/doc/doctemplates.cxx  |   37 ++
 sfx2/source/menu/thessubmenu.cxx  |8 ---
 svl/source/config/asiancfg.cxx|5 --
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx  |1 
 unodevtools/source/skeletonmaker/javacompskeleton.cxx |1 
 unotools/source/config/fontcfg.cxx|   24 ---
 8 files changed, 20 insertions(+), 79 deletions(-)

New commits:
commit 5e60674857d3d290f172b8c133c69aeba003b1ce
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 19:14:32 2013 +0200

use LanguageTag to convert

Change-Id: I11007c31e5b4eea39ce27876de8a65fbf563a5e9

diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index a529bdc..205746d 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -124,19 +124,9 @@ DefaultFontConfiguration::DefaultFontConfiguration()
 // fill config hash with empty interfaces
 int nLocales = aLocales.getLength();
 const OUString* pLocaleStrings = aLocales.getConstArray();
-Locale aLoc;
 for( int i = 0; i  nLocales; i++ )
 {
-sal_Int32 nIndex = 0;
-aLoc.Language = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiLowerCase();
-if( nIndex != -1 )
-aLoc.Country = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiUpperCase();
-else
-aLoc.Country = OUString();
-if( nIndex != -1 )
-aLoc.Variant = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiUpperCase();
-else
-aLoc.Variant = OUString();
+Locale aLoc( LanguageTag( pLocaleStrings[i]).getLocale( 
false));
 m_aConfig[ aLoc ] = LocaleAccess();
 m_aConfig[ aLoc ].aConfigLocaleString = pLocaleStrings[i];
 }
@@ -389,19 +379,9 @@ FontSubstConfiguration::FontSubstConfiguration() :
 // fill config hash with empty interfaces
 int nLocales = aLocales.getLength();
 const OUString* pLocaleStrings = aLocales.getConstArray();
-Locale aLoc;
 for( int i = 0; i  nLocales; i++ )
 {
-sal_Int32 nIndex = 0;
-aLoc.Language = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiLowerCase();
-if( nIndex != -1 )
-aLoc.Country = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiUpperCase();
-else
-aLoc.Country = OUString();
-if( nIndex != -1 )
-aLoc.Variant = pLocaleStrings[i].getToken( 0, 
sal_Unicode('-'), nIndex ).toAsciiUpperCase();
-else
-aLoc.Variant = OUString();
+Locale aLoc( LanguageTag( pLocaleStrings[i]).getLocale( 
false));
 m_aSubst[ aLoc ] = LocaleSubst();
 m_aSubst[ aLoc ].aConfigLocaleString = pLocaleStrings[i];
 }
commit 0f80c06463e63af9f52501469c0c2090b662ae55
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 19:04:04 2013 +0200

added FIXME-BCP47 comment

Change-Id: I77416a9e275dc204b3b82807d27b5276ad4f497f

diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx 
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 86ba705..7306b12 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -402,6 +402,7 @@ void generateXCompatibilityNamesBodies(std::ostream o)
 toString(\n
xNameAccess.getByName(sLocale));\n\n
 com.sun.star.lang.Locale aLocale = \n
 new com.sun.star.lang.Locale();\n\n
+/* FIXME-BCP47: this will break. */
 String tokens[] = sLocale.split(\-\);\n
 int nToken = tokens.length;\n
 if (nToken = 1) aLocale.Language = tokens[0];\n
commit 7d0f6f671e7f9027b46e9a87e4b3608429ed64ad
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 19:01:44 2013 +0200

added FIXME-BCP47 comment

Change-Id: I202c53a094ac7ddcbd1fa0d2367058aba56820ed

diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx 
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 98166ee..3228a8c 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++

Re: [Libreoffice-qa] minutes of ESC call ...

2013-07-11 Thread Florian Reisinger

Hi again and thanks for your quick reply,

Am 11.07.2013 um 19:11 schrieb Norbert Thiebaud nthieb...@gmail.com:

On Thu, Jul 11, 2013 at 11:55 AM, Florian Reisinger reisi...@gmail.com
wrote:

Hi,



Am 11.07.2013 um 18:45 schrieb Michael Meeks michael.me...@suse.com:


* Completed Action items:

  + get windows build-bot setup (Kendy)

  [ running well, one of the fastest tinderboxes,

doing incremental Windows builds of master + gerrit ]



Link please :)


http://tinderbox.libreoffice.org/MASTER/status.html

tb39


Found here, but not here: http://dev-builds.libreoffice.org/daily/master/



Norbert


Liebe Grüße, / Yours,
Florian Reisinger
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-07-11 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   45 ++-
 sc/source/core/tool/scmatrix.cxx |4 +++
 2 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 3c59183f5bfa22194f0287b449aaa6d882be8827
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 11 13:26:04 2013 -0400

Add test case for matrix's double array handling  fix one bug.

Change-Id: I6cb2ff8bf536ccb53ae9f146baf6aa582f9fbcfe

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6d2d0fc..5c3ec7b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2145,7 +2145,7 @@ struct PartiallyFilledEmptyMatrix
 
 void Test::testMatrix()
 {
-ScMatrixRef pMat;
+ScMatrixRef pMat, pMat2;
 
 // First, test the zero matrix type.
 pMat = new ScMatrix(0, 0, 0.0);
@@ -2226,6 +2226,49 @@ void Test::testMatrix()
 pMat-PutDouble(12.5, 1, 1);
 CPPUNIT_ASSERT_EQUAL(0.0, pMat-GetMinValue(false));
 CPPUNIT_ASSERT_EQUAL(12.5, pMat-GetMaxValue(false));
+
+// Convert matrix into a linear double array. String elements become NaN
+// and empty elements become 0.
+pMat = new ScMatrix(3, 3);
+pMat-PutDouble(2.5, 0, 0);
+pMat-PutDouble(1.2, 0, 1);
+pMat-PutString(A, 1, 1);
+pMat-PutDouble(2.3, 2, 1);
+pMat-PutDouble(-20, 2, 2);
+
+double fNaN;
+rtl::math::setNan(fNaN);
+
+std::vectordouble aDoubles;
+pMat-GetDoubleArray(aDoubles);
+
+{
+const double pChecks[] = { 2.5, 1.2, 0, 0, fNaN, 0, 0, 2.3, -20 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
+
+pMat2 = new ScMatrix(3, 3, 10.0);
+pMat2-PutString(B, 1, 0);
+pMat2-MergeDoubleArray(aDoubles, ScMatrix::Mul);
+
+{
+const double pChecks[] = { 25, 12, 0, fNaN, fNaN, 0, 0, 23, -200 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
 }
 
 void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index c692238..73ed2e2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1063,6 +1063,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
@@ -1133,6 +1135,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source

2013-07-11 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   45 ++-
 sc/source/core/tool/scmatrix.cxx |4 +++
 2 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 49090799395eff67498058b14742a27812d1fefc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 11 13:26:04 2013 -0400

Add test case for matrix's double array handling  fix one bug.

Change-Id: I6cb2ff8bf536ccb53ae9f146baf6aa582f9fbcfe

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6d2d0fc..5c3ec7b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2145,7 +2145,7 @@ struct PartiallyFilledEmptyMatrix
 
 void Test::testMatrix()
 {
-ScMatrixRef pMat;
+ScMatrixRef pMat, pMat2;
 
 // First, test the zero matrix type.
 pMat = new ScMatrix(0, 0, 0.0);
@@ -2226,6 +2226,49 @@ void Test::testMatrix()
 pMat-PutDouble(12.5, 1, 1);
 CPPUNIT_ASSERT_EQUAL(0.0, pMat-GetMinValue(false));
 CPPUNIT_ASSERT_EQUAL(12.5, pMat-GetMaxValue(false));
+
+// Convert matrix into a linear double array. String elements become NaN
+// and empty elements become 0.
+pMat = new ScMatrix(3, 3);
+pMat-PutDouble(2.5, 0, 0);
+pMat-PutDouble(1.2, 0, 1);
+pMat-PutString(A, 1, 1);
+pMat-PutDouble(2.3, 2, 1);
+pMat-PutDouble(-20, 2, 2);
+
+double fNaN;
+rtl::math::setNan(fNaN);
+
+std::vectordouble aDoubles;
+pMat-GetDoubleArray(aDoubles);
+
+{
+const double pChecks[] = { 2.5, 1.2, 0, 0, fNaN, 0, 0, 2.3, -20 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
+
+pMat2 = new ScMatrix(3, 3, 10.0);
+pMat2-PutString(B, 1, 0);
+pMat2-MergeDoubleArray(aDoubles, ScMatrix::Mul);
+
+{
+const double pChecks[] = { 25, 12, 0, fNaN, fNaN, 0, 0, 23, -200 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
 }
 
 void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index c692238..73ed2e2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1063,6 +1063,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
@@ -1133,6 +1135,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/qa sc/source

2013-07-11 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   45 ++-
 sc/source/core/tool/scmatrix.cxx |4 +++
 2 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit dc2064c5c3d872b778685a73a744d7249056e857
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 11 13:26:04 2013 -0400

Add test case for matrix's double array handling  fix one bug.

Conflicts:
sc/qa/unit/ucalc.cxx

Change-Id: I6cb2ff8bf536ccb53ae9f146baf6aa582f9fbcfe

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5ea6597..c054b67 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2437,7 +2437,7 @@ struct PartiallyFilledEmptyMatrix
 
 void Test::testMatrix()
 {
-ScMatrixRef pMat;
+ScMatrixRef pMat, pMat2;
 
 // First, test the zero matrix type.
 pMat = new ScMatrix(0, 0, 0.0);
@@ -2518,6 +2518,49 @@ void Test::testMatrix()
 pMat-PutDouble(12.5, 1, 1);
 CPPUNIT_ASSERT_EQUAL(0.0, pMat-GetMinValue(false));
 CPPUNIT_ASSERT_EQUAL(12.5, pMat-GetMaxValue(false));
+
+// Convert matrix into a linear double array. String elements become NaN
+// and empty elements become 0.
+pMat = new ScMatrix(3, 3);
+pMat-PutDouble(2.5, 0, 0);
+pMat-PutDouble(1.2, 0, 1);
+pMat-PutString(A, 1, 1);
+pMat-PutDouble(2.3, 2, 1);
+pMat-PutDouble(-20, 2, 2);
+
+double fNaN;
+rtl::math::setNan(fNaN);
+
+std::vectordouble aDoubles;
+pMat-GetDoubleArray(aDoubles);
+
+{
+const double pChecks[] = { 2.5, 1.2, 0, 0, fNaN, 0, 0, 2.3, -20 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
+
+pMat2 = new ScMatrix(3, 3, 10.0);
+pMat2-PutString(B, 1, 0);
+pMat2-MergeDoubleArray(aDoubles, ScMatrix::Mul);
+
+{
+const double pChecks[] = { 25, 12, 0, fNaN, fNaN, 0, 0, 23, -200 };
+CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(pChecks), aDoubles.size());
+for (size_t i = 0, n = aDoubles.size(); i  n; ++i)
+{
+if (rtl::math::isNan(pChecks[i]))
+CPPUNIT_ASSERT_MESSAGE(NaN is expected, but it's not., 
rtl::math::isNan(aDoubles[i]));
+else
+CPPUNIT_ASSERT_EQUAL(pChecks[i], aDoubles[i]);
+}
+}
 }
 
 void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index ffc3382..3980ef6 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1063,6 +1063,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
@@ -1133,6 +1135,8 @@ public:
 *miPos = mfNaN;
 }
 break;
+case mdds::mtm::element_empty:
+std::advance(miPos, node.size);
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - connectivity/registry

2013-07-11 Thread Andrzej J . R . Hunt

 connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu |  
 20 --
 1 file changed, 20 deletions(-)

New commits:
commit 28dba0cc2d2a69663008dd22aafe4cfebabc6f31
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 19:44:50 2013 +0100

Do not ask for user/password in embedded firebird.

Change-Id: I0237106e4012c9116248a97eda0ddf899b435f64

diff --git 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 527640a..3179fd2 100644
--- 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -57,28 +57,8 @@
 /node
   /node
   node oor:name=Features
-!-- These entries enable the Advanced Settings UI to change the 
settings
- whose default is set in node Properties above;
- as this is guaranteed not to work with PostgreSQL,
- we don't let people shoot themselves in the foot and don't enable 
the UI. --
-  !--   node oor:name=EscapeDateTime oor:op=replace --
-  !-- prop oor:name=Value oor:type=xs:boolean --
-  !--   valuefalse/value --
-  !-- /prop --
-  !--   /node --
-!--   Confusingly, this corresponds to EnableOuterJoinEscape in the 
Properties --
-  !--   node oor:name=UseBracketedOuterJoinSyntax oor:op=replace --
-  !-- prop oor:name=Value oor:type=xs:boolean --
-  !--   valuefalse/value --
-  !-- /prop --
-  !--   /node --
   /node
   node oor:name=MetaData
-   node oor:name=Authentication oor:op=replace
-  prop oor:name=Value oor:type=xs:string
-valueUserPassword/value
-  /prop
-/node
   /node
 /node
 node oor:name=sdbc:firebird:* oor:op=replace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Eike Rathke

 unotools/source/config/fontcfg.cxx |   62 ++---
 1 file changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 62f56ba02d7d664a835a36bfabe3a1704b175baa
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 20:33:56 2013 +0200

use LanguageTag and getFallbackStrings()

Change-Id: I398fb1cd3a2f456562d879b417ec964f21f67464

diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index 5e074d3..e9cec6c 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -1137,16 +1137,18 @@ const FontNameAttr* 
FontSubstConfiguration::getSubstInfo( const OUString rFontN
 FontNameAttr aSearchAttr;
 aSearchAttr.Name = aSearchFont;
 
-Locale aLocale;
-aLocale.Language = rLocale.Language.toAsciiLowerCase();
-aLocale.Country = rLocale.Country.toAsciiUpperCase();
-aLocale.Variant = rLocale.Variant.toAsciiUpperCase();
+LanguageTag aLanguageTag( rLocale);
 
-if( aLocale.Language.isEmpty() )
-aLocale = SvtSysLocale().GetUILanguageTag().getLocale();
+if( aLanguageTag.isSystemLocale() )
+aLanguageTag = SvtSysLocale().GetUILanguageTag();
 
-while( !aLocale.Language.isEmpty() )
+::std::vector OUString  aFallbacks( aLanguageTag.getFallbackStrings());
+if (aLanguageTag.getLanguage() != en)
+aFallbacks.push_back(en);
+
+for (::std::vector OUString ::const_iterator fb( aFallbacks.begin()); fb 
!= aFallbacks.end(); ++fb)
 {
+Locale aLocale( LanguageTag( *fb).getLocale());
 boost::unordered_map Locale, LocaleSubst, LocaleHash 
::const_iterator lang = m_aSubst.find( aLocale );
 if( lang != m_aSubst.end() )
 {
@@ -1165,15 +1167,6 @@ const FontNameAttr* 
FontSubstConfiguration::getSubstInfo( const OUString rFontN
 return rFoundAttr;
 }
 }
-// gradually become more unspecific
-if( !aLocale.Variant.isEmpty() )
-aLocale.Variant = OUString();
-else if( !aLocale.Country.isEmpty() )
-aLocale.Country = OUString();
-else if( aLocale.Language != en )
-aLocale.Language = OUString( en );
-else
-aLocale.Language = OUString();
 }
 return NULL;
 }
commit ac469ceef535c5463443d3d81dc02cd9744785a8
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 20:10:49 2013 +0200

use LanguageTag::getFallbackStrings()

Change-Id: Id9403337375077931e976358c4410ad18ac0e092

diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index 205746d..5e074d3 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -211,26 +211,33 @@ OUString DefaultFontConfiguration::tryLocale( const 
Locale rLocale, const OUStr
 
 OUString DefaultFontConfiguration::getDefaultFont( const Locale rLocale, int 
nType ) const
 {
-Locale aLocale;
-aLocale.Language = rLocale.Language.toAsciiLowerCase();
-aLocale.Country = rLocale.Country.toAsciiUpperCase();
-aLocale.Variant = rLocale.Variant.toAsciiUpperCase();
-
 OUString aType = OUString::createFromAscii( getKeyType( nType ) );
-OUString aRet = tryLocale( aLocale, aType );
-if( aRet.isEmpty()  !aLocale.Variant.isEmpty() )
+OUString aRet = tryLocale( rLocale, aType );
+if (aRet.isEmpty())
 {
-aLocale.Variant = OUString();
-aRet = tryLocale( aLocale, aType );
-}
-if( aRet.isEmpty()  !aLocale.Country.isEmpty() )
-{
-aLocale.Country = OUString();
-aRet = tryLocale( aLocale, aType );
+if (rLocale.Variant.isEmpty())
+{
+if (!rLocale.Country.isEmpty())
+{
+Locale aLocale( rLocale.Language, , );
+aRet = tryLocale( aLocale, aType );
+}
+}
+else
+{
+::std::vector OUString  aFallbacks( LanguageTag( 
rLocale).getFallbackStrings());
+aFallbacks.erase( aFallbacks.begin());  // first is full BCP47, we 
already checked that
+for (::std::vector OUString ::const_iterator it( 
aFallbacks.begin());
+it != aFallbacks.end()  aRet.isEmpty(); ++it)
+{
+Locale aLocale( LanguageTag( *it).getLocale( false));
+aRet = tryLocale( aLocale, aType );
+}
+}
 }
 if( aRet.isEmpty() )
 {
-aLocale.Language = OUString( en );
+Locale aLocale(en,,);
 aRet = tryLocale( aLocale, aType );
 }
 return aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Eike Rathke

 connectivity/source/parse/sqliterator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21b2b1c04998307d71129e607508007a795a7ce7
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 20:48:20 2013 +0200

unused variable 'sTableName' [loplugin]

Change-Id: I5fe746ed08a7b1124465231b6e85475da5490904

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index 4dc4058..12b4480 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -2058,7 +2058,7 @@ Reference XPropertySet  
OSQLParseTreeIterator::findSelectColumn( const OUStrin
 Reference XPropertySet  xColumn( *lookupColumn );
 try
 {
-OUString sName, sTableName;
+OUString sName;
 xColumn-getPropertyValue( 
OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) = sName;
 if ( sName == rColumnName )
 return xColumn;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Caolán McNamara

 vcl/generic/fontmanager/fontcache.cxx   |8 
 vcl/generic/fontmanager/fontmanager.cxx |1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit bfc060597078ff19fffbcbe21fb1dd41655a9e4c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 17:16:39 2013 +0100

Related: fdo#66524 don't invalidate font cache every time

The afm dirs are misdetected as having had something in it in the past and
having nothing in it now.

AFAICS it seems that this particular code has always been like this, so 
keeping
this fix separate for master only.

Change-Id: I8960d0b0d22ee24d5691eecdce262011dc141ea6

diff --git a/vcl/generic/fontmanager/fontmanager.cxx 
b/vcl/generic/fontmanager/fontmanager.cxx
index 7f2332c..2ab8e6c 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1831,6 +1831,7 @@ void PrintFontManager::initialize()
 m_aFontFileToFontID[ aFileName ].insert( 
m_nNextFontID );
 m_aFonts[ m_nNextFontID++ ] = *it;
 m_pFontCache-updateFontCacheEntry( *it, false 
);
+++nDirFonts;
 #if OSL_DEBUG_LEVEL  2
 nBuiltinFonts++;
 #endif
commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 19:32:57 2013 +0100

Resolves: fdo#66524 string conversion gone wrong

Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0

diff --git a/vcl/generic/fontmanager/fontcache.cxx 
b/vcl/generic/fontmanager/fontcache.cxx
index 0d14d48..0f6c677 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -264,10 +264,10 @@ void FontCache::read()
 do
 {
 aStream.ReadLine( aLine );
-if( aLine == FontCacheDirectory: ||
-aLine == EmptyFontCacheDirectory: )
+if( aLine.startsWith(FontCacheDirectory:) ||
+aLine.startsWith(EmptyFontCacheDirectory:) )
 {
-bool bEmpty = (aLine == Empty );
+bool bEmpty = aLine.startsWith(Empty);
 sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
 
 OString aDir;
@@ -309,7 +309,7 @@ void FontCache::read()
 m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
 }
 }
-else if( pDir  aLine == File:)
+else if( pDir  aLine.startsWith(File:) )
 {
 OString aFile( aLine.copy( 5 ) );
 aStream.ReadLine( aLine );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - lpsolve/lp_solve_5.5-windows.patch

2013-07-11 Thread Michael Meeks

 lpsolve/lp_solve_5.5-windows.patch |   94 ++---
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 89c4c2ea0d1c96559e85814805704dfbe053534f
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 17:18:28 2013 +0100

fdo#66826 - Add DOS CR/LR line endings to please patch 2.7 under cygwin

Change-Id: Iad6e6f69d2aa412cf14ef00c238ab458a239c627
Reviewed-on: https://gerrit.libreoffice.org/4838
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/lpsolve/lp_solve_5.5-windows.patch 
b/lpsolve/lp_solve_5.5-windows.patch
index d7c44e6..70fb553 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -2,59 +2,59 @@
 --- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008
 ***
 *** 7,14 
-  
-  set c=gcc
-  
-! rem rc lpsolve.rc
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! rem rc lpsolve.rc
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 --- 7,14 
-  
-  set c=gcc
-  
-! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
+  
+  set c=gcc
+  
+! windres lpsolve.rc lpsolve_res.obj
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin 
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% 
-o lpsolve55.dll
+  
+  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+  
 *** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun  4 00:15:24 2006
 --- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc   Fri Nov 23 16:34:22 2007
 ***
 *** 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include afxres.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include afxres.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- 7,13 
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include winresrc.h
-  
-  /
-  #undef APSTUDIO_READONLY_SYMBOLS
+  //
+  // Generated from the TEXTINCLUDE 2 resource.
+  //
+! #include winresrc.h
+  
+  /
+  #undef APSTUDIO_READONLY_SYMBOLS
 --- misc/lp_solve_5.5/lpsolve55/cvc6.bat
 +++ misc/build/lp_solve_5.5/lpsolve55/cvc6.bat
 @@ -14,15 +14,4 @@
- set c=cl
- 
--rc lpsolve.rc
-+rc %SOLARINC% lpsolve.rc
--%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine

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

2013-07-11 Thread Lionel Elie Mamane

 dbaccess/source/ui/dlg/directsql.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41ea132f7ba659a24d3e016077f2b9b40b473a61
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 11:44:03 2013 +0200

delete in destructor checkbox created in constructor

Change-Id: Ifceae4c7ffe15bfc62ce34f4463fd4e071403359
fixes: debug build aborts when closing that window
Reviewed-on: https://gerrit.libreoffice.org/4845
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dbaccess/source/ui/dlg/directsql.cxx 
b/dbaccess/source/ui/dlg/directsql.cxx
index 2f57720..cb8a895 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -122,6 +122,7 @@ DBG_NAME(DirectSQLDialog)
 stopAllComponentListening();
 }
 delete m_pSQLHistory;
+delete m_pShowOutput;
 
 DBG_DTOR(DirectSQLDialog,NULL);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Lionel Elie Mamane

 dbaccess/source/ui/dlg/directsql.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5fa66374ed6acbbf730c1c5dd6ee18ce63db340e
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 11 11:44:03 2013 +0200

delete in destructor checkbox created in constructor

Change-Id: Ifceae4c7ffe15bfc62ce34f4463fd4e071403359
fixes: debug build aborts when closing that window
Reviewed-on: https://gerrit.libreoffice.org/4835
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dbaccess/source/ui/dlg/directsql.cxx 
b/dbaccess/source/ui/dlg/directsql.cxx
index fe5c972..7df8d15 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -121,6 +121,7 @@ DBG_NAME(DirectSQLDialog)
 stopAllComponentListening();
 }
 delete m_pSQLHistory;
+delete m_pShowOutput;
 
 DBG_DTOR(DirectSQLDialog,NULL);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - connectivity/source

2013-07-11 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/FConnection.cxx|   19 ++--
 connectivity/source/drivers/firebird/FConnection.hxx|6 +--
 connectivity/source/drivers/firebird/FPreparedStatement.hxx |3 +
 connectivity/source/drivers/firebird/FStatement.hxx |1 
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 9849301c48c552820a4929ac1406a5da293712b3
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jul 11 20:15:41 2013 +0100

Cleanup warnings in FConnection.

Unused parameter warnings remain as these methods are still to be 
implemented.

Change-Id: I38ec0a895112766ecae322fdf9c07dea11e60c59

diff --git a/connectivity/source/drivers/firebird/FConnection.cxx 
b/connectivity/source/drivers/firebird/FConnection.cxx
index 8c81847..5576d1f 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -82,20 +82,23 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::uno;
 
 OConnection::OConnection(FirebirdDriver*_pDriver)
- : OSubComponentOConnection, 
OConnection_BASE((::cppu::OWeakObject*)_pDriver, this),
- OMetaConnection_BASE(m_aMutex),
+:OMetaConnection_BASE(m_aMutex),
+ OSubComponentOConnection, 
OConnection_BASE((::cppu::OWeakObject*)_pDriver, this),
+ m_xMetaData(NULL),
+ m_bIsEmbedded(sal_False),
+ m_aURL(),
+ m_sUser(),
  m_pDriver(_pDriver),
  m_bClosed(sal_False),
- m_xMetaData(NULL),
  m_bUseCatalog(sal_False),
- m_bUseOldDateFormat(sal_False)
+ m_bUseOldDateFormat(sal_False),
+ m_DBHandler(0)
 {
 SAL_INFO(connectivity.firebird, = OConnection::OConnection().);
 
 m_pDriver-acquire();
-m_DBHandler = NULL;
 }
-//-
+
 OConnection::~OConnection()
 {
 SAL_INFO(connectivity.firebird, = OConnection::~OConnection().);
@@ -105,7 +108,7 @@ OConnection::~OConnection()
 m_pDriver-release();
 m_pDriver = NULL;
 }
-//-
+
 void SAL_CALL OConnection::release() throw()
 {
 SAL_INFO(connectivity.firebird, = OConnection::release().);
@@ -118,7 +121,7 @@ void SAL_CALL OConnection::release() throw()
 /*Print the status, the SQLCODE, and exit.
  *Also, indicate which operation the error occured on.
  */
-static int pr_error(const ISC_STATUS* status, char* operation)
+static int pr_error(const ISC_STATUS* status, const char* operation)
 {
 SAL_WARN(connectivity.firebird, = OConnection static pr_error().);
 
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx 
b/connectivity/source/drivers/firebird/FConnection.hxx
index d6f284b..e72bb19 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -98,20 +98,20 @@ namespace connectivity
 
 ::com::sun::star::sdbc::SQLWarning  m_aLastWarning; //  
Last SQLWarning generated by
 //  an operation
-boolm_bIsEmbedded;
+sal_Boolm_bIsEmbedded;
 ::rtl::OUString m_aURL; //  URL of 
connection
 // or file 
path
 ::rtl::OUString m_sUser;// the 
user name
 FirebirdDriver* m_pDriver;  //  
Pointer to the owning
 //  driver 
object
 
-::com::sun::star::uno::Reference 
::com::sun::star::embed::XStorage  m_xEmbeddedStorage;
-
 sal_Boolm_bClosed;
 sal_Boolm_bUseCatalog;  // should 
we use the catalog on filebased databases
 sal_Boolm_bUseOldDateFormat;
 isc_db_handle   m_DBHandler;
 
+::com::sun::star::uno::Reference 
::com::sun::star::embed::XStorage  m_xEmbeddedStorage;
+
 voidbuildTypeInfo() throw( 
::com::sun::star::sdbc::SQLException);
 
 public:
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.hxx 
b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
index d6c6fb0..f1b7854 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
@@

Re: Thoughts on LibreOffice Math

2013-07-11 Thread Jonas Finnemann Jensen

 I think enabling the visual editor by default is indeed important. What is
 blocking it from going out of experimental features? I think the GSOC
 student who worked on that mentioned some crashes and I can try to debug
 and fix them. Are there other serious bugs / missing features apart
 undo/redo?

So there is a light weight todo for some of the things that would be nice
to have here:
http://cgit.freedesktop.org/libreoffice/core/tree/starmath/visual-editor-todo

Some of them, might already be fixed. Or reported as bugs, as some of the
other guys mentioned.

In my opinion the biggest problem with the current approach is that it is
unnecessarily complex, because the StarMath syntax tree is very concrete
(rather than being abstract).
So maintainability is at risk with the current approach, but a rewrite also
carries it's risks...
So it's a matter of resources and priority... Just my two cents...


--
Regards Jonas Finnemann Jensen.


On Thu, Jul 4, 2013 at 6:10 PM, Frédéric WANG fred.w...@free.fr wrote:

 On 04/07/2013 13:17, Michael Meeks wrote:

 First - thanks so much for your contribution ! :-) it's great to have
 someone working on and caring about math - it seems to me like you should
 have commit access if you havn't already for that ( can you poke me with
 your gerrit account name ;-)

 Thanks, my gerrit account is Frédéric Wang attached to the mail address
 I'm writing this mail. BTW, I'm not sure why, but I can not comment on
 gerrit commit. Do I need commit access for that?


  Which of course makes life hard :-) IMHO it's fine to switch to something
 more standard; but of course for back-compatibility we need to be able to
 import (and probably export) (perfectly) StarMath to and from our new
 representation.

 I think the visual rendering can be preserved when converting from
 StarMath to MathML, but the other direction is not possible since StarMath
 does not have all the MathML features. In general, perfectly preserving the
 StarMath markup is not really possible for example a_b^c and a^c_b will
 be converted to the same MathML markup and it's not possible to convert it
 back. A more serious example is matrix{A ## B}, stack{A # B} and A
 newline B that are all exported as a MathML table with two rows A and B...


  Having said that - I'd love to see the final small pieces (IIRC. mostly
 undo/redo which is quite asy) for interactive editing sorted out before
 doing a deprecate/replace. The skills gained pulling the interactive
 formula editing out of experimental work will be useful learning for the
 re-write :-)

 I think enabling the visual editor by default is indeed important. What is
 blocking it from going out of experimental features? I think the GSOC
 student who worked on that mentioned some crashes and I can try to debug
 and fix them. Are there other serious bugs / missing features apart
 undo/redo?

  There were a number of technology suggestions in the thread too:
 just
 re-use GtkMathView - that seem to bring significant licensing and
 dependency issues. In general, that seems deeply problematic to me.

 Of course, if we can re-use some code from Firefox for a new
 formula
 editor (I assume they only render not edit) then that would be really
 ideal - though, naturally there would need to be some degree of
 abstracting of rendering etc. That's something I'd love to see. Editing
 is often quite unpleasant to achieve ;-)

 Thoughts on that much appreciated :-) how re-usable is the
 firefox code
 - is it a tightly coupled, vast chunk of beast tied to dozens of
 megabytes / mega-lines of existing firefox infrastructure ? or is it
 something smallish and re-usable ? :-)


 Gecko has an editor but it currently does not know anything about MathML
 and so editing it will produce invalid markup (try for example div
 contenteditable=truemath**msqrtmfracmia/mimib/**
 mi/mfrac/msqrt/math/**div in a HTML page).

 Gecko/WebKit MathML code base itself is small (say about the same size as
 StarMath) but it is strongly dependent on the rest of the Web rendering
 engine (all the CSS properties, table and text layout, DOM etc) so I'm not
 sure it's a really good idea to use it in LibreOffice. The need for Web
 content is a bit different, Web people want all the CSS features like
 text-shadow on mathematical expressions or want to mix MathML with other
 languages like SVG or want to use Javascript/DOM to edit them. I think
 LibreOffice people just want basic math support without too much
 interaction with the other features of the rendering engine (although at
 least integration in the surrounding text is important). I admit that I
 didn't check GtkMathView in details, but it seemed to be a small piece of
 code that is designed to be integrated in other applications and
 interactive edition is possible. The rendering did not seem so good to me
 (a font issue on my system?) but that would be better if Khaled adds Open
 Type MATH support.

 --
 Frédéric Wang

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - lpsolve/UnpackedTarball_lpsolve.mk solenv/gbuild

2013-07-11 Thread Michael Meeks

 lpsolve/UnpackedTarball_lpsolve.mk |1 +
 solenv/gbuild/UnpackedTarball.mk   |   11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 88be4728d30ac30e19f6fe6b9dd2545a66c71802
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 20:51:48 2013 +0100

fdo#66826 - Allow parameters to be passed to patch such as --binary

diff --git a/lpsolve/UnpackedTarball_lpsolve.mk 
b/lpsolve/UnpackedTarball_lpsolve.mk
index 09cb1a2..f9074a2 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
 ifeq ($(OS_FOR_BUILD),WNT)
 
+$(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
lpsolve/lp_solve_5.5-windows.patch \
 ))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a62b42a..5f5af1f 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case $$s in [0-9]$(CLOSE_PAREN) 
pl=$$s; ;; esac ; \
-   $(GNUPATCH) -f -s -p$$pl  $$p; \
+   $(GNUPATCH) $(UNPACKED_PATCHFLAGS) -f -s 
-p$$pl  $$p; \
if test $$? -ne 0; then echo Patch FAILED: 
$$p; exit 1; fi;\
done  \
) \
@@ -195,6 +195,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES 
:=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := 
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
 
@@ -250,6 +251,14 @@ $(call gb_UnpackedTarball_get_target,$(1)) : 
UNPACKED_PATCHLEVEL := $(2)
 
 endef
 
+# Add patch flags to be passed to patch for all patches cf. fdo#66826
+#
+# gb_UnpackedTarball_set_patchlevel unpacked level
+define gb_UnpackedTarball_set_patchflags
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS := $(2)
+
+endef
+
 # Add a patch to be applied on the unpacked files
 #
 # gb_UnpackedTarball_add_patch unpacked patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Michael Meeks

 lpsolve/UnpackedTarball_lpsolve.mk |1 +
 solenv/gbuild/UnpackedTarball.mk   |   11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit e962805b31074d6b6a2ed0db6452769448337553
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 20:51:48 2013 +0100

fdo#66826 - Allow parameters to be passed to patch such as --binary

diff --git a/lpsolve/UnpackedTarball_lpsolve.mk 
b/lpsolve/UnpackedTarball_lpsolve.mk
index 09cb1a2..f9074a2 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
 ifeq ($(OS_FOR_BUILD),WNT)
 
+$(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
lpsolve/lp_solve_5.5-windows.patch \
 ))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index ab2d6ff..d75cc23 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case $$s in [0-9]$(CLOSE_PAREN) 
pl=$$s; ;; esac ; \
-   $(GNUPATCH) -f -s -p$$pl --fuzz=0  $$p; \
+   $(GNUPATCH) $(UNPACKED_PATCHFLAGS) -f -s 
-p$$pl --fuzz=0  $$p; \
if test $$? -ne 0; then echo Patch FAILED: 
$$p; exit 1; fi;\
done  \
) \
@@ -195,6 +195,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES 
:=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := 
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
 
@@ -250,6 +251,14 @@ $(call gb_UnpackedTarball_get_target,$(1)) : 
UNPACKED_PATCHLEVEL := $(2)
 
 endef
 
+# Add patch flags to be passed to patch for all patches cf. fdo#66826
+#
+# gb_UnpackedTarball_set_patchlevel unpacked level
+define gb_UnpackedTarball_set_patchflags
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS := $(2)
+
+endef
+
 # Add a patch to be applied on the unpacked files
 #
 # gb_UnpackedTarball_add_patch unpacked patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Caolán McNamara

 vcl/generic/fontmanager/fontcache.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e533ba0e521cf1da08c6b8d1b8229d5622bddcb5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jul 11 19:32:57 2013 +0100

Resolves: fdo#66524 string conversion gone wrong

Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0
(cherry picked from commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7)
Reviewed-on: https://gerrit.libreoffice.org/4848
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/vcl/generic/fontmanager/fontcache.cxx 
b/vcl/generic/fontmanager/fontcache.cxx
index 0d14d48..0f6c677 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -264,10 +264,10 @@ void FontCache::read()
 do
 {
 aStream.ReadLine( aLine );
-if( aLine == FontCacheDirectory: ||
-aLine == EmptyFontCacheDirectory: )
+if( aLine.startsWith(FontCacheDirectory:) ||
+aLine.startsWith(EmptyFontCacheDirectory:) )
 {
-bool bEmpty = (aLine == Empty );
+bool bEmpty = aLine.startsWith(Empty);
 sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
 
 OString aDir;
@@ -309,7 +309,7 @@ void FontCache::read()
 m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
 }
 }
-else if( pDir  aLine == File:)
+else if( pDir  aLine.startsWith(File:) )
 {
 OString aFile( aLine.copy( 5 ) );
 aStream.ReadLine( aLine );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   26 +++--
 1 file changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 50726b3012d75c0d86c651074cbffe85bad4b1b7
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 11 21:58:50 2013 +0200

simpleExtract() with re-casing

Change-Id: I3ee2cdab9ac889eb3e73c08924c349777fbef2f8

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 4aefa79..0309ca1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -464,6 +464,20 @@ bool LanguageTag::canonicalize()
 Extraction eExt = simpleExtract( maBcp47, aLanguage, aScript, 
aCountry);
 if (eExt != EXTRACTED_NONE)
 {
+if (eExt == EXTRACTED_LSC)
+{
+// Rebuild bcp47 with proper casing of tags.
+OUString aStr( aLanguage);
+if (!aScript.isEmpty())
+aStr += - + aScript;
+if (!aCountry.isEmpty())
+aStr += - + aCountry;
+if (maBcp47 != aStr)
+{
+maBcp47 = aStr;
+bChanged = true;
+}
+}
 if (eExt == EXTRACTED_LSC  aScript.isEmpty())
 {
 maLocale.Language = aLanguage;
@@ -1233,15 +1247,15 @@ LanguageTag::Extraction LanguageTag::simpleExtract( 
const OUString rBcp47,
 }
 else if ((nLen == 2 || nLen == 3)  nHyph1  0) // ll or lll
 {
-rLanguage = rBcp47;
+rLanguage = rBcp47.toAsciiLowerCase();
 rScript = rCountry = OUString();
 eRet = EXTRACTED_LSC;
 }
 else if (  (nLen == 5  nHyph1 == 2)   // ll-CC
 || (nLen == 6  nHyph1 == 3))  // lll-CC
 {
-rLanguage = rBcp47.copy( 0, nHyph1);
-rCountry  = rBcp47.copy( nHyph1 + 1, 2);
+rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
+rCountry  = rBcp47.copy( nHyph1 + 1, 2).toAsciiUpperCase();
 rScript = OUString();
 eRet = EXTRACTED_LSC;
 }
@@ -1251,9 +1265,9 @@ LanguageTag::Extraction LanguageTag::simpleExtract( const 
OUString rBcp47,
 const sal_Int32 nHyph2 = rBcp47.indexOf( '-', nHyph1 + 1);
 if (nHyph2 == nHyph1 + 5)
 {
-rLanguage = rBcp47.copy( 0, nHyph1);
-rScript   = rBcp47.copy( nHyph1 + 1, 4);
-rCountry  = rBcp47.copy( nHyph2 + 1, 2);
+rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
+rScript   = rBcp47.copy( nHyph1 + 1, 1).toAsciiUpperCase() + 
rBcp47.copy( nHyph1 + 2, 3).toAsciiLowerCase();
+rCountry  = rBcp47.copy( nHyph2 + 1, 2).toAsciiUpperCase();
 eRet = EXTRACTED_LSC;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - lpsolve/UnpackedTarball_lpsolve.mk solenv/gbuild

2013-07-11 Thread Michael Meeks

 lpsolve/UnpackedTarball_lpsolve.mk |1 +
 solenv/gbuild/UnpackedTarball.mk   |   11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f1e7eeb83c18bce720d49e0e55704abd09ab96f7
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jul 11 20:51:48 2013 +0100

fdo#66826 - Allow parameters to be passed to patch such as --binary

Change-Id: I575b2721ffd08adabc3184b04ec302025a1feef2
Reviewed-on: https://gerrit.libreoffice.org/4850
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/lpsolve/UnpackedTarball_lpsolve.mk 
b/lpsolve/UnpackedTarball_lpsolve.mk
index 09cb1a2..f9074a2 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
 ifeq ($(OS_FOR_BUILD),WNT)
 
+$(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
lpsolve/lp_solve_5.5-windows.patch \
 ))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a62b42a..5f5af1f 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case $$s in [0-9]$(CLOSE_PAREN) 
pl=$$s; ;; esac ; \
-   $(GNUPATCH) -f -s -p$$pl  $$p; \
+   $(GNUPATCH) $(UNPACKED_PATCHFLAGS) -f -s 
-p$$pl  $$p; \
if test $$? -ne 0; then echo Patch FAILED: 
$$p; exit 1; fi;\
done  \
) \
@@ -195,6 +195,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES 
:=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := 
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
 
@@ -250,6 +251,14 @@ $(call gb_UnpackedTarball_get_target,$(1)) : 
UNPACKED_PATCHLEVEL := $(2)
 
 endef
 
+# Add patch flags to be passed to patch for all patches cf. fdo#66826
+#
+# gb_UnpackedTarball_set_patchlevel unpacked level
+define gb_UnpackedTarball_set_patchflags
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS := $(2)
+
+endef
+
 # Add a patch to be applied on the unpacked files
 #
 # gb_UnpackedTarball_add_patch unpacked patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Michael Meeks

 extras/source/truetype/symbol/README |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5e75084ca252ae9d90e18df0c50a92f48dfa7ece
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jul 9 17:17:25 2013 +0100

Update opensymbol readme.

Change-Id: Id6f82bb23336d056b2a4aa9966d93f9098f2cc26

diff --git a/extras/source/truetype/symbol/README 
b/extras/source/truetype/symbol/README
index 67efc7b..e5a3f93 100644
--- a/extras/source/truetype/symbol/README
+++ b/extras/source/truetype/symbol/README
@@ -19,3 +19,8 @@ The glyph names in the font should follow Adobe Glyph list 
for new fonts
 (http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt) or just 
the
 uni scheme (see http://www.adobe.com/devnet/opentype/archives/glyph.html 
for
 the rationale).
+
+Fragments of OpenSymbol are mapped internally to a number of other
+fonts for interoperability purposes. See
+unotools/source/misc/fontcvt.cxx pwrt.  the StarSymbol conversion
+tables.
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-11 Thread Andras Timar

 sw/source/filter/html/htmlatr.cxx |1 
 sw/source/filter/html/htmlfly.cxx |  115 --
 sw/source/filter/html/htmlnum.cxx |1 
 sw/source/filter/html/wrthtml.hxx |2 
 4 files changed, 51 insertions(+), 68 deletions(-)

New commits:
commit 562c39d73fb473f0eaec227ed0f607de4b7d8322
Author: Andras Timar ati...@suse.com
Date:   Thu Jul 11 16:54:36 2013 +0200

fix HTML export of linked image bullets

Change-Id: I14ade42adfff9beb0e40eb0d7e5569cbef0ced06

diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 57f9be7..9032d02 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -978,7 +978,6 @@ void OutHTML_SwFmt( Writer rWrt, const SwFmt rFmt,
 OSL_ENSURE( nBulletGrfLvl  MAXLEVEL, So viele Ebenen gibt's nicht );
 const SwNumFmt rNumFmt = aNumInfo.GetNumRule()-Get(nBulletGrfLvl);
 OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, 
rNumFmt.GetBrush(),
- rHWrt.aBulletGrfs[nBulletGrfLvl],
  rNumFmt.GetGraphicSize(), 
rNumFmt.GetGraphicOrientation() );
 }
 
diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index d0426c3..7889ebf 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1199,33 +1199,21 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt 
rFrmFmt,
 Writer OutHTML_BulletImage( Writer rWrt,
  const sal_Char *pTag,
  const SvxBrushItem* pBrush,
- String rGrfName,
  const Size rSize,
  const SwFmtVertOrient* pVertOrient )
 {
 SwHTMLWriter  rHTMLWrt = (SwHTMLWriter)rWrt;
 
-//Wenn es ein BrushItem gibt, muss die Grafiknoch exportiert werden
-const String *pLink = 0;
 OUString aGraphicInBase64;
 if( pBrush )
 {
-pLink = pBrush-GetGraphicLink();
-
-//embeddete Grafik - WriteEmbedded schreiben
-if( !pLink )
+const Graphic* pGrf = pBrush-GetGraphic();
+if( pGrf )
 {
-const Graphic* pGrf = pBrush-GetGraphic();
-if( pGrf )
+sal_uLong nErr = XOutBitmap::GraphicToBase64(*pGrf, 
aGraphicInBase64);
+if( nErr )
 {
-sal_uLong nErr = XOutBitmap::GraphicToBase64(*pGrf, 
aGraphicInBase64);
-if( nErr )
-{
-rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
-}
-if( rHTMLWrt.GetOrigFileName() )
-rGrfName = *rHTMLWrt.GetOrigFileName();
-pLink = rGrfName;
+rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
 }
 }
 }
@@ -1234,61 +1222,58 @@ Writer OutHTML_BulletImage( Writer rWrt,
 if( pTag )
 sOut.append('').append(pTag);
 
-if( pLink )
+sOut.append(' ');
+sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append(=\).
+append(OOO_STRING_SVTOOLS_HTML_O_data).append(:);
+rWrt.Strm()  sOut.makeStringAndClear().getStr();
+HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, 
rHTMLWrt.eDestEnc, rHTMLWrt.aNonConvertableCharacters );
+sOut.append('\');
+
+// Groesse des Objekts Twips ohne Raender
+Size aPixelSz( 0, 0 );
+if( (rSize.Width() || rSize.Height())  Application::GetDefaultDevice() )
 {
-sOut.append(' ');
-sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append(=\).
-append(OOO_STRING_SVTOOLS_HTML_O_data).append(:);
-rWrt.Strm()  sOut.makeStringAndClear().getStr();
-HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, 
rHTMLWrt.eDestEnc, rHTMLWrt.aNonConvertableCharacters );
-sOut.append('\');
+aPixelSz =
+Application::GetDefaultDevice()-LogicToPixel( rSize,
+MapMode(MAP_TWIP) );
+if( !aPixelSz.Width()  rSize.Width() )
+aPixelSz.Width() = 1;
+if( !aPixelSz.Height()  rSize.Height() )
+aPixelSz.Height() = 1;
+}
 
-// Groesse des Objekts Twips ohne Raender
-Size aPixelSz( 0, 0 );
-if( (rSize.Width() || rSize.Height())  
Application::GetDefaultDevice() )
-{
-aPixelSz =
-Application::GetDefaultDevice()-LogicToPixel( rSize,
-MapMode(MAP_TWIP) );
-if( !aPixelSz.Width()  rSize.Width() )
-aPixelSz.Width() = 1;
-if( !aPixelSz.Height()  rSize.Height() )
-aPixelSz.Height() = 1;
-}
+if( aPixelSz.Width() )
+{
+sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).
+append('=').append(static_castsal_Int32(aPixelSz.Width()));
+}
 
-if( aPixelSz.Width() )
-{
-

1 2 3 4 >

1 - 100 of 368 matches

Mail list logo