date:20140518

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 03/a410876fbdb5f9e1a7216d9d622557275d4896

2014-05-18 Thread Caolán McNamara

 03/a410876fbdb5f9e1a7216d9d622557275d4896 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f516dbbff21501a23451d25a6aeafaf0f017e1b9
Author: CaolÃ¡n McNamara 
Date:   Sun May 18 08:53:33 2014 +0100

Notes added by 'git notes add'

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

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

2014-05-18 Thread Tsutomu Uchino

 scripting/source/protocolhandler/scripthandler.cxx |   40 +
 1 file changed, 40 insertions(+)

New commits:
commit a00c4c5e2fb9461fef1fbce4d51c8cdf36141b9f
Author: Tsutomu Uchino 
Date:   Sat May 17 10:16:40 2014 +

Resolves: #i113481# query script invocation from the current frame...

when the controller is not yet attached

(cherry picked from commit 03a410876fbdb5f9e1a7216d9d622557275d4896)

Change-Id: I1da3b3da258445d5187dcc75c4d151d08f9017dc

diff --git a/scripting/source/protocolhandler/scripthandler.cxx 
b/scripting/source/protocolhandler/scripthandler.cxx
index 50fa627..d2c6f75 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -158,7 +158,28 @@ void SAL_CALL 
ScriptProtocolHandler::dispatchWithNotification(
 
 OSL_ENSURE( xDocumentScripts.is(), 
"ScriptProtocolHandler::dispatchWithNotification: can't do the security check!" 
);
 if ( !xDocumentScripts.is() || 
!xDocumentScripts->getAllowMacroExecution() )
+{
+if ( xListener.is() )
+{
+::com::sun::star::frame::DispatchResultEvent aEvent(
+static_cast< ::cppu::OWeakObject* >( this ),
+
::com::sun::star::frame::DispatchResultState::FAILURE,
+invokeResult );
+try
+{
+xListener->dispatchFinished( aEvent ) ;
+}
+catch(RuntimeException & e)
+{
+OSL_TRACE(
+
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
+"while dispatchFinished with failture of the 
execution %s",
+::rtl::OUStringToOString( e.Message,
+RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+}
+}
 return;
+}
 }
 
 // Creates a ScriptProvider ( if one is not created already )
@@ -333,6 +354,25 @@ ScriptProtocolHandler::getScriptInvocation()
 if ( !m_xScriptInvocation.set( xController->getModel(), UNO_QUERY 
) )
 m_xScriptInvocation.set( xController, UNO_QUERY );
 }
+else
+{
+Reference< XFrame > xFrame( m_xFrame.get(), UNO_QUERY );
+if ( xFrame.is() )
+{
+SfxFrame* pFrame = NULL;
+for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = 
SfxFrame::GetNext( *pFrame ) )
+{
+if ( pFrame->GetFrameInterface() == xFrame )
+break;
+}
+SfxObjectShell* pDocShell = pFrame ? 
pFrame->GetCurrentDocument() : SfxObjectShell::Current();
+if ( pDocShell )
+{
+Reference< XModel > xModel( pDocShell->GetModel() );
+m_xScriptInvocation.set( xModel, UNO_QUERY );
+}
+}
+}
 }
 return m_xScriptInvocation.is();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - Repository.mk vcl/Module_vcl.mk vcl/workben

2014-05-18 Thread Chris Sherlock

 Repository.mk |6 -
 vcl/Module_vcl.mk |6 -
 vcl/workben/svdem.cxx |2 -
 vcl/workben/svpclient.cxx |   47 +-
 vcl/workben/svptest.cxx   |   19 +++---
 vcl/workben/vcldemo.cxx   |   19 +++---
 6 files changed, 56 insertions(+), 43 deletions(-)

New commits:
commit 01c52c3f7115569798591320f094e2a3db23bdbf
Author: Chris Sherlock 
Date:   Sun May 18 18:13:18 2014 +1000

vcl: fix svpclient

I have converted the UNO stuff to the more modern variety (i.e. the
stuff that actually works now...), use GraphicFilter to get the
bitmap and fixed the string copy typo.

Change-Id: I6a3c1af54d222ef70814d2bb581cc2f3c058bb2f

diff --git a/Repository.mk b/Repository.mk
index 15288f7..65c80e0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter-out ANDROID IOS,$(OS)), \
 svdemo \
 svptest \
+svpclient \
 vcldemo) \
 ))
 
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a38d076..c8c436a 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 $(if $(filter-out ANDROID IOS,$(OS)), \
 Executable_svdemo \
 Executable_svptest \
+Executable_svpclient \
 Executable_vcldemo) \
 Library_vclopengl \
 ))
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 4537158..60823d0 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -18,7 +18,12 @@
  */
 
 #include 
+
+#include 
+#include 
+
 #include 
+#include 
 #include 
 
 #include 
@@ -28,6 +33,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -36,10 +43,6 @@
 
 #include 
 
-#include 
-#include 
-#include 
-
 #include 
 #include 
 #include 
@@ -47,10 +50,9 @@
 #include 
 #include 
 
-using namespace cppu;
-using namespace comphelper;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
+using namespace cppu;
 
 // Forward declaration
 void Main();
@@ -60,23 +62,13 @@ SAL_IMPLEMENT_MAIN()
 tools::extendApplicationEnvironment();
 
 // create the global service-manager
-Reference< XMultiServiceFactory > xFactory;
-try
-{
-Reference< XComponentContext > xCtx = 
defaultBootstrap_InitialComponentContext();
-xFactory = Reference< XMultiServiceFactory >(  
xCtx->getServiceManager(), UNO_QUERY );
-if( xFactory.is() )
-setProcessServiceFactory( xFactory );
-}
-catch(const com::sun::star::uno::Exception&)
-{
-}
+Reference< XComponentContext > xContext = 
defaultBootstrap_InitialComponentContext();
+Reference< XMultiServiceFactory > xServiceManager( 
xContext->getServiceManager(), UNO_QUERY );
 
-if( ! xFactory.is() )
-{
-fprintf( stderr, "Could not bootstrap UNO, installation must be in 
disorder. Exiting.\n" );
-exit( 1 );
-}
+if( !xServiceManager.is() )
+Application::Abort( "Failed to bootstrap" );
+
+comphelper::setProcessServiceFactory( xServiceManager );
 
 InitVCL();
 ::Main();
@@ -235,13 +227,18 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, )
 {
 OStringBuffer aCommand( 64 );
 aCommand.append( "get " );
-aCommand.append( OUStringToOString( aEntry.Copy( nPos+2 ), 
RTL_TEXTENCODING_ASCII_US ) );
+aCommand.append( OUStringToOString( aEntry.copy( nPos+2 ), 
RTL_TEXTENCODING_ASCII_US ) );
 OString aAnswer( processCommand( aCommand.makeStringAndClear() ) );
 SvMemoryStream aStream( aAnswer.getLength() );
 aStream.Write( aAnswer.getStr(), aAnswer.getLength() );
 aStream.Seek( STREAM_SEEK_TO_BEGIN );
-Bitmap aBitmap;
-aStream >> aBitmap;
+
+Graphic aGraphicResult;
+GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
+rFilter.ImportGraphic( aGraphicResult, OUString("import"), aStream );
+
+Bitmap aBitmap = aGraphicResult.GetBitmap();
+
 fprintf( stderr, "got bitmap of size %ldx%ld\n",
  sal::static_int_cast< long >(aBitmap.GetSizePixel().Width()),
  sal::static_int_cast< long 
>(aBitmap.GetSizePixel().Height()));
commit c0d5da912302ed14469ba3ed0900d346122d34b0
Author: Chris Sherlock 
Date:   Sun May 18 16:07:08 2014 +1000

vcl: fix svptest

Change-Id: Ibaec6e027aa9fd61824ff6b4f1f71b69d217dfdc

diff --git a/Repository.mk b/Repository.mk
index db18c10..15288f7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -120,6 +120,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
) \
$(if $(filter-out ANDROID IOS,$(OS)), \
 svdemo \
+svptest \
 vcldemo) \
 ))
 
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 641d061..a38d076 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -27,6 +27,7 @@ $

VCL demos now working

2014-05-18 Thread Chris Sherlock

Hi folks,

I finally managed to get the VCL demos working.

To see one of them, run:

instdir/program/svptest

and for a basic one:

instdir/program/vcldemo

The sources can be found in vcl/workben/

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

[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file

2014-05-18 Thread bugzilla-daemon

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

--- Comment #9 from Vishv  ---
(In reply to comment #8)
> (In reply to comment #7)
> > The above code don't give me any compilation error. But, when I open an
> > instance of Impress from my terminal, I could see this messages
> > http://pastebin.ca/2679016. And this seems to be the reason behind the
> > EmbedMedia() not able to create & store the .mp3 file in "Media/" (which is
> > vnd.sun.star.Package:Media).
> > 
> That paste is not really helpful, since you can't tell which part of your
> code is triggering it. Have you debugged this (both a working call to
> EmbedMedia, and your snippets)?

Yes, I had debugged the working call to "EmbedMedia()", when called by (1)
"Insert->Media and Sound"  and (2) and for this case (slide transitions). It
seems to work similarly in both cases. But, still for the second case it does
not embed the music file.

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

[Libreoffice-commits] core.git: vcl/Executable_svpclient.mk vcl/Executable_svptest.mk vcl/Executable_vcldemo.mk

2014-05-18 Thread Chris Sherlock

 vcl/Executable_svpclient.mk |   39 +++
 vcl/Executable_svptest.mk   |   39 +++
 vcl/Executable_vcldemo.mk   |   39 +++
 3 files changed, 117 insertions(+)

New commits:
commit 2701cc1aed7264582cfe07278a74b9de7460a3a6
Author: Chris Sherlock 
Date:   Sun May 18 19:10:23 2014 +1000

vcl: missing demo files

Change-Id: If269ee28c80210186699a2f2de85db8c914b28f1

diff --git a/vcl/Executable_svpclient.mk b/vcl/Executable_svpclient.mk
new file mode 100644
index 000..5f3ba57
--- /dev/null
+++ b/vcl/Executable_svpclient.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,svpclient))
+
+$(eval $(call gb_Executable_use_api,svpclient,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,svpclient,boost_headers))
+
+$(eval $(call gb_Executable_set_include,svpclient,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+-I$(SRCDIR)/solenv/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,svpclient,\
+tl \
+sal \
+vcl \
+cppu \
+cppuhelper \
+comphelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,svpclient,\
+vcl/workben/svpclient \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_svptest.mk b/vcl/Executable_svptest.mk
new file mode 100644
index 000..35c9806
--- /dev/null
+++ b/vcl/Executable_svptest.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,svptest))
+
+$(eval $(call gb_Executable_use_api,svptest,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,svptest,boost_headers))
+
+$(eval $(call gb_Executable_set_include,svptest,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+-I$(SRCDIR)/solenv/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,svptest,\
+tl \
+sal \
+vcl \
+cppu \
+cppuhelper \
+comphelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,svptest,\
+vcl/workben/svptest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
new file mode 100644
index 000..fb29b9a
--- /dev/null
+++ b/vcl/Executable_vcldemo.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,vcldemo))
+
+$(eval $(call gb_Executable_use_api,vcldemo,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,vcldemo,boost_headers))
+
+$(eval $(call gb_Executable_set_include,vcldemo,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+-I$(SRCDIR)/solenv/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,vcldemo,\
+tl \
+sal \
+vcl \
+cppu \
+cppuhelper \
+comphelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,vcldemo,\
+vcl/workben/vcldemo \
+))
+
+# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Chris Sherlock

 Repository.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c39bb97e475659b2007667d99914991b059b8841
Author: Chris Sherlock 
Date:   Sun May 18 19:16:24 2014 +1000

vcl: don't deploy demos

Change-Id: If5e720569ddf5e0538712c24cadb6e15812a0f69

diff --git a/Repository.mk b/Repository.mk
index 65c80e0..7efe301 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -62,6 +62,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \
unoidl-read \
unoidl-write \
xrmex \
+   $(if $(filter-out ANDROID IOS,$(OS)), \
+svdemo \
+svptest \
+svpclient \
+vcldemo) \
 ))
 
 $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
@@ -118,11 +123,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
unopkg \
unopkg_com \
) \
-   $(if $(filter-out ANDROID IOS,$(OS)), \
-svdemo \
-svptest \
-svpclient \
-vcldemo) \
 ))
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
___
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

2014-05-18 Thread Vinaya Mandke

 sw/qa/extras/ooxmlexport/data/fdo78651.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |1 +
 sw/source/filter/ww8/ww8atr.cxx  |7 +++
 4 files changed, 18 insertions(+)

New commits:
commit 6d73c5d748363173e73861ba46fcba36f04a1122
Author: Vinaya Mandke 
Date:   Tue May 13 18:19:52 2014 +0530

fdo#78651 DOCX Incorrect export of nested Tables

As the m_oldTableReference->m_pOldTablepInner was not cleared
the same tabled was incorrectly nested with itself.

Another issue was that the same table was mirrored in RT file
as LO was trying to export a Section break within a table cell.

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

Reviewe on:
https://gerrit.libreoffice.org/9361

Change-Id: I09b730a10f1a0bc4434050e0078aeab3185de817

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78651.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78651.docx
new file mode 100644
index 000..a510782
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78651.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ebf2d33..795ec67 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3377,6 +3377,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78300,"fdo78300.docx")
 0);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFdo78651, "fdo78651.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+return;
+// ensure that there are only two tables
+assertXPath(pXmlDoc, "//w:tbl", 2);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index aba33a4..4c6c7d0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2553,6 +2553,7 @@ void DocxAttributeOutput::switchHeaderFooter(bool 
isHeaderFooter, sal_Int32 inde
 //Reset the oldReference, after copying it back to the original.
 m_oldTableReference->m_bTableCellOpen = false ;
 m_oldTableReference->m_nTableDepth = 0;
+m_oldTableReference->m_pOldTablepInner.reset();
}
 
 }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index e3e4bcc..93c0682 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -434,6 +434,13 @@ void MSWordExportBase::OutputSectionBreaks( const 
SfxItemSet *pSet, const SwNode
 the RT files with different first page being set.
 */
 bNewPageDesc = false;
+
+/*
+ * If Table cell is open and page header types are different
+ * set pSet to NULL as we don't want to add any section breaks.
+ */
+if ( isCellOpen && ( pAktPageDesc->GetName() != 
pPageDesc->GetName() ) )
+pSet = NULL;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Questions about getCppuType

2014-05-18 Thread julien2412

I noticed there are a lot of "Reference" without prefix.
Is there a way to be sure it's ok to replace these occurences by
cppu::UnoType... ?



--
View this message in context: 
http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109226.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - external/mysqlcppconn include/sal sal/textenc

2014-05-18 Thread Thomas Arnhold

 external/mysqlcppconn/README  |2 +-
 external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch |4 +---
 include/sal/types.h   |6 +++---
 sal/textenc/generate/big5hkscs2001.pl |2 --
 sal/textenc/generate/big5hkscs2001.tab|2 --
 sal/textenc/generate/cns116431992.pl  |2 --
 sal/textenc/generate/cns116431992.tab |2 --
 sal/textenc/generate/gb180302000.pl   |4 
 8 files changed, 5 insertions(+), 19 deletions(-)

New commits:
commit 8899e449b75ce4c0fd191d18ab00e11f3f88e365
Author: Thomas Arnhold 
Date:   Sun May 18 11:56:51 2014 +0200

fix include guard for sal/types.h

Change-Id: I77e10d2644b18b150f9489c7f754405974af107a

diff --git a/include/sal/types.h b/include/sal/types.h
index 8668cd5..5a534b8 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SAL_TYPES_H_
-#define _SAL_TYPES_H_
+#ifndef INCLUDED_SAL_TYPES_H
+#define INCLUDED_SAL_TYPES_H
 
 #include 
 #include 
@@ -603,6 +603,6 @@ template< typename T1, typename T2 > inline T1 
static_int_cast(T2 n) {
 #define SAL_WARN_UNUSED
 #endif
 
-#endif /*_SAL_TYPES_H_ */
+#endif // INCLUDED_SAL_TYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 70fc3a299c2adb2711e13fe07ac73b827a54bbed
Author: Thomas Arnhold 
Date:   Sun May 18 11:50:02 2014 +0200

remove some external header guards

Change-Id: I5a51dc496835f0998a3422f2a1f0f2ff8bb3c13f

diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch 
b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
index c7fd21b..ec439d2 100644
--- a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
+++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
@@ -1,13 +1,11 @@
 --- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h  2010-09-10 
11:47:47.0 +0200
 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/build_config.h
2011-11-12 00:45:19.0 +0100
-@@ -25,25 +25,23 @@
+@@ -25,25 +25,21 @@
  #ifndef _SQL_BUILD_CONFIG_H_
  #define _SQL_BUILD_CONFIG_H_
  
 -#ifndef CPPCONN_PUBLIC_FUNC
-+#ifndef _SAL_TYPES_H_
 +#include 
-+#endif
  
 -#if defined(_WIN32)
   // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build 
only
diff --git a/sal/textenc/generate/big5hkscs2001.pl 
b/sal/textenc/generate/big5hkscs2001.pl
index 1ba83a6..8e7b700 100644
--- a/sal/textenc/generate/big5hkscs2001.pl
+++ b/sal/textenc/generate/big5hkscs2001.pl
@@ -452,9 +452,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . 
$filename;
 }
 
 print OUT "\n",
-  "#ifndef _SAL_TYPES_H_\n",
   "#include \"sal/types.h\"\n",
-  "#endif\n",
   "\n";
 
 print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n";
diff --git a/sal/textenc/generate/big5hkscs2001.tab 
b/sal/textenc/generate/big5hkscs2001.tab
index b5d81a4..8eeff4d 100644
--- a/sal/textenc/generate/big5hkscs2001.tab
+++ b/sal/textenc/generate/big5hkscs2001.tab
@@ -16,9 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
 static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = {
  /* row 0: --- */
diff --git a/sal/textenc/generate/cns116431992.pl 
b/sal/textenc/generate/cns116431992.pl
index af1b65d..8333581 100644
--- a/sal/textenc/generate/cns116431992.pl
+++ b/sal/textenc/generate/cns116431992.pl
@@ -433,9 +433,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . 
$filename;
 }
 
 print OUT "\n",
-  "#ifndef _SAL_TYPES_H_\n",
   "#include \"sal/types.h\"\n",
-  "#endif\n",
   "\n";
 
 print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n";
diff --git a/sal/textenc/generate/cns116431992.tab 
b/sal/textenc/generate/cns116431992.tab
index 8f8a7cd..33d6c26 100644
--- a/sal/textenc/generate/cns116431992.tab
+++ b/sal/textenc/generate/cns116431992.tab
@@ -16,9 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
 static sal_uInt16 const aImplCns116431992ToUnicodeData[] = {
  /* plane 1, row 1 */
diff --git a/sal/textenc/generate/gb180302000.pl 
b/sal/textenc/generate/gb180302000.pl
index 410e7b6..cc19187 100644
--- a/sal/textenc/generate/gb180302000.pl
+++ b/sal/textenc/generate/gb180302000.pl
@@ -224,13 +224,9 @@ open OUT, ("> " . $filename) or die "Cannot write " . 
$filename;
 }
 
 print OUT "\n",
-  "#ifndef INCLUDED_RTL_TEXTENC_CONVERTGB18030_H\n",
   "#include \"convertgb18030.h\"\n",
-  "#endif\n",
   "\n",
-  "#ifndef _SAL_TYPES_H_\n",
   "#include \"sal/types.h\"\n",
-  "#endif\n",
   "\n";

[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/editeng winaccessibility/source

2014-05-18 Thread Thomas Arnhold

 dbaccess/source/ui/inc/toolbox_tmpl.hrc   |6 +++---
 include/editeng/memberids.hrc |4 ++--
 winaccessibility/source/UAccCOM/AccActionBase.cxx |2 --
 winaccessibility/source/UAccCOM/MAccessible.h |4 
 4 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit e9d40e29d1efc214c5169eaa7b0bde3e4084db16
Author: Thomas Arnhold 
Date:   Sun May 18 12:11:42 2014 +0200

remove some more external header guards

Change-Id: Ic9efae442fef33c620fbdb1e1c3daef4b64d9780

diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx 
b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index a12d8a9..99ead42 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -32,9 +32,7 @@
 
 #include "AccessibleKeyStroke.h"
 
-#ifndef __ACCCOMMON_H_
 #include "acccommon.h"
-#endif
 
 using namespace com::sun::star::accessibility::AccessibleRole;
 using namespace com::sun::star::accessibility;
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h 
b/winaccessibility/source/UAccCOM/MAccessible.h
index e0620db..8447b8f 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -27,12 +27,8 @@
 #include 
 #include 
 #include "EnumVariant.h"
-#ifndef __ACCCOMMON_H_
 #include "acccommon.h"
-#endif
-#ifndef _RTL_USTRING_HXX_
 #include 
-#endif
 
 #define OBJID_WINDOW((LONG)0x)
 #define OBJID_SYSMENU   ((LONG)0x)
commit 064ca9248407bff10623a86599ad45cbf71decd2
Author: Thomas Arnhold 
Date:   Sun May 18 12:10:02 2014 +0200

hrc files should have hrc suffix

Change-Id: Iadbedc145c85c5f333e4449704fd01d5e12ddde5

diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc 
b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 3cd6f6a..5a03481d 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef DBAUI_TOOLBOX_HXX
-#define DBAUI_TOOLBOX_HXX
+#ifndef DBAUI_TOOLBOX_HRC
+#define DBAUI_TOOLBOX_HRC
 
 #define MID_SBA_QRY_REFRESH \
 Identifier = ID_BROWSER_REFRESH ; \
@@ -65,6 +65,6 @@
 HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
 Text [ en-US ] = "Report Wizard...";\
 
-#endif // DBAUI_TOOLBOX_HXX
+#endif // DBAUI_TOOLBOX_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 402d1a5..28a831a 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EDT_UNOMID_HXX
-#define _EDT_UNOMID_HXX
+#ifndef _EDT_UNOMID_HRC
+#define _EDT_UNOMID_HRC
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Questions about getCppuType

2014-05-18 Thread athomas

Only by looking into the source file:

If there's a:

using namespace com::sun::star::uno;

Then css::uno::Reference is used.

if there's a using namespace ::rtl;

Then it's rtl::Reference.


But looking after those is pretty annoying. Maybe there's another way :)

Thomas


On 18.05.2014 11:30, julien2412 [via Document Foundation Mail Archive] 
wrote:
> I noticed there are a lot of "Reference" without prefix.
> Is there a way to be sure it's ok to replace these occurences by
> cppu::UnoType... ?
>
> 
> If you reply to this email, your message will be added to the discussion
> below:
> http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109226.html
>
> To unsubscribe from Questions about getCppuType, click here
> .
> NAML
> 
>




--
View this message in context: 
http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109227.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Mukhiddin Yusupov MPLv2/LGPLv3+

2014-05-18 Thread Mukhiddin

All of my past and future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: build failure, clock_gettime undefined, linking libavmedialo.so

2014-05-18 Thread David Tardon

Hi,

On Fri, May 16, 2014 at 03:19:21PM +0100, Tamas Zolnai wrote:
>  
> On Friday, May 16, 2014 15:00 BST, Terrence Enger  
> wrote: 
>  
> > My build of commit 48eccfb, fetched around 2014-05-16 00:57 UTC, is
> > failing with messages:
> > 
> > [build LNK] Library/libavmedialo.so
> > 
> > /home/terry/lo_hacking/git/libo2/workdir/LinkTarget/StaticLibrary/libcollada2gltf.a(GLTF-Open3DGC.o):
> >  In function `o3dgc::Timer::Tic()':
> > 
> > /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115:
> >  undefined reference to `clock_gettime'
> I google it and find that:
> http://stackoverflow.com/questions/2418157/ubuntu-linux-c-error-undefined-reference-to-clock-gettime-and-clock-settim
> It suggests to link -lrt library.
> So you can try to add these lines:
> ifeq ($(OS),LINUX)
> $(eval $(call gb_Library_add_libs,collada2gltf,\
>   -lrt \
> ))
> endif
> to the external/collada2gltf/StaticLibrary_collada2gltf.mk file.

This will not work. The extra library is needed at the place(s) where
collada2gltf.a is _used_. The attached patch should do that.

D.
>From 8e1800c467ab44edea5f2e0055bbbfc8253d2ff7 Mon Sep 17 00:00:00 2001
From: David Tardon 
Date: Sun, 18 May 2014 12:42:37 +0200
Subject: [PATCH] fix linking with collada2gltf lib

Change-Id: I3628c41803a2a0432354c8fcb9e090b53ebef4f1
---
 RepositoryExternal.mk | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6e2d19b..6c9b787 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3148,6 +3148,12 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_use_static_libraries,$(1),\
collada2gltf \
 )
+
+ifeq ($(OS),LINUX)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -lrt \
+)
+endif
 endef
 
 endif
-- 
1.9.0

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

[Libreoffice-commits] core.git: Repository.mk vcl/Module_vcl.mk

2014-05-18 Thread Thomas Arnhold

 Repository.mk |2 +-
 vcl/Module_vcl.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5c669a5cfb380a6c3c65c4e4460a8736ce7f0880
Author: Thomas Arnhold 
Date:   Sun May 18 13:39:02 2014 +0200

vcl: don't build demos for windows at the moment

as they are broken, see red tinderboxes

Change-Id: I09fed7b4c4dec0bebd9e8f85c6266688cf0d68ea

diff --git a/Repository.mk b/Repository.mk
index 7efe301..c0a644b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
unoidl-read \
unoidl-write \
xrmex \
-   $(if $(filter-out ANDROID IOS,$(OS)), \
+   $(if $(filter-out ANDROID IOS WNT,$(OS)), \
 svdemo \
 svptest \
 svpclient \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index c8c436a..acf8ccb 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
 Executable_ui-previewer) \
-$(if $(filter-out ANDROID IOS,$(OS)), \
+$(if $(filter-out ANDROID IOS WNT,$(OS)), \
 Executable_svdemo \
 Executable_svptest \
 Executable_svpclient \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/svx sc/uiconfig sd/source sd/uiconfig svx/source sw/uiconfig

2014-05-18 Thread Maxim Monastirsky

 include/svx/dialogs.hrc   |1 
 include/svx/linectrl.hxx  |   18 
 include/svx/tbcontrl.hxx  |   25 +
 sc/uiconfig/scalc/toolbar/drawobjectbar.xml   |2 
 sd/source/ui/app/sddll.cxx|2 
 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml|2 
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml |2 
 svx/source/sidebar/line/LinePropertyPanel.cxx |2 
 svx/source/tbxctrls/linectrl.cxx  |   77 -
 svx/source/tbxctrls/tbcontrl.cxx  |   95 --
 svx/source/tbxctrls/tbcontrl.src  |5 +
 svx/source/tbxctrls/tbxcolorupdate.cxx|3 
 sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml  |2 
 sw/uiconfig/sweb/toolbar/drawingobjectbar.xml |2 
 sw/uiconfig/swform/toolbar/drawingobjectbar.xml   |2 
 sw/uiconfig/swreport/toolbar/drawingobjectbar.xml |2 
 sw/uiconfig/swriter/toolbar/drawingobjectbar.xml  |2 
 sw/uiconfig/swxform/toolbar/drawingobjectbar.xml  |2 
 18 files changed, 133 insertions(+), 113 deletions(-)

New commits:
commit 14b05361b8f8f5953289d1c8b03528fa0d3838cd
Author: Maxim Monastirsky 
Date:   Sun May 18 13:26:54 2014 +0300

Fix last color detection

Change-Id: Idb0f90a3f2100211689c3ede1dfedda86edb9728

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 617b8c3..d3a055e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1244,7 +1244,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, 
SfxItemState eState, co
 else if ( pState->ISA( XLineColorItem ) )
 rColor = ((const XLineColorItem*)pState)->GetColorValue();
 
-for ( size_t i = 1; i < aColorSet.GetItemCount(); i++ )
+for ( size_t i = 1; i <= aColorSet.GetItemCount(); ++i )
 {
 if ( rColor == aColorSet.GetItemColor(i) )
 {
commit a1fc526845df5b8641c996a9f96a25e323771dd4
Author: Maxim Monastirsky 
Date:   Sun May 18 13:26:31 2014 +0300

That's actually a pointer

Change-Id: I9d6333646f8ef366f63ff09e089c84517d9756e7

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 93c5981..617b8c3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2404,10 +2404,10 @@ SfxPopupWindow* 
SvxColorToolBoxControl::CreatePopupWindow()
 return pColorWin;
 }
 
-IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, Color*, aColor)
+IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, Color*, pColor)
 {
-pBtnUpdater->Update( *aColor );
-mLastColor = *aColor;
+pBtnUpdater->Update( *pColor );
+mLastColor = *pColor;
 return 0;
 }
 
commit e4ce7d286a5039e5a65ba994bd1b168679d4a7c3
Author: Maxim Monastirsky 
Date:   Sun May 18 08:38:16 2014 +0300

fdo#46839 Convert line color picker to split button

Change-Id: I4987cc9ffba675009f2d2ae9f6b12ed4ee02fe13

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 09a122d..f35a97f 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -260,6 +260,7 @@
 #define RID_SVXSTR_MORE (RID_SVX_START + 198)
 #define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
 #define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200)
+#define RID_SVXSTR_LINECOLOR(RID_SVX_START + 201)
 
 // Strings for insert/overwrite mode
 #define RID_SVXSTR_INSERT_HELPTEXT  (RID_SVX_START + 210)
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 1419b65..4beb9bd 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -30,7 +30,6 @@ class XLineStyleItem;
 class XLineDashItem;
 class SvxLineBox;
 class SvxMetricField;
-class SvxColorBox;
 
 
 // SvxLineStyleController:
@@ -74,23 +73,6 @@ public:
 };
 
 
-// SvxLineColorController:
-
-
-class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
-{
-public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& 
rTbx );
-virtual ~SvxLineColorToolBoxControl();
-
-virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
-  const SfxPoolItem* pState ) SAL_OVERRIDE;
-voidUpdate( const SfxPoolItem* pState );
-virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
-};
-
 
 // class SvxLineEndWindow
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index e086b0e..1694d13 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -66,6 +66,11 @@
 for 3D extrusion
 Execute-Id  SID_EXTRUSION_3D_COLOR
 
+SvxLineColorToolBoxControl
+--
+Item type:  XLineColorItem
+Execute-Id  SID_ATTR_LINE_COLOR
+

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

2014-05-18 Thread Thomas Arnhold

 bridges/source/jni_uno/jni_bridge.h |4 ++--
 winaccessibility/source/UAccCOM/acccommon.h |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a7eae9c280d860ca12b6300539404bec16700a7b
Author: Thomas Arnhold 
Date:   Sun May 18 13:44:01 2014 +0200

fix some header guards

Change-Id: Id2c15eba3f70cd8f1ae8869bc0838aef13cd96ee

diff --git a/bridges/source/jni_uno/jni_bridge.h 
b/bridges/source/jni_uno/jni_bridge.h
index 049f1e5..5779ae7 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_JNI_BRIDGE_H
-#define INCLUDED_JNI_BRIDGE_H
+#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BRIDGE_H
+#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BRIDGE_H
 
 #include "jni_base.h"
 #include "jni_info.h"
diff --git a/winaccessibility/source/UAccCOM/acccommon.h 
b/winaccessibility/source/UAccCOM/acccommon.h
index 2f6b5d6..b3458d0 100644
--- a/winaccessibility/source/UAccCOM/acccommon.h
+++ b/winaccessibility/source/UAccCOM/acccommon.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCCOMMON_H_
-#define __ACCCOMMON_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMMON_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMMON_H
 
 //for MAccessible.cxx
 struct ltComp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Thomas Arnhold

 bin/fixincludeguards.sh |2 +-
 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h|5 +
 odk/examples/cpp/complextoolbarcontrols/MyJob.h |4 ++--
 odk/examples/cpp/complextoolbarcontrols/MyListener.h|6 +++---
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h |4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit e0f08c06aa49e9c3d63f57ffb643d0eba561096e
Author: Thomas Arnhold 
Date:   Sun May 18 14:05:42 2014 +0200

fixincludeguards.pl: handle odk/examples

Now we have nice example header guards ;)

Change-Id: I1a5f8031cf267abf67dc4fbb20880d23e3640867

diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh
index 4c3e409..6bdb59e 100755
--- a/bin/fixincludeguards.sh
+++ b/bin/fixincludeguards.sh
@@ -28,7 +28,7 @@ for fn in "$@"; do
 
 # global header in include/ top level dir:
 # drop the project dir
-fnfixed=`echo $fn | sed 's/include\///g'`
+fnfixed=`echo $fn | sed 's/\(include\|odk\/examples\/cpp\)\///g'`
 
 # convert file path to header guard
 guard=`echo "$fnfixed" | sed 's/[\/\.-]/_/g' | tr 'a-z' 'A-Z'`
diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h 
b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index 0fe4bd0..c529a0a 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+
 #include 
 #include 
 
@@ -77,4 +80,6 @@ public:
 virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& 
aEvent ) throw (com::sun::star::uno::RuntimeException);
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h 
b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
index b6ac4be..4c02cc6 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyJob_HXX
-#define _MyJob_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
 
 #include 
 #include 
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h 
b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
index 12d485c..6a6c7e1 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyListener_HXX
-#define _MyListener_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
 
 #include 
 #include 
@@ -108,6 +108,6 @@ class WriterListener : public cppu::WeakImplHelper1< 
css::document::XEventListen
 throw (css::uno::RuntimeException);
 };
 
-#endif // _MyListener_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h 
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index 026cf42..830cded 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyProtocolHandler_HXX
-#define _MyProtocolHandler_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Maxim Monastirsky

 solenv/gbuild/extensions/pre_MergedLibsList.mk |2 +-
 svx/source/tbxctrls/tbcontrl.cxx   |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 558618e0dd75424bd2d7134ba536ee78bdb4a26a
Author: Maxim Monastirsky 
Date:   Sun May 18 16:33:55 2014 +0300

Sort alphabetically

Change-Id: I54a9bdaa306e4a9c492e2be35378b9b42f64312f

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 88e7e55..b85d36f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -82,8 +82,8 @@ gb_EXTRAMERGEDLIBS := \
$(if $(filter-out ANDROID IOS,$(OS)),scn) \
sd \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
-   storagefd \
spell \
+   storagefd \
svgfilter \
swd \
t602filter \
commit 0c4c6c1d9967d04683a68dc9fb5de23f617eea24
Author: Maxim Monastirsky 
Date:   Sun May 18 16:33:10 2014 +0300

Correct prefix

Change-Id: I767501475b0b826a76a8743513c60f25e70dea8a

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d3a055e..d1771f2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1238,21 +1238,21 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 
nSID, SfxItemState eState, co
 {
 aColorSet.SetNoSelection();
 
-Color rColor;
+Color aColor;
 if ( pState->ISA( SvxColorItem ) )
-rColor = ((const SvxColorItem*)pState)->GetValue();
+aColor = ((const SvxColorItem*)pState)->GetValue();
 else if ( pState->ISA( XLineColorItem ) )
-rColor = ((const XLineColorItem*)pState)->GetColorValue();
+aColor = ((const XLineColorItem*)pState)->GetColorValue();
 
 for ( size_t i = 1; i <= aColorSet.GetItemCount(); ++i )
 {
-if ( rColor == aColorSet.GetItemColor(i) )
+if ( aColor == aColorSet.GetItemColor(i) )
 {
 aColorSet.SelectItem(i);
 return;
 }
 }
-if ( rColor == COL_AUTO || rColor == COL_TRANSPARENT )
+if ( aColor == COL_AUTO || aColor == COL_TRANSPARENT )
 aColorSet.SelectItem(0);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-05-18 Thread bugzilla-daemon

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

Maxim Monastirsky  changed:

   What|Removed |Added

 Depends on||68806

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-05-18 Thread bugzilla-daemon

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

Maxim Monastirsky  changed:

   What|Removed |Added

 Depends on|68806   |

-- 
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: Questions about getCppuType

2014-05-18 Thread julien2412

Athomas: indeed, I hope there's another way because I'm running a simple
regexp to replace the occurences:-)



--
View this message in context: 
http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109260.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-05-18 Thread Takeshi Abe

 sc/source/ui/drawfunc/drtxtob.cxx |6 --
 sc/source/ui/drawfunc/drtxtob1.cxx|   14 ++
 sc/source/ui/drawfunc/fuins2.cxx  |6 +++---
 sc/source/ui/miscdlgs/scuiautofmt.cxx |   13 +
 sc/source/ui/pagedlg/tphf.cxx |   11 ---
 sc/source/ui/pagedlg/tphfedit.cxx |6 +++---
 sc/source/ui/unoobj/filtuno.cxx   |   14 ++
 sc/source/ui/view/editsh.cxx  |4 ++--
 sc/source/ui/view/tabvwsh3.cxx|4 ++--
 sc/source/ui/view/tabvwshf.cxx|5 ++---
 10 files changed, 37 insertions(+), 46 deletions(-)

New commits:
commit c623612b0bd0bbd2307a19ccf3c2f1f343b932b3
Author: Takeshi Abe 
Date:   Sun May 18 23:09:36 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: Icc1e11e173329fd88898a3d13270406fd651eb2b

diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index 38ce5be..f0ed72e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -76,6 +76,8 @@
 #define ScDrawTextObjectBar
 #include "scslots.hxx"
 
+#include 
+
 using namespace ::com::sun::star;
 
 SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL))
@@ -833,14 +835,14 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
 case SID_DRAWTEXT_ATTR_DLG:
 {
 SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
-SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( 
pViewData->GetDialogParent(), &aEditAttr, pView );
+boost::scoped_ptr 
pDlg(pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, 
pView ));
 
 bDone = ( RET_OK == pDlg->Execute() );
 
 if ( bDone )
 aNewAttr.Put( *pDlg->GetOutputItemSet() );
 
-delete pDlg;
+pDlg.reset();
 
 SfxBindings& rBindings = pViewData->GetBindings();
 rBindings.Invalidate( SID_TABLE_VERT_NONE );
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx 
b/sc/source/ui/drawfunc/drtxtob1.cxx
index d993d81..5cb6368 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -38,6 +38,7 @@
 #include "scresid.hxx"
 
 #include "scabstdlg.hxx"
+#include 
 
 
 bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
@@ -46,9 +47,9 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& 
rArgs,
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(
+boost::scoped_ptr pDlg(pFact->CreateScCharDlg(
 pViewData->GetDialogParent(), &rArgs,
-pViewData->GetSfxDocShell());
+pViewData->GetSfxDocShell()));
 OSL_ENSURE(pDlg, "Dialog create fail!");
 if (nSlot == SID_CHAR_DLG_EFFECT)
 {
@@ -62,7 +63,6 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& 
rArgs,
 if ( pNewAttrs )
 rOutSet.Put( *pNewAttrs );
 }
-delete pDlg;
 
 return bRet;
 }
@@ -94,8 +94,8 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& 
rArgs,
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-SfxAbstractTabDialog* pDlg = pFact->CreateScParagraphDlg(
-pViewData->GetDialogParent(), &aNewAttr);
+boost::scoped_ptr pDlg(pFact->CreateScParagraphDlg(
+pViewData->GetDialogParent(), &aNewAttr));
 OSL_ENSURE(pDlg, "Dialog create fail!");
 bool bRet = ( pDlg->Execute() == RET_OK );
 
@@ -105,7 +105,6 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& 
rArgs,
 if ( pNewAttrs )
 rOutSet.Put( *pNewAttrs );
 }
-delete pDlg;
 
 return bRet;
 }
@@ -115,7 +114,7 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest 
& /* rReq */ )
 SdrView* pView = pViewData->GetScDrawView();
 OutlinerView* pOutView = pView->GetTextEditOutlinerView();
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( 
pViewData->GetDialogParent() );
+boost::scoped_ptr pDlg(pFact->CreatePasteDialog( 
pViewData->GetDialogParent() ));
 
 pDlg->Insert( SOT_FORMAT_STRING, EMPTY_OUSTRING );
 pDlg->Insert( SOT_FORMAT_RTF,EMPTY_OUSTRING );
@@ -133,7 +132,6 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest 
& /* rReq */ )
 else
 pOutView->PasteSpecial();
 }
-delete pDlg;
 }
 
 
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 9c7b192..4e7b0dc 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -83,6 +83,7 @@ using namespace ::com::sun::star;
 #include "drawview.hxx"
 #include "markdata.hxx"

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

2014-05-18 Thread Julien Nabet

 extras/source/autotext/lang/en-AU/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-GB/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-US/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/ja/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/ko/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/zh-CN/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/zh-TW/acor/DocumentList.xml |4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 9868373a6f6db525e963ec79301ecbd74fbfdeba
Author: Julien Nabet 
Date:   Sun May 18 18:38:59 2014 +0200

Resolves: fdo#78846 wrong AutoCorrect entries

Change-Id: Iff2e343c56092ba85a1179f121f460e5ada841f4

diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
index 5d91d0a..28424d1 100644
--- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
index 2548ff2..678d820 100644
--- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
index b8c3da2..6052471 100644
--- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
index 5576dc8..878db3e 100644
--- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
@@ -260,7 +260,7 @@
   
   
   
-  
+  
   
   
   
@@ -301,7 +301,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ja/acor/DocumentList.xml 
b/extras/source/autotext/lang/ja/acor/DocumentList.xml
index 659af8f..f54314d 100644
--- a/extras/source/autotext/lang/ja/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ja/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ko/acor/DocumentList.xml 
b/extras/source/autotext/lang/ko/acor/DocumentList.xml
index 659af8f..f54314d 100644
--- a/extras/source/autotext/lang/ko/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ko/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
index 5583c5f..09f5325 100644
--- a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
index 5583c5f..09f5325 100644
--- a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Kohei Yoshida

 sc/source/ui/cctrl/checklistmenu.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 836328d6473ae1a0c472c7dbf8262641c74843cb
Author: Kohei Yoshida 
Date:   Sun May 18 12:43:06 2014 -0400

fdo#78786: No need to insert entries here for date members.

Data member entries are inserted when they are added in addDateMember().

Change-Id: I6cb2e3629053fe2bb49517c4ef8d5c1fee576446

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 49061fa..1b05eff 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1511,9 +1511,6 @@ void ScCheckListMenuWindow::initMembers()
 {
 if (maMembers[i].mbDate)
 {
-maChecks.InsertEntry(maMembers[i].maName, NULL, false, 
TREELIST_APPEND, NULL,
-SvLBoxButtonKind_enabledCheckbox );
-
 maChecks.CheckEntry(maMembers[i].maName, maMembers[i].mpParent, 
maMembers[i].mbVisible);
 // Expand first node of checked dates
 if (!maMembers[i].mpParent && 
maChecks.IsChecked(maMembers[i].maName,  maMembers[i].mpParent))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |   64 ++--
 svl/source/numbers/zforfind.hxx |7 
 2 files changed, 62 insertions(+), 9 deletions(-)

New commits:
commit 41b9ab0375f455f504c66b4870e817aba0f990d2
Author: Eike Rathke 
Date:   Sat May 17 02:33:42 2014 +0200

resolved fdo#41166 match month and day name word instead of substring

(cherry picked from commit 8e71f81f47c20320c4de7a7aadb7d524f0d8ea76)
(cherry picked from commit 3885b5d4b00ebb31adabc36c507abd642c03d0d4)

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

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 840af0c..9c8bb1c 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -438,6 +438,52 @@ bool ImpSvNumberInputScan::StringPtrContainsImpl( const 
OUString& rWhat,
 
 
 /**
+ * Whether rString contains word rWhat at nPos
+ */
+bool ImpSvNumberInputScan::StringContainsWord( const OUString& rWhat,
+   const OUString& rString, 
sal_Int32 nPos )
+{
+if (rWhat.isEmpty() || rString.getLength() < nPos + rWhat.getLength())
+return false;
+
+if (StringPtrContainsImpl( rWhat, rString.getStr(), nPos))
+{
+nPos += rWhat.getLength();
+if (nPos == rString.getLength())
+return true;// word at end of string
+
+/* TODO: we COULD invoke bells and whistles word break iterator to find
+ * the next boundary, but really ... this is called for date input, so
+ * how many languages do not separate the day and month names in some
+ * form? */
+
+// Check simple ASCII first before invoking i18n or anything else.
+if (rtl::isAsciiAlphanumeric( rString[nPos] ))
+return false;   // Alpha or numeric is not word gap.
+
+sal_Int32 nIndex = nPos;
+const sal_uInt32 c = rString.iterateCodePoints( &nIndex);
+if (nPos+1 < nIndex)
+return true;// Surrogate, assume these to be new words.
+(void)c;
+
+const sal_Int32 nType = pFormatter->GetCharClass()->getCharacterType( 
rString, nPos);
+using namespace ::com::sun::star::i18n;
+
+if ((nType & (KCharacterType::UPPER | KCharacterType::LOWER | 
KCharacterType::DIGIT)) != 0)
+return false;   // Alpha or numeric is not word gap.
+
+if ((nType & (KCharacterType::LETTER)) != 0)
+return true;// Letter other than alpha is new word. (Is it?)
+
+return true;// Catch all remaining as gap until we know better.
+}
+
+return false;
+}
+
+
+/**
  * Skips the supplied char
  */
 inline bool ImpSvNumberInputScan::SkipChar( sal_Unicode c, const OUString& 
rString,
@@ -575,7 +621,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 // if we stopped at the first match.
 for ( sal_Int16 i = 0; i < nMonths; i++ )
 {
-if ( bScanGenitiveMonths && StringContains( 
pUpperGenitiveMonthText[i], rString, nPos ) )
+if ( bScanGenitiveMonths && StringContainsWord( 
pUpperGenitiveMonthText[i], rString, nPos ) )
 {   // genitive full names first
 const int nMonthLen = pUpperGenitiveMonthText[i].getLength();
 if (nMonthLen > nMatchLen)
@@ -584,7 +630,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 res = i + 1;
 }
 }
-else if ( bScanGenitiveMonths && StringContains( 
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
+else if ( bScanGenitiveMonths && StringContainsWord( 
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
 {   // genitive abbreviated
 const int nMonthLen = 
pUpperGenitiveAbbrevMonthText[i].getLength();
 if (nMonthLen > nMatchLen)
@@ -593,7 +639,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 res = sal::static_int_cast< short >(-(i+1)); // negative
 }
 }
-else if ( bScanPartitiveMonths && StringContains( 
pUpperPartitiveMonthText[i], rString, nPos ) )
+else if ( bScanPartitiveMonths && StringContainsWord( 
pUpperPartitiveMonthText[i], rString, nPos ) )
 {   // partitive full names
 const int nMonthLen = pUpperPartitiveMonthText[i].getLength();
 if (nMonthLen > nMatchLen)
@@ -602,7 +648,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 res = i+1;
 }
 }
-else if ( bScanPartitiveMonths && StringContains( 
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
+else if ( bScanPartitiveMonths && St

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

2014-05-18 Thread Kohei Yoshida

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d7c97a607615c3f176c9f553d1d011e4ee55c1d
Author: Kohei Yoshida 
Date:   Sun May 18 14:16:28 2014 -0400

fdo#78824: Avoid having two menu entries having the same accelarator.

Sort should have an 'S' as accelerator.  The other one can be auto-assigned.

Change-Id: I61e630c9b6d89658c65cca77333f1ad0a591e3ab

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 1bfa929..a0f7e86 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -666,7 +666,7 @@
   
   
 
-  ~Statistics
+  Statistics
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Julien Nabet

 extras/source/autotext/lang/en-AU/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-GB/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-US/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/ja/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/ko/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/zh-CN/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/zh-TW/acor/DocumentList.xml |4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit cacde838a6369cfe9231f0808b76ecedfb87e312
Author: Julien Nabet 
Date:   Sun May 18 18:38:59 2014 +0200

Resolves: fdo#78846 wrong AutoCorrect entries

Cherry-picked from master (9868373a6f6db525e963ec79301ecbd74fbfdeba)

Change-Id: Iff2e343c56092ba85a1179f121f460e5ada841f4
Reviewed-on: https://gerrit.libreoffice.org/9397
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
index 33312da..8332403 100644
--- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
index d46b7ea..18719ca 100644
--- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
index 26abc6f..dc18c01 100644
--- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
index febfe61..00964f5 100644
--- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
@@ -260,7 +260,7 @@
   
   
   
-  
+  
   
   
   
@@ -301,7 +301,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ja/acor/DocumentList.xml 
b/extras/source/autotext/lang/ja/acor/DocumentList.xml
index d533d06..8cc47df 100644
--- a/extras/source/autotext/lang/ja/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ja/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ko/acor/DocumentList.xml 
b/extras/source/autotext/lang/ko/acor/DocumentList.xml
index d533d06..8cc47df 100644
--- a/extras/source/autotext/lang/ko/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ko/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
index 8298a1d..e7dad2f 100644
--- a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
index 8298a1d..e7dad2f 100644
--- a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Kohei Yoshida

 sc/source/ui/cctrl/checklistmenu.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit f5e3380a699f7eff866178cd2c2a839b42e16d19
Author: Kohei Yoshida 
Date:   Sun May 18 12:43:06 2014 -0400

fdo#78786: No need to insert entries here for date members.

Data member entries are inserted when they are added in addDateMember().

(cherry picked from commit 836328d6473ae1a0c472c7dbf8262641c74843cb)

Conflicts:
sc/source/ui/cctrl/checklistmenu.cxx

Change-Id: I6cb2e3629053fe2bb49517c4ef8d5c1fee576446
Reviewed-on: https://gerrit.libreoffice.org/9398
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 999c9bb..5986ea5 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1517,9 +1517,6 @@ void ScCheckListMenuWindow::initMembers()
 {
 if (maMembers[i].mbDate)
 {
-maChecks.InsertEntry(maMembers[i].maName, NULL, sal_False, 
LIST_APPEND, NULL,
-SvLBoxButtonKind_enabledCheckbox );
-
 maChecks.CheckEntry(maMembers[i].maName, maMembers[i].mpParent, 
maMembers[i].mbVisible);
 // Expand first node of checked dates
 if (!maMembers[i].mpParent && 
maChecks.IsChecked(maMembers[i].maName,  maMembers[i].mpParent))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2014-05-18 Thread Andras Timar

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

New commits:
commit 20c561859972952a56fe6cea2937cd1056a25509
Author: Andras Timar 
Date:   Sun May 18 21:11:24 2014 +0200

Updated core
Project: translations  eb6ea5dcf7183a496e02d21024fc05b141c5c65e

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

Re: [solved] build failure, clock_gettime undefined, linking libavmedialo.so

2014-05-18 Thread Terrence Enger

On Sun, 2014-05-18 at 12:46 +0200, David Tardon wrote:
> Hi,
> 
[snip]
> This will not work. The extra library is needed at the place(s) where
> collada2gltf.a is _used_. The attached patch should do that.

Thank you, David.  This seems to do the job.

In particular, I did:

(*) Applied your patch on top of commit 483ccfb.

(*) Renamed away workdir/Headers/Library/libavmedialo.so

(*) `make --dry-run verbose=5`.  The link command includes '-lrt'.

(*) `make`.  This did a lot, and the program runs.

Thanks,
Terry.

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

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

2014-05-18 Thread László Németh

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

New commits:
commit e6d08f4ada5af645c81aeaf1219b18475faa8554
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu May 15 13:03:17 2014 +0200

Updated core
Project: dictionaries  7ff2a6c889831d22af168f311ee8cfd01983a350

diff --git a/dictionaries b/dictionaries
index c7f9fbd..7ff2a6c 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c7f9fbd1c238b0bd78b0f5732e5ac72b230b4345
+Subproject commit 7ff2a6c889831d22af168f311ee8cfd01983a350
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Miklos Vajna

 sal/osl/w32/path_helper.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ee43de69083fc9f90d4fadb9129b3d0dcf804439
Author: Miklos Vajna 
Date:   Fri May 16 08:10:46 2014 +0200

error C3861: 'rtl_allocateMemory': identifier not found

Change-Id: Ie1576aba31dbbd067280ba8fa9c5ef095879cbc2

diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 8087ac4..3881e44 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
 
 #include "path_helper.h"
+#include 
 #include 
 
 namespace osl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Tomaž Vajngerl

 test/source/mtfxmldump.cxx|   15 -
 vcl/qa/cppunit/wmf/data/computer_mail.emf |binary
 vcl/qa/cppunit/wmf/data/sine_wave.emf |binary
 vcl/qa/cppunit/wmf/wmfimporttest.cxx  |   82 +-
 vcl/source/filter/wmf/enhwmf.cxx  |  230 
 vcl/source/filter/wmf/winmtf.cxx  |   31 +--
 vcl/source/filter/wmf/winmtf.hxx  |  238 +++---
 7 files changed, 350 insertions(+), 246 deletions(-)

New commits:
commit 9a4a48d213457f93c797493011ac362eb528de6a
Author: TomaÅ¾ Vajngerl 
Date:   Sun May 18 23:57:09 2014 +0200

vcl emf test: test clip region is correct for problematic files

Change-Id: I60caf9ebcff417e0f87bae9c6b5d308b5e2f0b37

diff --git a/vcl/qa/cppunit/wmf/data/computer_mail.emf 
b/vcl/qa/cppunit/wmf/data/computer_mail.emf
new file mode 100644
index 000..0dbf23f
Binary files /dev/null and b/vcl/qa/cppunit/wmf/data/computer_mail.emf differ
diff --git a/vcl/qa/cppunit/wmf/data/sine_wave.emf 
b/vcl/qa/cppunit/wmf/data/sine_wave.emf
new file mode 100644
index 000..e5a4fa6
Binary files /dev/null and b/vcl/qa/cppunit/wmf/data/sine_wave.emf differ
diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 12d1942..7460447 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -27,37 +27,46 @@ using namespace css;
 
 class WmfTest : public test::BootstrapFixture, public XmlTestTools
 {
+OUString maDataUrl;
+
+OUString getFullUrl(OUString sFileName)
+{
+return getURLFromSrc(maDataUrl) + sFileName;
+}
+
 public:
 WmfTest() :
-BootstrapFixture(true, false)
+BootstrapFixture(true, false),
+maDataUrl("/vcl/qa/cppunit/wmf/data/")
 {}
 
 void testNonPlaceableWmf();
+void testSine();
+void testEmfProblem();
 
 CPPUNIT_TEST_SUITE(WmfTest);
 CPPUNIT_TEST(testNonPlaceableWmf);
+CPPUNIT_TEST(testSine);
+CPPUNIT_TEST(testEmfProblem);
 CPPUNIT_TEST_SUITE_END();
 };
 
 void WmfTest::testNonPlaceableWmf()
 {
-OUString aUrl = getURLFromSrc("/vcl/qa/cppunit/wmf/data/");
-
-SvFileStream aFileStream(aUrl + "visio_import_source.wmf", STREAM_READ);
+SvFileStream aFileStream(getFullUrl("visio_import_source.wmf"), 
STREAM_READ);
 GDIMetaFile aGDIMetaFile;
 ReadWindowMetafile(aFileStream, aGDIMetaFile);
 
-boost::scoped_ptr aStream(new SvMemoryStream);
+SvMemoryStream aStream;
 
-MetafileXmlDump dumper(*aStream);
+MetafileXmlDump dumper(aStream);
 dumper.filterAllActionTypes();
 dumper.filterActionType(META_POLYLINE_ACTION, false);
 dumper.dump(aGDIMetaFile);
 
-aStream->WriteChar(0);
-aStream->Seek(STREAM_SEEK_TO_BEGIN);
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
-xmlDocPtr pDoc = parseXmlStream(aStream.get());
+xmlDocPtr pDoc = parseXmlStream(&aStream);
 
 CPPUNIT_ASSERT (pDoc);
 
@@ -77,6 +86,61 @@ void WmfTest::testNonPlaceableWmf()
 assertXPath(pDoc, "/metafile/polyline[1]/point[5]", "y", "1003");
 }
 
+void WmfTest::testSine()
+{
+SvFileStream aFileStream(getFullUrl("sine_wave.emf"), STREAM_READ);
+GDIMetaFile aGDIMetaFile;
+ReadWindowMetafile(aFileStream, aGDIMetaFile);
+
+SvMemoryStream aStream;
+
+MetafileXmlDump dumper(aStream);
+dumper.filterAllActionTypes();
+dumper.filterActionType(META_ISECTRECTCLIPREGION_ACTION, false);
+dumper.dump(aGDIMetaFile);
+
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+
+CPPUNIT_ASSERT (pDoc);
+
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "top", "0");
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "left", "0");
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "bottom", "1155947");
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "right", "1155378");
+
+assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "top", "1411");
+assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "left", "2962");
+assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "bottom", "16651");
+assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "right", "20698");
+}
+
+void WmfTest::testEmfProblem()
+{
+SvFileStream aFileStream(getFullUrl("computer_mail.emf"), STREAM_READ);
+GDIMetaFile aGDIMetaFile;
+ReadWindowMetafile(aFileStream, aGDIMetaFile);
+
+SvMemoryStream aStream;
+
+MetafileXmlDump dumper(aStream);
+dumper.filterAllActionTypes();
+dumper.filterActionType(META_ISECTRECTCLIPREGION_ACTION, false);
+dumper.dump(aGDIMetaFile);
+
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+
+CPPUNIT_ASSERT (pDoc);
+
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "top", "427");
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "left", "740");
+assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "bottom", "2823");
+assertXPath(pDoc, "/metafile/se

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

2014-05-18 Thread Tor Lillqvist

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |2 +-
 vcl/workben/svpclient.cxx|   18 +-
 vcl/workben/svptest.cxx  |   18 +-
 vcl/workben/vcldemo.cxx  |   18 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 6a21c29fc6a8284aa594d8ba7cbe80eeb0c1c114
Author: Tor Lillqvist 
Date:   Mon May 19 08:46:07 2014 +0300

WaE: passing OUString by value, rather pass by reference

Change-Id: I6a7331ab3d87cc04021e92283db938c92b066e6b

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 7460447..5204007 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -29,7 +29,7 @@ class WmfTest : public test::BootstrapFixture, public 
XmlTestTools
 {
 OUString maDataUrl;
 
-OUString getFullUrl(OUString sFileName)
+OUString getFullUrl(OUString& sFileName)
 {
 return getURLFromSrc(maDataUrl) + sFileName;
 }
commit d7034051a94816e4e81bd17ed5eb81ca0c8a97f4
Author: Tor Lillqvist 
Date:   Mon May 19 08:45:31 2014 +0300

WaE: overriding virtual function declaration not marked 'SAL_OVERRIDE'

Change-Id: I00aaacadf108f2cc5d57963991e5c99ea4485056

diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 60823d0..c9c52f5 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -84,17 +84,17 @@ class MyWin : public WorkWindow
 ImageControlm_aImage;
 PushButton  m_aQuitButton;
 public:
-MyWin( Window* pParent, WinBits nWinStyle );
+ MyWin( Window* pParent, WinBits nWinStyle );
 
-voidMouseMove( const MouseEvent& rMEvt );
-voidMouseButtonDown( const MouseEvent& rMEvt );
-voidMouseButtonUp( const MouseEvent& rMEvt );
-voidKeyInput( const KeyEvent& rKEvt );
-voidKeyUp( const KeyEvent& rKEvt );
-voidPaint( const Rectangle& rRect );
-voidResize();
+virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+virtual void Resize() SAL_OVERRIDE;
 
-boolClose();
+virtual bool Close() SAL_OVERRIDE;
 
 void parseList( const OString& rList );
 OString processCommand( const OString& rCommand );
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 134a4fd..8ba8277 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -69,15 +69,15 @@ class MyWin : public WorkWindow
 {
 Bitmap  m_aBitmap;
 public:
-MyWin( Window* pParent, WinBits nWinStyle );
-
-voidMouseMove( const MouseEvent& rMEvt );
-voidMouseButtonDown( const MouseEvent& rMEvt );
-voidMouseButtonUp( const MouseEvent& rMEvt );
-voidKeyInput( const KeyEvent& rKEvt );
-voidKeyUp( const KeyEvent& rKEvt );
-voidPaint( const Rectangle& rRect );
-voidResize();
+ MyWin( Window* pParent, WinBits nWinStyle );
+
+virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+virtual void Resize() SAL_OVERRIDE;
 };
 
 void Main()
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 3ce00ed..8b26e37 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -63,15 +63,15 @@ SAL_IMPLEMENT_MAIN()
 class MyWin : public WorkWindow
 {
 public:
-MyWin( Window* pParent, WinBits nWinStyle );
-
-voidMouseMove( const MouseEvent& rMEvt );
-voidMouseButtonDown( const MouseEvent& rMEvt );
-voidMouseButtonUp( const MouseEvent& rMEvt );
-voidKeyInput( const KeyEvent& rKEvt );
-voidKeyUp( const KeyEvent& rKEvt );
-voidPaint( const Rectangle& rRect );
-voidResize();
+ MyWin( Window* pParent, WinBits nWinStyle );
+
+virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+virt

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

2014-05-18 Thread Tor Lillqvist

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b529df25fa6de1918bee0c3edb18f81d63b1366
Author: Tor Lillqvist 
Date:   Mon May 19 09:04:11 2014 +0300

Fix 'non-const lvalue reference cannot bind to a temporary'

Change-Id: Ic308a281f7b16c8924658be792216d3abac5

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 5204007..b12fbe9 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -29,9 +29,9 @@ class WmfTest : public test::BootstrapFixture, public 
XmlTestTools
 {
 OUString maDataUrl;
 
-OUString getFullUrl(OUString& sFileName)
+OUString getFullUrl(const char * sFileName)
 {
-return getURLFromSrc(maDataUrl) + sFileName;
+return getURLFromSrc(maDataUrl) + OUString(sFileName, 
strlen(sFileName), RTL_TEXTENCODING_UTF8);
 }
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

2014-05-18 Thread Maxim Monastirsky

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

New commits:
commit 214de0e5124b44df0f37fdf89271a527667590dc
Author: Maxim Monastirsky 
Date:   Mon May 19 08:53:16 2014 +0300

fdo#78815 Fix report builder toolbox controller

Change-Id: Iecbf84b29500729e228d22c8e50b119d1fb471c5

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

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

2014-05-18 Thread Tor Lillqvist

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5f45a51638901ea679bf238ab460283e41bc622
Author: Tor Lillqvist 
Date:   Mon May 19 09:10:30 2014 +0300

Argh, *this* is what the compiler tried to tell me

Change-Id: Id5716bf6f9c86e7fa0d64b1bae9b69b4a5dadfe5

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index b12fbe9..45c3cc4 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -29,9 +29,9 @@ class WmfTest : public test::BootstrapFixture, public 
XmlTestTools
 {
 OUString maDataUrl;
 
-OUString getFullUrl(const char * sFileName)
+OUString getFullUrl(const OUString& sFileName)
 {
-return getURLFromSrc(maDataUrl) + OUString(sFileName, 
strlen(sFileName), RTL_TEXTENCODING_UTF8);
+return getURLFromSrc(maDataUrl) + sFileName;
 }
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-18 Thread Markus Mohrhard

 formula/source/core/resource/core_resource.src   |6 ++
 include/formula/compiler.hrc |3 -
 include/formula/opcode.hxx   |1 
 sc/inc/helpids.h |1 
 sc/qa/unit/ucalc.cxx |1 
 sc/source/core/inc/interpre.hxx  |1 
 sc/source/core/tool/interpr4.cxx |1 
 sc/source/core/tool/interpr7.cxx |   44 +
 sc/source/ui/src/scfuncs.src |   47 +++
 xmloff/source/chart/SchXMLPropertyMappingContext.cxx |9 +++
 10 files changed, 113 insertions(+), 1 deletion(-)

New commits:
commit dd0f844728a53a337233a3c687b792e725803da5
Author: Markus Mohrhard 
Date:   Mon May 19 08:12:04 2014 +0200

add COLOR function

This function makes property mapping in charts more user friendly.

Change-Id: I01cfb31edd749ee474d5078042fa5c4b4a270f86

diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index 1aecc1a..259eda0 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -423,6 +423,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 /* END defined ERROR.TYPE() values. */
 String SC_OPCODE_FILTERXML { Text = "COM.MICROSOFT.FILTERXML";};
 String SC_OPCODE_WEBSERVICE{ Text = "COM.MICROSOFT.WEBSERVICE"; };
+String SC_OPCODE_COLOR { Text = "COLOR"; };
 String SC_OPCODE_ERF_MS { Text = "COM.MICROSOFT.ERF.PRECISE" ; };
 String SC_OPCODE_ERFC_MS { Text = "COM.MICROSOFT.ERFC.PRECISE" ; };
 };
@@ -1237,6 +1238,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 /* END defined ERROR.TYPE() values. */
 String SC_OPCODE_FILTERXML { Text = "FILTERXML";};
 String SC_OPCODE_WEBSERVICE{ Text = "WEBSERVICE"; };
+String SC_OPCODE_COLOR { Text = "COLOR"; };
 String SC_OPCODE_ERF_MS { Text = "ERF.PRECISE" ; };
 String SC_OPCODE_ERFC_MS { Text = "ERFC.PRECISE" ; };
 };
@@ -2767,6 +2769,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "FILTERXML";
 };
+String SC_OPCODE_COLOR
+{
+Text [ en-US ] = "COLOR";
+};
 String SC_OPCODE_WEBSERVICE
 {
 Text [ en-US ] = "WEBSERVICE";
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 2ce7230..6d642ae 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -468,8 +468,9 @@
 #define SC_OPCODE_NETWORKDAYS_MS468
 #define SC_OPCODE_WORKDAY_MS469
 #define SC_OPCODE_AGGREGATE 470
+#define SC_OPCODE_COLOR 471
 
-#define SC_OPCODE_STOP_2_PAR471 /* last function with two or more 
parameters' OpCode + 1 */
+#define SC_OPCODE_STOP_2_PAR472 /* last function with two or more 
parameters' OpCode + 1 */
 #define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last 
function's OpCode + 1 */
 #define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1)   /* last 
OpCode */
 
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 0e9fb70..199d598 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -461,6 +461,7 @@ enum OpCodeEnum
 ocEuroConvert   = SC_OPCODE_EUROCONVERT,
 ocFilterXML = SC_OPCODE_FILTERXML,
 ocWebservice= SC_OPCODE_WEBSERVICE,
+ocColor = SC_OPCODE_COLOR,
 ocErf_MS= SC_OPCODE_ERF_MS,
 ocErfc_MS   = SC_OPCODE_ERFC_MS,
 // internal stuff
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2646504..50df627 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -646,6 +646,7 @@
 #define HID_FUNC_BITRSHIFT  
"SC_HID_FUNC_BITRSHIFT"
 #define HID_FUNC_FILTERXML  
"SC_HID_FUNC_FILTERXML"
 #define HID_FUNC_WEBSERVICE 
"SC_HID_FUNC_WEBSERVICE"
+#define HID_FUNC_COLOR  
"SC_HID_FUNC_COLOR"
 #define HID_FUNC_COVARIANCE_P   
"SC_HID_FUNC_COVARIANCE_P"
 #define HID_FUNC_COVARIANCE_S   
"SC_HID_FUNC_COVARIANCE_S"
 #define HID_FUNC_ST_DEV_P_MS
"SC_HID_FUNC_ST_DEV_P_MS"
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 4dc7b1b..8e65f68 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2509,6 +2509,7 @@ void Test::testFunctionLists()
 "BITXOR",
 "CEILING",
 "CEILING.PRECISE",
+"COLOR",
 "COMBIN",
 "COMBINA",
 "CONVERT",
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 0c14d32..6022c8e 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -8

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-05-18 Thread bugzilla-daemon

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

a07cd040897db54e1...@spambog.com changed:

   What|Removed |Added

 Depends on||53023

--- Comment #141 from a07cd040897db54e1...@spambog.com ---
Adding bug 53023.

Autotexts get an unneccessary linebreak appended when created via "Autotext" >
"New (Text only)".

See also:
bug 77482 (with screenshots)
bug 63740
bug 53023
https://issues.apache.org/ooo/show_bug.cgi?id=79861
https://issues.apache.org/ooo/show_bug.cgi?id=123748

-- 
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: Question unoType for getXmlToken (dbaccess/reportdesign module)

2014-05-18 Thread sberg

On 05/16/2014 07:30 PM, julien2412 [via Document Foundation Mail 
Archive] wrote:
> I noticed this:
> s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType::get();
> present at 2 locations:
> See
> http://opengrok.libreoffice.org/search?q=%22GetXMLToken%28+XML_FLOAT%29%22&project=core&defs=&refs=&path=&hist=
>
> Why shouldn't be this:
> s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType::get();
> ?

Why should it, because of the "FLOAT" in XML_FLOAT?  I don't know 
anything about that dbaccess/reportbuilder code.  You might want to ask 
on the ML instead (maybe Lionel knows), but I'd assume the code is fine 
as is.

Stephan




--
View this message in context: 
http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071p4109306.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Questions about getCppuType

2014-05-18 Thread sberg

On 05/17/2014 01:42 AM, julien2412 [via Document Foundation Mail 
Archive] wrote:
> I noticed that if I did this:
> diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
> index bbea200..f0d2b03 100644
> --- a/cppu/qa/test_unotype.cxx
> +++ b/cppu/qa/test_unotype.cxx
> @@ -271,8 +271,8 @@ void Test::testUnoType() {
>   void Test::testGetTypeFavourUnsigned() {
>   CPPUNIT_ASSERT(typeid(::sal_Unicode) == typeid(::sal_uInt16));
>   CPPUNIT_ASSERT(
> -::getCppuType(static_cast< ::sal_Unicode * >(0)) ==
> -::getCppuType(static_cast< ::sal_uInt16 * >(0)));
> +cppu::UnoType::get() ==
> +cppu::UnoType::get() );
>
> make cppu gives this:
> /home/julien/compile-libreoffice/libreoffice/cppu/qa/test_unotype.cxx:275:(anonymous
> namespace)::Test::testGetTypeFavourUnsigned
> assertion failed
> - Expression: cppu::UnoType::get() ==
> cppu::UnoType::get()
>
> test_unotype.cxx:275:Assertion
> Test name: (anonymous namespace)::Test::testGetTypeFavourUnsigned
> assertion failed
> - Expression: cppu::UnoType::get() ==
> cppu::UnoType::get()
>
> Failures !!!
> Run: 3   Failure total: 1   Failures: 1   Errors: 0
>
> I don't understand why it's failing in this case.
> Any idea?

That code is a test that getCppuType (mis-)behaves as advertised, and 
conflates sal_Unicode/sal_uInt16.  Do not change code testing 
getCppuType/getTypeFavourUnsigned/getTypeFavourChar to use UnoType instead.

Stephan




--
View this message in context: 
http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109307.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

42 matches

Mail list logo