date:20131011

Re: [BUILD] Which license do I need to build a professional edition of LibreOffice (4.0.x/4.1.x) of windows ?

2013-10-11 Thread Lionel Elie Mamane

On Wed, Oct 09, 2013 at 04:46:19PM +0200, Jonathan Aquilina wrote:

> I am not understanding the end goal. You are basically duplicating
> efforts here and just reinventing the wheel.

It is crucial for a "healthy" libre/free software project that
building is *easy* and the know-how to do that is known by the most
people possible. This is the *only* way that one can even hope to get
new (code / development) contributors.

Getting people up to "can build" is IMHO by no means meaningless
effort-duplication.

>From a "free software politics" point of view, it also tips the
balance of power away from the TDF to the users, which is a *good*
thing. If (nearly) only the TDF knows how to build, then users cannot
effectively exercise (nearly all) the freedoms that free software
grants them.


> On Wed, Oct 9, 2013 at 4:34 PM, Gay, Matthieu 
> wrote:
> 
> >  Hello, I still have problem to build under windows, but I wanted to
> > know, what do I need to build LibreOffice (4.0.x/4.1.x) entirely as the
> > original available in the website.
> >
> >
> >
> > First can you confirm that I need a certificate to sign the DLL and a
> > license of Visual Studio 12 (without I can't build ATL and ActiveX
> > modules).
> >
> >
> >
> > Which version of Windows is the best? Do I need a pro version or a
> > familial one?
> >
> >
> >
> > Thanks for your answer, if you find others license/not free component (in
> > cygwin dependency or Microsoft tools by example) don't hesitate to tell me.
> >
> >
> >
> > Matthieu GAY.
> >
> >
> >
> >
> >
> >
> >  This message contains information that may be privileged or confidential
> > and is the property of the Capgemini Group. It is intended only for the
> > person to whom it is addressed. If you are not the intended recipient, you
> > are not authorized to read, print, retain, copy, disseminate, distribute,
> > or use this message or any part thereof. If you receive this message in
> > error, please notify the sender immediately and delete all copies of this
> > message.
> >
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libreoffice
> >
> >
> 
> 

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

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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Tor Lillqvist

> Because we (intend to) have platforms where we need a
> "stripped down" LibreOffice

I used to think so too (and still do). But now I think that should be
handled during packaging, not during building. That puts the burden on
the packagers of such stripped-down versions, where it should be,
instead of making it possible to *build* (and fail building) LO in
hundreds of different ways, which puts the birder on the source code
maintainers.

Of course, keep in mind that I am a (Groucho) Marxist; if my opinions
aren't valid, I am prepared to change them.

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

Re: Avmedia/VLC

2013-10-11 Thread Minh Ngo

Hi,

I have tested on this file http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4

All the best,

Minh
Minh Ngo | m...@fedoraproject.org | Principal Lazy Engineer


On 7 October 2013 11:36, Jean-Baptiste Kempf  wrote:
> Le 07/10/2013 09:49, Minh Ngo a écrit :
>
>> Also there are some problems with reading media files.
>> libvlc_video_get_track_count returns -1 for one media file that is
>> played successfully on the VLC player. The last error is "No active
>
>
> What format is that?
>
> Some formats like ogg, don't have any track info until you "play" them...
>
>
> --
> Jean-Baptiste Kempf
> http://www.jbkempf.com/ - +33 672 704 734
> Sent from my Electronic Device
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - desktop/Extension_test-passive.mk scp2/source smoketest/Extension_TestExtension.mk solenv/gbuild

2013-10-11 Thread David Tardon

 desktop/Extension_test-passive.mk  |2 +-
 scp2/source/extensions/file_extensions.scp |   24 
 smoketest/Extension_TestExtension.mk   |2 +-
 solenv/gbuild/Extension.mk |   20 ++--
 4 files changed, 28 insertions(+), 20 deletions(-)

New commits:
commit b506fcdf2477f68c34344346267543ca6a31da6e
Author: David Tardon 
Date:   Fri Oct 11 09:36:33 2013 +0200

install extensions using filelist

Change-Id: I16dae6402d13d912830a02fbc3a7f8347e890bc7

diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index 3161490..272328e 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -28,9 +28,9 @@
 
 File gid_File_Oxt_Presentation_Minimizer
 TXT_FILE_BODY;
-Styles = (PACKED, ARCHIVE);
-Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
-Name = "presentation-minimizer.oxt";
+Styles = (PACKED, FILELIST);
+Dir = FILELIST_DIR;
+Name = "Extension/presentation-minimizer.filelist";
 End
 
 #endif
@@ -41,9 +41,9 @@ End
 
 File gid_File_Oxt_MediaWiki
 TXT_FILE_BODY;
-Styles = (PACKED, ARCHIVE);
-Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
-Name = "wiki-publisher.oxt";
+Styles = (PACKED, FILELIST);
+Dir = FILELIST_DIR;
+Name = "Extension/wiki-publisher.filelist";
 End
 
 #endif
@@ -171,9 +171,9 @@ End
 
 File gid_File_Oxt_NLPSolver
 TXT_FILE_BODY;
-Styles = (PACKED, ARCHIVE);
-Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
-Name = "nlpsolver.oxt";
+Styles = (PACKED, FILELIST);
+Dir = FILELIST_DIR;
+Name = "Extension/nlpsolver.filelist";
 End
 
 #endif
@@ -197,9 +197,9 @@ End
 
 File gid_File_Oxt_MySQLConnector
 TXT_FILE_BODY;
-Styles = (PACKED, ARCHIVE);
-Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
-Name = "mysql-connector-ooo.oxt";
+Styles = (PACKED, FILELIST);
+Dir = FILELIST_DIR;
+Name = "Extension/mysql-connector-ooo.filelist";
 End
 
 #endif
commit 06293b051c9eb418ce0f5a6ee2f7dabafd78f98c
Author: David Tardon 
Date:   Fri Oct 11 09:33:21 2013 +0200

do not copy testing extensions to instdir

Change-Id: Ibd2f18a8998b3e182d8d5b8af9c9f74a8ac00744

diff --git a/desktop/Extension_test-passive.mk 
b/desktop/Extension_test-passive.mk
index 354ce26..dbd03cf 100644
--- a/desktop/Extension_test-passive.mk
+++ b/desktop/Extension_test-passive.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 
gb_Extension_Extension,test-passive,desktop/test/deployment/passive))
+$(eval $(call 
gb_Extension_Extension,test-passive,desktop/test/deployment/passive,nodeliver))
 
 $(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call 
gb_Rdb_get_target,passive_generic)))
 
diff --git a/smoketest/Extension_TestExtension.mk 
b/smoketest/Extension_TestExtension.mk
index 454aede..8644a73 100644
--- a/smoketest/Extension_TestExtension.mk
+++ b/smoketest/Extension_TestExtension.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 
gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest))
+$(eval $(call 
gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest,nodeliver))
 
 $(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call 
gb_Jar_get_outdir_target,TestExtension)))
 
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 8477055..42da363 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -114,7 +114,7 @@ $(call gb_Extension_get_target,%) : \
 # add deliverable
 # add dependency for outdir target to workdir target (pattern rule for 
delivery is in Package.mk)
 #
-# gb_Extension_Extension extension srcdir
+# gb_Extension_Extension extension srcdir nodeliver
 define gb_Extension_Extension
 $(call gb_Extension_get_target,$(1)) : DESCRIPTION :=
 $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml
@@ -127,11 +127,7 @@ $(call gb_Extension_get_workdir,$(1))/description.xml :| \
$(call gb_Extension__get_preparation_target,$(1))
 $(call gb_Extension__get_final_target,$(1)) : $(call 
gb_Extension_get_target,$(1))
 
-$(call gb_GeneratedPackage_GeneratedPackage,Extension/$(1),$(dir $(call 
gb_Extension_get_rootdir,$(1
-$(call 
gb_GeneratedPackage_add_dir,Extension/$(1),$(INSTROOT)/share/extensions/$(1),$(notdir
 $(call gb_Extension_get_rootdir,$(1
-
-$(call gb_GeneratedPackage_get_target,Extension/$(1)) : $(call 
gb_Extension_get_target,$(1))
-$(call gb_Extension__get_final_target,$(1)) : $(call 
gb_GeneratedPackage_get_target,Extension/$(1))
+$(if $(filter nodeliver,$(3)),,$(call 
gb_Extension__Extension_deliver,$(1),Extension/$(1)))
 
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : \
@@ -149,6 +145,18 @@ $(call 
gb_Helper_make_userfriendly_targets,$(1),Extension

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c4/b76f0442c452693846a4c92970ba67f26f2226

2013-10-11 Thread Caolán McNamara

 c4/b76f0442c452693846a4c92970ba67f26f2226 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5cbf61e7554683b9a20d2653bad35d68de0c91b5
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:44:42 2013 +0100

Notes added by 'git notes add'

diff --git a/c4/b76f0442c452693846a4c92970ba67f26f2226 
b/c4/b76f0442c452693846a4c92970ba67f26f2226
new file mode 100644
index 000..5e31f8f
--- /dev/null
+++ b/c4/b76f0442c452693846a4c92970ba67f26f2226
@@ -0,0 +1 @@
+merged as: 483ea555bfdde46dc581deaae5e782405de81a2e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Armin Le Grand

 sc/source/ui/app/transobj.cxx |   19 +--
 sc/source/ui/inc/transobj.hxx |4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 483ea555bfdde46dc581deaae5e782405de81a2e
Author: Armin Le Grand 
Date:   Thu Oct 10 16:20:50 2013 +

Resolves: #i123405# Allow to not limit size to PageSize...

when creating Metafile content

(cherry picked from commit c4b76f0442c452693846a4c92970ba67f26f2226)

Change-Id: I8536f4d55e422ad5550c1aaa311789ad31647611

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 0269e2a..a961cbe 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -354,11 +354,15 @@ sal_Bool ScTransferObj::GetData( const 
datatransfer::DataFlavor& rFlavor )
 }
 else if ( nFormat == SOT_FORMAT_GDIMETAFILE )
 {
-InitDocShell();
+// #i123405# Do not limit visual size calculation for metafile 
creation.
+// It seems unlikely that removing the limitation causes problems 
since
+// metafile creation means that no real pixel device in the needed 
size is
+// created.
+InitDocShell(false);
+
 SfxObjectShell* pEmbObj = aDocShellRef;
 
 // like SvEmbeddedTransfer::GetData:
-
 GDIMetaFile aMtf;
 VirtualDevice   aVDev;
 MapMode aMapMode( pEmbObj->GetMapUnit() );
@@ -380,7 +384,8 @@ sal_Bool ScTransferObj::GetData( const 
datatransfer::DataFlavor& rFlavor )
 else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
 {
 //TODO/LATER: differentiate between formats?!
-InitDocShell(); // set aDocShellRef
+// #i123405# Do limit visual size calculation to PageSize
+InitDocShell(true); // set aDocShellRef
 
 SfxObjectShell* pEmbObj = aDocShellRef;
 bOK = SetObject( pEmbObj, SCTRANS_TYPE_EMBOBJ, rFlavor );
@@ -582,8 +587,10 @@ ScMarkData ScTransferObj::GetSourceMarkData()
 //
 //  initialize aDocShellRef with a live document from the ClipDoc
 //
+// #i123405# added parameter to allow size calculation without limitation
+// to PageSize, e.g. used for Metafile creation for clipboard.
 
-void ScTransferObj::InitDocShell()
+void ScTransferObj::InitDocShell(bool bLimitToPageSize)
 {
 if ( !aDocShellRef.Is() )
 {
@@ -700,14 +707,14 @@ void ScTransferObj::InitDocShell()
 for (nCol=nStartX; nCol<=nEndX; nCol++)
 {
 long nAdd = pDestDoc->GetColWidth( nCol, 0 );
-if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX )   // above limit?
+if ( bLimitToPageSize && nSizeX+nAdd > aPaperSize.Width() && 
nSizeX )   // above limit?
 break;
 nSizeX += nAdd;
 }
 for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
 {
 long nAdd = pDestDoc->GetRowHeight( nRow, 0 );
-if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY )  // above limit?
+if ( bLimitToPageSize && nSizeY+nAdd > aPaperSize.Height() && 
nSizeY )  // above limit?
 break;
 nSizeY += nAdd;
 }
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 46446b0..9bd0d12 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -56,7 +56,9 @@ private:
 boolbHasFiltered;   // if has filtered rows
 boolbUseInApi;  // to recognize 
clipboard content copied from API
 
-voidInitDocShell();
+// #i123405# added parameter to allow size calculation without limitation
+// to PageSize, e.g. used for Metafile creation for clipboard.
+voidInitDocShell(bool bLimitToPageSize);
 static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY,
 SCCOL nEndX, SCROW nEndY,
 ScDocument* pDestDoc=0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - dbaccess/source oox/source svtools/source

2013-10-11 Thread Caolán McNamara

 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |3 +--
 oox/source/shape/ShapeContextHandler.cxx  |8 
 svtools/source/filter/exportdialog.cxx|2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 77ba51a2dd1c37cce2ffb596f4544d9c8cfefeda
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:53:27 2013 +0100

CID#1103695 avoid use of -1 here

Change-Id: I7097d26f301fffa79d04fe4f26aeddb32223d62c

diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index 706715b..b935acf 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -951,7 +951,7 @@ void ExportDialog::updateControls()
 if (nInd != -1)
 aEst = aEst.replaceAt( nInd, 2, ImpValueOfInKB( nRawFileSize ) );
 
-if ( nRealFileSize )
+if ( nRealFileSize && nInd != -1 )
 {
 nInd = aEst.indexOf( "%", nInd );
 if (nInd != -1)
commit 44fa08ed89f61add6ba6fb0eb1b5c243b53c350f
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:51:26 2013 +0100

CID#1103679 calm coverity re invalid iterators

Change-Id: Iad07aa59c6016752ec9467945d737380d214c3c0

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx 
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index ca189a1..0ae0859 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1826,8 +1826,7 @@ void OSelectionBrowseBox::AddCondition( const 
OTableFieldDescRef& rInfo, const O
 }
 m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True;
 }
-
-else if (aIter == getFields().end())
+else if (aIter == rFields.end())
 {
 OTableFieldDescRef pTmp = InsertField(rInfo, BROWSER_INVALIDID, 
sal_False, sal_False );
 if ( pTmp->isNumericOrAggreateFunction() && rInfo->IsGroupBy() ) // 
the GroupBy was inherited from rInfo
commit 88af59fa755505422958746fb321e15f50c99378
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:47:04 2013 +0100

CID#1103719 leak on default: path

Change-Id: I74a17da384499fb18f13d5caa04c356dfee71eff

diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index 3e7efb0..96d4849 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -97,16 +97,16 @@ uno::Reference 
ShapeContextHandler::getChartShape
 {
 if (!mxChartShapeContext.is())
 {
-ContextHandler2Helper *rFragmentHandler
-(new ShapeFragmentHandler(*mxFilterBase, 
msRelationFragmentPath));
-ShapePtr pMasterShape;
-
 switch (nElement & 0x)
 {
 case XML_chart:
+{
+ContextHandler2Helper *rFragmentHandler
+(new ShapeFragmentHandler(*mxFilterBase, 
msRelationFragmentPath));
 mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" ));
 mxChartShapeContext.set(new 
ChartGraphicDataContext(*rFragmentHandler, mpShape, true));
 break;
+}
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE:[BUILD] Which license do I need to build a professional edition of LibreOffice (4.0.x/4.1.x) of windows ?

2013-10-11 Thread Gay, Matthieu

Hello,

I have another (and last I hope) question:

Here there are a lot of version of MVSC 2010, 
http://msdn.microsoft.com/fr-fr/vstudio/dd582936(en-us).aspx

I suppose I have to download Visual Studio 2010 Professional but can you 
confirm it?

Thanks again for your support

___
De : lohma...@googlemail.com [lohma...@googlemail.com] de la part de Christian 
Lohmaier [lohmaier+libreoff...@googlemail.com]
Envoyé : mercredi 9 octobre 2013 22:33
À : Gay, Matthieu
Cc : LibreOffice dev
Objet : Re: [BUILD] Which license do I need to build a professional edition of 
LibreOffice (4.0.x/4.1.x) of windows ?

Matthieu, *,

On Wed, Oct 9, 2013 at 4:34 PM, Gay, Matthieu
 wrote:
> Hello, I still have problem to build under windows, but I wanted to know,
> what do I need to build LibreOffice (4.0.x/4.1.x) entirely as the original
> available in the website.

You cannot produce libreOffice as from the website, as it is using a
TDF-only certificate to sign (obviously), and also used TDF branding
(which you may not use - but you probably want your own branding
anyway)

But one is just optical thing, the other a technical detail.

> First can you confirm that I need a certificate to sign the DLL

You don't /need/ it, but without having it signed, you'll get
corresponding warning dialogs (unknown publisher) when trying to
install. So using a certificate is strongly recommended.

> and a
> license of Visual Studio 12 (without I can't build ATL and ActiveX modules).

Visual Studio 2010 is used to build the official releases. But yes,
you need a payed version.
Visual Studio 2012 also works, but when you want your builds to run on
Windows XP, you must install at least update 1 for VS 2012, and you
need to tell autogen.sh/configure to use the 7.1A SDK.

> Which version of Windows is the best? Do I need a pro version or a familial
> one?

Windows Version should not matter - official builds are done on
Windows Server 2008 R2 - but any version of Windows sould work.

Only paid stuff you need is Windows itself and the Visual Studio
license. Rest of the build requirements is free software.

configure switches for official build: (see
https://wiki.documentfoundation.org/Development/ReleaseBuilds )

--with-distro=LibreOfficeWin32 --enable-release-build
--enable-windows-build-signing --with-lang=ALL
--disable-dependency-tracking --enable-pch
--with-nss-build-tools=/path/to/mozilla-build
--with-branding=/path/to/tdf-branding
--with-junit=/path/to/junit-4.10.jar
--with-ant-home=/path/to/apache-ant-1.9.2
--with-external-tar=/path/to/lo-externalsrc

nss-build-tools are no longer needed for current codeline, but you
also asked for 4.0.x …

ciao
Christian
This message contains information that may be privileged or confidential and is 
the property of the Capgemini Group. It is intended only for the person to whom 
it is addressed. If you are not the intended recipient, you are not authorized 
to read, print, retain, copy, disseminate, distribute, or use this message or 
any part thereof. If you receive this message in error, please notify the 
sender immediately and delete all copies of this message.

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

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

2013-10-11 Thread Jan Holesovsky

 basctl/source/basicide/bastype2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ec3a4bfbf5a72b9814fb093b4300427855c161d1
Author: Jan Holesovsky 
Date:   Thu Oct 10 13:18:07 2013 +0200

Fix whitespace.

Change-Id: I76acfa77eea862a1562521eea5160ed054f68650

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 4699117..c3b0908 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -60,9 +60,9 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< 
container::XNameCont
 {
 try
 {
-uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( 
rLib, uno::UNO_QUERY );
-if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( 
rModName ) )
-{
+uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( rLib, 
uno::UNO_QUERY );
+if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) )
+{
 script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( 
rModName );
 uno::Any aObject( aModuleInfo.ModuleObject );
 uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, 
uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 canvas/source/opengl/ogl_canvashelper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f6b2cf6e91c973998256f2f7e6b801489915cab
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:57:01 2013 +0100

CID#1103749 unintialized member

Change-Id: I33f92b9fc6adc6fabc9732c4e62e7331e0baba25

diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index ae349b9..3d4bd55 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -378,6 +378,7 @@ namespace oglcanvas
 
 CanvasHelper::CanvasHelper() :
 mpDevice( NULL ),
+mpDeviceHelper( NULL ),
 mpRecordedActions()
 {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 sd/source/ui/dlg/headerfooterdlg.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 51013801b055eeb1b5a60894be383e0c639ba059
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 08:58:14 2013 +0100

CID#1103763 uninitialized member

Change-Id: Ib6b003160a36e4dcdfab603def10c2731828806e

diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index d3ebed9..b499e3f 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -734,7 +734,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( 
LanguageType &rLanguage, boo
 ///
 
 PresLayoutPreview::PresLayoutPreview( ::Window* pParent )
-:Control( pParent )
+: Control(pParent)
+, mpMaster(NULL)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 i18nlangtag/source/languagetag/languagetag.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 258d9fac7544f925c8250bad99b9554cc49578d5
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:00:29 2013 +0100

CID#1103756 missing initialization

Change-Id: I0a0dcf7a6009940854b3a6f8e26127c5868b5a55

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index fd14889..40ade94 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -564,7 +564,8 @@ LanguageTag::LanguageTag( const LanguageTag & rLanguageTag )
 mbSystemLocale( rLanguageTag.mbSystemLocale),
 mbInitializedBcp47( rLanguageTag.mbInitializedBcp47),
 mbInitializedLocale( rLanguageTag.mbInitializedLocale),
-mbInitializedLangID( rLanguageTag.mbInitializedLangID)
+mbInitializedLangID( rLanguageTag.mbInitializedLangID),
+mbIsFallback(rLanguageTag.mbIsFallback)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

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

New commits:
commit 16be3d0737d87d5a0715dfdce52d38f1b588e450
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:02:10 2013 +0100

CID#1103765 missing initialization

Change-Id: I2c3781b30054662c21e4c1fa984e36c3898c5c3d

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 506bb97..99addf5 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -281,7 +281,7 @@ SvxAutoCorrect::SvxAutoCorrect( const OUString& 
rShareAutocorrFile,
 : sShareAutoCorrFile( rShareAutocorrFile ),
 sUserAutoCorrFile( rUserAutocorrFile ),
 pLangTable( new boost::ptr_map ),
-pCharClass( 0 ), bRunNext( false ),
+pCharClass( 0 ), bRunNext( false ), eCharClassLang( LANGUAGE_DONTKNOW ),
 cStartDQuote( 0 ), cEndDQuote( 0 ), cStartSQuote( 0 ), cEndSQuote( 0 )
 {
 nFlags = SvxAutoCorrect::GetDefaultFlags();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 sc/source/ui/docshell/tablink.cxx |4 +---
 sc/source/ui/view/viewfun2.cxx|3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 9f279e9902b07a07505fe7191e8b0a1d3db81c57
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:04:14 2013 +0200

Simplify string literal concatenations

Change-Id: Ibf5e9ed2716f2f22beb3b68ba7569b638f35a960

diff --git a/sc/source/ui/docshell/tablink.cxx 
b/sc/source/ui/docshell/tablink.cxx
index b6255d1..8b52e37 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -501,9 +501,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& 
rFileName,
 
 void ScDocumentLoader::RemoveAppPrefix( OUString& rFilterName )
 {
-OUStringBuffer aBuf;
-aBuf.appendAscii( STRING_SCAPP).appendAscii( ": ");
-OUString aAppPrefix( aBuf.makeStringAndClear());
+OUString aAppPrefix( STRING_SCAPP ": ");
 if (rFilterName.startsWith( aAppPrefix))
 rFilterName = rFilterName.copy( aAppPrefix.getLength());
 }
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 5f1f592..c848d08 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2486,8 +2486,7 @@ void ScViewFunc::MoveTable(
 
 //  execute without SFX_CALLMODE_RECORD, because already contained in 
move command
 
-OUString aUrl("private:factory/");
-aUrl += STRING_SCAPP;   // "scalc"
+OUString aUrl("private:factory/" STRING_SCAPP);
 SfxStringItem aItem( SID_FILE_NAME, aUrl );
 SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 package/source/zippackage/ZipPackage.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 2d30d16e1314883fdd02f0dda0a1115799320299
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:05:41 2013 +0200

-Werror,-Wunused-variable

Change-Id: I682b5d72c1785e8d8cb9c8bb42d4a0bab6db263e

diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 669a802..3f6a0f5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1030,9 +1030,6 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, 
const vector< uno::Seq
 
 void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< 
uno::Sequence < PropertyValue > >& aManList )
 {
-const OUString sFullPath ("FullPath");
-const OUString sMediaType ("MediaType");
-
 ZipEntry* pEntry = new ZipEntry;
 ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
 uno::Reference< io::XOutputStream > xConTypeOutStream( *pBuffer, UNO_QUERY 
);
@@ -1055,7 +1052,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& 
aZipOut, const vector< uno:
 {
 OUString aPath;
 OUString aType;
-OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name.equals( sMediaType ) 
&& ( *aIter )[PKG_MNFST_FULLPATH].Name.equals( sFullPath ),
+OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name == "MediaType" && ( 
*aIter )[PKG_MNFST_FULLPATH].Name == "FullPath",
 "The mediatype sequence format is wrong!\n" );
 ( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType;
 if ( !aType.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 tools/source/stream/strmunx.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 015c00b62f948920e7fc9eb280420cf2558b8fa8
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:07:47 2013 +0200

-Werror,-Wunused-variable

Change-Id: Ia49c97f3ccecf42852e21f0a3690352b9620e16c

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 24eacee..d3b44df 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -494,9 +494,9 @@ void SvFileStream::Open( const OUString& rFilename, 
StreamMode nOpenMode )
 eStreamMode &= ~STREAM_TRUNC; // don't truncat on reopen
 
 aFilename = rFilename;
-OString aLocalFilename(OUStringToOString(aFilename, 
osl_getThreadTextEncoding()));
 
 #ifdef DBG_UTIL
+OString aLocalFilename(OUStringToOString(aFilename, 
osl_getThreadTextEncoding()));
 OStringBuffer aTraceStr("SvFileStream::Open(): ");
 aTraceStr.append(aLocalFilename);
 OSL_TRACE( "%s", aTraceStr.getStr() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 basic/source/runtime/methods.cxx |2 +-
 sw/source/ui/docvw/romenu.cxx|3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d22fb8a60881f96f0347b5eae6c67f056ddc53cc
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:12:24 2013 +0100

CID#1103740 uninitialized value

Change-Id: I2d10104277d8ad0781e3dd088d51d62fa759fe57

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1180a81..4167152 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1985,7 +1985,7 @@ RTLFUNC(CDateFromUnoTime)
 
 void SbxDateFromUNODateTime( SbxValue *pVal, const 
::com::sun::star::util::DateTime& aUnoDT)
 {
-double dDate;
+double dDate(0.0);
 if( implDateTimeSerial( aUnoDT.Year, aUnoDT.Month, aUnoDT.Day,
 aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds,
 dDate ) )
commit 17605133e01c7a58d5e2f10c441bf67582ae4898
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:10:46 2013 +0100

CID#1103774 avoid use after free

Change-Id: I0cbe52bf48fb9a2611043c6c3e187b9db4414365

diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index f478471..ea48000 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -198,13 +198,14 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, 
SwView &rV ) :
 Check( MN_READONLY_OPENURL, SID_OPENDOC,rDis );
 Check( MN_READONLY_OPENURLNEW,  SID_OPENDOC,rDis );
 
-SfxPoolItem* pState;
+SfxPoolItem* pState = NULL;
 
 SfxItemState eState = pVFrame->GetBindings().QueryState( SID_COPY, pState 
);
 Check( MN_READONLY_COPY,SID_COPY,   rDis );
 if(eState < SFX_ITEM_AVAILABLE)
 EnableItem( MN_READONLY_COPY, sal_False );
 delete pState;
+pState = NULL;
 
 eState = pVFrame->GetBindings().QueryState( SID_EDITDOC, pState );
 if (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 sd/source/filter/eppt/epptbase.hxx|2 ++
 sfx2/source/control/templatecontaineritem.cxx |1 +
 sfx2/source/inc/templatesearchviewitem.hxx|1 +
 3 files changed, 4 insertions(+)

New commits:
commit 0fa78319a8148cf1e0d200dac1cabbe7fdd47d3a
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:15:56 2013 +0100

CID#1103760 uninitialized members

Change-Id: I81cfd90640be41f0e09fdb38f765fcef77a59b6f

diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index 392cd72..8b033fb 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -156,6 +156,8 @@ struct FontCollectionEntry
 
 FontCollectionEntry( const OUString& rName ) :
 Scaling ( 1.0 ),
+Family  ( 0 ),
+Pitch   ( 0 ),
 Original( rName )
 {
 ImplInit( rName );
commit 92407d540684c8b5953417b21742c7d94363ce1f
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:14:49 2013 +0100

CID#1103767 uninitialized members

Change-Id: I2b2a7728bf0a93cf3da033e8b1e1bfccdf6c1df2

diff --git a/sfx2/source/inc/templatesearchviewitem.hxx 
b/sfx2/source/inc/templatesearchviewitem.hxx
index f6e6a6d..0b52abc 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -16,6 +16,7 @@ struct TemplateSearchViewItem : public TemplateViewItem
 {
 TemplateSearchViewItem (ThumbnailView &rView, sal_uInt16 nId)
 : TemplateViewItem(rView, nId)
+, mnAssocId(0)
 {}
 
 virtual ~TemplateSearchViewItem ()
commit 1e9a71fed817eaae64ebe455d1644c917d082c95
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 09:14:00 2013 +0100

CID#1103771 uninitialized members

Change-Id: I3189f29d4632b8c04649dbded7250c1510e5b515

diff --git a/sfx2/source/control/templatecontaineritem.cxx 
b/sfx2/source/control/templatecontaineritem.cxx
index fb0cf99..e49cf72 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -30,6 +30,7 @@ using namespace drawinglayer::primitive2d;
 
 TemplateContainerItem::TemplateContainerItem (ThumbnailView &rView, sal_uInt16 
nId)
 : ThumbnailViewItem(rView, nId)
+, mnRegionId(0)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl ios/experimental vcl/ios

2013-10-11 Thread ptyl

 include/osl/detail/ios-bootstrap.h |3 +
 ios/experimental/LibreOffice/LibreOffice/AppDelegate.m |2 +
 ios/experimental/LibreOffice/LibreOffice/View.h|2 +
 ios/experimental/LibreOffice/LibreOffice/View.m|   17 ++
 vcl/ios/iosinst.cxx|   28 +
 5 files changed, 52 insertions(+)

New commits:
commit da69a3ef5c395a3772a1c999aae5f172fc139d1e
Author: p...@cloudon.com 
Date:   Wed Sep 11 16:25:04 2013 +0300

iOS experimental app support for selection marking via long press gesture

Change-Id: Ib7a71797a2dc967f9d8ddd60fdc10c78201a87c8
Reviewed-on: https://gerrit.libreoffice.org/5911
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/include/osl/detail/ios-bootstrap.h 
b/include/osl/detail/ios-bootstrap.h
index 42c38e4..0225c9a 100644
--- a/include/osl/detail/ios-bootstrap.h
+++ b/include/osl/detail/ios-bootstrap.h
@@ -41,6 +41,8 @@ extern "C" {
 
 /* 1) */
 
+typedef enum { DOWN, MOVE, UP} LOMouseButtonState;
+
 void lo_damaged(CGRect rect);
 
 /* 2) */
@@ -51,6 +53,7 @@ void lo_render_windows(CGContextRef context, CGRect rect);
 void lo_tap(int x, int y);
 void lo_pan(int deltaX, int deltaY);
 void lo_zoom(int x, int y, float scale);
+void lo_mouse_drag(int x, int y, LOMouseButtonState state);
 void lo_keyboard_input(int c);
 
 #ifdef __cplusplus
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m 
b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index b0857ce..7e3a0a9 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -60,9 +60,11 @@ static View *theView;
 
 UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc] 
initWithTarget:self.view action:@selector(tapGesture:)];
 UIPanGestureRecognizer *panRecognizer = [[UIPanGestureRecognizer alloc] 
initWithTarget:self.view action:@selector(panGesture:)];
+UILongPressGestureRecognizer * longPressRecognizer = 
[[UILongPressGestureRecognizer alloc] initWithTarget:self.view 
action:@selector(longPressGesture:)];
 
 [self.window addGestureRecognizer: tapRecognizer];
 [self.window addGestureRecognizer: panRecognizer];
+[self.window addGestureRecognizer: longPressRecognizer];
 
 NSLog(@"statusBarOrientation: %ld", (long) [[UIApplication 
sharedApplication] statusBarOrientation]);
 
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.h 
b/ios/experimental/LibreOffice/LibreOffice/View.h
index 4abe2baa..7fd47d1 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.h
+++ b/ios/experimental/LibreOffice/LibreOffice/View.h
@@ -17,6 +17,8 @@
 - (void)drawRect:(CGRect)rect;
 - (void)tapGesture:(UITapGestureRecognizer *)gestureRecognizer;
 - (void)panGesture:(UIPanGestureRecognizer *)gestureRecognizer;
+- (void)longPressGesture:(UILongPressGestureRecognizer *)gestureRecognizer;
+
 
 @end
 
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m 
b/ios/experimental/LibreOffice/LibreOffice/View.m
index 4e347a2..a047bb0 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -95,6 +95,23 @@
 }
 }
 
+- (void)longPressGesture:(UILongPressGestureRecognizer *)gestureRecognizer
+{
+CGPoint point = [gestureRecognizer locationInView:self];
+
+UIGestureRecognizerState state = gestureRecognizer.state;
+
+NSLog(@"longPressGesture: state %d cords (%d,%d)",state 
,(int)point.x,(int)point.y);
+
+if (state == UIGestureRecognizerStateBegan) {
+lo_mouse_drag(point.x, point.y, DOWN);
+} else if (state == UIGestureRecognizerStateChanged) {
+lo_mouse_drag(point.x, point.y, MOVE);
+} else if (state == UIGestureRecognizerStateEnded) {
+lo_mouse_drag(point.x, point.y, UP);
+}
+}
+
 @end
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index e7cec9f..3605288 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -426,6 +426,34 @@ void lo_tap(int x, int y)
 }
 
 extern "C"
+void lo_mouse_drag(int x, int y, LOMouseButtonState state)
+{
+SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame();
+
+if (pFocus) {
+MouseEvent aEvent;
+sal_uLong nEvent;
+
+switch(state) {
+case DOWN:
+aEvent = MouseEvent(Point(x, y), 1, MOUSE_SIMPLECLICK, MOUSE_LEFT);
+nEvent = VCLEVENT_WINDOW_MOUSEBUTTONDOWN;
+break;
+case MOVE:
+aEvent = MouseEvent(Point(x, y), 1, MOUSE_SIMPLEMOVE, MOUSE_LEFT);
+nEvent = VCLEVENT_WINDOW_MOUSEMOVE;
+break;
+case UP:
+aEvent = MouseEvent(Point(x, y), 1, MOUSE_SIMPLECLICK, MOUSE_LEFT);
+nEvent = VCLEVENT_WINDOW_MOUSEBUTTONUP;
+break;
+}
+
+Application::PostMouseEvent(nEvent, pFocus->GetWindow(), &aEvent);
+}
+}
+
+extern "C

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

2013-10-11 Thread Stephan Bergmann

 include/sal/log-areas.dox |   35 ++---
 unoxml/source/dom/documentbuilder.cxx |   16 -
 unoxml/source/xpath/xpathapi.cxx  |   56 +-
 3 files changed, 48 insertions(+), 59 deletions(-)

New commits:
commit 54ec8a9a718281968291da2c4ffee11da07f30c2
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:25:21 2013 +0200

-Werror,-Wunused-variable

Change-Id: I008aac6331d7598f496c4808ab34c73f814e

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 56472e0..b4ddc03 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -428,6 +428,7 @@ certain functionality.
 @li @c svg
 @li @c ucbhelper
 @li @c unoidl
+@li @c unoxml
 @li @c uui
 @li @c vbahelper
 @li @c xmlhelp
diff --git a/unoxml/source/dom/documentbuilder.cxx 
b/unoxml/source/dom/documentbuilder.cxx
index 6cd4798..eef5e38 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -278,19 +278,19 @@ namespace DOM
 // default warning handler does not trigger assertion
 static void warning_func(void * ctx, const char * /*msg*/, ...)
 {
-OUStringBuffer buf("libxml2 warning\n");
-buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
-OString msg = OUStringToOString(buf.makeStringAndClear(), 
RTL_TEXTENCODING_ASCII_US);
-OSL_TRACE(msg.getStr());
+SAL_INFO(
+"unoxml",
+"libxml2 warning: "
+<< make_error_message(static_cast(ctx)));
 }
 
 // default error handler triggers assertion
 static void error_func(void * ctx, const char * /*msg*/, ...)
 {
-OUStringBuffer buf("libxml2 error\n");
-buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
-OString msg = OUStringToOString(buf.makeStringAndClear(), 
RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(msg.getStr());
+SAL_WARN(
+"unoxml",
+"libxml2 error: "
+<< make_error_message(static_cast(ctx)));
 }
 
 } // extern "C"
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 69960a0..65c58c0 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -260,20 +260,24 @@ namespace XPath
 static OUString make_error_message(xmlErrorPtr pError)
 {
 OUStringBuffer buf;
-if (pError->message) {
-buf.appendAscii(pError->message);
-}
-int line = pError->line;
-if (line) {
-buf.appendAscii("Line: ");
-buf.append(static_cast(line));
-buf.appendAscii("\n");
-}
-int column = pError->int2;
-if (column) {
-buf.appendAscii("Column: ");
-buf.append(static_cast(column));
-buf.appendAscii("\n");
+if (pError) {
+if (pError->message) {
+buf.appendAscii(pError->message);
+}
+int line = pError->line;
+if (line) {
+buf.appendAscii("Line: ");
+buf.append(static_cast(line));
+buf.appendAscii("\n");
+}
+int column = pError->int2;
+if (column) {
+buf.appendAscii("Column: ");
+buf.append(static_cast(column));
+buf.appendAscii("\n");
+}
+} else {
+buf.appendAscii("no error argument!");
 }
 OUString msg = buf.makeStringAndClear();
 return msg;
@@ -281,9 +285,8 @@ namespace XPath
 
 extern "C" {
 
-static void generic_error_func(void *userData, const char *format, ...)
+static void generic_error_func(void *, const char *format, ...)
 {
-(void) userData;
 char str[1000];
 va_list args;
 
@@ -294,27 +297,12 @@ namespace XPath
 vsnprintf(str, sizeof(str), format, args);
 va_end(args);
 
-OUStringBuffer buf(
-"libxml2 error:\n");
-buf.appendAscii(str);
-OString msg = OUStringToOString(buf.makeStringAndClear(),
-RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(msg.getStr());
+SAL_WARN("unoxml", "libxml2 error: " << str);
 }
 
-static void structured_error_func(void * userData, xmlErrorPtr error)
+static void structured_error_func(void *, xmlErrorPtr error)
 {
-(void) userData;
-OUStringBuffer buf(
-"libxml2 error:\n");
-if (error) {
-buf.append(make_error_message(error));
-} else {
-buf.append("no error argument!");
-}
-OString msg = OUStringToOString(buf.makeStringAndClear(),
-RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(msg.getStr());
+SAL_WARN("unoxml", "libxml2 error: " <

Re: How are installation sets being built?

2013-10-11 Thread Stephan Bergmann


On 10/10/2013 04:12 PM, Michael Stahl wrote:

On 10/10/13 09:14, Stephan Bergmann wrote:

which brings me back to my original question for a universal trigger
whether or not to produce installation sets during a build.

Seeing that --enable-epm currently effectively fulfills that role
everywhere but on Windows, one option would be to make it fulfill that
role on Windows too.  (I have a local patch to do that.)

The alternative would be to introduce an explicit
--enable-installation-sets.  Opinions, anyone?


we already have --with-package-format, much simpler to do nothing if the
user doesn't specify that than adding another option, or using
--enable-epm on a plaform where EPM is irrelevant.


Yes, sounds better to tweak --with-package-format into that role than to 
stretch --enable-epm.


So, if there are no complaints coming, I'll change the meaning of 
--with-package-format so that only if --with-package-format=... is 
explicitly specified are installation sets (of the specified kinds) 
generated.


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

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

2013-10-11 Thread Stephan Bergmann

 filter/source/odfflatxml/OdfFlatXml.cxx |6 +++---
 include/sal/log-areas.dox   |1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 21055f014c2d98f9f57ee81da9c54a4218d45e0d
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:48:41 2013 +0200

-Werror,-Wunused-variable

Change-Id: Ia3e6da86b47099106c4be793a1477979d327a2b9

diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx 
b/filter/source/odfflatxml/OdfFlatXml.cxx
index 1303b64..13de487 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -135,9 +135,9 @@ OdfFlatXml::importer(
 }
 catch (const Exception &exc)
 {
-OString msg = OUStringToOString(exc.Message,
-RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(msg.getStr());
+SAL_WARN(
+"filter.odfflatxml",
+"caught exception \"" << exc.Message << "\"");
 return sal_False;
 }
 return sal_True;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b4ddc03..e85a498 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -133,6 +133,7 @@ certain functionality.
 
 @li @c filter.config
 @li @c filter.ms - escher import/export
+@li @c filter.odfflatxml
 @li @c filter.xslt - xslt import/export
 @li @c oox.cscode - see oox/source/drawingml/customshapes/README
 @li @c oox.drawingml - DrawingML
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 vcl/unx/generic/app/saldisp.cxx |   78 
 1 file changed, 39 insertions(+), 39 deletions(-)

New commits:
commit e4274443340cc73695622dfa94fa09c32217a69e
Author: Stephan Bergmann 
Date:   Fri Oct 11 10:56:39 2013 +0200

-Werror,-Wunused-const-variable

Change-Id: Id8a5df0151fa07ca36fc84206501b94a3405b114

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 713e9c3..a068967 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -82,45 +82,6 @@ using namespace vcl_sal;
 #define SALCOLOR_WHITE  MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
 #define SALCOLOR_BLACK  MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
 
-static const char* const EventNames[] =
-{
-NULL,
-NULL,
-"KeyPress",
-"KeyRelease",
-"ButtonPress",
-"ButtonRelease",
-"MotionNotify",
-"EnterNotify",
-"LeaveNotify",
-"FocusIn",
-"FocusOut",
-"KeymapNotify",
-"Expose",
-"GraphicsExpose",
-"NoExpose",
-"VisibilityNotify",
-"CreateNotify",
-"DestroyNotify",
-"UnmapNotify",
-"MapNotify",
-"MapRequest",
-"ReparentNotify",
-"ConfigureNotify",
-"ConfigureRequest",
-"GravityNotify",
-"ResizeRequest",
-"CirculateNotify",
-"CirculateRequest",
-"PropertyNotify",
-"SelectionClear",
-"SelectionRequest",
-"SelectionNotify",
-"ColormapNotify",
-"ClientMessage",
-"MappingNotify"
-};
-
 inline const char *Null( const char *p ) { return p ? p : ""; }
 inline const char *GetEnv( const char *p ) { return Null( getenv( p ) ); }
 inline const char *KeyStr( KeySym n ) { return Null( XKeysymToString( n ) ); }
@@ -2013,6 +1974,45 @@ long SalX11Display::Dispatch( XEvent *pEvent )
 #ifdef DBG_UTIL
 void SalDisplay::DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) 
const
 {
+static const char* const EventNames[] =
+{
+NULL,
+NULL,
+"KeyPress",
+"KeyRelease",
+"ButtonPress",
+"ButtonRelease",
+"MotionNotify",
+"EnterNotify",
+"LeaveNotify",
+"FocusIn",
+"FocusOut",
+"KeymapNotify",
+"Expose",
+"GraphicsExpose",
+"NoExpose",
+"VisibilityNotify",
+"CreateNotify",
+"DestroyNotify",
+"UnmapNotify",
+"MapNotify",
+"MapRequest",
+"ReparentNotify",
+"ConfigureNotify",
+"ConfigureRequest",
+"GravityNotify",
+"ResizeRequest",
+"CirculateNotify",
+"CirculateRequest",
+"PropertyNotify",
+"SelectionClear",
+"SelectionRequest",
+"SelectionNotify",
+"ColormapNotify",
+"ClientMessage",
+"MappingNotify"
+};
+
 if( pEvent->type <= MappingNotify )
 {
 fprintf( stderr, "[%s] %s s=%d w=%ld\n",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How are installation sets being built?

2013-10-11 Thread Tor Lillqvist

> So, if there are no complaints coming, I'll change the meaning of
> --with-package-format so that only if --with-package-format=... is
> explicitly specified are installation sets (of the specified kinds)
> generated.

Sounds excellent, great!

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

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

2013-10-11 Thread Stephan Bergmann

 desktop/source/app/dispatchwatcher.cxx |   23 ++-
 desktop/source/migration/migration.cxx |4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 5645564d9cf20bb54accceb5b6bcf4990e05f476
Author: Stephan Bergmann 
Date:   Fri Oct 11 11:08:02 2013 +0200

-Werror,-Wunused-variable

Change-Id: I4727687b1f359ecf4eb8855b7894bf2a2047ba9d

diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index 7105aa2..53a9ed2 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -327,10 +327,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatch
 else
 xDispatcher->dispatch( aURL, aArgs2 );
 }
-catch (const ::com::sun::star::uno::Exception&)
+catch (const ::com::sun::star::uno::Exception& e)
 {
-OUString aMsg = "Desktop::OpenDefault() 
IllegalArgumentException while calling XNotifyingDispatch: ";
-OSL_FAIL( OUStringToOString(aMsg, 
RTL_TEXTENCODING_ASCII_US).getStr());
+SAL_WARN(
+"desktop.app",
+"Desktop::OpenDefault() ignoring Exception while"
+" calling XNotifyingDispatch: \"" << e.Message
+<< "\"");
 }
 }
 }
@@ -385,15 +388,17 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatch
 }
 catch (const ::com::sun::star::lang::IllegalArgumentException& iae)
 {
-OUString aMsg = "Dispatchwatcher IllegalArgumentException 
while calling loadComponentFromURL: "
-+ iae.Message;
-OSL_FAIL( OUStringToOString(aMsg, 
RTL_TEXTENCODING_ASCII_US).getStr());
+SAL_WARN(
+"desktop.app",
+"Dispatchwatcher IllegalArgumentException while calling"
+" loadComponentFromURL: \"" << iae.Message << "\"");
 }
 catch (const com::sun::star::io::IOException& ioe)
 {
-OUString aMsg = "Dispatchwatcher IOException while calling 
loadComponentFromURL: "
-+ ioe.Message;
-OSL_FAIL( OUStringToOString(aMsg, 
RTL_TEXTENCODING_ASCII_US).getStr());
+SAL_WARN(
+"desktop.app",
+"Dispatchwatcher IOException while calling"
+" loadComponentFromURL: \"" << ioe.Message << "\"");
 }
 if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
  aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/desktop/source/migration/migration.cxx 
b/desktop/source/migration/migration.cxx
index 932c9fb..f8f3153 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -883,8 +883,8 @@ uno::Reference< XNameAccess > 
MigrationImpl::getConfigAccess(const sal_Char* pPa
 }
 catch (const com::sun::star::uno::Exception& e)
 {
-OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(aMsg.getStr());
+SAL_WARN(
+"desktop.migration", "ignoring Exception \"" << e.Message << "\"");
 }
 return xNameAccess;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Michael Stahl

On 11/10/13 09:00, Tor Lillqvist wrote:
>> Because we (intend to) have platforms where we need a
>> "stripped down" LibreOffice
> 
> I used to think so too (and still do). But now I think that should be
> handled during packaging, not during building. That puts the burden on
> the packagers of such stripped-down versions, where it should be,
> instead of making it possible to *build* (and fail building) LO in
> hundreds of different ways, which puts the birder on the source code
> maintainers.

no, the problem is that there are independent conditionals determining
whether something should be built, and whether the same thing should be
packaged.  there should be only one conditional to guard both building
and packaging.


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/10/2013 09:16 PM, David Tardon wrote:

On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote:

* Bundled extensions (Stephan)


So, some extra thoughts / suggestions for that:

There are two categories of extensions:

1. "Internal" extensions. These are built from sources and include
presentation-minimizer, nlpsolver, wiki-publisher and
mysql-connector-ooo. I think it should be easy to add a
GeneratedPackage into the Extension gbuild class that copies the
extension root dir from workdir to the right place in instdir. (The
.oxt file will still be produced and copied to solver, but I do not
think this is worth any more effort. Much better way to spend one's
time would be to convert these extensions to optional components.)


Indeed, de-extension-alising presentation-minimizer is covered by 
 "Change 
Presentation Minimizer from bundled extensions to plain code," which is 
work in progress.


And seeing that nlpsolver and wiki-publisher are effectively enabled in 
all distro-configs/*.conf anyway, it would make sense to 
de-extension-alise them, too (and have them enabled by default).  I 
wonder how these two fell through the cracks when generating the 
original list of bundled extensions to de-extension-alise (on which 
presentation-minimizer was the last one remaining now)---probably 
because they were disabled by default in configure.ac.


But what was the story with mysql-connector-ooo, these days apparently 
enabled via a switch called --enable-ext-mariadb-connector?  That switch 
is off by default, and it is not mentioned in any distro-configs/*.conf, 
so appears to be effectively dead code.  Or was that the extension that 
cannot be included in installation sets for whatever reason (and is only 
included in our source tree to make it easy to build it)?  I guess 
Lionel knows.


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

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

2013-10-11 Thread Stephan Bergmann

 basctl/source/basicide/baside2b.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 383ad54a25b97d4ae9c6fb76b92cb6fbaf8f1f0f
Author: Stephan Bergmann 
Date:   Fri Oct 11 11:21:33 2013 +0200

-Werror,-Wunused-variable

Change-Id: Iac999c157d0d3fdb737bd2d92240e252cfb05333

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 8699ea3..4738327 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2419,8 +2419,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
 while ( pEntry )
 {
 WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
-OUString aVName( pItem->maName );
-DBG_ASSERT( !aVName.isEmpty(), "Var? - Must not be empty!" );
+DBG_ASSERT( !pItem->maName.isEmpty(), "Var? - Must not be empty!" );
 OUString aWatchStr;
 OUString aTypeStr;
 if ( pCurMethod )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 cui/source/options/optgdlg.cxx |6 ++
 cui/source/options/treeopt.cxx |3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 3700700982f49d5e1dc599791517abc31c38dbf8
Author: Stephan Bergmann 
Date:   Fri Oct 11 11:39:54 2013 +0200

-Werror,-Wunused-variable

Change-Id: Ie599ca533db3a626ab63a9d47e10d76a4a94

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 55d76b5..6c7f60e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1079,8 +1079,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet& rSe
 {
 // we'll just leave the box in it's default setting and won't
 // even give it event handler...
-OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(aMsg.getStr());
+SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
 }
 
 m_pWesternLanguageLB->SetLanguageList( LANG_LIST_WESTERN | 
LANG_LIST_ONLY_KNOWN, sal_True,  sal_False, sal_True );
@@ -1239,8 +1238,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& 
rSet )
 {
 // we'll just leave the box in it's default setting and won't
 // even give it event handler...
-OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(aMsg.getStr());
+SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
 }
 
 OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0ece675..062d9c9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1607,8 +1607,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< 
XFrame >& _xFrame )
 
 
 OUString aFactory = getCurrentFactory_Impl( _xFrame );
-OUString sTemp = GetModuleIdentifier( _xFrame );
-DBG_ASSERT( sTemp == aFactory, "S H I T!!!" );
+DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" );
 
 // Writer and Writer/Web options
 SvtModuleOptions aModuleOpt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 editeng/source/items/frmitems.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 0a0248f89048fb3d85696eddbbcb2c176bc468c5
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 10:52:34 2013 +0100

Resolves: fdo#69467 nTxtLeft not compared in operator==

so the maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE )
in sd is considered the same value as the default
all 0 EE_PARA_OUTLLRSPACE.

But why the change of the Which id triggers this apparently
always there underlying problem needs further investigation

Change-Id: I41ef93cf8992f2b5cc72ddb474c54525415657b4

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index 0d194b1..18c6cae 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -561,14 +561,17 @@ int SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr 
) const
 {
 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
 
+const SvxLRSpaceItem& rOther = (const SvxLRSpaceItem&)rAttr;
+
 return (
-nLeftMargin == ((SvxLRSpaceItem&)rAttr).GetLeft()  &&
-nRightMargin == ((SvxLRSpaceItem&)rAttr).GetRight() &&
-nFirstLineOfst == ((SvxLRSpaceItem&)rAttr).GetTxtFirstLineOfst() &&
-nPropLeftMargin == ((SvxLRSpaceItem&)rAttr).GetPropLeft()  &&
-nPropRightMargin == ((SvxLRSpaceItem&)rAttr).GetPropRight() &&
-nPropFirstLineOfst == 
((SvxLRSpaceItem&)rAttr).GetPropTxtFirstLineOfst() &&
-bAutoFirst == ((SvxLRSpaceItem&)rAttr).IsAutoFirst() );
+nFirstLineOfst == rOther.GetTxtFirstLineOfst() &&
+nTxtLeft == rOther.GetTxtLeft() &&
+nLeftMargin == rOther.GetLeft()  &&
+nRightMargin == rOther.GetRight() &&
+nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() &&
+nPropLeftMargin == rOther.GetPropLeft()  &&
+nPropRightMargin == rOther.GetPropRight() &&
+bAutoFirst == rOther.IsAutoFirst() );
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Alex Thurgood


Le 11/10/2013 11:21, Stephan Bergmann a écrit :


But what was the story with mysql-connector-ooo, these days apparently
enabled via a switch called --enable-ext-mariadb-connector?  That switch
is off by default, and it is not mentioned in any distro-configs/*.conf,
so appears to be effectively dead code.  Or was that the extension that
cannot be included in installation sets for whatever reason (and is only
included in our source tree to make it easy to build it)?  I guess
Lionel knows.



To the extent that I can get a successful build, I have been building on 
Mac OSX (and to a certain extent on Linux 32/64 for testing purposes), 
near enough on a daily basis, with a kitchen sink approach to the 
extensions because no-one else does them - certainly not TDF.


I rely on that mysql/mariadb connector extension being buildable via 
that switch as the connector extension is by far the most capable 
solution for me (and I am not alone judging by the requests on the 
user's list) for accessing a mysql/mariadb database, rather than say, 
using JDBC or ODBC. If the plan is now to retire that switch, needless 
to say, I will not be very happy, unless there is some other failsafe, 
guaranteed, multi-OS/arch  way of doing it.


The same goes with the other extensions. Perhaps it is not in TDF's 
interest to have all that spurious extension code lying around, but in 
that case IMHO a clear decision should be taken to either exclude it 
from the repo, have it hosted separately with instructions on how to 
build/install. Honestly, if we are no longer going to care for the "ext" 
extensions that are currently in the repo, why have them at all ?


I'm merely attempting to understand the reasoning into the 
decision-making process that determines whether or not an extension 
makes it into the main code, and at the moment I'm at a loss to 
understand how that reasoning works, as it all seems rather opaque to 
me. As regards licensing of the mysql/mariadb connector code, my 
understanding was that we now build with LGPL code completely, or did 
this not happen in the end ?



Sorry, if I appear a bit lost here, but I am.

Alex



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

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

2013-10-11 Thread Stephan Bergmann

 xmloff/source/forms/layerexport.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 94c4a221556d27fd203a50396de5a3f02f00699e
Author: Stephan Bergmann 
Date:   Fri Oct 11 12:00:17 2013 +0200

loplugin if-body warnings

Change-Id: Iea42dc54c6d3b81142939b920d932d4cf83dc6e1

diff --git a/xmloff/source/forms/layerexport.cxx 
b/xmloff/source/forms/layerexport.cxx
index 88fc19d..f8838c3 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -270,7 +270,9 @@ namespace xmloff
 // get the forms collection of the page
 Reference< XIndexAccess > xCollectionIndex;
 if (!impl_isFormPageContainingForms(_rxDrawPage, xCollectionIndex))
+{
 return;
+}
 
 #if OSL_DEBUG_LEVEL > 0
 sal_Bool bPageIsKnown =
@@ -406,7 +408,9 @@ namespace xmloff
 // get the forms collection of the page
 Reference< XIndexAccess > xCollectionIndex;
 if (!impl_isFormPageContainingForms(_rxDrawPage, xCollectionIndex))
+{
 return;
+}
 
 // move the iterator which specify the currently handled page
 #if OSL_DEBUG_LEVEL > 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Development wiki spring (autumn) cleanup

2013-10-11 Thread bjoern

Hi,

On Wed, Oct 09, 2013 at 12:00:22PM +0200, bjoern wrote:
> 2/ Link as much as possible between pages to make them more discoverable
> 3/ Tag categories and the development menu on those ~everywhere
> 4/ If you wrote a awesome wikipage not on this list (less than 1000 views),
>think about the "why": its likely going back to points 2 and 3

To help out here a bit, these are the least viewed wikipages, that:

- start with Development/
- are not some translated page (in which case the reason for fewer views is 
obvious)

these pages might just be new, but if they are not, they likely have few clicks
as they are hard to find -- therefore it might be helpful to add links to them
liberally.


least viewed development pages:
Development/GSoC/2013 (599 views)
Development/Gbuild (599 views)
Development/Clang plugins tutorial part1 (569 views)
Development/2010/MasterWeek39 (557 views)
Development/Patching External Libraries (495 views)
Development/Impress/Remote 2 (473 views)
Development/PyUno (470 views)
Development/Chart Regression Tests (461 views)
Development/Calc/Ixion (411 views)
Development/Clang plugins tutorial part0 (367 views)
Development/tb (361 views)
Development/2011/MasterWeek24 (353 views)
Development/Easy Hacks/lists/Selected Hacks (342 views)
Development/Clang plugins tutorial part2 (322 views)
Development/Clang plugins tutorial part3 (294 views)
Development/Impress/RemoteHowTo/fi (290 views)
Development/Easy Hacks/Creating a new Easy Hack (281 views)
Development/Portal (268 views)
Development/Calc Unit Test Concept (266 views)
Development/gerrit/SplitPatch (253 views)
Development/gerrit/logerritworkflow (240 views)
Development/id (230 views)
Development/Setting-up a Build Environment (210 views)
Development/Tinderbox/Setup (207 views)
Development/Gbuild/CheatSheet (193 views)
Development/Impress Remote Protocol (193 views)
Development/GSoC/2012 (153 views)
Development/Wikihelp/id (137 views)
Development/Gbuild migration tutorial (108 views)
Development/GSoC/2011 (107 views)
Development/Writer (92 views)
Development/SlideHack (79 views)
(generated from https://wiki.documentfoundation.org/Special:PopularPages)

orphaned development pages (never linked to from anywhere in the wiki:
Development/2010/MasterWeek39
Development/2011/MasterWeek24
Development/BuildingOnWindowsWithCygwinAndMSVCExpress/ar
Development/Calc/FeatureRequests
Development/Calc/Ixion
Development/Gbuild/CheatSheet
Development/Impress/Remote 2
Development/Portal
Development/PyUno
Development/Relicensing/pt-br
Development/Resources
Development/SlickEdit
Development/SlideHack
Development/Writer
Development/gerrit/compare
Development/gerrit/logerritworkflow
(generated from 
https://wiki.documentfoundation.org/index.php?title=Special:LonelyPages)

Best,

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

2013-10-11 Thread Oliver-Rainer Wittmann

 sw/source/ui/config/optpage.cxx |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 7b0d095c47c6fc1b8675ad11c008dcca47bb567d
Author: Oliver-Rainer Wittmann 
Date:   Fri Oct 11 09:30:43 2013 +

123462 - Writer's Formatting Aids option page - guard access to 
 instance as this is not available in Page Preview

Found by: Matthieu Riolo 
Review by: Matthieu Riolo 

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 53cb9ba..4fe17cf 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1608,9 +1608,13 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( 
SfxItemSet& rSet )
 bRet = sal_True;
 }
 
-m_pWrtShell->GetDoc()->set( 
IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT,
+if ( m_pWrtShell )
+{
+m_pWrtShell->GetDoc()->set(
+IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT,
 m_aMathBaselineAlignmentCB.IsChecked() );
-bRet |= m_aMathBaselineAlignmentCB.IsChecked() != 
m_aMathBaselineAlignmentCB.GetSavedValue();
+bRet |= m_aMathBaselineAlignmentCB.IsChecked() != 
m_aMathBaselineAlignmentCB.GetSavedValue();
+}
 
 if( aCrsrInProtCB.IsChecked() != aCrsrInProtCB.GetSavedValue())
 {
@@ -1618,8 +1622,8 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( 
SfxItemSet& rSet )
 bRet |= sal_True;
 }
 
-const SwDocDisplayItem* pOldAttr = (const SwDocDisplayItem*)
-GetOldItem(GetItemSet(), FN_PARAM_DOCDISP);
+const SwDocDisplayItem* pOldAttr =
+(const SwDocDisplayItem*)GetOldItem(GetItemSet(), FN_PARAM_DOCDISP);
 
 SwDocDisplayItem aDisp;
 if(pOldAttr)
@@ -1648,7 +1652,9 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& 
rSet )
 
 SwShadowCursorItem aOpt;
 if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, 
&pItem ))
+{
 aOpt = *(SwShadowCursorItem*)pItem;
+}
 aOnOffCB.Check( aOpt.IsOn() );
 
 sal_uInt8 eMode = aOpt.GetMode();
@@ -1657,17 +1663,25 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& 
rSet )
 aFillTabRB.Check( FILL_TAB == eMode );
 aFillSpaceRB.Check( FILL_SPACE == eMode );
 
-m_aMathBaselineAlignmentCB.Check( m_pWrtShell->GetDoc()->get( 
IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) );
-m_aMathBaselineAlignmentCB.SaveValue();
+if ( m_pWrtShell )
+{
+m_aMathBaselineAlignmentCB.Check( m_pWrtShell->GetDoc()->get( 
IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) );
+m_aMathBaselineAlignmentCB.SaveValue();
+}
+else
+{
+m_aMathBaselineAlignmentCB.Disable();
+}
 
 if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, 
sal_False, &pItem ))
+{
 aCrsrInProtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+}
 aCrsrInProtCB.SaveValue();
 
 const SwDocDisplayItem* pDocDisplayAttr = 0;
 
-rSet.GetItemState( FN_PARAM_DOCDISP, sal_False,
-(const SfxPoolItem**)&pDocDisplayAttr );
+rSet.GetItemState( FN_PARAM_DOCDISP, sal_False, (const 
SfxPoolItem**)&pDocDisplayAttr );
 if(pDocDisplayAttr)
 {
 aParaCB .Check  (pDocDisplayAttr->bParagraphEnd );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Lionel Elie Mamane

On Fri, Oct 11, 2013 at 11:21:13AM +0200, Stephan Bergmann wrote:
> On 10/10/2013 09:16 PM, David Tardon wrote:
>> On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote:
>>> * Bundled extensions (Stephan)

>> So, some extra thoughts / suggestions for that:

>> There are two categories of extensions:

>> 1. "Internal" extensions. These are built from sources and include
>> presentation-minimizer, nlpsolver, wiki-publisher and
>> mysql-connector-ooo. I think it should be easy to add a
>> GeneratedPackage into the Extension gbuild class that copies the
>> extension root dir from workdir to the right place in instdir. (The
>> .oxt file will still be produced and copied to solver, but I do not
>> think this is worth any more effort. Much better way to spend one's
>> time would be to convert these extensions to optional components.)

> But what was the story with mysql-connector-ooo, these days
> apparently enabled via a switch called
> --enable-ext-mariadb-connector?  That switch is off by default, and
> it is not mentioned in any distro-configs/*.conf, so appears to be
> effectively dead code.  Or was that the extension that cannot be
> included in installation sets for whatever reason (and is only
> included in our source tree to make it easy to build it)?  I guess
> Lionel knows.

Links against GPLed code, so TDF's policy of no strongly copylefted
code means that TDF builds don't bundle it.

Ubuntu, Debian and (I guess) most GNU/Linux distributions have no
problem with (strongly) copylefted code and they ship it.

I'd like it to be kept as an extension (not optional part of
LibreOffice), so that third parties can build it and redistribute it
at their will (more easily than distributing whole builds of
LibreOffice). The easier that extension is to build, the better.

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

[Libreoffice-commits] core.git: 8 commits - configure.ac odk/examples sfx2/source solenv/gbuild

2013-10-11 Thread Tor Lillqvist

 configure.ac  |  145 +-
 odk/examples/java/DocumentHandling/test/test1.odt |binary
 sfx2/source/control/dispatch.cxx  |   70 +-
 solenv/gbuild/platform/com_GCC_defs.mk|6 
 4 files changed, 128 insertions(+), 93 deletions(-)

New commits:
commit 1a56bda2aa8d1aea587aec8021e4380abf0effb3
Author: Tor Lillqvist 
Date:   Fri Oct 11 13:11:50 2013 +0300

Small fix for cross-compilation

Change-Id: I5851af308193527a30eef1ded256f6b9ae69b260

diff --git a/configure.ac b/configure.ac
index f45152e..0ec35cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4489,19 +4489,23 @@ if test "$cross_compiling" = "yes"; then
 echo
 rm -rf CONF-FOR-BUILD config_build.mk
 mkdir CONF-FOR-BUILD
+# Here must be listed all files needed when running the configure script. 
In particular, also
+# those expanded by the AC_CONFIG_FILES() call near the end of this 
configure.ac. For clarity,
+# keep them in the same order as there.
 (cd $SRC_ROOT && tar cf - \
 config.guess \
+bin/get_config_variables \
+solenv/bin/getcompver.awk \
+solenv/inc/langlist.mk \
 config_host.mk.in \
 Makefile.in \
 lo.xcent.in \
+instsetoo_native/util/openoffice.lst.in \
 config_host/*.in \
-bin/get_config_variables \
-solenv/bin/getcompver.awk \
-solenv/inc/langlist.mk \
-instsetoo_native/util/openoffice.lst.in) \
+sysui/desktop/macosx/Info.plist.in) \
 | (cd CONF-FOR-BUILD && tar xf -)
 cp configure CONF-FOR-BUILD
-test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host
+test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 
2>/dev/null
 (
 unset COM GUIBASE OS CPU CPUNAME
 unset CC CXX SYSBASE CFLAGS
commit 7d879c775c3212193c4703ae57940630dad8800e
Author: Tor Lillqvist 
Date:   Fri Oct 11 11:59:05 2013 +0300

SCNR: #include cleanup

Obviously just a question of personal taste, and we have no consensus
here, and some say that  should be included before any
other LO headers, for instance. Oh well, if this commit breaks on some
platform, please revert;)

Change-Id: Ie02ec4e68b19961165608220f07808641d2e4fda

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 27f6288..7ebb940 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -19,50 +19,50 @@
 
 #include 
 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include   // due to bsearch
-#include 
 
-#include 
-
-// due to nAutoPageID
-#include "appdata.hxx"
-#include "sfx2/sfxhelp.hxx"
+#include 
+#include 
+#include 
+#include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
+#include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include "slotserv.hxx"
-#include 
-#include "sfxtypes.hxx"
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "workwin.hxx"
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 DBG_NAME(SfxDispatcherFlush)
 DBG_NAME(SfxDispatcherFillState)
commit c7f7c954e0817de664344a620938a4e99ac7549c
Author: Tor Lillqvist 
Date:   Fri Oct 11 11:49:50 2013 +0300

Don't display menu unless HAVE_FEATURE_DESKTOP_GUI_ELEMENTS

Idea from 
http://lists.freedesktop.org/archives/libreoffice/2013-July/054088.html .

Sure, there must be tons of more code that should be ifdeffed for
HAVE_FEATURE_DESKTOP_GUI_ELEMENTS.

Change-Id: I1ef9ec749b795919c6e52e4f9e0a03bd0e874bc3

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9d52515..27f6288 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -1238,6 +1240,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, 
pReq )
 //
 void SfxDispatcher::SetMenu_Impl()
 {
+#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
 if ( pImp->pFrame )
 {
 SfxViewFrame* pTop = pImp->pFrame->GetTopViewFrame();
@@ -1262,6 +1265,7 @@ void SfxDispatcher::SetMenu_Impl()
 }
 }
 }
+#endif
 }
 
 //
commit 3a912a626f9f96b62a6c425292a25ec02280d926
Author: Tor Lillqvist 
Date:   Thu Oct 10 23:41:51 2013 +0300

Add a picture and a graphic

Change-Id: Ic58a0c6302b4bdac892ba1d9d019ae

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

2013-10-11 Thread Stephan Bergmann

 svx/source/form/fmpgeimp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 521cf8fe4d953b8af72c666403f965d624dbfa99
Author: Stephan Bergmann 
Date:   Fri Oct 11 12:19:50 2013 +0200

loplugin if-body warning

Change-Id: If19c06fafc6bdf121e72e49329c89839693297bf

diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 2dc6275..86842ed 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -266,7 +266,9 @@ namespace
 Reference< XControlModel > xControlModel( 
_object.GetUnoControlModel(), UNO_QUERY );
 OSL_ENSURE( xControlModel.is(), "lcl_removeFormObject: suspicious: no 
control model!" );
 if ( !xControlModel.is() )
+{
 return;
+}
 
 #if OSL_DEBUG_LEVEL > 0
 Any aOldAssignment =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Tor Lillqvist

 include/sal/config.h |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit c61891c096725cde7241ece415bf299ddb9e725f
Author: Tor Lillqvist 
Date:   Fri Oct 11 12:32:11 2013 +0300

[API CHANGE]: Drop SAL_PRGEXTENSION from 

It is unused in LO source code.

It was not really clearly defined what it meant and what it could be used
for. Its value was ".exe" for Windows and ".bin" for other platforms. But we
do have a "soffice.bin" on Windows, too, corresponding exactly to the
"soffice.bin" on Linux. On the other hand, on OS X we don't have any
"soffice.bin", just a "soffice".

Change-Id: Iceee19cc8768c5aaaeeb9bba34b9cde50073498b

diff --git a/include/sal/config.h b/include/sal/config.h
index ee230fe..bd2b833 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -29,7 +29,6 @@
 #ifdef WIN32
 #define SAL_W32
 #define SAL_DLLEXTENSION ".dll"
-#define SAL_PRGEXTENSION ".exe"
 #define SAL_PATHSEPARATOR ';'
 #define SAL_PATHDELIMITER '\\'
 #define SAL_CONFIGFILE( name ) name ".ini"
@@ -57,7 +56,6 @@
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".so"
 #define SAL_DLLPREFIX "lib"
-#define SAL_PRGEXTENSION ".bin"
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
@@ -67,7 +65,6 @@
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".dylib"
 #define SAL_DLLPREFIX "lib"
-#define SAL_PRGEXTENSION ".bin"
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
@@ -80,10 +77,6 @@
  */
 #define SAL_DLLEXTENSION ".dylib"
 #define SAL_DLLPREFIX "lib"
-/* This is fairly pointless too, an iOS app consists of a single
- * executable (plus data files).
- */
-#define SAL_PRGEXTENSION ".bin"
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70371] Identify unused headers

2013-10-11 Thread bugzilla-daemon

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

Björn Michaelsen  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillScript
 CC||libreoffice@lists.freedeskt
   ||op.org
 Ever confirmed|0   |1

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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread David Tardon

Hi,

On Fri, Oct 11, 2013 at 11:56:49AM +0200, Alex Thurgood wrote:
> Le 11/10/2013 11:21, Stephan Bergmann a écrit :
> 
> >But what was the story with mysql-connector-ooo, these days apparently
> >enabled via a switch called --enable-ext-mariadb-connector?  That switch
> >is off by default, and it is not mentioned in any distro-configs/*.conf,
> >so appears to be effectively dead code.  Or was that the extension that
> >cannot be included in installation sets for whatever reason (and is only
> >included in our source tree to make it easy to build it)?  I guess
> >Lionel knows.
> >
> 
> To the extent that I can get a successful build, I have been
> building on Mac OSX (and to a certain extent on Linux 32/64 for
> testing purposes), near enough on a daily basis, with a kitchen sink
> approach to the extensions because no-one else does them - certainly
> not TDF.

You are wrong. TDF official builds include presentation-minimizer,
nlpsolver and wiki-publisher. They do not include mysql-connector-ooo,
but apparently nobody remembers if that was a conscious decision or if
it "just happened". That is why Stephan asked. The other extensions we
have switches for we _do not_ build (and never have): we just allow to
download the .oxt files and put them into the installation. (And since
virtually nobody cares about them, nobody checks if there is a newer
version either...)

> The same goes with the other extensions. Perhaps it is not in TDF's
> interest to have all that spurious extension code lying around, but
> in that case IMHO a clear decision should be taken to either exclude
> it from the repo, have it hosted separately with instructions on how
> to build/install.

Where has anyone said that? I clearly separated the exensions into two
categories in my mail:
1. These whose code is inside libreoffice. The idea is to convert them
   to normal components, because it buys us nothing to have them as
   extensions. (Or drop the code if noone appears to use them. Which
   seems not to be the case, so that possibility is out.)
2. These we take from outside. There is _no_ code for these inside
   libreoffice that we could drop (or host separately with instructions
   etc. etc.) We just download them from third party sites like anyone
   else. And the only reason they are handled inside libreoffice at all
   is/was OxygenOffice.

> Honestly, if we are no longer going to care for
> the "ext" extensions that are currently in the repo, why have them
> at all ?

As I have already said, most of the extensions is not in the repo at
all. That is why we are discussing whether there is any advantage to
allow to include them in the install sets.

> 
> I'm merely attempting to understand the reasoning into the
> decision-making process that determines whether or not an extension
> makes it into the main code, and at the moment I'm at a loss to
> understand how that reasoning works, as it all seems rather opaque
> to me.

There is only one rule: "our" extensions (that have source code inside
libreoffice, i.e., the four I have already mentioned) should be
de-extensionized, because to have them as extensions does not have any
advantage to anyone. That is why I called them "internal extensions" in
my previous mail. Does that word combination not feel like an oxymoron
to you?

That we allow to bundle third-party extensions in the installation is an
historical accident and we have not decided anything about it (yet).

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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread bjoern

Hi,

On Fri, Oct 11, 2013 at 11:21:13AM +0200, Stephan Bergmann wrote:
> And seeing that nlpsolver and wiki-publisher are effectively enabled
> in all distro-configs/*.conf anyway, it would make sense to
> de-extension-alise them, too (and have them enabled by default).  I

De-extensionization likely also means it cant be packaged as a separate package
anymore. In the long run it likely makes sense to merge often used features in
LibreOffice if the implementation isnt huge. Wiki-publisher is somewhat
cringe-inducing with 3.5MB size increase in the default install for a likely
rarely used feature.

OTOH, the hope is that de-extensionization might actually allow closer
integration to reduce this footprint(*).

Best,

Bjoern

(*) Yes, I took my hopium pills today ...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7b/0d095c47c6fc1b8675ad11c008dcca47bb567d

2013-10-11 Thread Caolán McNamara

 7b/0d095c47c6fc1b8675ad11c008dcca47bb567d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91765f9bc976e6f6cf6b1099b37eb6ff57a3f572
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 11:59:21 2013 +0100

Notes added by 'git notes add'

diff --git a/7b/0d095c47c6fc1b8675ad11c008dcca47bb567d 
b/7b/0d095c47c6fc1b8675ad11c008dcca47bb567d
new file mode 100644
index 000..33cde55
--- /dev/null
+++ b/7b/0d095c47c6fc1b8675ad11c008dcca47bb567d
@@ -0,0 +1 @@
+prefer: acdff77b03cb9cbc78ca2379421b36fc94389e02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Eike Rathke

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

New commits:
commit a0f368b657fbba47bd8015cc1c173f38b3f2e8a0
Author: Eike Rathke 
Date:   Fri Oct 11 13:12:57 2013 +0200

yes, placement of parentheses is important :-/

Change-Id: I606efefada9529571e5a400da65592905200b987

diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index bc3f4a2..221da15 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1161,7 +1161,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 
nColIndex )
 if( (nColIndex < rStrVec.size()) && (rStrVec[ nColIndex ].getLength() 
> nStrPos) )
 {
 const OUString& rStr = rStrVec[ nColIndex ];
-OUString aText = rStr.copy( nStrPos, ::std::min( nStrLen, 
rStr.getLength()) - nStrPos );
+OUString aText = rStr.copy( nStrPos, ::std::min( nStrLen, 
rStr.getLength() - nStrPos) );
 ImplDrawCellText( Point( nStrX, GetY( GetFirstVisLine() + nLine ) 
), aText );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/11/2013 12:11 PM, Lionel Elie Mamane wrote:

On Fri, Oct 11, 2013 at 11:21:13AM +0200, Stephan Bergmann wrote:

But what was the story with mysql-connector-ooo, these days
apparently enabled via a switch called
--enable-ext-mariadb-connector?  That switch is off by default, and
it is not mentioned in any distro-configs/*.conf, so appears to be
effectively dead code.  Or was that the extension that cannot be
included in installation sets for whatever reason (and is only
included in our source tree to make it easy to build it)?  I guess
Lionel knows.


Links against GPLed code, so TDF's policy of no strongly copylefted
code means that TDF builds don't bundle it.


Ah, so that's apparently indeed what's up at 
.



Ubuntu, Debian and (I guess) most GNU/Linux distributions have no
problem with (strongly) copylefted code and they ship it.


As a bundled extension (ending up unzip'ed into the LO installation's 
share/extension) directory, I assume?


(I'm asking because there are cooking up changes to the UNO component 
"prefix" feature that would make it desirable that no non-bundled 
extension ever used that "prefix" feature.  Unfortunately, the 
mysql-connector-ooo.oxt that can be built from the LO source tree 
started to use that "prefix" feature with 
 
"prefix all component_getFactory methods" towards LO 4.1.  However, the 
only non-bundled instance of that extension out there that I am aware 
of, 
, 
is luckily old enough to not yet use that feature.)


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/11/2013 12:43 PM, bjoern wrote:

On Fri, Oct 11, 2013 at 11:21:13AM +0200, Stephan Bergmann wrote:

And seeing that nlpsolver and wiki-publisher are effectively enabled
in all distro-configs/*.conf anyway, it would make sense to
de-extension-alise them, too (and have them enabled by default).  I


De-extensionization likely also means it cant be packaged as a separate package
anymore. In the long run it likely makes sense to merge often used features in
LibreOffice if the implementation isnt huge. Wiki-publisher is somewhat
cringe-inducing with 3.5MB size increase in the default install for a likely
rarely used feature.

OTOH, the hope is that de-extensionization might actually allow closer
integration to reduce this footprint(*).


The easiest approach to de-extension-alization (cool word, eh?) is of 
course to tightly integrate the code into an existing module.  However, 
if there are good reasons to keep the thing separate (e.g., because it 
would drag in inappropriate dependencies), then there is no reason not 
to do so (as has e.g. be done when de-extension-alizing PDF import).


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Alex Thurgood


Le 11/10/2013 13:15, Stephan Bergmann a écrit :



,
is luckily old enough to not yet use that feature.)



Hopefully, this one is too ?

http://sourceforge.net/projects/lomysqlconnectorextension/files/4.2/mysql-connector-ooo.oxt/download



Alex

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

[Bug 70371] Identify unused headers

2013-10-11 Thread bugzilla-daemon

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

Björn Michaelsen  changed:

   What|Removed |Added

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

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

[Bug 70373] Identify unused source files

2013-10-11 Thread bugzilla-daemon

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

Björn Michaelsen  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillScript
   Priority|medium  |low
 CC||libreoffice@lists.freedeskt
   ||op.org
   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=70371
 Ever confirmed|0   |1

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-10-11 Thread bugzilla-daemon

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

Bug 65675 depends on bug 69467, which changed state.

Bug 69467 Summary: outline view is toast in 4.2
https://bugs.freedesktop.org/show_bug.cgi?id=69467

   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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/11/2013 01:38 PM, Alex Thurgood wrote:

Le 11/10/2013 13:15, Stephan Bergmann a écrit :



,

is luckily old enough to not yet use that feature.)



Hopefully, this one is too ?

http://sourceforge.net/projects/lomysqlconnectorextension/files/4.2/mysql-connector-ooo.oxt/download


No, unfortunately it's not.  :(  But given that 
 
claims it has only ever been downloaded two times (and only from Linux, 
while the extension is only packaged for Mac OS X there IIUC), maybe not 
all is lost?


Or is that build also available from 
?  I didn't find it 
there.


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Lionel Elie Mamane

On Fri, Oct 11, 2013 at 01:15:41PM +0200, Stephan Bergmann wrote:
> On 10/11/2013 12:11 PM, Lionel Elie Mamane wrote:
>> On Fri, Oct 11, 2013 at 11:21:13AM +0200, Stephan Bergmann wrote:

>>> But what was the story with mysql-connector-ooo, (...)

>> Links against GPLed code, so TDF's policy of no strongly copylefted
>> code means that TDF builds don't bundle it.

> Ah, so that's apparently indeed what's up at
> .

Yes. A third party built it and uploaded it there.

>> Ubuntu, Debian and (I guess) most GNU/Linux distributions have no
>> problem with (strongly) copylefted code and they ship it.

> As a bundled extension (ending up unzip'ed into the LO
> installation's share/extension) directory, I assume?

Yes, I think so, but for the sake of the other platforms, it is
desirable that it stays possible to do it as a non-bundled extension
(just take the .oxt from the build and distribute that).

> (I'm asking because there are cooking up changes to the UNO
> component "prefix" feature that would make it desirable that no
> non-bundled extension ever used that "prefix" feature.
> Unfortunately, the mysql-connector-ooo.oxt that can be built from
> the LO source tree started to use that "prefix" feature with 
> 
> "prefix all component_getFactory methods" towards LO 4.1.

What would be the consequences of reverting the use of that "prefix"
feature in mysql-connector in our master branch? Would that be "the
best" then?

> However, the only non-bundled instance of that extension out there
> that I am aware of,
> ,
> is luckily old enough to not yet use that feature.)

Sooner or later, someone will likely rebuild it from the 4.1 branch
and reupload it there.

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

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

2013-10-11 Thread Stephan Bergmann

 vcl/source/control/field2.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 11974b31bc5f2718d9f4da47bf376ee37e57deeb
Author: Stephan Bergmann 
Date:   Thu Oct 10 11:50:38 2013 +0200

Prevent out-of-bounds arguments to OUString::copy

...which would somewhat unhelpfully result in returning "!!br0ken!!"

(partial backport of 34e951bd7284d2e771c279e3adc3899d191fdad0 "More
OUString::copy out-of-bounds fixes")

Change-Id: Ibf66d218fe5f0d7b6216795a3b991705d4afda73
Reviewed-on: https://gerrit.libreoffice.org/6185
Reviewed-by: Markus Mohrhard 
Reviewed-by: Michael Stahl 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 5ae0453..080d1fc 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -19,6 +19,8 @@
 
 #include "sal/config.h"
 
+#include 
+
 #include 
 #include 
 #include 
@@ -1013,7 +1015,7 @@ static sal_uInt16 ImplCutNumberFromString( OUString& rStr 
)
 ++i2;
 }
 sal_Int32 nValue = rStr.copy(i1, i2-i1).toInt32();
-rStr = rStr.copy(i2+1);
+rStr = rStr.copy(std::min(i2+1, rStr.getLength()));
 return nValue;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/slideshowprimitives' - drawinglayer/source include/drawinglayer include/sal

2013-10-11 Thread Thorsten Behrens

 drawinglayer/source/processor2d/canvasprocessor2d.cxx  |  101 +
 include/drawinglayer/processor2d/canvasprocessor2d.hxx |2 
 include/sal/log-areas.dox  |5 
 3 files changed, 61 insertions(+), 47 deletions(-)

New commits:
commit 20f1564dc71ccf3780b879c218a97eb1e2300038
Author: Thorsten Behrens 
Date:   Fri Oct 11 14:48:48 2013 +0200

Fix some transformation bugs in canvasprocessor, add logging.

Change-Id: I74cbace8840205fa6b007fde0555416964c40ecb

diff --git a/drawinglayer/source/processor2d/canvasprocessor2d.cxx 
b/drawinglayer/source/processor2d/canvasprocessor2d.cxx
index a9559be..fd3b298 100644
--- a/drawinglayer/source/processor2d/canvasprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor2d.cxx
@@ -76,7 +76,7 @@ namespace drawinglayer
 
//
 // single primitive renderers
 
-void 
CanvasProcessor2D::impRenderTextSimpleOrDecoratedPortionPrimitive2D(const 
primitive2d::TextSimplePortionPrimitive2D& rTextCandidate)
+void CanvasProcessor2D::impRenderTextSimplePortionPrimitive2D(const 
primitive2d::TextSimplePortionPrimitive2D& rTextCandidate)
 {
 if(rTextCandidate.getTextLength())
 {
@@ -95,7 +95,7 @@ namespace drawinglayer
 : rendering::PanoseProportion::ANYTHING;
 aFontRequest.FontDescription.FontDescription.Letterform = 
rFontAttr.getItalic() ? 9 : 0;
 
-// init CellSize to 1.0, else a default font height will be 
used
+// init CellSize to 1.0, actual height comes TextTransform
 aFontRequest.CellSize = 1.0;
 aFontRequest.Locale = rTextCandidate.getLocale();
 
@@ -103,8 +103,11 @@ namespace drawinglayer
 css::geometry::Matrix2D aFontMatrix;
 canvas::tools::setIdentityMatrix2D(aFontMatrix);
 
-uno::Reference 
xFont(mxCanvas->createFont(
- aFontRequest, 
uno::Sequence< beans::PropertyValue >(), aFontMatrix));
+uno::Reference xFont(
+mxCanvas->createFont(
+aFontRequest,
+uno::Sequence< beans::PropertyValue >(),
+aFontMatrix));
 
 if(xFont.is())
 {
@@ -124,7 +127,8 @@ namespace drawinglayer
 const ::std::vector< double >& rDXArray = 
rTextCandidate.getDXArray();
 const sal_uInt32 nDXCount(rDXArray.size());
 
-if(nDXCount)
+// TODO(F3): this needs proper scaling
+if(false) //nDXCount)
 {
 // DXArray does not need to be adapted to 
getTextPosition/getTextLength,
 // it is already provided correctly
@@ -133,13 +137,17 @@ namespace drawinglayer
 }
 
 // set text color
-const basegfx::BColor 
aRGBColor(maBColorModifierStack.getModifiedColor(rTextCandidate.getFontColor()));
+const basegfx::BColor aRGBColor(
+maBColorModifierStack.getModifiedColor(
+rTextCandidate.getFontColor()));
 maVolatileRenderState.DeviceColor =
 
aRGBColor.colorToDoubleSequence(mxCanvas->getDevice());
 
 // set text transformation
-
canvas::tools::setRenderStateTransform(maVolatileRenderState,
-   
getViewInformation2D().getObjectTransformation() * 
rTextCandidate.getTextTransform());
+canvas::tools::setRenderStateTransform(
+maVolatileRenderState,
+getViewInformation2D().getObjectTransformation()
+* rTextCandidate.getTextTransform());
 
 // paint
 mxCanvas->drawTextLayout(xLayout, maViewState, 
maVolatileRenderState);
@@ -495,15 +503,25 @@ namespace drawinglayer
 //
 // See also http://www.w3.org/TR/SVG/masking.html#Masking
 
-// how big is the resulting image?
-const basegfx::B2DRange 
aRange(primitive2d::getB2DRangeFromPrimitive2DSequence(
-   
rTransCandidate.getChildren(),
-   getViewInformation2D()));
+// how big is the resulting image, in device pixel?
+basegfx::B2DRange 
aRange(primitive2d::getB2DRangeFromPrimitive2DSequence(
+ rTransCandidate.getChildren(),
+

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

2013-10-11 Thread Armin Le Grand

 sd/source/ui/table/tablefunction.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 888007f5850b997b2bbf4d1b7615a536140e72e8
Author: Armin Le Grand 
Date:   Wed Oct 9 15:31:38 2013 +

Resolves: #i123359# need to call SdrEndTextEdit before...

manipulating objects at model/view

(cherry picked from commit b5e8564995cd92e19cadcf8a6e9151be3efeeff4)

Change-Id: Ie282370c7fc2dea4f9d59d85aac742b41d7c4541
(cherry picked from commit 668730fbdd1ccf9a23d0a55361d019ca9e58ff39)

diff --git a/sd/source/ui/table/tablefunction.cxx 
b/sd/source/ui/table/tablefunction.cxx
index 77de56c..1ab6f9b 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -161,6 +161,15 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
 apply_table_style( pObj, GetDoc(), sTableStyle );
 SdrPageView* pPV = mpView->GetSdrPageView();
 
+// #i123359# if an object is to be replaced/manipulated it may be that 
it is in text edit mode,
+// so to be on the safe side call SdrEndTextEdit here
+SdrTextObj* pCheckForTextEdit = dynamic_cast< SdrTextObj* >(pPickObj);
+
+if(pCheckForTextEdit && pCheckForTextEdit->IsInEditMode())
+{
+mpView->SdrEndTextEdit();
+}
+
 // if we have a pick obj we need to make this new ole a pres obj 
replacing the current pick obj
 if( pPickObj )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/saxparser' - sax/source

2013-10-11 Thread Michael Meeks

 sax/source/fastparser/fastparser.cxx |   28 +++-
 sax/source/fastparser/fastparser.hxx |3 +++
 2 files changed, 26 insertions(+), 5 deletions(-)

New commits:
commit e5f9e9fbc50cfd8b85f8216c38b1589321019f0a
Author: Michael Meeks 
Date:   Fri Oct 11 13:51:47 2013 +0100

fastparser: don't allocate uno::Sequences when we don't need to.

Change-Id: Ic2fff8cabbc077b6fc9dabffd2c6fcf555152b11

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index c3d5aeb..724856b 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -345,6 +345,7 @@ void Entity::endElement()
 FastSaxParser::FastSaxParser()
 {
 mxDocumentLocator.set( new FastLocatorImpl( this ) );
+maUtf8Buffer.realloc( mnUtf8BufferSize );
 }
 
 // 
@@ -377,19 +378,36 @@ void FastSaxParser::DefineNamespace( const OString& 
rPrefix, const sal_Char* pNa
 
 sal_Int32 FastSaxParser::GetToken( const OString& rToken )
 {
-Sequence< sal_Int8 > aSeq( (sal_Int8*)rToken.getStr(), rToken.getLength() 
);
-
-return getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+return GetToken( rToken.getStr(), rToken.getLength() );
 }
 
 sal_Int32 FastSaxParser::GetToken( const sal_Char* pToken, sal_Int32 nLen /* = 
0 */ )
 {
+sal_Int32 nRet;
+
 if( !nLen )
 nLen = strlen( pToken );
 
-Sequence< sal_Int8 > aSeq( (sal_Int8*)pToken, nLen );
+if ( nLen < mnUtf8BufferSize )
+{
+// Get intimiate with the underlying sequence cf. sal/types.h
+sal_Sequence *pSeq = maUtf8Buffer.get();
+
+sal_Int32 nPreRefCount = pSeq->nRefCount;
+
+pSeq->nElements = nLen;
+memcpy( pSeq->elements, pToken, nLen );
+nRet = getEntity().mxTokenHandler->getTokenFromUTF8( maUtf8Buffer );
 
-return getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+(void)nPreRefCount; // for non-debug mode.
+assert( pSeq->nRefCount == nPreRefCount ); // callee must not take ref.
+}
+else
+{
+Sequence< sal_Int8 > aSeq( (sal_Int8*)pToken, nLen ); // heap allocate 
& free
+nRet = getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+}
+return nRet;
 }
 
 // 
diff --git a/sax/source/fastparser/fastparser.hxx 
b/sax/source/fastparser/fastparser.hxx
index 13be254..5b387c4 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -202,6 +202,9 @@ private:
 
 ParserData maData;  /// Cached parser configuration 
for next call of parseStream().
 ::std::stack< Entity > maEntities;  /// Entity stack for each call of 
parseStream().
+
+static const int mnUtf8BufferSize = 128;
+::css::uno::Sequence< sal_Int8 > maUtf8Buffer; /// avoid constantly 
re-allocating this
 };
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 cppuhelper/source/servicemanager.cxx |2 +-
 mysqlc/source/mysqlc.component   |2 +-
 mysqlc/source/mysqlc_services.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3bafe5f5f529f6539363c5a291dd13ef1e2cbbde
Author: Stephan Bergmann 
Date:   Fri Oct 11 14:57:32 2013 +0200

Extension shared library components must not use the "prefix" feature

...at least no non-bundled ones, see 
9dfcee9266c9769153444cdcd4ab0e6e636c3eb6
"Not being able to honor a 'prefix' is a rather hard error" and the 
description
there how that can lead to a crash when using mysql-connector-ooo.oxt:  
"'rm -rf
instdir/*/share/extensions/mysql-connector-ooo', 'instdir/*/program/soffice
workdir/*/Extension/mysql-connector.oxt', install the [extension] per-user, 
then
'File - New - Database - Connect to an existing database: MySQL - Next >> -
Connect directly - Next >> - Database name: foo - Server / Port - Server: 
bar -
Next >> - Test Connection', crash."

This is a partial revert of cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 
"prefix all
component_getFactory methods."

Change-Id: Ia7a6272eb0597e3b3bbf4ab333174b3232448539

diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component
index ae16484..e429511 100644
--- a/mysqlc/source/mysqlc.component
+++ b/mysqlc/source/mysqlc.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-http://openoffice.org/2010/uno-components"; prefix="mysqlc"
+http://openoffice.org/2010/uno-components";
 loader="com.sun.star.loader.SharedLibrary">
 
 
diff --git a/mysqlc/source/mysqlc_services.cxx 
b/mysqlc/source/mysqlc_services.cxx
index cc7e8e0..af1cabe 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
 
 
 /* {{{ component_getFactory -I- */
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysqlc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
 const sal_Char * pImplementationName,
 void * pServiceManager,
 void * /* pRegistryKey */)
commit 284347b764ed9867c0ba15f5ac9b153030a104f0
Author: Stephan Bergmann 
Date:   Fri Oct 11 14:35:31 2013 +0200

Not being able to honor a "prefix" is a rather hard error

It happens when an extension has just been live-deployed into the running
soffice process and then trying to instantiate out-of-process in an 
additional
uno process one of that extension's shared library components and that 
component
---erroneously---uses the "prefix" feature.  (Which can be reproduced with 
the
mysql-connector-ooo.oxt extension, --enable-ext-mariadb-connector: "rm -rf
instdir/*/share/extensions/mysql-connector-ooo", "instdir/*/program/soffice
workdir/*/Extension/mysql-connector.oxt", install the per-user, then "File 
- New
- Database - Connect to an existing database: MySQL - Next >> - Connect 
directly
- Next >> - Database name: foo - Server / Port - Server: bar - Next >> - 
Test
Connection", crash.)

Change-Id: Ibab2ad31199eec5dc26ffa337a5e3e7490f782d7

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index ab48268c..055bdd3 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -656,7 +656,7 @@ void cppuhelper::ServiceManager::loadImplementation(
 uri, rtl::OUString(), info->name, this,
 css::uno::Reference< css::registry::XRegistryKey >(), prefix);
 } else {
-SAL_INFO_IF(
+SAL_WARN_IF(
 !info->prefix.isEmpty(), "cppuhelper",
 "Loader " << info->loader << " and non-empty prefix "
 << info->prefix);
___
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' - sw/source

2013-10-11 Thread Arnaud Versini

 sw/source/core/doc/docedt.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit ca83560f3079289df88dd7df7c00917efbd72dc0
Author: Arnaud Versini 
Date:   Mon Oct 7 21:09:26 2013 +0200

fdo#70143: fix SwDoc::ReplaceRangeImpl()

Fix fdo#70143 by reporting swaping of positions

(regression from 6b08fe833186a04f9aef698a540d3a7493ac4519,
which changed SwUndoReplace::Impl::SetEnd to use the wrongly set end
position in rPam)

Change-Id: I14c6f58bc5c1418c69eb565d42f1829856eed58c
(cherry picked from commit 9685d20f2a0526a4c454cea1bd947eccbaeefa84)

Fixes regex replace of "$" with nothing (to delete line
breaks).

Change-Id: If7ec1e5f524f7bb308a2949ace16cb8aa6989106
(cherry picked from commit f011a5c5071ed4a60f0ee7117608b72cecbb958d)
Reviewed-on: https://gerrit.libreoffice.org/6175
Reviewed-by: Arnaud Versini 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f169ae5..b0794e6 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2442,17 +2442,23 @@ SetRedlineMode( eOld );
 }
 }
 
-*rPam.GetMark() = *aDelPam.GetMark();
-
+*rPam.GetPoint() = *aDelPam.GetMark();
 ++aPtNd;
 rPam.GetMark()->nNode = aPtNd;
 rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
 nPtCnt );
 
-if (bJoinTxt && !bJoinPrev)
+if (bJoinTxt)
 {
+assert(rPam.GetPoint() == rPam.End());
+// move so that SetEnd remembers position after sw_JoinText
 rPam.Move(fnMoveBackward);
 }
+else if (aDelPam.GetPoint() == pStt) // backward selection?
+{
+assert(*rPam.GetMark() <= *rPam.GetPoint());
+rPam.Exchange(); // swap so that rPam is backwards
+}
 
 if( pUndoRpl )
 {
___
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' - sw/source

2013-10-11 Thread Arnaud Versini

 sw/source/core/doc/docedt.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit f431f2fbaad8098870b1f9bdb71b6db514d2cbda
Author: Arnaud Versini 
Date:   Mon Oct 7 21:09:26 2013 +0200

fdo#70143: fix SwDoc::ReplaceRangeImpl()

Fix fdo#70143 by reporting swaping of positions

(regression from 6b08fe833186a04f9aef698a540d3a7493ac4519,
which changed SwUndoReplace::Impl::SetEnd to use the wrongly set end
position in rPam)

Change-Id: I14c6f58bc5c1418c69eb565d42f1829856eed58c
(cherry picked from commit 9685d20f2a0526a4c454cea1bd947eccbaeefa84)

Fixes regex replace of "$" with nothing (to delete line
breaks).

Change-Id: If7ec1e5f524f7bb308a2949ace16cb8aa6989106
(cherry picked from commit f011a5c5071ed4a60f0ee7117608b72cecbb958d)
Reviewed-on: https://gerrit.libreoffice.org/6176
Reviewed-by: Arnaud Versini 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 6d34685..52b0b40 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2469,17 +2469,23 @@ SetRedlineMode( eOld );
 }
 }
 
-*rPam.GetMark() = *aDelPam.GetMark();
-
+*rPam.GetPoint() = *aDelPam.GetMark();
 ++aPtNd;
 rPam.GetMark()->nNode = aPtNd;
 rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
 nPtCnt );
 
-if (bJoinTxt && !bJoinPrev)
+if (bJoinTxt)
 {
+assert(rPam.GetPoint() == rPam.End());
+// move so that SetEnd remembers position after sw_JoinText
 rPam.Move(fnMoveBackward);
 }
+else if (aDelPam.GetPoint() == pStt) // backward selection?
+{
+assert(*rPam.GetMark() <= *rPam.GetPoint());
+rPam.Exchange(); // swap so that rPam is backwards
+}
 
 if( pUndoRpl )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/saxparser' - sax/source

2013-10-11 Thread Michael Meeks

 sax/source/fastparser/fastparser.cxx |   45 +--
 sax/source/fastparser/fastparser.hxx |6 +++-
 2 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit 18f7972ed0ddde0c24b3b756d8e5eb2dc6f6683e
Author: Michael Meeks 
Date:   Fri Oct 11 14:09:52 2013 +0100

fastparser: re-work locking, add high & low watermarks, change sizes etc.

Change-Id: I7fe1435addc6dce5a74a8411f7825cea331a5b3f

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 724856b..041b667 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -613,15 +613,23 @@ void FastSaxParser::parseStream( const InputSource& 
maStructSource) throw (SAXEx
 EventList *pEventList = 0;
 bool done = false;
 do {
-rEntity.maEventsPushed.wait();
-rEntity.maEventsPushed.reset();
-MutexGuard aGuard(rEntity.maEventProtector);
+rEntity.maConsumeResume.wait();
+rEntity.maConsumeResume.reset();
+
+osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
 while (!rEntity.maPendingEvents.empty())
 {
+if (rEntity.maPendingEvents.empty() <= mnEventLowWater)
+maProduceResume.set(); // start producer again
+
 pEventList = rEntity.maPendingEvents.front();
 rEntity.maPendingEvents.pop();
+aGuard.clear(); // unlock
+
 if (!consume(pEventList))
 done = true;
+
+aGuard.reset(); // lock
 }
 } while (!done);
 xParser->join();
@@ -794,20 +802,30 @@ OUString lclGetErrorMessage( XML_Error xmlE, const 
OUString& sSystemId, sal_Int3
 
 void FastSaxParser::deleteUsedEvents()
 {
+osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
+
 Entity& rEntity = getEntity();
 while (!rEntity.maUsedEvents.empty())
 {
 EventList *pEventList = rEntity.maUsedEvents.front();
 rEntity.maUsedEvents.pop();
+aGuard.clear(); // unlock
+
 for (size_t i = 0; i < pEventList->size(); ++i)
 delete (*pEventList)[i];
 delete pEventList;
+
+aGuard.reset(); // lock
 }
 }
 
 // freeing in producer thread will leak one EventList
-#define FREE_IN_MAIN_THREAD 1
-#define SIZE 1000
+
+// FIXME: make this a static const size_t in the class ...
+#define SIZE 1
+// FIXME: kill this - it should be in the parse thread I'm convinced :-)
+#define FREE_IN_MAIN_THREAD 0
+
 void FastSaxParser::produce(Event *pEvent)
 {
 Entity& rEntity = getEntity();
@@ -821,13 +839,26 @@ void FastSaxParser::produce(Event *pEvent)
 pEvent->maType == CallbackType::EXCEPTION ||
 rEntity.mpProducedEvents->size() == SIZE)
 {
-MutexGuard aGuard(rEntity.maEventProtector);
+osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
+
+while (rEntity.maPendingEvents.size() >= mnEventHighWater)
+{ // pause parsing for a bit
+aGuard.clear(); // unlock
+rEntity.maProduceResume.wait();
+rEntity.maProduceResume.reset();
+aGuard.reset(); // lock
+}
+
 rEntity.maPendingEvents.push(rEntity.mpProducedEvents);
 rEntity.mpProducedEvents = 0;
+
+aGuard.clear(); // unlock
+
+rEntity.maConsumeResume.set();
+
 #ifndef FREE_IN_MAIN_THREAD
 deleteUsedEvents();
 #endif
-rEntity.maEventsPushed.set();
 }
 }
 
diff --git a/sax/source/fastparser/fastparser.hxx 
b/sax/source/fastparser/fastparser.hxx
index 5b387c4..ceba717 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -105,7 +105,11 @@ struct Entity : public ParserData
 std::queue< EventList * > maPendingEvents;
 std::queue< EventList * > maUsedEvents;
 osl::Mutex maEventProtector;
-osl::Condition maEventsPushed;
+
+static const size_t mnEventLowWater = 4;
+static const size_t mnEventHighWater = 8;
+osl::Condition maConsumeResume;
+osl::Condition maProduceResume;
 
 // copied in copy constructor:
 
___
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' - sfx2/source

2013-10-11 Thread Eike Rathke

 sfx2/source/appl/fileobj.cxx |   31 +--
 1 file changed, 25 insertions(+), 6 deletions(-)

New commits:
commit c42edd592e158d85a2231703552fdac6f13d7425
Author: Eike Rathke 
Date:   Fri Oct 11 01:08:01 2013 +0200

resolved fdo#69948 honor a detected FilterName

TypeDetection::queryTypeByDescriptor() adds the FilterName property to
the MediaDescriptor, use that if present.

Strangely enough the sequence returned by XNameAccess::getByName(sType)
of the type detection contains an empty PreferredFilter value so that is
useless in this scenario.

(cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd)

Backported.

Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a
Reviewed-on: https://gerrit.libreoffice.org/6207
Tested-by: Kohei Yoshida 
Reviewed-by: Kohei Yoshida 

diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 1083a85..553b2cd 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -392,13 +392,32 @@ String impl_getFilter( const String& _rURL )
 OUString sType = xTypeDetection->queryTypeByDescriptor( 
aDescrList, sal_True );
 if ( !sType.isEmpty() )
 {
-css::uno::Reference< css::container::XNameAccess > xTypeCont( 
xTypeDetection,
-  
css::uno::UNO_QUERY );
-if ( xTypeCont.is() )
+// Honor a selected/detected filter.
+for (sal_Int32 i=0; i < aDescrList.getLength(); ++i)
 {
-::comphelper::SequenceAsHashMap lTypeProps( 
xTypeCont->getByName( sType ) );
-sFilter = lTypeProps.getUnpackedValueOrDefault(
-OUString("PreferredFilter"), OUString() );
+if (aDescrList[i].Name == "FilterName")
+{
+OUString aFilterName;
+if (aDescrList[i].Value >>= aFilterName)
+{
+sFilter = aFilterName;
+break;
+}
+}
+}
+if (!sFilter.Len())
+{
+css::uno::Reference< css::container::XNameAccess > 
xTypeCont( xTypeDetection,
+css::uno::UNO_QUERY );
+if ( xTypeCont.is() )
+{
+/* XXX: for fdo#69948 scenario the sequence returned by
+ * getByName() contains an empty PreferredFilter
+ * property value (since? expected?) */
+::comphelper::SequenceAsHashMap lTypeProps( 
xTypeCont->getByName( sType ) );
+sFilter = lTypeProps.getUnpackedValueOrDefault(
+OUString("PreferredFilter"), OUString() );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sax/source toolkit/Library_tk.mk

2013-10-11 Thread Michael Meeks

 sax/source/fastparser/fastparser.cxx |   28 +++-
 sax/source/fastparser/fastparser.hxx |3 +++
 toolkit/Library_tk.mk|8 
 3 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit f1702566befe8771210194d767dbea0022d0eae3
Author: Michael Meeks 
Date:   Fri Oct 11 13:50:20 2013 +0100

fastparser: don't allocate uno::Sequences when we don't need to.

Change-Id: Ic2fff8cabbc077b6fc9dabffd2c6fcf555152b11

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 3477996..6b793db 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -201,6 +201,7 @@ Entity::~Entity()
 FastSaxParser::FastSaxParser()
 {
 mxDocumentLocator.set( new FastLocatorImpl( this ) );
+maUtf8Buffer.realloc( mnUtf8BufferSize );
 }
 
 // 
@@ -259,19 +260,36 @@ void FastSaxParser::DefineNamespace( const OString& 
rPrefix, const sal_Char* pNa
 
 sal_Int32 FastSaxParser::GetToken( const OString& rToken )
 {
-Sequence< sal_Int8 > aSeq( (sal_Int8*)rToken.getStr(), rToken.getLength() 
);
-
-return getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+return GetToken( rToken.getStr(), rToken.getLength() );
 }
 
 sal_Int32 FastSaxParser::GetToken( const sal_Char* pToken, sal_Int32 nLen /* = 
0 */ )
 {
+sal_Int32 nRet;
+
 if( !nLen )
 nLen = strlen( pToken );
 
-Sequence< sal_Int8 > aSeq( (sal_Int8*)pToken, nLen );
+if ( nLen < mnUtf8BufferSize )
+{
+// Get intimiate with the underlying sequence cf. sal/types.h
+sal_Sequence *pSeq = maUtf8Buffer.get();
+
+sal_Int32 nPreRefCount = pSeq->nRefCount;
+
+pSeq->nElements = nLen;
+memcpy( pSeq->elements, pToken, nLen );
+nRet = getEntity().mxTokenHandler->getTokenFromUTF8( maUtf8Buffer );
 
-return getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+(void)nPreRefCount; // for non-debug mode.
+assert( pSeq->nRefCount == nPreRefCount ); // callee must not take ref.
+}
+else
+{
+Sequence< sal_Int8 > aSeq( (sal_Int8*)pToken, nLen ); // heap allocate 
& free
+nRet = getEntity().mxTokenHandler->getTokenFromUTF8( aSeq );
+}
+return nRet;
 }
 
 // 
diff --git a/sax/source/fastparser/fastparser.hxx 
b/sax/source/fastparser/fastparser.hxx
index dab438f..e75ee0f 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -154,6 +154,9 @@ private:
 
 ParserData maData;  /// Cached parser configuration 
for next call of parseStream().
 ::std::stack< Entity > maEntities;  /// Entity stack for each call of 
parseStream().
+
+static const int mnUtf8BufferSize = 128;
+::css::uno::Sequence< sal_Int8 > maUtf8Buffer; /// avoid constantly 
re-allocating this
 };
 
 }
commit 0489d6b7d36dff230aa9f440ae54eb60c3643662
Author: Michael Meeks 
Date:   Tue Oct 8 14:47:29 2013 +0100

remove redundant X11 linkage in toolkit.

Change-Id: I73badeb7763da155296ff5bb673b36411e10791b

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 57a0bd3..14d84ee 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -124,14 +124,6 @@ $(eval $(call gb_Library_add_cxxflags,tk,\
 $(gb_OBJCXXFLAGS)))
 endif
 
-ifeq (,$(ENABLE_HEADLESS))
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_add_libs,tk,\
--lX11 \
-))
-endif
-endif
-
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_use_libraries,tk,\
 libotouch \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/slideshowprimitives' - 2 commits - offapi/com slideshow/Library_slideshow.mk slideshow/source

2013-10-11 Thread Thorsten Behrens

 offapi/com/sun/star/graphic/XPrimitive2D.idl|   21 -
 offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl |   72 ++
 slideshow/Library_slideshow.mk  |1 
 slideshow/source/engine/shapes/drawshape.cxx|   15 +++
 slideshow/source/engine/shapes/drawshape.hxx|5 +
 slideshow/source/engine/shapes/viewshape.cxx|   77 
 slideshow/source/engine/shapes/viewshape.hxx|   33 
 slideshow/source/engine/slide/slideimpl.cxx |9 ++
 slideshow/source/engine/slideshowcontext.cxx|8 +-
 slideshow/source/engine/slideshowimpl.cxx   |3 
 slideshow/source/inc/slideshowcontext.hxx   |   14 ++-
 11 files changed, 217 insertions(+), 41 deletions(-)

New commits:
commit e0c1dc6fe6078eade26779a10f7410726d8d86c2
Author: Thorsten Behrens 
Date:   Fri Oct 11 15:22:28 2013 +0200

Move slideshow over to use drawinglayer primitives.

Change-Id: I5d76809413ba2d9417fc842f3a316646b7e04162

diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 49c0c17..a11ca8e 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\
 cppcanvas \
 cppu \
 cppuhelper \
+drawinglayer \
 sal \
 svt \
 tl \
diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index 7543569..5d250be 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -177,6 +177,9 @@ namespace slideshow
  
// it does _not_ for MSVC without
  
// the extra mem_fn. WTF.
  _1,
+ ::boost::cref( mxShape ),
+ ::boost::cref( mxPage ),
+ ::boost::cref( mxPrimitives ),
  ::boost::cref( mpCurrMtf ),
  ::boost::cref(
  getViewRenderArgs() ),
@@ -390,6 +393,9 @@ namespace slideshow
 mnAttributeVisibilityState(0),
 maViewShapes(),
 mxComponentContext( rContext.mxComponentContext ),
+mxPrimitives(
+rContext.mxPrimitiveFactory->createPrimitivesFromXShape(xShape,
+
uno::Sequence()) ),
 maHyperlinkIndices(),
 maHyperlinkRegions(),
 maSubsetting(),
@@ -451,6 +457,9 @@ namespace slideshow
 mnAttributeVisibilityState(0),
 maViewShapes(),
 mxComponentContext( rContext.mxComponentContext ),
+mxPrimitives(
+rContext.mxPrimitiveFactory->createPrimitivesFromXShape(xShape,
+
uno::Sequence()) ),
 maHyperlinkIndices(),
 maHyperlinkRegions(),
 maSubsetting(),
@@ -503,6 +512,7 @@ namespace slideshow
 mnAttributeVisibilityState(0),
 maViewShapes(),
 mxComponentContext( rSrc.mxComponentContext ),
+mxPrimitives( rSrc.mxPrimitives ),
 maHyperlinkIndices(),
 maHyperlinkRegions(),
 maSubsetting( rTreeNode, mpCurrMtf ),
@@ -661,7 +671,10 @@ namespace slideshow
 // render the Shape on the newly added ViewLayer
 if( bRedrawLayer )
 {
-pNewShape->update( mpCurrMtf,
+pNewShape->update( mxShape,
+   mxPage,
+   mxPrimitives,
+   mpCurrMtf,
getViewRenderArgs(),
ViewShape::FORCE,
isVisible() );
diff --git a/slideshow/source/engine/shapes/drawshape.hxx 
b/slideshow/source/engine/shapes/drawshape.hxx
index 034f124..bfb5ee0 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 #include "attributableshape.hxx"
 #include "doctreenodesupplier.hxx"
@@ -335,6 +336,10 @@ namespace slideshow
 ::com::sun::star::uno::Reference<
 ::com::sun::star::uno::XComponentContext>  
 mxComponentContext;
 
+::com::sun::star::uno::Sequence<
+::com::sun::star::uno::Reference<
+::com::sun::star::graphic::XPrimitive2D > >
 mxPrimitives;
+
 /// hyperlink support
 typedef ::std::pair HyperlinkIndexPair;
diff --gi

ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)

2013-10-11 Thread Stephan Bergmann

If you use the LO git repo to build the mysql-connector-ooo.oxt 
extension (via --enable-ext-mariadb-connector, formerly 
--enable-ext-mysql-connector) and then use/distribute that extension as 
a non-bundled extension (i.e., not unzip it into a LO installation's 
share/extensions/ directory):  Please be aware that doing so off the LO 
git libreoffice-4-1[-*] and master (towards LO 4.2) branches leads to a 
broken extension that should not be distributed.


What is broken is detailed at 
 
"Extension shared library components must not use the 'prefix' feature," 
along with a fix of the problem, for which I also requested backports to 
libreoffice-4-1 () and 
libreoffice-4-1-3 ().


A further reason I'm so panicky about not distributing any broken 
versions is that there are cooking up changes to the UNO component 
"prefix" feature that would make it desirable that no non-bundled 
extension ever used that "prefix" feature.


In the wild, I find:

* 
 
"MySQL Native Connector for LibreOffice 4.x" from an UNKNOWN UPLOADER, 
which only offers 
 
which is apparently too old to be affected.


* 
 
"MySQL Native Connector" from an UKNOWN UPLOADER which only offers 
 
and 
 
which both are apparently too old to be affected.


*  by Alex 
Thurgood, which /is/ affected.  Alex, can you make available a fixed 
build there, either off master past 
 
or off libreoffice-4-1 past pending integration of 
?


Andreas, can you contact the uploaders of the two extensions marked 
"UNKNOWN UPLOADER" above, to make sure they do not inadvertently upload 
broken versions?


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

Fantastic new film investment opportunities

2013-10-11 Thread Film Investments

Film investments

 

 

[](http://notcancy.org/5036/2013/2527/11/?action=1&tag=longbridge10b&email=lib
reoff...@lists.freedesktop.org&url=http://niche.me.uk)

 

Offering the potential for stellar returns as well as the excitement of being
involved in the dynamic and glamorous movie industry, films can provide a
unique and potentially lucrative investment opportunity.

 

 

 

 

 

Earn Royalties for 25 years

Unique investment with low entry level

Opportunity to appear in a major film production as an extra or spend the day
on set watching the filming

A listed cast of Hollywood stars

Request our free no obligation film investment brochure

 

[](http://notcancy.org/5120/2013/3593/11/?action=1&tag=longbridge10b&email=lib
reoff...@lists.freedesktop.org&url=http://niche.me.uk)

 

_** if you feel you have received this email in error, please simply hit REPLY
& SEND. Thanks!_

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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/11/2013 02:19 PM, Stephan Bergmann wrote:

On 10/11/2013 01:38 PM, Alex Thurgood wrote:

Hopefully, this one is too ?

http://sourceforge.net/projects/lomysqlconnectorextension/files/4.2/mysql-connector-ooo.oxt/download



No, unfortunately it's not.  :(  But given that

claims it has only ever been downloaded two times (and only from Linux,
while the extension is only packaged for Mac OS X there IIUC), maybe not
all is lost?


(Please also see the "ATTENTION, creators of mysql-connector-ooo.oxt 
(--enable-ext-mariadb-connector)" mail I just sent to this mailing list.)


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Stephan Bergmann


On 10/11/2013 02:41 PM, Lionel Elie Mamane wrote:

On Fri, Oct 11, 2013 at 01:15:41PM +0200, Stephan Bergmann wrote:

As a bundled extension (ending up unzip'ed into the LO
installation's share/extension) directory, I assume?


Yes, I think so, but for the sake of the other platforms, it is
desirable that it stays possible to do it as a non-bundled extension
(just take the .oxt from the build and distribute that).


Yes, that option would remain.


(I'm asking because there are cooking up changes to the UNO
component "prefix" feature that would make it desirable that no
non-bundled extension ever used that "prefix" feature.
Unfortunately, the mysql-connector-ooo.oxt that can be built from
the LO source tree started to use that "prefix" feature with 

"prefix all component_getFactory methods" towards LO 4.1.


What would be the consequences of reverting the use of that "prefix"
feature in mysql-connector in our master branch? Would that be "the
best" then?


I just did that, see 
 
"Extension shared library components must not use the 'prefix' feature."



However, the only non-bundled instance of that extension out there
that I am aware of,
,
is luckily old enough to not yet use that feature.)


Sooner or later, someone will likely rebuild it from the 4.1 branch
and reupload it there.


See the "ATTENTION, creators of mysql-connector-ooo.oxt 
(--enable-ext-mariadb-connector)" mail I just sent to this mailing list.


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

Re: [libreoffice-projects] minutes of ESC call ...

2013-10-11 Thread Alex Thurgood


Le 11/10/2013 14:19, Stephan Bergmann a écrit :


> No, unfortunately it's not.  :(  But given that


claims it has only ever been downloaded two times (and only from Linux,
while the extension is only packaged for Mac OS X there IIUC), maybe not
all is lost?



No worries, I am rebuilding LO again from a fresh pull after having seen 
your other message, thanks :-)





Or is that build also available from
?  I didn't find it
there.


No, that one's not mine (maybe Dan Lewis ??). I wanted something simple 
to set up and manage the uploads, and unfortunately, the Extensions 
Manager site isn't it, whereas Sourceforge fits the bill nicely (at 
least for me).



Alex

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

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

2013-10-11 Thread Stephan Bergmann

 stoc/source/loader/dllcomponentloader.cxx |   22 ++
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 22edbdf53cc22c6cd5bb1cff99508fe4f588f462
Author: Stephan Bergmann 
Date:   Fri Oct 11 15:46:14 2013 +0200

No need to support "prefix" in DllComponentLoader

...which is only used for extension components, and only while they are 
live-
deployed into an soffice process and thus offloaded to an additional uno
process (which never happens for bundled extensions), cf.
cppuhelper::ServiceManager::loadImplementation
(cppuhelper/source/servicemanager.cxx), and (at least non-bundled) 
extensions
should never use the "prefix" feature anyway, cf.
3bafe5f5f529f6539363c5a291dd13ef1e2cbbde "Extension shared library 
components
must not use the 'prefix' feature."

Change-Id: I19c4b71029eccf0c4f3d4481ea5f3542205f685e

diff --git a/stoc/source/loader/dllcomponentloader.cxx 
b/stoc/source/loader/dllcomponentloader.cxx
index 854487d..9720ac0 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -161,31 +161,13 @@ void DllComponentLoader::initialize( const 
::com::sun::star::uno::Sequence< ::co
 //*
 Reference SAL_CALL DllComponentLoader::activate(
 const OUString & rImplName, const OUString &, const OUString & rLibName,
-const Reference< XRegistryKey > & xKey )
+const Reference< XRegistryKey > & )
 
 throw(CannotActivateFactoryException, RuntimeException)
 {
-OUString aPrefix;
-if( xKey.is() )
-{
-Reference xActivatorKey = xKey->openKey(
-OUString("/UNO/ACTIVATOR") );
-if (xActivatorKey.is() && xActivatorKey->getValueType() == 
RegistryValueType_ASCII )
-{
-Reference xPrefixKey = xKey->openKey(
-OUString("/UNO/PREFIX") );
-if( xPrefixKey.is() && xPrefixKey->getValueType() == 
RegistryValueType_ASCII )
-{
-aPrefix = xPrefixKey->getAsciiValue();
-if( !aPrefix.isEmpty() )
-aPrefix = aPrefix + "_";
-}
-}
-}
-
 return loadSharedLibComponentFactory(
 cppu::bootstrap_expandUri(rLibName), OUString(), rImplName, m_xSMgr,
-css::uno::Reference(), aPrefix );
+css::uno::Reference(), OUString() );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)

2013-10-11 Thread Alex Thurgood


Le 11/10/2013 15:33, Stephan Bergmann a écrit :

If you use the LO git repo to build the mysql-connector-ooo.oxt
extension (via --enable-ext-mariadb-connector, formerly
--enable-ext-mysql-connector) and then use/distribute that extension as
a non-bundled extension (i.e., not unzip it into a LO installation's
share/extensions/ directory):  Please be aware that doing so off the LO
git libreoffice-4-1[-*] and master (towards LO 4.2) branches leads to a
broken extension that should not be distributed.



OK, thanks for the heads up.




"MySQL Native Connector for LibreOffice 4.x" from an UNKNOWN UPLOADER,
which only offers

which is apparently too old to be affected.




*

"MySQL Native Connector" from an UKNOWN UPLOADER which only offers

and

which both are apparently too old to be affected.



One of those might be from Dan Lewis, but I don't currently know the 
status of what he's doing with them at the moment.





*  by Alex
Thurgood, which /is/ affected.  Alex, can you make available a fixed
build there, either off master past

or off libreoffice-4-1 past pending integration of
?




Am rebuilding on Linux 32bit and OSX64bit after a fresh pull from master 
after your changes went in, so at least those should be ok once they're 
finished. I'll not be attempting the Linux 64bit til later anyway, after 
a fresh pull from master again.



As for 4.1, I have to suss out how to switch cleanly between branches 
with git (i.e. rtfm) before I start on that.




Alex

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

2013-10-11 Thread Armin Le Grand

 sw/source/core/layout/paintfrm.cxx |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 85388f93f40c4cb36d2bb9103d5264f476c2afe6
Author: Armin Le Grand 
Date:   Fri Oct 11 13:08:48 2013 +

i29105 when a page background garphic is set in sw, use GlobalRetoucheColor 
as fallback for draw object text edit

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 83df988..3ff19d7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6383,10 +6383,27 @@ const Color& SwPageFrm::GetDrawBackgrdColor() const
 const SvxBrushItem* pBrushItem;
 const Color* pDummyColor;
 SwRect aDummyRect;
+
 if ( GetBackgroundBrush( pBrushItem, pDummyColor, aDummyRect, true) )
-return pBrushItem->GetColor();
-else
-return aGlobalRetoucheColor;
+{
+const Graphic* pGraphic = pBrushItem->GetGraphic();
+
+if(pGraphic)
+{
+// #29105# when a graphic is set, it may be possible to calculate 
a single
+// color which looks good in all places of the graphic. Since it is
+// planned to have text edit on the overlay one day and the 
fallback
+// to aGlobalRetoucheColor returns something useful, just use that
+// for now.
+}
+else
+{
+// not a graphic, use (hopefully) initialized color
+return pBrushItem->GetColor();
+}
+}
+
+return aGlobalRetoucheColor;
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Adam Co

 sw/source/core/text/pormulti.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 221643376f1bd5bd6be1738c0ea1b62fb646aaca
Author: Adam Co 
Date:   Thu Oct 10 13:43:05 2013 +0200

fdo#66399 - fix rendering of 'two lines in one'

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

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 05bf26f..95e0f91 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2006,7 +2006,16 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( 
SwTxtFormatInfo &rInf,
 if( pLine )
 {
 GetInfo().SetMulti( sal_True );
-CalcNewBlock( pLine, NULL, rMulti.Width() );
+
+// If the fourth element bSkipKashida of function CalcNewBlock 
is true, multiportion will be showed in justification.
+// Kashida (Persian) is a type of justification used in some 
cursive scripts, particularly Arabic.
+// In contrast to white-space justification, which increases 
the length of a line of text by expanding spaces between words or individual 
letters,
+// kashida justification is accomplished by elongating 
characters at certain chosen points.
+// Kashida justification can be combined with white-space 
justification to various extents.
+// The default value of bSkipKashida (the 4th parameter passed 
to 'CalcNewBlock') is false.
+// Only when Adjust is SVX_ADJUST_BLOCK ( alignment is justify 
), multiportion will be showed in justification in new code.
+CalcNewBlock( pLine, NULL, rMulti.Width(), GetAdjust() != 
SVX_ADJUST_BLOCK );
+
 GetInfo().SetMulti( sal_False );
 }
 rInf.SetIdx( nStartIdx );
___
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' - mysqlc/source

2013-10-11 Thread Stephan Bergmann

 mysqlc/source/mysqlc.component|2 +-
 mysqlc/source/mysqlc_services.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c23fa104084fccd8aa3bd930499406380c410d02
Author: Stephan Bergmann 
Date:   Fri Oct 11 14:57:32 2013 +0200

Extension shared library components must not use the "prefix" feature

...at least no non-bundled ones, see 
9dfcee9266c9769153444cdcd4ab0e6e636c3eb6
"Not being able to honor a 'prefix' is a rather hard error" and the 
description
there how that can lead to a crash when using mysql-connector-ooo.oxt:  
"'rm -rf
instdir/*/share/extensions/mysql-connector-ooo', 'instdir/*/program/soffice
workdir/*/Extension/mysql-connector.oxt', install the [extension] per-user, 
then
'File - New - Database - Connect to an existing database: MySQL - Next >> -
Connect directly - Next >> - Database name: foo - Server / Port - Server: 
bar -
Next >> - Test Connection', crash."

This is a partial revert of cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 
"prefix all
component_getFactory methods."

Change-Id: Ia7a6272eb0597e3b3bbf4ab333174b3232448539
(cherry picked from commit 3bafe5f5f529f6539363c5a291dd13ef1e2cbbde)
Reviewed-on: https://gerrit.libreoffice.org/6209
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component
index ae16484..e429511 100644
--- a/mysqlc/source/mysqlc.component
+++ b/mysqlc/source/mysqlc.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-http://openoffice.org/2010/uno-components"; prefix="mysqlc"
+http://openoffice.org/2010/uno-components";
 loader="com.sun.star.loader.SharedLibrary">
 
 
diff --git a/mysqlc/source/mysqlc_services.cxx 
b/mysqlc/source/mysqlc_services.cxx
index cc7e8e0..af1cabe 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
 
 
 /* {{{ component_getFactory -I- */
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysqlc_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
 const sal_Char * pImplementationName,
 void * pServiceManager,
 void * /* pRegistryKey */)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 sw/source/ui/dbui/mailmergehelper.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9b03a3688ff9c55293eccbb77dd24845c7fed6bf
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 15:18:42 2013 +0100

fix mail merge launch

Change-Id: I6604d1e626f83e6ac2203b7c80cd5b5b7d80181a

diff --git a/sw/source/ui/dbui/mailmergehelper.cxx 
b/sw/source/ui/dbui/mailmergehelper.cxx
index 50a033e..39265ac 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -601,13 +601,16 @@ SwMergeAddressItem   SwAddressIterator::Next()
 }
 else if(-1 == nOpen && -1 == nReturn)
 {
-nOpen = sAddress.getLength();
 aRet.sText = sAddress;
 sAddress = "";
 }
 else
 {
-xub_StrLen nTarget = ::std::min(nOpen, nReturn);
+if (nOpen == -1)
+nOpen = sAddress.getLength();
+if (nReturn == -1)
+nReturn = sAddress.getLength();
+sal_Int32 nTarget = ::std::min(nOpen, nReturn);
 aRet.sText = sAddress.copy(0, nTarget);
 sAddress = sAddress.copy(nTarget);
 }
___
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' - 85/388f93f40c4cb36d2bb9103d5264f476c2afe6

2013-10-11 Thread Caolán McNamara

 85/388f93f40c4cb36d2bb9103d5264f476c2afe6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa93c6fae7cd07685bd8117aa85996e1b8e1775a
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 15:26:25 2013 +0100

Notes added by 'git notes add'

diff --git a/85/388f93f40c4cb36d2bb9103d5264f476c2afe6 
b/85/388f93f40c4cb36d2bb9103d5264f476c2afe6
new file mode 100644
index 000..a707640
--- /dev/null
+++ b/85/388f93f40c4cb36d2bb9103d5264f476c2afe6
@@ -0,0 +1 @@
+merged as: 331216e2361eb682c7bc21c92345110d380503ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Armin Le Grand

 sw/source/core/layout/paintfrm.cxx |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 331216e2361eb682c7bc21c92345110d380503ed
Author: Armin Le Grand 
Date:   Fri Oct 11 13:08:48 2013 +

Resolves: #i29105# when a page background graphic is set in sw...

use GlobalRetoucheColor as fallback for draw object text edit

(cherry picked from commit 85388f93f40c4cb36d2bb9103d5264f476c2afe6)

Conflicts:
sw/source/core/layout/paintfrm.cxx

Change-Id: Ic7db0f2cf25727baa47e0cfeca4655549a820a85

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index d9d38d7..ccd8226 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7134,10 +7134,27 @@ const Color& SwPageFrm::GetDrawBackgrdColor() const
 const XFillGradientItem* pFillGradientItem;
 const Color* pDummyColor;
 SwRect aDummyRect;
+
 if ( GetBackgroundBrush( pBrushItem, pFillStyleItem, pFillGradientItem, 
pDummyColor, aDummyRect, true) )
-return pBrushItem->GetColor();
-else
-return aGlobalRetoucheColor;
+{
+const Graphic* pGraphic = pBrushItem->GetGraphic();
+
+if(pGraphic)
+{
+// #i29105# when a graphic is set, it may be possible to calculate 
a single
+// color which looks good in all places of the graphic. Since it is
+// planned to have text edit on the overlay one day and the 
fallback
+// to aGlobalRetoucheColor returns something useful, just use that
+// for now.
+}
+else
+{
+// not a graphic, use (hopefully) initialized color
+return pBrushItem->GetColor();
+}
+}
+
+return aGlobalRetoucheColor;
 }
 
 /*
___
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

2013-10-11 Thread Caolán McNamara

 helpers/help_hid.lst |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a16a5ca2d6fa6604177f0d007226c7d99031f68e
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 15:56:39 2013 +0100

drop unused help id

Change-Id: Ieee6e14307cd896288b878480bdbd2ef6a8fdc44

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index efa442b..0c79ce1 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2372,7 +2372,6 @@ HID_MEMO_PAGE3,53291,
 HID_MEMO_PAGE4,53292,
 HID_MEMO_PAGE5,53293,
 HID_MERGE_PRINTMONITOR,52773,
-HID_MERGE_SOURCE_UNAVAILABLE,54950,
 HID_MM_ADDRESSBLOCKPAGE,54957,
 HID_MM_ASSIGNFIELDS,54972,
 HID_MM_ASSIGN_FIELDS,55034,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Caolán McNamara

 sw/UIConfig_swriter.mk |1 
 sw/inc/helpid.h|1 
 sw/source/ui/app/app.src   |   33 ---
 sw/source/ui/inc/app.hrc   |8 --
 sw/source/ui/uiview/view2.cxx  |   56 ++--
 sw/uiconfig/swriter/ui/warndatasourcedialog.ui |   69 +
 6 files changed, 76 insertions(+), 92 deletions(-)

New commits:
commit cc6f43275a00b0aff2e60e70ee803a2c9610
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 15:55:24 2013 +0100

convert merge source error dialog to .ui

Change-Id: I1f09a4b4377a9a6c21e0e260c856dd9fbff4f1bd

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 1a03283..64900b1 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -204,6 +204,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/titlepage \
sw/uiconfig/swriter/ui/tokenwidget \
sw/uiconfig/swriter/ui/viewoptionspage \
+   sw/uiconfig/swriter/ui/warndatasourcedialog \
sw/uiconfig/swriter/ui/wordcount \
sw/uiconfig/swriter/ui/wrapdialog \
sw/uiconfig/swriter/ui/wrappage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index cc4a15e..da7cb7e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -365,7 +365,6 @@
 #define HID_PVIEW_ZOOM_LB   
"SW_HID_PVIEW_ZOOM_LB"
 #define HID_MAIL_MERGE_SELECT   
"SW_HID_MAIL_MERGE_SELECT"
 #define HID_PRINT_AS_MERGE  
"SW_HID_PRINT_AS_MERGE"
-#define HID_MERGE_SOURCE_UNAVAILABLE
"SW_HID_MERGE_SOURCE_UNAVAILABLE"
 #define HID_MODULE_TOOLBOX  
"SW_HID_MODULE_TOOLBOX"
 
 #define HID_MM_ADDRESSBLOCKPAGE 
"SW_HID_MM_ADDRESSBLOCKPAGE"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 5b4000c..a42d2de 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -489,39 +489,6 @@ QueryBox MSG_PRINT_AS_MERGE
 Message [ en-US ] = "Your document contains address database fields. Do 
you want to print a form letter?";
 };
 
-ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
-{
-HelpId = HID_MERGE_SOURCE_UNAVAILABLE;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 202 , 72 ) ;
-Moveable = TRUE ;
-
-FixedImage IMG_MERGE
-{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 103 , 32 ) ;
-};
-FixedText ST_MERGE_SOURCE_UNAVAILABLE
-{
-Pos = MAP_APPFONT ( 12 , 6 ) ;
-Size = MAP_APPFONT ( 178 , 40 ) ;
-WordBreak = TRUE;
-Text [ en-US ] = "The data source '%1' was not found. Thus the 
connection to the data source could not be established.\n\nPlease check the 
connection settings.";
-};
-OKButton PB_MERGE_OK
-{
-Pos = MAP_APPFONT ( 12 , 52 ) ;
-Size = MAP_APPFONT ( 125 , 14 ) ;
-Text [ en-US ] = "Check Connection Settings...";
-};
-CancelButton PB_MERGE_CANCEL
-{
-Pos = MAP_APPFONT ( 140 , 52 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-};
-};
-
 String RID_MODULE_TOOLBOX
 {
 Text [ en-US ] = "Function Bar (viewing mode)" ;
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 7752ca0..d28ae33 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -45,14 +45,6 @@
 #define STR_CJK_FONT(RC_APP_BEGIN + 78)
 #define MSG_PRINT_AS_MERGE  (RC_APP_BEGIN + 80)
 
-#define DLG_MERGE_SOURCE_UNAVAILABLE(RC_APP_BEGIN + 83)
-
-#define ST_MERGE_SOURCE_UNAVAILABLE 1
-#define PB_MERGE_OK 2
-#define PB_MERGE_CANCEL 3
-#define IMG_MERGE   4
-
-
 #define STR_ENV_TITLE   (RC_APP_BEGIN + 91)
 #define STR_LAB_TITLE   (RC_APP_BEGIN + 92)
 
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 77f8637..eedf54e 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2218,52 +2218,6 @@ namespace
 }
 }
 
-class SwMergeSourceWarningBox_Impl : public ModalDialog
-{
-FixedInfo   aMessageFI;
-OKButtonaOK;
-CancelButtonaCancel;
-
-FixedImage  aWarnImage;
-public:
-SwMergeSourceWarningBox_Impl( Window* pParent ) :
-ModalDialog( pParent, SW_RES( DLG_MERGE_SOURCE_UNAVAILABLE   ) ),
-aMessageFI( this, SW_RES( ST_MERGE_SOURCE_UNAVAILABLE ) ),
-aOK(this, SW_RES( PB_MERGE_OK ) ),
-aCancel(this, SW_RES( PB_MERGE_CANCEL ) ),
-aWarnImage( this, SW_RES( IMG_MERGE   ) )
-{
-FreeResource();
-SetText( Application::GetDisplay

[Libreoffice-commits] core.git: helpcontent2

2013-10-11 Thread Caolán McNamara

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

New commits:
commit 9b444c64132723cb148cf51bca5a81a83f3d2805
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 11 15:56:39 2013 +0100

Updated core
Project: help  a16a5ca2d6fa6604177f0d007226c7d99031f68e

diff --git a/helpcontent2 b/helpcontent2
index 0168bad..a16a5ca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0168bad31cf97541695bffec867e078d76abf352
+Subproject commit a16a5ca2d6fa6604177f0d007226c7d99031f68e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Tor Lillqvist

 ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |   16 
--
 ios/experimental/LibreOffice/LibreOffice/View.m|9 +
 vcl/source/window/window.cxx   |2 -
 3 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit d404c67e8a0f597e3d2fdd027e8e822823c6b1ae
Author: Tor Lillqvist 
Date:   Fri Oct 11 18:00:38 2013 +0300

Don't use X11 concepts on iOS or Android

Change-Id: I39023acc08e652fcc9d365fe50a8240cbe0b610d

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 95c6f61..9aa6289 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8504,7 +8504,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
 {
 uno::Reference< XComponentContext > xContext( 
comphelper::getProcessComponentContext() );
 
-#if defined(UNX) && !defined(MACOSX)
+#if defined(UNX) && !defined(MACOSX) && !defined(IOS) && !defined(ANDROID)
 // A hack, making the primary selection available as an 
instance
 // of the SystemClipboard service on X11:
 css::uno::Sequence args(1);
commit 54be385b3332a0ad615426a1085ef18b6f517af7
Author: Tor Lillqvist 
Date:   Fri Oct 11 17:58:53 2013 +0300

Redo the temporary hack for long touch: just simulate a double-click

This is just throwaway experimentation, not how it should *really* be
done of course.

Change-Id: If600a5d3f01f118e84079f513dfccb25f4d59622

diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m 
b/ios/experimental/LibreOffice/LibreOffice/View.m
index a047bb0..99d57e9 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -103,12 +103,9 @@
 
 NSLog(@"longPressGesture: state %d cords (%d,%d)",state 
,(int)point.x,(int)point.y);
 
-if (state == UIGestureRecognizerStateBegan) {
-lo_mouse_drag(point.x, point.y, DOWN);
-} else if (state == UIGestureRecognizerStateChanged) {
-lo_mouse_drag(point.x, point.y, MOVE);
-} else if (state == UIGestureRecognizerStateEnded) {
-lo_mouse_drag(point.x, point.y, UP);
+if (state == UIGestureRecognizerStateEnded) {
+lo_tap(point.x, point.y);
+lo_tap(point.x, point.y);
 }
 }
 
commit ee0e92c9e939cfea947b749675829571c537b259
Author: Tor Lillqvist 
Date:   Fri Oct 11 17:58:42 2013 +0300

Add some more source files

Change-Id: Ife2ee57878b2fad7af84f4a8b0b0a172f7a2cb7e

diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
index 97a7147..d1c6f60 100644
--- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
@@ -21,6 +21,12 @@
BE02DE57175F2E2A00ED4032 /* guess.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = guess.cxx; path = ../../../../sw/source/core/text/guess.cxx; sourceTree 
= ""; };
BE08805B16FDB784000CED5C /* View.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
View.h; sourceTree = ""; };
BE08805C16FDB784000CED5C /* View.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= View.m; sourceTree = ""; };
+   BE2CB9601808247600953CB4 /* winproc.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = winproc.cxx; 
path = ../../../../vcl/source/window/winproc.cxx; sourceTree = ""; };
+   BE2CB9611808297500953CB4 /* select.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = select.cxx; path = ../../../../sw/source/ui/wrtsh/select.cxx; sourceTree 
= ""; };
+   BE2CB962180829DD00953CB4 /* txtcrsr.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = txtcrsr.cxx; path = ../../../../sw/source/ui/shells/txtcrsr.cxx; 
sourceTree = ""; };
+   BE2CB96318082A7800953CB4 /* edtwin.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin.cxx; 
path = ../../../../sw/source/ui/docvw/edtwin.cxx; sourceTree = ""; };
+   BE2CB96418082A7800953CB4 /* edtwin2.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin2.cxx; 
path = ../../../../sw/source/ui/docvw/edtwin2.cxx; sourceTree = ""; };
+   BE2CB96518082A7800953CB4 /* edtwin3.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin3.cxx; 
path = ../../../../sw/source/ui/docvw/edtwin3.cxx; sourceTree = ""; };
BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.cpp.c

Re: Efficient UNO component linkage & GC ...

2013-10-11 Thread Stephan Bergmann


On 10/08/2013 03:23 PM, Michael Meeks wrote:

** Part one - splitting factories

Clearly we need a new naming scheme for these; this should be
based on a mangled version of the implementation name; so:

   

->

com_sun_star_comp_Draw_GraphicExporter_getFactory();

Despite everyone's loathing of the css. namespace this makes
part three much easier.

There are various ways to annotate that a .component file
eg. svx/util/svx.component refers to a shlib with a split factory. I
suggest we reduce the problem space by asserting that each shlib with
this property has it's components entirely split up - yielding a
single attribute change.

For these we alter the prefix="svx" to prefix="" or
some equivalent magic, and tweak:

stoc/source/loader/dllcomponentloader.cxx:

Reference SAL_CALL DllComponentLoader::activate(
 const OUString & rImplName, const OUString &, const OUString & rLibName,
 const Reference< XRegistryKey > & xKey )

To special case this prefix, and build a symbol name (in
aPrefix) and use a new variant of:

cppuhelper/source/shlib.cxx:Reference< XInterface > SAL_CALL 
loadSharedLibComponentFactory(

To load and hook out the correctly named symbol there.


DllComponentLoader is mostly dead by now, only comes into play during 
live-deployment of (non-bundled) extensions.  And since, as per 
 
"Extension shared library components must not use the 'prefix' feature," 
see 
 
"No need to support 'prefix' in DllComponentLoader."


Handling of the prefix feature is done entirely in 
cppuhelper/source/servicemanger.cxx and cppu::loadSharedLibComponentFactory.


Having reached this point, we basically have two options:

Either, keep with the current design of _component_getFactory 
functions (responsible for returning factories for potentially many 
object implementations, dispatched by name).  To split into smaller, 
unconnected parts would mean to split existing  XML entities 
into smaller ones, each with its own prefix attribute (but potentially 
multiple ones with the same uri attribute), and to split exisiting 
_component_getFactory function definitions into smaller ones 
accordingly (but keeping their structure).  That way, a 
_component_getFactory could still be responsible for either 
multiple or just a single object implementation (though in the latter 
case would incur somewhat more overhead than a more straightforward 
design), and we would need no modifications to the infrastructure.


Or, as you detail below, go further and add more efficient support for 
the "single-object-implementation" factory case.  (Do you have any idea 
whether this is worth it, given we have to continue supporting the other 
case for extension-compatibility anyway?)


Anyway, given that the current "prefix" feature should only be used by 
internal code we have under full control (see recent discussion 
elsewhere on this mailing list), should we go down that road, I'd prefer 
to replace the existing "prefix" feature with something new (e.g., an 
extension of the components XML schema that associates an individual 
 rather than a  with a prefix attribute), 
rather than keeping both.  (Though we could support both for a 
transition period while we incrementally update the existing code.)



We also define these factory functions to always be passed a
valid pServiceManager, and only ever to be asked to construct the
exact service name mangled into the symbol, hence:


SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
com_sun_star_drawing_SvxUnoColorTable_getFactory ( void * pServiceManager )
{
 // Ideally this reference, and the branch below would be subsumed
 // by a helper, such that this method call was a single line, and
 // ideally could be macro-ized elegantly.

 uno::Reference< lang::XSingleServiceFactory > xFactory;

 xFactory = cppu::createSingleFactory(
  reinterpret_cast< lang::XMultiServiceFactory * >( 
pServiceManager ),
  SvxUnoColorTable::getImplementationName_Static(),
  SvxUnoColorTable_createInstance,
  SvxUnoColorTable::getSupportedServiceNames_Static() );
  if( xFactory.is())
  {
 xFactory->acquire();
 return xFactory.get();
  }
  return NULL;
}


Not sure what that specific step buys you in comparison to keeping with 
the existing


  extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
  _component_getFactory(
  char const * name, void * serviceManager, void * registryKey)

interface (which is already "always [...] passed a valid 
pServiceManager," and always ignores the long-time legacy registryKey 
argument) and just ignoring the name argument in the 
"single-object-implementation" case.


What would likely be more entertaining i

[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 0 commits -

2013-10-11 Thread Unknown

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

[Libreoffice-commits] core.git: Changes to 'feature/saxparser'

2013-10-11 Thread Michael Meeks

New branch 'feature/saxparser' available with the following commits:
commit 166010e5ed3799d685c40cea9eaa4b0567c0a67e
Author: Michael Meeks 
Date:   Fri Oct 11 14:09:52 2013 +0100

fastparser: re-work locking, add high & low watermarks, change sizes etc.

Change-Id: I7fe1435addc6dce5a74a8411f7825cea331a5b3f

commit 8362dc1692e379c9b8598b73568b464784111092
Author: Michael Meeks 
Date:   Fri Oct 11 13:51:47 2013 +0100

fastparser: don't allocate uno::Sequences when we don't need to.

Conflicts:
sax/source/fastparser/fastparser.cxx

Change-Id: Ic2fff8cabbc077b6fc9dabffd2c6fcf555152b11

commit e38c74a896a2eb1f77c09d264fdb6b030ae6d683
Author: MatÃºÅ¡ Kukan 
Date:   Fri Oct 11 13:16:04 2013 +0200

remove not implemented method declaration

Change-Id: I340ab40724cc864920cea05db63440803e60e275

commit 20626e05b715c8c6feb4a45f21d794cdb35d6840
Author: MatÃºÅ¡ Kukan 
Date:   Fri Oct 11 13:11:44 2013 +0200

FastSaxParser: remove duplicated OString version methods

Also remove AttributeData and make the two for-cycles faster.

Change-Id: If0343992173bb333eee39c33bcb86acaa5a3d288

commit 0bb5dfba049b085619e3b6c14fefb8ef3e69133a
Author: MatÃºÅ¡ Kukan 
Date:   Tue Oct 8 23:28:32 2013 +0200

FastSaxParser: implementation using two threads

Change-Id: I963e6ba2781c92895e6737198c95a275368303f7

commit bb3200b96e6ca1c484a4683e7d25a4c397c592ad
Author: MatÃºÅ¡ Kukan 
Date:   Tue Oct 8 15:17:01 2013 +0200

FastSaxParser: isolate calls to XFastContextHandler in Entity's methods

Unfortunately, we have to store maNamespace in two stacks.
One for future parser thread to compute tokens and one for
main thread calling XFastContextHandler.

Now we are prepared to implement multithreading.

Change-Id: I421b55afa2e9ea80142e6068c7a515d31913ba69

commit 2f58b6eb7db907b88bcfa53ce30db176ed5b839c
Author: MatÃºÅ¡ Kukan 
Date:   Tue Oct 8 12:42:21 2013 +0200

FastSaxParser: store mnNamespaceCount in another stack

This is preparation work for multithreading.
mnNamespaceCount will be handled in parser thread and the rest in main
thread.

Change-Id: I571026ea499f6876b8dafb4e1bdc56d1add649e5

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

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 3 commits - sc/qa sc/source svl/qa svl/source

2013-10-11 Thread Kohei Yoshida

 sc/qa/unit/subsequent_filters-test.cxx |   37 +
 sc/source/ui/view/gridwin.cxx  |2 -
 svl/qa/unit/svl.cxx|   24 -
 svl/source/misc/sharedstring.cxx   |2 -
 4 files changed, 44 insertions(+), 21 deletions(-)

New commits:
commit 9890d623906cbcc49b3491edf10085be9a99743c
Author: Kohei Yoshida 
Date:   Fri Oct 11 11:33:05 2013 -0400

Fix equality operator for SharedString & write test for it.

Change-Id: Ib592ca2fe359293da6c10aa9e1535a91627cfc43

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 0ac019b..a34150f 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -39,6 +39,7 @@
 #include 
 
 using namespace ::com::sun::star;
+using namespace svl;
 
 namespace {
 
@@ -51,15 +52,17 @@ public:
 virtual void tearDown();
 
 void testNumberFormat();
-void testStringPool();
-void testStringPoolPurge();
+void testSharedString();
+void testSharedStringPool();
+void testSharedStringPoolPurge();
 void testFdo60915();
 void testI116701();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testNumberFormat);
-CPPUNIT_TEST(testStringPool);
-CPPUNIT_TEST(testStringPoolPurge);
+CPPUNIT_TEST(testSharedString);
+CPPUNIT_TEST(testSharedStringPool);
+CPPUNIT_TEST(testSharedStringPoolPurge);
 CPPUNIT_TEST(testFdo60915);
 CPPUNIT_TEST(testI116701);
 CPPUNIT_TEST_SUITE_END();
@@ -278,7 +281,16 @@ void Test::testNumberFormat()
 }
 }
 
-void Test::testStringPool()
+void Test::testSharedString()
+{
+// Use shared string as normal, non-shared string, which is allowed.
+SharedString aSS1("Test"), aSS2("Test");
+CPPUNIT_ASSERT_MESSAGE("Equality check should return true.", aSS1 == aSS2);
+SharedString aSS3("test");
+CPPUNIT_ASSERT_MESSAGE("Equality check is case sensitive.", aSS1 != aSS3);
+}
+
+void Test::testSharedStringPool()
 {
 SvtSysLocale aSysLocale;
 svl::SharedStringPool aPool(aSysLocale.GetCharClassPtr());
@@ -311,7 +323,7 @@ void Test::testStringPool()
 CPPUNIT_ASSERT_MESSAGE("These two ID's should be equal.", 
p1.getDataIgnoreCase() == p2.getDataIgnoreCase());
 }
 
-void Test::testStringPoolPurge()
+void Test::testSharedStringPoolPurge()
 {
 SvtSysLocale aSysLocale;
 svl::SharedStringPool aPool(aSysLocale.GetCharClassPtr());
diff --git a/svl/source/misc/sharedstring.cxx b/svl/source/misc/sharedstring.cxx
index 8389ff8..6a5d395 100644
--- a/svl/source/misc/sharedstring.cxx
+++ b/svl/source/misc/sharedstring.cxx
@@ -81,7 +81,7 @@ bool SharedString::operator== ( const SharedString& r ) const
 if (mpData->length != r.mpData->length)
 return false;
 
-return rtl_ustr_compare_WithLength(mpData->buffer, mpData->length, 
r.mpData->buffer, r.mpData->length);
+return rtl_ustr_reverseCompare_WithLength(mpData->buffer, 
mpData->length, r.mpData->buffer, r.mpData->length) == 0;
 }
 
 return !r.mpData;
commit 7a7a60361df09f713a0b574f0f054d256e4a4146
Author: Kohei Yoshida 
Date:   Fri Oct 11 11:23:54 2013 -0400

Use OUString & a bit more fine-grained unit test error messages.

Change-Id: I6d9ce2afd97d6011eaa93855c49f3d7071db0159

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index b69cb08..5c0fb54 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1046,16 +1046,18 @@ struct ValDataTestParams
 {
 ScValidationMode eValMode;
 ScConditionMode eCondOp;
-String aStrVal1, aStrVal2;
+OUString aStrVal1;
+OUString aStrVal2;
 ScDocument* pDocument;
 ScAddress aPosition;
-String aErrorTitle, aErrorMessage;
+OUString aErrorTitle;
+OUString aErrorMessage;
 ScValidErrorStyle eErrorStyle;
 sal_uLong nExpectedIndex;
 
 ValDataTestParams( ScValidationMode eMode, ScConditionMode eOp,
-   String aExpr1, String aExpr2, ScDocument* pDoc,
-   ScAddress aPos, String aETitle, String aEMsg,
+   OUString aExpr1, OUString aExpr2, ScDocument* pDoc,
+   ScAddress aPos, OUString aETitle, OUString aEMsg,
ScValidErrorStyle eEStyle, sal_uLong nIndex ):
 eValMode(eMode), eCondOp(eOp), aStrVal1(aExpr1),
 aStrVal2(aExpr2), pDocument(pDoc), aPosition(aPos),
@@ -1077,7 +1079,7 @@ void checkValiditationEntries( const ValDataTestParams& 
rVDTParams )
 aValData.SetListType( 1 );
 aValData.ResetInput();
 aValData.SetError( rVDTParams.aErrorTitle, rVDTParams.aErrorMessage, 
rVDTParams.eErrorStyle );
-aValData.SetSrcString( EMPTY_STRING );
+aValData.SetSrcString( EMPTY_OUSTRING );
 
 //get actual data validation entry from document
 const ScValidationData* pValDataTest = pDoc->GetValidationEntry( 
rVDTParams.nExpectedIndex );
@@ -1086,9 +1088,18 @@ void checkValidita

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

2013-10-11 Thread Stephan Bergmann

 oox/source/docprop/docprophandler.cxx |3 +--
 oox/source/vml/vmlshape.cxx   |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 52e07f1fd2ba3d1cf25ec8fe8c1892398c7cd364
Author: Stephan Bergmann 
Date:   Fri Oct 11 17:55:38 2013 +0200

-Werror,-Wunused-variable

Change-Id: I7f4f232475339d524eed7ba578e22b53991bd123

diff --git a/oox/source/docprop/docprophandler.cxx 
b/oox/source/docprop/docprophandler.cxx
index e9a35b2..39082a2 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -333,8 +333,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( 
::sal_Int32 nElement, const
 void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& 
aNamespace, const OUString& aName, const uno::Reference< 
xml::sax::XFastAttributeList >& )
 throw (xml::sax::SAXException, uno::RuntimeException)
 {
-OUString aUnknown = "Unknown element" + aNamespace + ":" + aName;
-OSL_FAIL( OUStringToOString( aUnknown, RTL_TEXTENCODING_UTF8 ).getStr() );
+SAL_WARN("oox", "Unknown element " << aNamespace << ":" << aName);
 
 if ( m_nInBlock == SAL_MAX_INT32 )
 throw uno::RuntimeException();
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index a9ef5f8..5d89a9b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -942,7 +942,9 @@ Reference< XShape > ComplexShape::implConvertAndInsert( 
const Reference< XShapes
 // try to find registered OLE object info
 if( const OleObjectInfo* pOleObjectInfo = mrDrawing.getOleObjectInfo( 
maTypeModel.maShapeId ) )
 {
-OSL_ENSURE( nShapeType == VML_SHAPETYPE_PICTUREFRAME, 
"ComplexShape::implConvertAndInsert - unexpected shape type" );
+SAL_WARN_IF(
+nShapeType != VML_SHAPETYPE_PICTUREFRAME, "oox",
+"ComplexShape::implConvertAndInsert - unexpected shape type");
 
 // if OLE object is embedded into a DrawingML shape (PPTX), do not 
create it here
 if( pOleObjectInfo->mbDmlShape )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Jan Holesovsky

 basctl/source/basicide/baside2b.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be194006496368bfd5bd0d93ac45e729814961f1
Author: Jan Holesovsky 
Date:   Fri Oct 11 13:59:33 2013 +0200

Basic: When we warned & stopped the program, don't warn again.

It's extremely annoying to have to dismiss the warning with every keypress 
;-)

Change-Id: Ie117085ef25676065aedd0744cf618e1b566688b

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 4738327..10ee7b4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -476,7 +476,7 @@ void EditorWindow::Command( const CommandEvent& rCEvt )
 bool EditorWindow::ImpCanModify()
 {
 bool bCanModify = true;
-if ( StarBASIC::IsRunning() )
+if ( StarBASIC::IsRunning() && rModulWindow.GetBasicStatus().bIsRunning )
 {
 // If in Trace-mode, abort the trace or refuse input
 // Remove markers in the modules in Notify at Basic::Stoped
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Thorsten Behrens

 sd/source/ui/slideshow/slideshowimpl.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 516ecd072f9dbfbacce77127a02b666ce387982d
Author: Thorsten Behrens 
Date:   Fri Oct 11 18:07:37 2013 +0200

Restore persistent userpaint functionality in slideshow.

This was part of i103174 - Code from the ecntablet and eraser CWS;
optionally improves user paint interactions in slideshow, and got
accidentally cleaned away for being commented out.

Change-Id: I4fb87a3e1cb834e10ae766ed8c58cd6f2397c45f

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index afc85dc..3350675 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1422,6 +1422,13 @@ void SlideshowImpl::displayCurrentSlide (const bool 
bSkipAllMainSequenceEffects)
 
 void SlideshowImpl::endPresentation()
 {
+if( maPresSettings.mbMouseAsPen)
+{
+Reference< XMultiServiceFactory > xDocFactory(mpDoc->getUnoModel(), 
UNO_QUERY );
+if( xDocFactory.is() )
+mxShow->registerUserPaintPolygons(xDocFactory);
+}
+
 if( !mnEndShowEvent )
 mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, 
endPresentationHdl) );
 }
___
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-10-11 Thread Miklos Vajna

 sw/qa/extras/odfimport/data/spellmenu-redline.odt |binary
 sw/source/ui/app/mn.src   |   30 +---
 sw/source/ui/inc/misc.hrc |   27 +++
 sw/source/ui/inc/olmenu.hxx   |3 +
 sw/source/ui/lingu/olmenu.cxx |   39 ++
 sw/source/ui/lingu/olmenu.src |3 +
 6 files changed, 75 insertions(+), 27 deletions(-)

New commits:
commit e2cdde1f187de7b6fd0cab740ab7be54fc6fb1f0
Author: Miklos Vajna 
Date:   Fri Oct 11 17:54:15 2013 +0200

sw: make it possible to accept/reject changes if they contain spelling 
errors

If there were spelling errors in a text portion that is to be
accepted/rejected, right mouse click just shown the spellcheck menu, so
oddly if an inserted text contained spelling mistakes and we wanted to
reject them, Writer didn't allow that.

Fix this by adding the redline operations (accept change, reject change,
next change, previous change) to the spellcheck menu, but make it only a
wrapper around the SwView code, so all the logic on what to do and when
to hide these menu items is not duplicated.

Change-Id: I76cad2f58a47575f8ef9517af51f1ffe7c4b6844

diff --git a/sw/qa/extras/odfimport/data/spellmenu-redline.odt 
b/sw/qa/extras/odfimport/data/spellmenu-redline.odt
new file mode 100644
index 000..268d15c
Binary files /dev/null and b/sw/qa/extras/odfimport/data/spellmenu-redline.odt 
differ
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index fb2c31e..7a762e9 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -24,6 +24,7 @@
 #include "globals.hrc"
 #include "helpid.h"
 #include "popup.hrc"
+#include "misc.hrc"
 
 /* - F O R M A T - */
 #define SEPARATOR   MenuItem { Separator = TRUE; }
@@ -218,32 +219,6 @@ location: 
/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
 Text [ en-US ] = "Inde~x Entry..." ;   \
 };
 
-#define _MN_EDIT_REDLINE  \
-MenuItem\
-{   \
-Identifier = FN_REDLINE_ACCEPT_DIRECT;\
-HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;
\
-Text [ en-US ] = "Accept Change" ;   \
-};\
-MenuItem\
-{   \
-Identifier = FN_REDLINE_REJECT_DIRECT ;
\
-HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;
\
-Text [ en-US ] = "Reject Change" ;   \
-};  \
-MenuItem \
-{\
-Identifier = FN_REDLINE_NEXT_CHANGE; \
-HelpId = CMD_FN_REDLINE_NEXT_CHANGE ;\
-Text [ en-US ] = "Next Change" ; \
-};\
-MenuItem \
-{\
-Identifier = FN_REDLINE_PREV_CHANGE; \
-HelpId = CMD_FN_REDLINE_PREV_CHANGE ;\
-Text [ en-US ] = "Previous Change" ; \
-};\
-SEPARATOR ;
 #define _MN_EDIT_BIB_ENTRY_DLG  \
 MenuItem\
 {   \
@@ -296,7 +271,8 @@ location: 
/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
 _MN_EDIT_FOOTNOTE  
 \
 _MN_EDIT_IDX_ENTRY_DLG 
 \
 _MN_EDIT_BIB_ENTRY_DLG 
 \
-_MN_EDIT_REDLINE   
 \
+MN_EDIT_REDLINE
\
+SEPARATOR ;
\
 MenuItem\
 {   \
 ITEM_POPUP_TEMPLATE_EDIT\
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index 95113ff..ff20090 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -21,6 +21,7 @@

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - dictionaries

2013-10-11 Thread Andras Timar

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

New commits:
commit 34c935539096f70abfdf60521a13f8f6da7321ae
Author: Andras Timar 
Date:   Thu Oct 10 09:22:36 2013 +0200

Updated core
Project: dictionaries  3cb609ce5cf8e2d8b1fd36226cf7f83032bb2f1a

updated pt dictionary

Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6
Reviewed-on: https://gerrit.libreoffice.org/6181
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/dictionaries b/dictionaries
index 680c6e2..3cb609c 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 680c6e25c5d716d402b8b34fe337178c0ed67052
+Subproject commit 3cb609ce5cf8e2d8b1fd36226cf7f83032bb2f1a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-0-6' - pt_PT/description.xml pt_PT/pt_PT.dic

2013-10-11 Thread Andras Timar

 pt_PT/description.xml |2 -
 pt_PT/pt_PT.dic   |   75 ++
 2 files changed, 53 insertions(+), 24 deletions(-)

New commits:
commit 3cb609ce5cf8e2d8b1fd36226cf7f83032bb2f1a
Author: Andras Timar 
Date:   Thu Oct 10 09:22:36 2013 +0200

updated pt dictionary

Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6
Reviewed-on: https://gerrit.libreoffice.org/6181
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/pt_PT/description.xml b/pt_PT/description.xml
index f3196f2..92bec39 100644
--- a/pt_PT/description.xml
+++ b/pt_PT/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 
diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic
index e73e46c..fad14ba 100644
--- a/pt_PT/pt_PT.dic
+++ b/pt_PT/pt_PT.dic
@@ -1,4 +1,4 @@
-43909
+43938
 Ã  [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s]
 abacateiro/p   [CAT=nc,G=m,N=s]
 abacate/p  [CAT=nc,G=m,N=s]
@@ -20,9 +20,10 @@ abalo/p  [CAT=nc,G=m,N=s]
 abalroar/XYPLcM[CAT=v,T=inf,TR=t]
 abanadela/p[CAT=nc,G=f,N=s]
 abanadura/p[CAT=nc,G=f,N=s]
+abananado/fp   [CAT=adj,N=s,G=m]
 abanÃ£o/p  [CAT=nc,G=m,N=s]
 abanar/XYPLD   [CAT=v,T=inf,TR=t]
-abandalhar/XYPLcM  [CAT=v,T=inf,TR=t]
+abanar/XYPLD   [CAT=v,T=inf,TR=t]
 abandonar/XYPLMv   [CAT=v,T=inf,TR=t]
 abandono/p [CAT=nc,G=m,N=s]
 aba/p  [CAT=nc,G=f,N=s]
@@ -824,6 +825,7 @@ agarrar/XYPLDW  [CAT=v,T=inf,TR=_]
 agasalhar/XYPLD[CAT=v,T=inf,TR=t]
 agasalho/p [CAT=nc,G=m,N=s]
 agastar/XYPLM  [CAT=v,T=inf,TR=t]
+Ã¡gata/p   [CAT=nc,G=f,N=s]
 agemado[CAT=adj,N=s,G=m]
 agÃªncia/p [CAT=nc,G=f,N=s]
 agenciar/LP[CAT=v,T=inf,TR=t]
@@ -935,6 +937,7 @@ aguadeiro/p [CAT=a_nc,G=m,N=s]
 Ã¡gua-marinha  [CAT=nc,G=f,N=s]
 Ã¡gua-oxigenada[CAT=nc,G=f,N=s]
 Ã¡gua-pÃ©/p[CAT=nc,G=f,N=s]
+aguapÃ©/p  [CAT=nc,G=f,N=s]
 aguardar/XYPLD [CAT=v,T=inf,TR=t]
 aguardenteiro  [CAT=nc,G=m,N=s]
 aguardente/p   [CAT=nc,G=f,N=s]
@@ -1097,7 +1100,7 @@ alcoolemia[CAT=nc,G=f,N=s]
 alcoÃ³lico/fpx [CAT=adj,N=s,G=m]
 alcoolificar/XYPLc [CAT=v,T=inf,TR=t]
 alcoolismo/p   [CAT=nc,G=m,N=s]
-alcoolizar/XYPLc   [CAT=v,T=inf,TR=t]
+alcoolizar/XYPLcv  [CAT=v,T=inf,TR=t]
 Ã¡lcool[CAT=nc,G=m,N=s]
 alcoolometria/p[CAT=nc,G=f,N=s]
 alcoolÃ³metro  [CAT=nc,G=m,N=s]
@@ -1114,7 +1117,7 @@ aldeÃdo/p[CAT=nc,G=m,N=s]
 aldeola/p  [CAT=nc,G=f,N=s]
 aldeota[CAT=nc,G=f,N=s]
 aldrabada  [CAT=nc,G=f,N=s]
-aldrabÃ£o/p[CAT=a_nc,G=m,N=s]
+aldrabÃ£o/pf   [CAT=a_nc,G=m,N=s]
 aldrabar/XYPLc [CAT=v,T=inf,TR=t]
 aldrabeiro [CAT=a_nc,G=m,N=s]
 aldrabice/p[CAT=nc,G=f,N=s]
@@ -2672,12 +2675,12 @@ arcaz   [CAT=nc,G=m,N=s]
 arcebispado[CAT=nc,G=m,N=s]
 arcebispal [CAT=adj,N=s,G=_]
 arcebispo/p[CAT=nc,G=m,N=s]
-arcediago  [CAT=nc,G=m,N=s]
+arcediago/p[CAT=nc,G=m,N=s]
 archeiro/p [CAT=nc,G=m,N=s]
 archoteiro [CAT=nc,G=m,N=s]
 archote/pt [CAT=nc,G=m,N=s]
 arciforme/p[CAT=adj,N=s,G=_]
-arcipreste [CAT=nc,G=m,N=s]
+arcipreste/p   [CAT=nc,G=m,N=s]
 arco-celeste   [CAT=nc,G=m,N=s]
 arco-irisar/XYPL   [CAT=v,T=inf,TR=_]
 arco-Ãris [CAT=nc,G=m,N=s]
@@ -3728,6 +3731,7 @@ autÃ³gamo [CAT=adj,N=s,G=m]
 autogÃ©neo [CAT=adj,N=s,G=m]
 autogÃ©nese[CAT=nc,G=f,N=s]
 autogenÃ©tico  [CAT=adj,N=s,G=m]
+autogestÃ£o[CAT=nc,G=f,N=s]
 autognose  [CAT=nc,G=f,N=s]
 autogolo/p [CAT=nc,G=m,N=s]
 autogoverno/p  [CAT=nc,G=m,N=s]
@@ -3964,7 +3968,7 @@ babadura  [CAT=nc,G=f,N=s]
 baba/p [CAT=nc,G=f,N=s]
 babÃ£o/fp  [CAT=a_nc,G=m,N=s]
 babar/XYPL [CAT=v,T=inf,TR=t]
-babeiro[CAT=nc,G=m,N=s]
+babeiro/p  [CAT=nc,G=m,N=s]
 babÃ©lico  [CAT=adj,N=s,G=m]
 babel  [CAT=nc,G=f,N=s]
 babilÃ³nia [CAT=nc,G=f,N=s]
@@ -9283,7 +9287,7 @@ convento/p[CAT=nc,G=m,N=s]
 conventual/p   [CAT=nc,G=m,N=s]
 convergÃªncia/p[CAT=nc,G=f,N=s]
 convergente/p  [CAT=adj,N=s,G=_]
-convergir/XYL  [CAT=v,T=inf,TR=i]
+convergir/YL   [CAT=v,T=inf,TR=i]
 conversadeira  [CAT=a_nc,G=f,N=s]
 conversado [CAT=a_nc,G=m,N=s]
 conversador[CAT=a_nc,G=m,N=s]
@@ -11931,7 +11935,7 @@ dissociar/XYPLcv[CAT=v,T=inf,TR=t]
 dissociativo   [CAT=adj,N=s,G=m]
 dissoluÃ§Ã£o/p [CAT=nc,G=f,N=s]
 dissolutivo[CAT=adj,N=s,G=m]
-dissoluto  [CAT=adj,N=s,G=m]
+dissoluto/pf   [CAT=adj,N=s,G=m]
 dissolÃºvel/dpI[CAT=adj,N=s,G=_]
 dissolvÃªncia/p[CAT=nc,G=f,N=s]
 dissolvente/p  [CAT=a_nc,G=2,N=s]
@@ -17340,7 +17344,7 @@ harmÃ³nica  [CAT=a_nc,G=f,N=s]
 harmÃ³nico/fpH [CAT=adj,N=s,G=m]
 harmÃ³nio/p[CAT=nc,G=m,N=s]
 harmonioso/fpSm[CAT=adj,N=s,G=m]
-harmonista [CAT=nc,G=_,N=s]
+harmonista/p   [CAT=nc,G=_,N=s]
 harmonizador   [CAT=a_nc,G=m,N=s]
 harmonizar/XYPLcDv [CAT=v,T=inf,

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

2013-10-11 Thread Stephan Bergmann

 sc/source/core/data/dociter.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 603b62c618b96e960ed8411626abc02418d5f3cc
Author: Stephan Bergmann 
Date:   Fri Oct 11 18:26:00 2013 +0200

-Werror,-Wunused-function

Change-Id: I27d1bd3f4a94ba6951e5082509980f45cf48650c

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index a73b02b..3277d36 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -53,11 +53,6 @@ using ::std::set;
 
 namespace {
 
-void upperCase(OUString& rStr)
-{
-rStr = ScGlobal::pCharClass->uppercase(rStr.trim());
-}
-
 template
 void incBlock(std::pair<_Iter, size_t>& rPos)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 sc/source/filter/excel/xistring.cxx   |4 +
 sc/source/filter/oox/condformatbuffer.cxx |   65 +++---
 sc/source/filter/oox/pivotcachebuffer.cxx |8 ++-
 sc/source/filter/oox/pivottablebuffer.cxx |   12 +++--
 4 files changed, 67 insertions(+), 22 deletions(-)

New commits:
commit dbad3d0e6e972e76484e36ab48513730ca4db1eb
Author: Stephan Bergmann 
Date:   Fri Oct 11 18:24:12 2013 +0200

-Werror,-Wunused-variable

Change-Id: Ia69312b4adc11c256e57e69c0fd488eca441ce4e

diff --git a/sc/source/filter/excel/xistring.cxx 
b/sc/source/filter/excel/xistring.cxx
index e03c3a8..6bb003f 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -47,7 +47,9 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags 
nFlags )
 if( !::get_flag( nFlags, EXC_STR_SEPARATEFORMATS ) )
 maFormats.clear();
 
-OSL_ENSURE( (nFlags & ~nAllowedFlags) == 0, "XclImpString::Read - unknown 
flag" );
+SAL_WARN_IF(
+(nFlags & ~nAllowedFlags) != 0, "sc.filter",
+"XclImpString::Read - unknown flag");
 bool b16BitLen = !::get_flag( nFlags, EXC_STR_8BITLENGTH );
 
 switch( rStrm.GetRoot().GetBiff() )
diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index aa31edd..d14ff5d 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -482,7 +482,9 @@ void CondFormatRule::importCfRule( SequenceInputStream& 
rStrm )
 switch( nType )
 {
 case BIFF12_CFRULE_TYPE_CELLIS:
-OSL_ENSURE( nSubType == BIFF12_CFRULE_SUB_CELLIS, 
"CondFormatRule::importCfRule - rule type/subtype mismatch" );
+SAL_WARN_IF(
+nSubType != BIFF12_CFRULE_SUB_CELLIS, "sc.filter",
+"CondFormatRule::importCfRule - rule type/subtype mismatch");
 maModel.mnType = XML_cellIs;
 maModel.setBiffOperator( nOperator );
 OSL_ENSURE( maModel.mnOperator != XML_TOKEN_INVALID, 
"CondFormatRule::importCfRule - unknown operator" );
@@ -520,52 +522,77 @@ void CondFormatRule::importCfRule( SequenceInputStream& 
rStrm )
 maModel.mnType = XML_notContainsErrors;
 break;
 case BIFF12_CFRULE_SUB_TODAY:
-OSL_ENSURE( nOperator == BIFF12_CFRULE_TIMEOP_TODAY, 
"CondFormatRule::importCfRule - unexpected time operator value" );
+SAL_WARN_IF(
+nOperator != BIFF12_CFRULE_TIMEOP_TODAY, "sc.filter",
+"CondFormatRule::importCfRule - unexpected time 
operator value");
 maModel.mnType = XML_timePeriod;
 maModel.mnTimePeriod = XML_today;
 break;
 case BIFF12_CFRULE_SUB_TOMORROW:
-OSL_ENSURE( nOperator == BIFF12_CFRULE_TIMEOP_TOMORROW, 
"CondFormatRule::importCfRule - unexpected time operator value" );
+SAL_WARN_IF(
+nOperator != BIFF12_CFRULE_TIMEOP_TOMORROW, 
"sc.filter",
+"CondFormatRule::importCfRule - unexpected time 
operator value");
 maModel.mnType = XML_timePeriod;
 maModel.mnTimePeriod = XML_tomorrow;
 break;
 case BIFF12_CFRULE_SUB_YESTERDAY:
-OSL_ENSURE( nOperator == BIFF12_CFRULE_TIMEOP_YESTERDAY, 
"CondFormatRule::importCfRule - unexpected time operator value" );
+SAL_WARN_IF(
+nOperator != BIFF12_CFRULE_TIMEOP_YESTERDAY,
+"sc.filter",
+"CondFormatRule::importCfRule - unexpected time 
operator value");
 maModel.mnType = XML_timePeriod;
 maModel.mnTimePeriod = XML_yesterday;
 break;
 case BIFF12_CFRULE_SUB_LAST7DAYS:
-OSL_ENSURE( nOperator == BIFF12_CFRULE_TIMEOP_LAST7DAYS, 
"CondFormatRule::importCfRule - unexpected time operator value" );
+SAL_WARN_IF(
+nOperator != BIFF12_CFRULE_TIMEOP_LAST7DAYS,
+"sc.filter",
+"CondFormatRule::importCfRule - unexpected time 
operator value");
 maModel.mnType = XML_timePeriod;
 maModel.mnTimePeriod = XML_last7Days;
 break;
 case BIFF12_CFRULE_SUB_LASTMONTH:
-OSL_ENSURE( nOperator == BIFF12_CFRULE_TIMEOP_LASTMONTH, 
"CondFormatRule::importCfRule - unexpected time operator value" );
+SAL_WARN_IF(
+nOperator != BIFF12_CFRULE_TIMEOP_LASTMONTH,
+"sc.filter",
+"CondFormatRule::importCfRule - unexpected time 
operator value");
 maModel.mnType = XML_timePeriod;
 maModel.mnTimePer

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sal/rtl

2013-10-11 Thread Stephan Bergmann

 sal/rtl/source/strtmpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5688ab5ba457ea9a50152570d161a11a1d093994
Author: Stephan Bergmann 
Date:   Wed Oct 9 19:10:32 2013 +0200

Fail fast at least in debug builds

(cherry picked from commit 57a28dc9556b4e6fff337e0eb9d0d8abc5223161)
Conflicts:
sal/rtl/strtmpl.cxx

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

diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index f9d7a5e..b303e10 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -1198,7 +1198,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromSubString )( 
IMPL_RTL_STRINGDATA** ppT
 }
 if ( count < 0 || beginIndex < 0 || beginIndex + count > pFrom->length )
 {
-OSL_FAIL( "Out of bounds substring access" );
+assert(false);
 IMPL_RTL_STRINGNAME( newFromLiteral )( ppThis, "!!br0ken!!", 10, 0 );
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: Branch 'feature/writeable-oletool' - src/oletool.py

2013-10-11 Thread Noel Power

 src/oletool.py |   26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 944df93d70bd0b60d9c299cd2f3ca2d45b5f7658
Author: Noel Power 
Date:   Fri Oct 11 17:15:42 2013 +0100

fix oletool.py -l we were missing quite a few files in the listing

diff --git a/src/oletool.py b/src/oletool.py
index 768f91c..4e3c3e4 100755
--- a/src/oletool.py
+++ b/src/oletool.py
@@ -82,9 +82,9 @@ class OleContainer:
 nextLeft = child.Entry.DirIDLeft
 if ( nextLeft > 0 ):
 newEntry = DirNode( entries[ nextLeft ], nextLeft )
-newEntry.HierachicalName = newEntry.Entry.Name
-if len(  parent.HierachicalName ):
-newEntry.HierachicalName = parent.HierachicalName + '/' + 
newEntry.HierachicalName
+newEntry.HierachicalName = parent.HierachicalName + 
newEntry.Entry.Name
+if  newEntry.Entry.DirIDRoot > 0:
+newEntry.HierachicalName = newEntry.HierachicalName + '/'
 
 self.__addSiblings( entries, parent, newEntry ) 
 parent.Nodes.insert( 0, newEntry )
@@ -93,9 +93,9 @@ class OleContainer:
 # add children to the right 
 if ( nextRight > 0 ):
 newEntry = DirNode( entries[ nextRight ], nextRight )
-newEntry.HierachicalName = newEntry.Entry.Name
-if len(  parent.HierachicalName ):
-newEntry.HierachicalName = parent.HierachicalName + '/' + 
newEntry.HierachicalName
+newEntry.HierachicalName = parent.HierachicalName + 
newEntry.Entry.Name
+if  newEntry.Entry.DirIDRoot > 0:
+newEntry.HierachicalName = newEntry.HierachicalName + '/'
 self.__addSiblings( entries, parent, newEntry ) 
 parent.Nodes.append( newEntry )
 
@@ -103,11 +103,13 @@ class OleContainer:
 
 if ( parent.Entry.DirIDRoot > 0 ):
 newEntry = DirNode( entries[ parent.Entry.DirIDRoot ], 
parent.Entry.DirIDRoot )
-if len(  parent.HierachicalName ):
-newEntry.HierachicalName = parent.HierachicalName + '/' + 
newEntry.HierachicalName
+newEntry.HierachicalName = parent.HierachicalName +  
newEntry.Entry.Name
+if ( newEntry.Entry.DirIDRoot > 0 ):
+newEntry.HierachicalName =  newEntry.HierachicalName + '/'
+
 self.__addSiblings( entries, parent, newEntry )
-parent.Nodes.append( newEntry )
-
+parent.Nodes.append( newEntry )
+
 for child in parent.Nodes:
 if child.Entry.DirIDRoot > 0:
 self.__buildTreeImpl( entries, child )
@@ -152,7 +154,7 @@ class OleContainer:
 obj.parseDirEntries()
 count = 0
 for entry in obj.entries:
-print("Entry [0x%x] Name %s  Root 0x%x Left 0x%x Right %x")%( 
count, entry.Name, entry.DirIDRoot, entry.DirIDLeft, entry.DirIDRight )
+print("Entry [%i] Name %s  Root %i Left %i Right %i")%( count, 
entry.Name, entry.DirIDRoot, entry.DirIDLeft, entry.DirIDRight )
 count = count + 1
 def list(self, directory):
 if directory != None:
@@ -162,7 +164,7 @@ class OleContainer:
 self.__printHeader()
 self.__printListReport( rootNode, directory.entries )
 # need to print a footer ( total bytes, total files like unzip )
-
+
 def extract(self, name, directory):
 if ( directory == None ):
 print "failed to extract %s"%name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 sc/inc/externalrefmgr.hxx|3 +--
 sc/source/ui/docshell/externalrefmgr.cxx |4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d58d1719a49c5c25cce8ddfa7fef52b09d0f9957
Author: Stephan Bergmann 
Date:   Fri Oct 11 18:40:10 2013 +0200

Unused ScExternalRefCache::mrStrPool

Change-Id: Idc9d05cae6ebee4c5f88dbe53ab182da66781582

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index df794bd..9ade21d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -201,7 +201,7 @@ public:
 typedef ::boost::unordered_map< OUString, size_t, OUStringHash>
 TableNameIndexMap;
 
-ScExternalRefCache(svl::SharedStringPool& rPool);
+ScExternalRefCache();
 ~ScExternalRefCache();
 
 const OUString* getRealTableName(sal_uInt16 nFileId, const OUString& 
rTabName) const;
@@ -340,7 +340,6 @@ private:
 DocItem* getDocItem(sal_uInt16 nFileId) const;
 
 private:
-svl::SharedStringPool& mrStrPool;;
 mutable DocDataType maDocs;
 };
 
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 302d17c..6ed09cf 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -488,8 +488,7 @@ ScExternalRefCache::CellFormat::CellFormat() :
 
 // 
 
-ScExternalRefCache::ScExternalRefCache(svl::SharedStringPool& rPool) :
-mrStrPool(rPool) {}
+ScExternalRefCache::ScExternalRefCache() {}
 
 ScExternalRefCache::~ScExternalRefCache() {}
 
@@ -1503,7 +1502,6 @@ static ScTokenArray* lcl_fillEmptyMatrix(const ScRange& 
rRange)
 
 ScExternalRefManager::ScExternalRefManager(ScDocument* pDoc) :
 mpDoc(pDoc),
-maRefCache(pDoc->GetSharedStringPool()),
 mbInReferenceMarking(false),
 mbUserInteractionEnabled(true)
 {
___
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' - editeng/source

2013-10-11 Thread Caolán McNamara

 editeng/source/outliner/outliner.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9225bf807d40bf85a83536e2df23a28c457f
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 22 15:29:10 2013 +0100

Resolves: rhbz#996162 apparent NULL bullet font

Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2
(cherry picked from commit 166510ed48bf49b75a031ce973f41d08fb4e4518)
Reviewed-on: https://gerrit.libreoffice.org/6153
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 92923d3..70da2fc 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -898,9 +898,15 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
 }
 
 Font aBulletFont;
+const Font *pSourceFont = 0;
 if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
 {
-aBulletFont = *pFmt->GetBulletFont();
+pSourceFont = pFmt->GetBulletFont();
+}
+
+if (pSourceFont)
+{
+aBulletFont = *pSourceFont;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Michael Meeks

 shell/source/win32/zipfile/zipfile.cxx |   51 +
 1 file changed, 40 insertions(+), 11 deletions(-)

New commits:
commit 53138c9968e28a25a8cd6d2b5e3d31cbb3257852
Author: Michael Meeks 
Date:   Fri Oct 11 17:43:19 2013 +0100

fdo#56007 - fast zip directory find to accelerate Windows Explorer 
thumbnail.

Change-Id: Id9436def56f40d2bb54dea35bea916bd99964653

diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index fb7dc88..cf05a56 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -102,6 +102,9 @@ struct CentralDirectoryEnd
 #define LOC_FILE_HEADER_SIG 0x04034b50
 #define CDIR_END_SIG 0x06054b50
 
+// This little lot performs in a truly appalling way without
+// buffering eg. on an IStream.
+
 static unsigned char readByte(StreamInterface *stream)
 {
 if (!stream || stream->stell() == -1)
@@ -250,31 +253,57 @@ static bool areHeadersConsistent(const LocalFileHeader 
&header, const CentralDir
 return true;
 }
 
+#define BLOCK_SIZE 0x800
+
+static bool findSignatureAtOffset(StreamInterface *stream, unsigned long 
nOffset)
+{
+// read in reasonably sized chunk, and read more, to get overlapping sigs
+unsigned char aBuffer[ BLOCK_SIZE + 4 ];
+
+stream->sseek(nOffset, SEEK_SET);
+
+unsigned long nBytesRead = stream->sread(aBuffer, sizeof(aBuffer));
+if (nBytesRead < 0)
+return false;
+
+for (long n = nBytesRead - 4; n >= 0; n--)
+{
+if (aBuffer[n  ] == 0x50 && aBuffer[n+1] == 0x4b &&
+aBuffer[n+2] == 0x05 && aBuffer[n+3] == 0x06)
+{ // a palpable hit ...
+stream->sseek(nOffset + n, SEEK_SET);
+return true;
+}
+}
+
+return false;
+}
+
 static bool findCentralDirectoryEnd(StreamInterface *stream)
 {
 if (!stream)
 return false;
-stream->sseek(0, SEEK_SET);
-if (stream->sseek(-1024, SEEK_END)) stream->sseek(0, SEEK_SET);
+
+stream->sseek(0,SEEK_END);
+
+long nLength = stream->stell();
+if (nLength == -1)
+return false;
+
 try
 {
-while (stream->stell() != -1)
+for (long nOffset = nLength - BLOCK_SIZE;
+ nOffset > 0; nOffset -= BLOCK_SIZE)
 {
-unsigned signature = readInt(stream);
-if (signature == CDIR_END_SIG)
-{
-stream->sseek(-4, SEEK_CUR);
+if (findSignatureAtOffset(stream, nOffset))
 return true;
-}
-else
-stream->sseek(-3, SEEK_CUR);
 }
+return findSignatureAtOffset(stream, 0);
 }
 catch (...)
 {
 return false;
 }
-return false;
 }
 
 static bool isZipStream(StreamInterface *stream)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Andras Timar

 l10ntools/source/localize.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2731092c12a08e2b53d28089070d2a97c23e8925
Author: Andras Timar 
Date:   Fri Oct 11 18:44:42 2013 +0200

add sw/source/ui/inc/misc.hrc

Change-Id: Id1e0d4241a356bdb08a44b3ae87c3d1023c4669e

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index be8ec9b..be88cea 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -119,6 +119,7 @@ bool passesPositiveList(const OUString& rUrl) {
 { RTL_CONSTASCII_STRINGPARAM(
 "/svx/source/unodialogs/textconversiondlgs/"
 "chinese_direction_tmpl.hrc") },
+{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") },
 { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swacc_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swmn_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/toolbox_tmpl.hrc") }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Stephan Bergmann

 sw/source/core/undo/undel.cxx  |2 ++
 sw/source/core/undo/unins.cxx  |1 +
 sw/source/core/undo/unovwr.cxx |3 +++
 3 files changed, 6 insertions(+)

New commits:
commit 4ee0bbff0ebb88a249321c74e32b61f4c7eb3878
Author: Stephan Bergmann 
Date:   Fri Oct 11 18:51:42 2013 +0200

-Werror,-Wunused-variable

Change-Id: Ia7fa834e3d9bf8578dcdc667fbe97ce58606704b

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 34e9fcb..766ed61 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -789,6 +789,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 OUString const ins( pTxtNd->InsertText(*pEndStr, aPos.nContent,
 IDocumentContentOperations::INS_NOHINTEXPAND) );
 assert(ins.getLength() == pEndStr->Len()); // must succeed
+(void) ins;
 // METADATA: restore
 pTxtNd->RestoreMetadata(m_pMetadataUndoEnd);
 }
@@ -883,6 +884,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 OUString const ins( pTxtNd->InsertText(*pSttStr, aPos.nContent,
 IDocumentContentOperations::INS_NOHINTEXPAND) );
 assert(ins.getLength() == pSttStr->Len()); // must succeed
+(void) ins;
 // METADATA: restore
 pTxtNd->RestoreMetadata(m_pMetadataUndoStart);
 }
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 5145aaa..3f3a00e 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -730,6 +730,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & 
rContext)
 {
 OUString const ins( pNd->InsertText( m_sOld, aIdx ) );
 assert(ins.getLength() == m_sOld.getLength()); // must succeed
+(void) ins;
 }
 
 if( pHistory )
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index b7559c2..6a2fc8a 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -157,6 +157,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, 
SwPosition& rPos,
 OUString const ins( pDelTxtNd->InsertText(OUString(cIns), rPos.nContent,
 IDocumentContentOperations::INS_EMPTYEXPAND) );
 assert(ins.getLength() == 1); // check in SwDoc::Overwrite => cannot fail
+(void) ins;
 aInsStr.Insert( cIns );
 
 if( !bInsChar )
@@ -210,6 +211,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & 
rContext)
 OUString aTmpStr(aDelStr.GetChar(n));
 OUString const ins( pTxtNd->InsertText(aTmpStr, rIdx) );
 assert(ins.getLength() == 1); // cannot fail
+(void) ins;
 rIdx -= 2;
 pTxtNd->EraseText( rIdx, 1 );
 rIdx += 2;
@@ -282,6 +284,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & 
rContext)
 pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx,
 IDocumentContentOperations::INS_EMPTYEXPAND) );
 assert(ins.getLength() == 1); // cannot fail
+(void) ins;
 if( n < aDelStr.Len() )
 {
 rIdx -= 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Michael Stahl

 sw/source/ui/shells/textsh1.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 9533e01713c0170bdae030429de38756d9c5ca74
Author: Michael Stahl 
Date:   Fri Oct 11 18:36:47 2013 +0200

fdo#67796: sw: fix table cursor when setting language in status bar

Unfortunately it turns out that the neat hack in commit
b227a8e4d65e4bbfe991aed9342fe3e30eca8639 does not work unless something
actually _deletes_ the current m_pTblCrsr between Push() and Pop(),
e.g. by calling SwCrsrShell::ClearMark() or KillPams().

It would be possible to do some invalidation of m_pTblCrsr in
SwCrsrShell::ClearUpCrsrs() or UpdateCrsr(), to set it's bChg flag
or perhaps call ParkTblCrsr(); not sure if doing that is an improvement;
certainly it shouldn't be tried in a 4.0.6 backport.

So work around the problem locally in SwTextShell::Execute().

Change-Id: I2981506b3065e824532deda28d21dad4a5734a8c

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index c76969a..1ffbe4b 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -322,9 +322,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
 // prevent view from jumping because of (temporary) selection 
changes
 rWrtSh.LockView( sal_True );
 
-// save selection for later restoration
-rWrtSh.Push();
-
 // setting the new language...
 if (!aNewLangTxt.isEmpty())
 {
@@ -363,6 +360,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
 bForSelection = false;
 }
 
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Push(); // save selection for later restoration
+rWrtSh.ClearMark(); // fdo#67796: invalidate table crsr
+}
+
 if (bForParagraph)
 SwLangHelper::SelectCurrentPara( rWrtSh );
 
@@ -381,11 +384,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
 SwLangHelper::SetLanguage( rWrtSh, aNewLangTxt, 
bForSelection, aCoreSet );
 rWrtSh.EndUndo();
 
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Pop(false); // restore selection...
+}
 }
 
-// restore selection...
-rWrtSh.Pop( sal_False );
-
 rWrtSh.LockView( sal_False );
 rWrtSh.EndAction();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-11 Thread Andras Timar

 l10ntools/source/localize.cxx |   22 ++
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit e17600eba244f8ee3e37cc24b4e2171f801c5ea6
Author: Andras Timar 
Date:   Fri Oct 11 19:13:26 2013 +0200

file list cleanup

Change-Id: I7bffb6c976654e23e8728e902d7bac287e45afd3

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index be88cea..4b7afd7 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -79,9 +79,7 @@ bool passesNegativeList(const OUString& rUrl) {
 "org.openoffice.hu.hunspell.dictionaries/page1.xhp") },
 { RTL_CONSTASCII_STRINGPARAM(
 "/officecfg/registry/data/org/openoffice/Office/"
-"Accelerators.xcu") },
-{ RTL_CONSTASCII_STRINGPARAM(
-"/officecfg/registry/data/org/openoffice/Office/SFX.xcu") }
+"Accelerators.xcu") }
 };
 return !matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
@@ -98,31 +96,15 @@ bool passesPositiveList(const OUString& rUrl) {
 "/chart2/source/controller/dialogs/"
 "res_SecondaryAxisCheckBoxes_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM(
-"/chart2/source/controller/dialogs/res_Statistic_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM(
 "/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM(
-"/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM(
-"/chart2/source/controller/menu/MenuItems_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM(
 "/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM(
 "/dbaccess/source/ui/inc/toolbox_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM("/description.xml") },
 { 
RTL_CONSTASCII_STRINGPARAM("/android/sdremote/res/values/strings.xml") },
-{ RTL_CONSTASCII_STRINGPARAM("/offmgr/inc/offmenu_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM(
-"/offmgr/source/offapp/intro/intro_tmpl.hrc") },
 { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/svx/source/intro/intro_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM(
-"/svx/source/unodialogs/textconversiondlgs/"
-"chinese_direction_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swacc_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swmn_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/toolbox_tmpl.hrc") }
+{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") }
 };
 return matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 126 matches

Mail list logo