[Libreoffice-commits] .: helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/source/text/shared/01/05040300.xhp |5 +
 helpcontent2/source/text/shared/01/05040400.xhp |5 +
 2 files changed, 10 insertions(+)

New commits:
commit 26f55ef2eb44e3969b325544686e60993d917e3b
Author: Miklos Vajna 
Date:   Wed Oct 10 09:59:01 2012 +0200

add help for SVX:CHECKBOX:RID_SVXPAGE_HEADER/FOOTER:CB_SHARED_FIRST

Change-Id: If5a19ed3d7a2433a6f68818867ee53610bd1003f

diff --git a/helpcontent2/source/text/shared/01/05040300.xhp 
b/helpcontent2/source/text/shared/01/05040300.xhp
index 3593581..d14c948 100644
--- a/helpcontent2/source/text/shared/01/05040300.xhp
+++ b/helpcontent2/source/text/shared/01/05040300.xhp
@@ -70,6 +70,11 @@
  oldref="21">Same content 
left/righti80087
   Even and odd pages share the 
same content. To assign a 
different header to even and odd pages, clear this option, and then click 
Edit. 
 
+
+Same content on first page
+
+First and even/odd pages share the same content.
 
 Left margin
diff --git a/helpcontent2/source/text/shared/01/05040400.xhp 
b/helpcontent2/source/text/shared/01/05040400.xhp
index f086e64..583de55 100644
--- a/helpcontent2/source/text/shared/01/05040400.xhp
+++ b/helpcontent2/source/text/shared/01/05040400.xhp
@@ -70,6 +70,11 @@
  oldref="20">Same content left/right
   Even and odd pages share the 
same content. To assign a 
different footer to even and odd pages, clear this option, and then click 
Edit. 
 
+
+Same content on first page
+
+First and even/odd pages share the same content.
 
 Left margin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/CppunitTest_connectivity_mork.mk connectivity/Module_connectivity.mk connectivity/qa connectivity/source

[Libreoffice Gerrit user]

 connectivity/CppunitTest_connectivity_mork.mk|   57 +++
 connectivity/Module_connectivity.mk  |6 
 connectivity/qa/connectivity/mork/DriverTest.cxx |  173 +++
 connectivity/qa/connectivity/mork/abook_10_john_does.mab |  159 ++
 connectivity/source/drivers/mork/MColumnAlias.cxx|4 
 connectivity/source/drivers/mork/MColumnAlias.hxx|3 
 connectivity/source/drivers/mork/MConnection.cxx |   28 +
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   31 +
 connectivity/source/drivers/mork/MQueryHelper.cxx|   46 ++
 connectivity/source/drivers/mork/MQueryHelper.hxx|3 
 connectivity/source/drivers/mork/MResultSet.cxx  |4 
 connectivity/source/drivers/mork/MorkParser.cxx  |  133 
 connectivity/source/drivers/mork/MorkParser.hxx  |6 
 13 files changed, 621 insertions(+), 32 deletions(-)

New commits:
commit 36026a6ae5d2f42db5fa262a358a3bc8e33e036c
Author: David Ostrovsky 
Date:   Sun Sep 30 19:53:40 2012 +0200

mork driver: add list tables and unit test

Change-Id: I594b24341eb38c05523f578c1dc2e43d90544f30

diff --git a/connectivity/CppunitTest_connectivity_mork.mk 
b/connectivity/CppunitTest_connectivity_mork.mk
new file mode 100644
index 000..987dd57
--- /dev/null
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -0,0 +1,57 @@
+# -*- 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_CppunitTest_CppunitTest,connectivity_mork))
+
+$(eval $(call gb_CppunitTest_set_include,connectivity_mork,\
+   -I$(SRCDIR)/connectivity/source/inc \
+   -I$(SRCDIR)/connectivity/source/drivers/mork \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,connectivity_mork,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,connectivity_mork))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,connectivity_mork, \
+   connectivity/qa/connectivity/mork/DriverTest \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \
+comphelper \
+cppu \
+cppuhelper \
+i18nisolang1 \
+mork \
+sal \
+salhelper \
+sb \
+test \
+unotest \
+ucbhelper \
+utl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,connectivity_mork,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+connectivity/source/drivers/mork/mork \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,connectivity_mork))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index 3cd7daa..ae5932d 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -145,10 +145,14 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,connectivity,\
Jar_ConnectivityTools \
 ))
 # FIXME: Does not work. Convert to JUnit.
-   # JunitTest_complex \
+# JunitTest_complex \
 
 endif
 
+$(eval $(call gb_Module_add_check_targets,connectivity,\
+   CppunitTest_connectivity_mork \
+))
+
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx 
b/connectivity/qa/connectivity/mork/DriverTest.cxx
new file mode 100644
index 000..1db1d9f
--- /dev/null
+++ b/connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include "MColumnAlias.hxx"
+#include "MQueryHelper.hxx"
+#include "MConnection.hxx"
+
+#include 
+
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
+
+namespace connectivity { namespace mork {
+
+
+class MorkDriverTest: public test::BootstrapFixture
+{
+public:
+MorkDriverTest() : test::BootstrapFixture(false, false) {};
+
+void test_metadata();
+void test_select_default_all();
+void test_select_list_table_joe_doe_5();
+
+virtual void setUp();
+virtual void tearDown();
+
+CPPUNIT_TEST_SUITE(MorkDriverTest);
+
+CPPUNIT_TEST(test_metadata);
+CPPUNIT_TEST(test_select_default_all);
+CPPUNIT_TEST(test_select_list_table_joe_doe_5);
+CPPUNIT_TEST_SUITE_END();
+
+private:
+

[PUSHED] mork driver: add list tables and unit test

[Muthu Subramanian K (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/841


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I594b24341eb38c05523f578c1dc2e43d90544f30
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: Muthu Subramanian K 

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

Re: getting started with bug 45904

[Markus Mohrhard]

Hey,


>
> I am a 2012 cse graduate with an interest in c++ development. I was thinking
> about fixing the bug number as mentioned above. But i am new to bugzilla and
> each time i open a new bug, there ain;t any description of it only some
> comments by the users. What should i do to get started with the development.
> My c++ skills are of a recent grad.
>

Great that you have an interested in helping us. As mentor for this
easy hack I'm trying to outline what needs to be done for this easy
hack:

First of all you need a libreoffice build as explained at
http://wiki.documentfoundation.org/Development/Native_Build . For this
task you benefit very much from a build with junit so that you can run
both the java based api tests and also the c++ based cppunit tests.

Then the second step is to pick one of the existent java based api
tests. Best you start with a simple one from sc (calc core) where I
can help you. Porting one of the tests normally consists of two steps:
First writing a test for the interface and secondly using these test
methods in an test that is written against a specific implementation
of the interface.

An easy example is XNamed ([1]) which is used for example in
ScNamedRangeObj  ([2] as part of the XNamedRange interface) and the
test code for the XNamed interface in test ([3],[4]) and then a test
against the implementation ([5]).

You should start with such an easy example and when you are
comfortable with writing such tests you can transform one of the
failing java based tests and debug the c++ based test to fix the
underlying problem.

You find the java based test code for both the interfaces and the
services in qaDevOOo/tests/

If you have more questions or need more help please write a mail or
ask on #libreoffice-dev.

Regards,
Markus

[1] 
http://opengrok.libreoffice.org/xref/core/udkapi/com/sun/star/container/XNamed.idl
[2] http://opengrok.libreoffice.org/xref/core/sc/inc/nameuno.hxx#60
[3] http://opengrok.libreoffice.org/xref/core/test/inc/test/container/xnamed.hxx
[4] http://opengrok.libreoffice.org/xref/core/test/source/container/xnamed.cxx
[5] http://opengrok.libreoffice.org/xref/core/sc/qa/extras/scnamedrangeobj.cxx
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/wrtw8esh.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ffb06e5eaadabf2d80277a3f8808957fca8b3b0e
Author: Michael Stahl 
Date:   Tue Oct 9 13:32:15 2012 +0200

fdo#54648: WW8 export: test that FlyFrm actually has layout frm

The bugdoc has 2 "hidden" drawing objects that are invisible.

Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2
(cherry picked from commit c1d2eed375293d7c27bb885f344cc24ec0cd40ca)
Reviewed-on: https://gerrit.libreoffice.org/845
Reviewed-by: Muthu Subramanian K 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index cfaf64b..88055d2 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1665,6 +1665,10 @@ bool lcl_isInHeader(const SwFrmFmt& rFmt)
 if (!pFlyFrmFmt)
 return false;
 SwFlyFrm* pFlyFrm = const_cast(pFlyFrmFmt->GetFrm());
+if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame
+{
+return false;
+}
 SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor();
 SwFrm* pHeader = pPageFrm->Lower();
 if (pHeader->GetType() == FRM_HEADER)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fdo#54648: WW8 export: test that FlyFrm actually has layout ...

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/845

Approvals:
  Muthu Subramanian K: Looks good to me, but someone else must approve
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Muthu Subramanian K 

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

[Libreoffice-commits] .: salhelper/CppunitTest_salhelper_testapi.mk salhelper/Module_salhelper.mk salhelper/qa

[Libreoffice Gerrit user]

 salhelper/CppunitTest_salhelper_testapi.mk |   33 +
 salhelper/Module_salhelper.mk  |1 
 salhelper/qa/test_api.cxx  |   13 +++
 3 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit 0ea421781b16b449045e66c38007374ab2f2c509
Author: Radu Ioan 
Date:   Mon Oct 8 22:07:39 2012 +0300

fdo#39625 Make existing cppunittests work

Make salhelper testapi cppunit work
- removed call to simpleheader.hxx
- added call in Module_sal.mk for sal_testapi
- created mk for cppunittest for sal_testapi
- fixed some compile warning for auto_ptr

Change-Id: I07a58dbd5282f92604f58eb450e0bf549c54c6b3
Reviewed-on: https://gerrit.libreoffice.org/839
Reviewed-by: Muthu Subramanian K 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/salhelper/CppunitTest_salhelper_testapi.mk 
b/salhelper/CppunitTest_salhelper_testapi.mk
new file mode 100644
index 000..ae80042
--- /dev/null
+++ b/salhelper/CppunitTest_salhelper_testapi.mk
@@ -0,0 +1,33 @@
+# -*- 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/.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Radu Ioan  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+
+$(eval $(call gb_CppunitTest_CppunitTest,salhelper_testapi))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,salhelper_testapi,\
+salhelper/qa/test_api \
+))
+
+$(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\
+   $$(INCLUDE) \
+   -I$(SRCDIR)/salhelper/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\
+salhelper \
+sal \
+$(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 7f111d8..699fbed 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,salhelper,\
 
 $(eval $(call gb_Module_add_check_targets,salhelper,\
CppunitTest_salhelper_checkapi \
+   CppunitTest_salhelper_testapi \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 2566b9a..afddab1 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -48,11 +48,14 @@ std::type_info const & getSimpleReferenceObjectTypeInfo()
 
 }
 
-#include "testshl/simpleheader.hxx"
 #include "osl/mutex.hxx"
 #include "salhelper/condition.hxx"
 #include "salhelper/dynload.hxx"
 #include "salhelper/simplereferenceobject.hxx"
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -208,12 +211,12 @@ void Test::testSimpleReferenceObject() {
 
 void Test::testDerivedCondition() {
 osl::Mutex mutex;
-std::auto_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
+boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
 CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0);
 }
 
 void Test::testDerivedConditionWaiterTimedout() {
-std::auto_ptr< salhelper::ConditionWaiter::timedout > p(
+boost::scoped_ptr< salhelper::ConditionWaiter::timedout > p(
 new DerivedConditionWaiterTimedout);
 CPPUNIT_ASSERT(
 dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0);
@@ -235,10 +238,10 @@ void Test::testDerivedSimpleReferenceObject() {
 }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#39625 Make existing cppunittests work

[via Code Review]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/839

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Muthu Subramanian K: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07a58dbd5282f92604f58eb450e0bf549c54c6b3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Muthu Subramanian K 

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

[Libreoffice-commits] .: 2 commits - framework/source sal/qa vcl/inc

[Libreoffice Gerrit user]

 framework/source/services/substitutepathvars.cxx |   12 ---
 sal/qa/osl/file/osl_old_test_file.cxx|3 --
 sal/qa/osl/module/osl_Module_Const.h |9 
 sal/qa/rtl/cipher/rtl_cipher.cxx |2 -
 vcl/inc/vcl/builder.hxx  |   25 ++-
 5 files changed, 8 insertions(+), 43 deletions(-)

New commits:
commit 19d37e5c4bd43d2477d21fbaeccef923a60eb9ec
Author: Caolán McNamara 
Date:   Wed Oct 10 09:28:34 2012 +0100

loplugin: unused O[U]Strings

Change-Id: I020149a3073d8479887d108465cf5d3b727588d7

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index 9ac3c21..fbab8a4 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -375,11 +375,9 @@ const rtl::OUString& 
SubstitutePathVariables_Impl::GetNTDomainName()
 
 const rtl::OUString& SubstitutePathVariables_Impl::GetHostName()
 {
-if ( !m_bHostRetrieved )
+if (!m_bHostRetrieved)
 {
-rtl::OUString   aHostName;
 oslSocketResult aSocketResult;
-
 m_aHost = osl::SocketAddr::getLocalHostname( &aSocketResult 
).toAsciiLowerCase();
 }
 
@@ -1133,8 +1131,8 @@ throw ( NoSuchElementException, RuntimeException )
 aVariable = rVariable.copy( 2, rVariable.getLength() - 3 );
 else
 {
-rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( 
"Unknown variable!" ));
-throw NoSuchElementException();
+OUString aExceptionText("Unknown variable!");
+throw NoSuchElementException(aExceptionText, 
(cppu::OWeakObject *)this);
 }
 }
 else
@@ -1148,8 +1146,8 @@ throw ( NoSuchElementException, RuntimeException )
 return pIter->second.aSubstValue;
 }
 
-rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( "Unknown 
variable!" ));
-throw NoSuchElementException( aExceptionText, (cppu::OWeakObject 
*)this );
+OUString aExceptionText("Unknown variable!");
+throw NoSuchElementException(aExceptionText, (cppu::OWeakObject 
*)this);
 }
 }
 
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx 
b/sal/qa/osl/file/osl_old_test_file.cxx
index 1cdb283..0d2379e 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -173,9 +173,6 @@ void oldtestfile::test_file_004()
 {
 CPPUNIT_ASSERT_MESSAGE("failure #10.1",  target.equalsAscii( 
aSource1[i+1] ) );
 }
-OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
-OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US );
-//fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), 
aSource1[i], o.pData->buffer );
 }
 #endif
 }
diff --git a/sal/qa/osl/module/osl_Module_Const.h 
b/sal/qa/osl/module/osl_Module_Const.h
index 00de78d..544c525 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -47,15 +47,6 @@
 
 #   define FILE_PREFIX  "file:///"
 
-//Korea charactors
-::rtl::OUString aKname(
-RTL_CONSTASCII_STRINGPARAM(
-"/\xEC\x95\x88\xEB\x85\x95\xED\x95\x98\xEC\x84\xB8\xEC\x9A\x94"),
-RTL_TEXTENCODING_ISO_8859_1);
-// zero-extend the individual byte-sized characters one-to-one to 
individual
-// sal_Unicode-sized characters; not sure whether this is what was
-// intended...
-
 //
 // function pointer type.
 //
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 2b982e5..9514bd5 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -258,8 +258,6 @@ public:
 /* rtlCipherError */ aError = rtl_cipher_decode(aCipher, 
pCipherBuffer, nCipherLen, pPlainText2Buffer, nPlainText2Len);
 CPPUNIT_ASSERT_MESSAGE("wrong decode", aError == 
rtl_Cipher_E_None);
 
-rtl::OString sPlainText2Str((char*)pPlainText2Buffer, 
nPlainText2Len);
-
 sal_Int32 nCompare = memcmp(pPlainTextBuffer, pPlainText2Buffer, 
16);
 
 CPPUNIT_ASSERT_MESSAGE("compare between plain and decoded plain 
failed", nCompare == 0);
commit c14bd74f268d4883a73f46a7ceac2d2e98ac96a3
Author: Caolán McNamara 
Date:   Wed Oct 10 00:06:09 2012 +0100

don't do things differently on higher debug levels

Change-Id: Ib1fd8c4a5ab4db8d5889ea489b74569639994714

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index aae959a..83b1139 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -144,36 +144,17 @@ public:
 template  T* get(T*& ret, OString sID)
 {
 Window *w = get_by_name(sID);
-assert(w);
+assert(w && dynamic_

[Libreoffice-commits] .: binaryurp/README ct2n/README drawinglayer/README fontconfig/README freetype/README gdk-pixbuf/README gettext/README git-hooks/README glib/README i18npool/README

[Libreoffice Gerrit user]

 binaryurp/README|9 +
 ct2n/README |4 
 drawinglayer/README |3 +++
 fontconfig/README   |4 
 freetype/README |6 ++
 gdk-pixbuf/README   |   10 ++
 gettext/README  |5 +
 git-hooks/README|9 +
 glib/README |4 
 i18npool/README |3 +++
 10 files changed, 57 insertions(+)

New commits:
commit 0770b6cc2034851cf46dff66bc446f47e7d57846
Author: Manal Alhassoun 
Date:   Wed Oct 10 10:08:52 2012 +0300

add a README files

Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034
Reviewed-on: https://gerrit.libreoffice.org/852
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/binaryurp/README b/binaryurp/README
new file mode 100644
index 000..05dfc33
--- /dev/null
+++ b/binaryurp/README
@@ -0,0 +1,9 @@
+UNO Remote Protocol (URP). A binary protocol. 
+
+UNO provides a protocol called the UNO Remote Protocol (URP) that provides
+a bridge between UNO environments. This bridge allows processes and objects
+to send method calls and to receive return values. UNO objects in different 
+environments are connected by way of this interprocess bridge. The underlying 
+connection is made through a socket or pipe. Remote UNO objects are connected
+by means of TCP/IP using the high-level protocol of the URP.
+
diff --git a/ct2n/README b/ct2n/README
new file mode 100644
index 000..25d4d57
--- /dev/null
+++ b/ct2n/README
@@ -0,0 +1,4 @@
+From 
[http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates].
+
+ConvertTextToNumber replaces numbers and dates, formatted
+ as text, with real numbers.
\ No newline at end of file
diff --git a/drawinglayer/README b/drawinglayer/README
new file mode 100644
index 000..70dda94
--- /dev/null
+++ b/drawinglayer/README
@@ -0,0 +1,3 @@
+*Somewhat of a middle layer between rendering subsystems and application cores.
+
+*It offers a nice and easy API to render complex shapes. 
\ No newline at end of file
diff --git a/fontconfig/README b/fontconfig/README
new file mode 100644
index 000..068f680
--- /dev/null
+++ b/fontconfig/README
@@ -0,0 +1,4 @@
+Fontconfig is a font configuration and customization library. It is designed 
to locate fonts
+within the system and select them according to requirements specified by 
applications. 
+
+From [ http://packages.debian.org/squeeze/fontconfig ]
\ No newline at end of file
diff --git a/freetype/README b/freetype/README
new file mode 100644
index 000..5d4ffe8
--- /dev/null
+++ b/freetype/README
@@ -0,0 +1,6 @@
+FreeType 2 is a software font engine that is designed to be small, efficient, 
highly customizable,
+and portable while capable of producing high-quality output (glyph images). It 
can be
+used in graphics libraries, display servers, font conversion tools, text image 
generation
+tools, and many other products as well.
+
+From [http://freetype.sourceforge.net/freetype2/index.html]
\ No newline at end of file
diff --git a/gdk-pixbuf/README b/gdk-pixbuf/README
new file mode 100644
index 000..325bd2d
--- /dev/null
+++ b/gdk-pixbuf/README
@@ -0,0 +1,10 @@
+GdkPixbuf is a library for image loading and pixel buffer manipulation.
+And it's provides a number of features:
+
+   - Image loading saving facilities.
+   - Rendering of a GdkPixBuf into various formats:
+ drawables (windows, pixmaps), GdkRGB buffers.
+- Fast scaling and compositing of pixbufs.
+- Simple animation loading (ie. animated GIFs)
+
+See Also [ http://developer.gnome.org/gdk-pixbuf/stable/ ]
\ No newline at end of file
diff --git a/gettext/README b/gettext/README
new file mode 100644
index 000..94ff100
--- /dev/null
+++ b/gettext/README
@@ -0,0 +1,5 @@
+
+GNU `gettext' utilities are a set of tools that provides a framework to help 
other GNU packages produce multi-lingual messages.
+
+Seel Also [ http://www.gnu.org/software/gettext/manual/gettext.html ]
+
diff --git a/git-hooks/README b/git-hooks/README
new file mode 100644
index 000..3ddd71a
--- /dev/null
+++ b/git-hooks/README
@@ -0,0 +1,9 @@
+Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to 
trigger action at certain points. 
+
+There are two groups of these hooks: client side and server side. 
+The client-side hooks:
+are for client operations such as committing and merging.
+The server-side hooks:
+are for Git server operations such as receiving pushed commits.
+
+See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
\ No newline at end of file
diff --git a/glib/README b/glib/README
new file mode 100644
index 000..80272cb
--- /dev/null
+++ b/glib/README
@@ -0,0 +1,4 @@
+GLib is a general-purpose utility library, which provides many useful data 
types, macros,
+type conversions, string utilities, file utilities, a main loop abstraction, 
and so on.
+
+From [ http://www.gtk.org/api/2.6/glib/glib.html ]
\ No newline at end of file
diff --git 

[PUSHED] add a README files

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/852

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Manal Alhassoun 
Gerrit-Reviewer: Michael Meeks 

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

[Libreoffice-commits] .: fontconfig/README freetype/README

[Libreoffice Gerrit user]

 fontconfig/README |2 ++
 freetype/README   |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 451056538f8092167653704e8074b760dcbb
Author: Tor Lillqvist 
Date:   Wed Oct 10 12:42:01 2012 +0300

Mention that these are used for Android only

Change-Id: Ie9ae6c2087dd6757ca22eabe2073e1f03a5489c8

diff --git a/fontconfig/README b/fontconfig/README
index 068f680..b4c67d4 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,3 +1,5 @@
+This "bundled" fontconfig is built only in an Android build
+
 Fontconfig is a font configuration and customization library. It is designed 
to locate fonts
 within the system and select them according to requirements specified by 
applications. 
 
diff --git a/freetype/README b/freetype/README
index 5d4ffe8..27ce144 100644
--- a/freetype/README
+++ b/freetype/README
@@ -1,3 +1,5 @@
+This "bundled" freetype is built only in an Android build
+
 FreeType 2 is a software font engine that is designed to be small, efficient, 
highly customizable,
 and portable while capable of producing high-quality output (glyph images). It 
can be
 used in graphics libraries, display servers, font conversion tools, text image 
generation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/condformat/colorformat.cxx|   23 ++-
 sc/source/ui/condformat/condformatdlgentry.cxx |   15 +--
 sc/source/ui/inc/colorformat.hxx   |8 ++--
 sc/source/ui/inc/condformatdlgentry.hxx|2 --
 4 files changed, 21 insertions(+), 27 deletions(-)

New commits:
commit 2b44ae0a5b20b7e4392d7f034207ac20a888d5ae
Author: Markus Mohrhard 
Date:   Wed Oct 10 12:00:33 2012 +0200

also support formulas in the data bar dialog

Change-Id: Ie86f935280667c8d9b4497fec7d519a212a452b6

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index 532c692..7983591 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -36,7 +36,7 @@
 #include 
 #include 
 
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDocument* pDoc):
+ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDocument* pDoc, 
const ScAddress& rPos):
 ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ),
 maBtnOk( this, ScResId( BTN_OK ) ),
 maBtnCancel( this, ScResId( BTN_CANCEL ) ),
@@ -57,7 +57,9 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, 
ScDocument* pDoc):
 maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
 maEdMin( this, ScResId( ED_MIN ) ),
 maEdMax( this, ScResId( ED_MAX ) ),
-mpNumberFormatter( pDoc->GetFormatTable() )
+mpNumberFormatter( pDoc->GetFormatTable() ),
+mpDoc(pDoc),
+maPos(rPos)
 {
 Init();
 FreeResource();
@@ -74,7 +76,8 @@ void SetType(const ScColorScaleEntry* pEntry, ListBox& 
rLstBox)
 rLstBox.SelectEntryPos(pEntry->GetType());
 }
 
-void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* 
pEntry, SvNumberFormatter* pNumberFormatter )
+void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* 
pEntry, SvNumberFormatter* pNumberFormatter,
+ScDocument* pDoc, const ScAddress& rPos )
 {
 double nVal = 0;
 sal_uInt32 nIndex = 0;
@@ -91,8 +94,8 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, 
ScColorScaleEntry* pEntry,
 pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal );
 pEntry->SetValue(nVal);
 break;
-case 6:
-//TODO: moggi
+case COLORSCALE_FORMULA:
+pEntry->SetFormula(rEd.GetText(), pDoc, rPos);
 break;
 }
 }
@@ -109,7 +112,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit)
 
 }
 
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const 
ScDataBarFormatData& rData, ScDocument* pDoc):
+ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const 
ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos):
 ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ),
 maBtnOk( this, ScResId( BTN_OK ) ),
 maBtnCancel( this, ScResId( BTN_CANCEL ) ),
@@ -131,7 +134,9 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, 
const ScDataBarForma
 maEdMin( this, ScResId( ED_MIN ) ),
 maEdMax( this, ScResId( ED_MAX ) ),
 maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) ),
-mpNumberFormatter( pDoc->GetFormatTable() )
+mpNumberFormatter( pDoc->GetFormatTable() ),
+mpDoc(pDoc),
+maPos(rPos)
 {
 Init();
 FreeResource();
@@ -240,8 +245,8 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData()
 pData->mpLowerLimit.reset(new ScColorScaleEntry());
 pData->maAxisColor = maLbAxisCol.GetSelectEntryColor();
 
-::GetType(maLbTypeMin, maEdMin, pData->mpLowerLimit.get(), 
mpNumberFormatter);
-::GetType(maLbTypeMax, maEdMax, pData->mpUpperLimit.get(), 
mpNumberFormatter);
+::GetType(maLbTypeMin, maEdMin, pData->mpLowerLimit.get(), 
mpNumberFormatter, mpDoc, maPos);
+::GetType(maLbTypeMax, maEdMax, pData->mpUpperLimit.get(), 
mpNumberFormatter, mpDoc, maPos);
 GetAxesPosition(pData, maLbAxisPos);
 
 return pData;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2e1c148..865cfcc 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1041,7 +1041,7 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl )
 {
 SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, 
maEdDataBarMin, mpDoc, maPos, true);
 SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, 
maEdDataBarMax, mpDoc, maPos, true);
-ScDataBarSettingsDlg* pDlg = new ScDataBarSettingsDlg(this, 
*mpDataBarData, mpDoc);
+ScDataBarSettingsDlg* pDlg = new ScDataBarSettingsDlg(this, 
*mpDataBarData, mpDoc, maPos);
 if( pDlg->Execute() == RET_OK)
 {
 mpDataBarData.reset(pDlg->GetData());
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index 5f552d8..3c58131 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -34

[Libreoffice-commits] .: connectivity/Module_connectivity.mk

[Libreoffice Gerrit user]

 connectivity/Module_connectivity.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fce309fcabb546b0814ad41e80da48d3ff2448c6
Author: Tor Lillqvist 
Date:   Wed Oct 10 13:06:29 2012 +0300

No mork on non-desktop OSes

Change-Id: Ic9391a020915cdb794434d8728bad1bd64dd20c8

diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index ae5932d..93af10f 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -130,7 +130,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-else ifneq ($(filter-out ANDROID IOS,$(OS)),)
+else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mork \
@@ -149,10 +149,14 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,connectivity,\
 
 endif
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_mork \
 ))
 
 endif
 
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#51004: some progress and 10 years old bug pending

[Michael Meeks]

Hi David,

On Tue, 2012-10-09 at 10:15 +0200, d.ostrov...@idaia.de wrote:
> Quoting Michael Meeks :
> > Of course - it would be -lovely- to have a native C++ unit test in
> > dbaccess/qa/extras/ that we could use to do a few queries on a sample
> > mork file and add that to our regression test suite :-) having more
> > native-code dbaccess/ tests as a harness others can build around would
> > be really nice.
>
> done: https://gerrit.libreoffice.org/#/c/841/

Ooh - that's really nice ! :-)

> It seems to be the first cpp unit test in connectivity module
> that does uno bootstraping and executes a SQL statement ;-)

Yes - quite :-) it's brilliant to have a first unit test there.

> I wasn't sure what would be the best way to differentiate between test
> and production case, so i abused driver url...
> It would be nice if someone could review it.

Sounds like Markus already did that and merged it.

Great work there ! hopefully you built a good foundation for more, and
more diverse database tests.

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

Re: getting started with libreoffice development or a mentor

[Michael Meeks]

Hi there,

On Wed, 2012-10-10 at 13:13 +0530, vikash kumar wrote:
> I am vikash, a recent cse graduate and a old linux and libreoffice
> user. I am looking to contribute to the project,

Welcome ! :-) good to have you around. One thing to do is to hang out
on IRC and ask questions: irc.freenode.net, #libreoffice-dev is a good
place to be.

> Please help me get involved in the project. I would really appreciate
> if someone would like to be my mentor to get me started.

It looks like Markus helped you out with bug#45904 - and no doubt has
some great tasks up his sleeve for people :-)

> Other helps like what should i study and prepare to get involved in
> the development process would also be very helpful. All in all i just
> need the directions to become a part of this community. 

Overview documentation is sparse; but we're trying to build it in the
README files in the top-level directories: ls */README for example. Of
course, it depends on what you want to hack on as to which one to read -
but reading through them all wouldn't be such a long effort & perhaps
quite useful.

Looking forward to seeing your work,

Also - why not try out a simpler task first to get into the flow - such
as a conversion from String to OUString or somesuch ? Perhaps some
dialog migrations using Caolan's nice new layout code ?

All the best,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: connectivity/Module_connectivity.mk

[Libreoffice Gerrit user]

 connectivity/Module_connectivity.mk |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit d814448c41c1095f32be95c67c887ec0db17fffd
Author: Caolán McNamara 
Date:   Wed Oct 10 11:12:37 2012 +0100

put the test and the thing to be tested inside the same if condition

Change-Id: I0bb23749cd74797838fe45ef6e739f75879eea6a

diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index 93af10f..ab3a451 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -138,6 +138,10 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_mork \
 ))
 
+$(eval $(call gb_Module_add_check_targets,connectivity,\
+   CppunitTest_connectivity_mork \
+))
+
 endif
 
 ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
@@ -149,14 +153,6 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,connectivity,\
 
 endif
 
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-
-$(eval $(call gb_Module_add_check_targets,connectivity,\
-   CppunitTest_connectivity_mork \
-))
-
-endif
-
 endif
 
 # 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] .: Branch 'libreoffice-3-6' - RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2570fa3ca70a1634b8c45a0b9e796af80616d71f
Author: Michael Stahl 
Date:   Tue Oct 9 18:56:26 2012 +0200

RepositoryExternal: internal libpng requires zlib as well

(cherry picked from commit 398ce44c54b26b31eb826c150926fd49e59b4f52
and commit f96d58bd53d8068f6056b3f9e45a2b14be5dd4a9
by Matúš Kukan )

Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2
Reviewed-on: https://gerrit.libreoffice.org/848
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57b7249..730043c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1104,14 +1104,15 @@ endef
 
 else # !SYSTEM_LIBPNG
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
png \
 ))
 
 define gb_LinkTarget__use_png
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
png \
 )
+$(call gb_LinkTarget__use_zlib,$(1))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/inc editeng/source sw/source writerfilter/source

[Libreoffice Gerrit user]

 editeng/inc/editeng/borderline.hxx   |5 +
 editeng/source/items/borderline.cxx  |   77 ++-
 sw/source/filter/ww8/ww8par6.cxx |   76 --
 writerfilter/source/dmapper/ConversionHelper.cxx |   69 +---
 4 files changed, 86 insertions(+), 141 deletions(-)

New commits:
commit 0820afc00b2ab647413c3118ad75fdddecf505e0
Author: Michael Stahl 
Date:   Tue Oct 9 17:27:52 2012 +0200

add editeng::ConvertBorderWidthFromWord:

Replace the 2 duplicate implementations of this in ww8 and writerfilter
with a common one.  Differences were:
 2) ww8 doubles the with, writerfilter does not
13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP
22) unsupported, mapped to DASHED vs. SOLID
26) INSET not supported in writerfilter
27) OUTSET not supported in writerfilter

Change-Id: I533b77394388e736f38d70284a6a11061d81e813
(cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270)
Reviewed-on: https://gerrit.libreoffice.org/846
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/editeng/inc/editeng/borderline.hxx 
b/editeng/inc/editeng/borderline.hxx
index 7d18587..4bb4388 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -52,9 +52,12 @@ namespace editeng {
 // values from ::com::sun::star::table::BorderLineStyle
 typedef sal_Int16 SvxBorderStyle;
 
+// convert border style between Word formats and LO
+SvxBorderStyle EDITENG_DLLPUBLIC ConvertBorderStyleFromWord(int);
 /// convert border width in twips between Word formats and LO
 double EDITENG_DLLPUBLIC ConvertBorderWidthToWord(SvxBorderStyle, double);
-double EDITENG_DLLPUBLIC ConvertBorderWidthFromWord(SvxBorderStyle, 
double);
+double EDITENG_DLLPUBLIC ConvertBorderWidthFromWord(SvxBorderStyle,
+double, int);
 
 class EDITENG_DLLPUBLIC SvxBorderLine
 {
diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 9f538c2..8a09ba7 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -120,6 +120,78 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, long 
nWidth,
 aColor = *pCol;
 }
 
+
+SvxBorderStyle
+ConvertBorderStyleFromWord(int const nWordLineStyle)
+{
+switch (nWordLineStyle)
+{
+// First the single lines
+case  1:
+case  2: // thick line
+case  5:
+// and the unsupported special cases which we map to a single line
+case  8:
+case  9:
+case 20:
+return SOLID;
+break;
+case  6:
+return DOTTED;
+break;
+case  7:
+case 22:
+return DASHED;
+break;
+// then the shading beams which we represent by a double line
+case 23:
+return DOUBLE;
+break;
+// then the double lines, for which we have good matches
+case  3:
+case 10: // Don't have triple so use double
+case 21: // Don't have double wave: use double instead
+return DOUBLE;
+break;
+case 11:
+return THINTHICK_SMALLGAP;
+break;
+case 12:
+case 13: // Don't have thin thick thin, so use thick thin
+return THICKTHIN_SMALLGAP;
+break;
+case 14:
+return THINTHICK_MEDIUMGAP;
+break;
+case 15:
+case 16: // Don't have thin thick thin, so use thick thin
+return THICKTHIN_MEDIUMGAP;
+break;
+case 17:
+return THINTHICK_LARGEGAP;
+break;
+case 18:
+case 19: // Don't have thin thick thin, so use thick thin
+return THICKTHIN_LARGEGAP;
+break;
+case 24:
+return EMBOSSED;
+break;
+case 25:
+return ENGRAVED;
+break;
+case 26:
+return OUTSET;
+break;
+case 27:
+return INSET;
+break;
+default:
+return NONE;
+break;
+}
+}
+
 static const double THINTHICK_SMALLGAP_line2 = 15.0;
 static const double THINTHICK_SMALLGAP_gap   = 15.0;
 static const double THINTHICK_LARGEGAP_line1 = 30.0;
@@ -132,7 +204,8 @@ static const double OUTSET_line1 = 15.0;
 static const double INSET_line2  = 15.0;
 
 double
-ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth)
+ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth,
+int const nWordLineStyle)
 {
 switch (eStyle)
 {
@@ -140,7 +213,7 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, 
double const fWidth)
 case SOLID:
 case DOTTED:
 case DASHED:
-return fWidth;
+return (2 == nWordLineStyle) ? (fWi

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/aqua

[Libreoffice Gerrit user]

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

New commits:
commit 6dd3e7afecd703e8f1435a63e7dad37a4f07b800
Author: Sergey Farbotka 
Date:   Wed Oct 10 09:29:55 2012 +0200

Fix fdo#55142 - use proper output offsets.

Change-Id: I49cd72a91cd31ddc8b3d57000210523a73926d1f
Reviewed-on: https://gerrit.libreoffice.org/853
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx 
b/vcl/aqua/source/gdi/salatslayout.cxx
index f368f51..cf827ef 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -436,7 +436,7 @@ void ATSLayout::DrawText( SalGraphics& rGraphics ) const
 {
 const SubPortion& rSubPortion = *it;
 // calculate sub-portion offset for rotated text
-Fixed nXOfsFixed = 0, nYOfsFixed = 0;
+Fixed nXOfsFixed = rSubPortion.mnXOffset, nYOfsFixed = 0;
 if( rAquaGraphics.mnATSUIRotation != 0 )
 {
 const double fRadians = rAquaGraphics.mnATSUIRotation * 
(M_PI/0xB4);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/source

[Libreoffice Gerrit user]

 editeng/source/items/borderline.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit b747a8f75f97f6e83297073e61acd95c7a9cc3d6
Author: Michael Stahl 
Date:   Tue Oct 9 17:56:21 2012 +0200

fdo#55526: fix import of RTF \brdrhair:

This is a hairline border that should be mapped to a non-zero width
border given that LO doesn't have hairline borders as such.

Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72
(cherry picked from commit 59ab112fe93cbf4e2b052f4e8bafbdb4e6738bef)
Reviewed-on: https://gerrit.libreoffice.org/847
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 8a09ba7..6fdefe2 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -129,7 +129,7 @@ ConvertBorderStyleFromWord(int const nWordLineStyle)
 // First the single lines
 case  1:
 case  2: // thick line
-case  5:
+case  5: // hairline
 // and the unsupported special cases which we map to a single line
 case  8:
 case  9:
@@ -211,9 +211,23 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, 
double const fWidth,
 {
 // Single lines
 case SOLID:
+switch (nWordLineStyle)
+{
+case 2:
+return (fWidth * 2.0); // thick
+break;
+case 5: // fdo#55526: map 0 hairline width to > 0
+return (fWidth > 1.0) ? fWidth : 1.0;
+break;
+default:
+return fWidth;
+break;
+}
+break;
+
 case DOTTED:
 case DASHED:
-return (2 == nWordLineStyle) ? (fWidth * 2.0) : fWidth;
+return fWidth;
 break;
 
 // Double lines
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: RepositoryExternal: internal libpng requires zlib as well

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/848

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Fridrich Strba 

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

[PUSHED] Change in core[libreoffice-3-6]: add editeng::ConvertBorderWidthFromWord:

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/846

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I533b77394388e736f38d70284a6a11061d81e813
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Fridrich Strba 

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

[PUSHED] Change in core[libreoffice-3-6]: Fix fdo#55142 - use proper output offsets.

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/853

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49cd72a91cd31ddc8b3d57000210523a73926d1f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Thorsten Behrens 
Gerrit-Reviewer: Fridrich Strba 

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

[PUSHED] Change in core[libreoffice-3-6]: fdo#55526: fix import of RTF \brdrhair:

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/847

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Muthu Subramanian K 

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Alex Thurgood  changed:

   What|Removed |Added

 Depends on||53924

--- Comment #139 from Alex Thurgood  ---
Nominating 53924, which is a regression over 3.5.6 in printed output on Mac
OSX, also present in master.


Alex

-- 
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] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/ConversionHelper.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7476fa6ec224824ff07d9daec4852a7c4bf8ad93
Author: Miklos Vajna 
Date:   Wed Oct 10 13:05:59 2012 +0200

writerfilter: these can be static in ConversionHelper

Change-Id: I2436a884627c4f9b112086cb7ca1a096093ea3f6

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 40ea9bd..88c9372 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -147,6 +147,7 @@ void MakeBorderLine( sal_Int32 nLineThickness,   sal_Int32 
nLineType,
 rToFill.Color = nLineColor;
 }
 
+namespace {
 void lcl_SwapQuotesInField(OUString &rFmt)
 {
 //Swap unescaped " and ' with ' and "
@@ -172,6 +173,7 @@ bool lcl_IsNotAM(OUString& rFmt, sal_Int32 nPos)
 )
 );
 }
+}
 
 OUString ConvertMSFormatStringToSO(
 const OUString& rFormat, lang::Locale& rLocale, bool bHijri)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: icon-themes/galaxy

[Libreoffice Gerrit user]

 dev/null |binary
 1 file changed

New commits:
commit fef9d3090f7abd4371e7b7da61a5f959c208f0c1
Author: Jack Leigh 
Date:   Tue Oct 9 20:25:54 2012 +0100

fdo#48873 clean unused icons

Change-Id: Ia797808dcee0cee53f72c5bda62297130e04e85e
Reviewed-on: https://gerrit.libreoffice.org/850
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/icon-themes/galaxy/dbaccess/res/nu09.png 
b/icon-themes/galaxy/dbaccess/res/nu09.png
deleted file mode 100644
index 2092d6f..000
Binary files a/icon-themes/galaxy/dbaccess/res/nu09.png and /dev/null differ
diff --git a/icon-themes/galaxy/desktop/res/extension_16.png 
b/icon-themes/galaxy/desktop/res/extension_16.png
deleted file mode 100644
index be3c8ef..000
Binary files a/icon-themes/galaxy/desktop/res/extension_16.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/desktop/res/regkey.png 
b/icon-themes/galaxy/desktop/res/regkey.png
deleted file mode 100644
index 24d374c..000
Binary files a/icon-themes/galaxy/desktop/res/regkey.png and /dev/null differ
diff --git a/icon-themes/galaxy/extensions/res/m_arrow.png 
b/icon-themes/galaxy/extensions/res/m_arrow.png
deleted file mode 100644
index 576cf2d..000
Binary files a/icon-themes/galaxy/extensions/res/m_arrow.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-01.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-01.png
deleted file mode 100644
index 5018887..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-01.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-02.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-02.png
deleted file mode 100644
index 082ec90..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-02.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-03.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-03.png
deleted file mode 100644
index db6de05..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-03.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-04.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-04.png
deleted file mode 100644
index df295bc..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-04.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-05.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-05.png
deleted file mode 100644
index 25f74e6..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-05.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-16-06.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-16-06.png
deleted file mode 100644
index 6a4daa3..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-16-06.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-01.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-01.png
deleted file mode 100644
index c3596c1..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-01.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-02.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-02.png
deleted file mode 100644
index e2ca6b9..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-02.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-03.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-03.png
deleted file mode 100644
index 6609d3a..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-03.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-04.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-04.png
deleted file mode 100644
index e70a393..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-04.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-05.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-05.png
deleted file mode 100644
index 63eb3e1..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-05.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-06.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-06.png
deleted file mode 100644
index c072e39..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-06.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-07.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-07.png
deleted file mode 100644
index 801ea3b..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-07.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/hicontrast/shared/spinner-32-08.png 
b/icon-themes/galaxy/hicontrast/shared/spinner-32-08.png
deleted file mode 100644
index 60635b1..000
Binary files a/icon-themes/galaxy/hicontrast/shared/spinner-32-08.png

[PUSHED] fdo#48873 clean unused icons

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/850

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia797808dcee0cee53f72c5bda62297130e04e85e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jack Leigh 
Gerrit-Reviewer: Michael Meeks 

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

[Libreoffice-commits] .: filter/source

[Libreoffice Gerrit user]

 filter/source/svg/svgwriter.cxx |   24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 1a969ab932a4d76eabdb867dbc267fece3429ef8
Author: Michael Stahl 
Date:   Wed Oct 10 13:35:00 2012 +0200

SVGActionWriter::ImplWriteActions: fix debug code

Change-Id: I770e72673d794b4e3e52a199a05f018558b8a3c4

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ab7efe3..c80532b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2933,36 +2933,38 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 {
 
 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, "desc", 
sal_False, sal_False );
-::rtl::OUString sType = ::rtl::OUString::valueOf( ( (sal_Int32) 
nType ) );
+OUStringBuffer sType;
+sType.append(static_cast(nType));
 if( pAction && ( nType == META_COMMENT_ACTION ) )
 {
-sType += B2UCONST( ": " );
+sType.append(": ");
 const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
 rtl::OString sComment = pA->GetComment();
 if( !sComment.isEmpty() )
 {
 OUString ssComment = OUString( sComment.getStr(), 
sComment.getLength(), RTL_TEXTENCODING_UTF8 );
-sType += ssComment;
+sType.append(ssComment);
 }
 if( 
sComment.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")) )
 {
-const sal_uInt8* pData = NULL;
-pData = pA->GetData();
+sal_uInt8 const*const pData = pA->GetData();
 if( pData && ( pA->GetDataSize() ) )
 {
 sal_uInt16 sz = (sal_uInt16)( ( pA->GetDataSize() ) / 
2 );
 if( sz )
 {
-String sData( ( (const sal_Unicode*) pData ), sz );
-OUString ssData = OUString::valueOf( (sal_Int32) 
pA->GetDataSize() );
-sType += B2UCONST( "; " );
-sType += sData;
+sType.append("; ");
+sType.append(
+reinterpret_cast(pData),
+sz);
 }
 }
 }
 }
-if( !sType.isEmpty() )
-mrExport.GetDocHandler()->characters( sType );
+if (sType.getLength())
+{
+
mrExport.GetDocHandler()->characters(sType.makeStringAndClear());
+}
 }
 catch( ... )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: On support for Ideographic Variation Sequences

[Caolán McNamara]

On Wed, 2012-10-10 at 09:42 +0900, Takeshi Abe wrote:
> Hi all,
> 
> I am now wondering how we can approach support for ideographic variation 
> sequences
> (IVS) in LibreOffice, which has been long requested as you can see at [1].

For our Linux story anyway I wonder why (these are new to me) icu
doesn't know about these already and "do the right thing" at least for
the purposes of rendering text. Maybe a dig into the icu trac on the ivs
search terms might throw up some additional info ?

> So far, having read [2] about Mozilla's case, I think HarfBuzz looks 
> promising for
> the purpose. And employing the library has already been mentioned [3] in 
> somewhat
> different context in this list.

Yeah. FWIW it's also quite possible that icu might itself eventually end
up sitting on top of harfbuzz.

C.

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

[Libreoffice-commits] .: basic/source

[Libreoffice Gerrit user]

 basic/source/comp/exprtree.cxx |   18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 38968e2963302e650b718e5882ef85ff12f71e40
Author: Tor Lillqvist 
Date:   Wed Oct 10 14:56:29 2012 +0300

WaE [loplugin]: statement alignment

Change-Id: Ia09c74e02d261de5946e6d7e0530a7913e0bcb8d

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 710965d..1a4b465 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -819,10 +819,22 @@ short SbiConstExpression::GetShortValue()
 else
 {
 double n = nVal;
-if( n > 0 ) n += .5; else n -= .5;
-if( n > SbxMAXINT ) n = SbxMAXINT, pParser->Error( SbERR_OUT_OF_RANGE 
);
+if( n > 0 )
+n += .5;
 else
-if( n < SbxMININT ) n = SbxMININT, pParser->Error( SbERR_OUT_OF_RANGE 
);
+n -= .5;
+
+if( n > SbxMAXINT )
+{
+n = SbxMAXINT;
+pParser->Error( SbERR_OUT_OF_RANGE );
+}
+else if( n < SbxMININT )
+{
+n = SbxMININT;
+pParser->Error( SbERR_OUT_OF_RANGE );
+}
+
 return (short) n;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

[Libreoffice Gerrit user]

 filter/source/svg/svgwriter.cxx |   61 
 1 file changed, 32 insertions(+), 29 deletions(-)

New commits:
commit bd4727567414d469896d7aaf7ee9a823c987e3d1
Author: Michael Stahl 
Date:   Wed Oct 10 13:46:55 2012 +0200

SVGActionWriter::ImplWriteActions: indent that

Change-Id: I6ae6d96f88df813172017bafe1dd883c7b871c9e

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c80532b..2e7316b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2931,40 +2931,43 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 {
 try
 {
-
-SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, "desc", 
sal_False, sal_False );
-OUStringBuffer sType;
-sType.append(static_cast(nType));
-if( pAction && ( nType == META_COMMENT_ACTION ) )
-{
-sType.append(": ");
-const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
-rtl::OString sComment = pA->GetComment();
-if( !sComment.isEmpty() )
-{
-OUString ssComment = OUString( sComment.getStr(), 
sComment.getLength(), RTL_TEXTENCODING_UTF8 );
-sType.append(ssComment);
-}
-if( 
sComment.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")) )
-{
-sal_uInt8 const*const pData = pA->GetData();
-if( pData && ( pA->GetDataSize() ) )
+SvXMLElementExport aElem( mrExport,
+XML_NAMESPACE_NONE, "desc", sal_False, sal_False );
+OUStringBuffer sType;
+sType.append(static_cast(nType));
+if (pAction && (nType == META_COMMENT_ACTION))
+{
+sType.append(": ");
+const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
+rtl::OString sComment = pA->GetComment();
+if (!sComment.isEmpty())
+{
+OUString ssComment = OUString( sComment.getStr(),
+sComment.getLength(), RTL_TEXTENCODING_UTF8 );
+sType.append(ssComment);
+}
+if (sComment.equalsIgnoreAsciiCaseL(
+RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")))
 {
-sal_uInt16 sz = (sal_uInt16)( ( pA->GetDataSize() ) / 
2 );
-if( sz )
+sal_uInt8 const*const pData = pA->GetData();
+if (pData && (pA->GetDataSize()))
 {
-sType.append("; ");
-sType.append(
-reinterpret_cast(pData),
-sz);
+sal_uInt16 sz = (sal_uInt16)((pA->GetDataSize()) / 
2);
+if (sz)
+{
+sType.append("; ");
+sType.append(
+reinterpret_cast(pData),
+sz);
+}
 }
 }
 }
-}
-if (sType.getLength())
-{
-
mrExport.GetDocHandler()->characters(sType.makeStringAndClear());
-}
+if (sType.getLength())
+{
+mrExport.GetDocHandler()->characters(
+sType.makeStringAndClear());
+}
 }
 catch( ... )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/rtl/logfile.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 994ec9638027fdb1dd1afea9a3cb229b5ab900d6
Author: Luboš Luňák 
Date:   Wed Oct 10 14:12:37 2012 +0200

avoid unused variable warnings for vars used for RTL_LOGFILE_CONTEXT_TRACEx

Change-Id: I8847192f61b2fca696a1ec6fbad65026e1ffdb43

diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index 1ed8c66..fc4dc1d 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -171,9 +171,9 @@ namespace rtl
 #define RTL_LOGFILE_CONTEXT( instance, name )  ((void)0)
 #define RTL_LOGFILE_CONTEXT_AUTHOR( instance, project, author, name )  
((void)0)
 #define RTL_LOGFILE_CONTEXT_TRACE( instance, message )  ((void)0)
-#define RTL_LOGFILE_CONTEXT_TRACE1( instance, frmt, arg1 ) ((void)0)
-#define RTL_LOGFILE_CONTEXT_TRACE2( instance, frmt, arg1, arg2 ) ((void)0)
-#define RTL_LOGFILE_CONTEXT_TRACE3( instance, frmt, arg1, arg2 , arg3 ) 
((void)0)
+#define RTL_LOGFILE_CONTEXT_TRACE1( instance, frmt, arg1 ) ((void)arg1,(void)0)
+#define RTL_LOGFILE_CONTEXT_TRACE2( instance, frmt, arg1, arg2 ) 
((void)arg1,(void)arg2,(void)0)
+#define RTL_LOGFILE_CONTEXT_TRACE3( instance, frmt, arg1, arg2 , arg3 ) 
((void)arg1,(void)arg2,(void)arg3,(void)0)
 #endif
 
 // Normal RTL_LOGFILE_* entries will not make it into release versions,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

A special product version of OpenOffice which is compiled with a defined preprocessor symbol 'TIMELOG'

[Tor Lillqvist]

Look in .

Does anybody of us ever use that TIMELOG facility? If not, is anybody
interested in trying, now that they are told about it?

If nobody is interested, we presumably should kill all that, kill the
RTL_LOGFILE_CONTEXT stuff in the code, etc?

If we do that, is the RTL_LOGFILE stuff that is not dependent on
whether TIMELOG is defined or not still useful, or should that, too,
be killed?

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

[Libreoffice-commits] .: apache-commons/ExternalProject_apache_commons_codec.mk apache-commons/ExternalProject_apache_commons_httpclient.mk apache-commons/ExternalProject_apache_commons_lang.mk apache

[Libreoffice Gerrit user]

 apache-commons/ExternalProject_apache_commons_codec.mk  |2 +-
 apache-commons/ExternalProject_apache_commons_httpclient.mk |2 +-
 apache-commons/ExternalProject_apache_commons_lang.mk   |2 +-
 apache-commons/ExternalProject_apache_commons_logging.mk|2 +-
 beanshell/ExternalProject_beanshell.mk  |2 +-
 hsqldb/ExternalProject_hsqldb.mk|2 +-
 jfreereport/ExternalProject_jfreereport_flow_engine.mk  |2 +-
 jfreereport/ExternalProject_jfreereport_flute.mk|2 +-
 jfreereport/ExternalProject_jfreereport_libbase.mk  |2 +-
 jfreereport/ExternalProject_jfreereport_libfonts.mk |2 +-
 jfreereport/ExternalProject_jfreereport_libformula.mk   |2 +-
 jfreereport/ExternalProject_jfreereport_liblayout.mk|2 +-
 jfreereport/ExternalProject_jfreereport_libloader.mk|2 +-
 jfreereport/ExternalProject_jfreereport_librepository.mk|2 +-
 jfreereport/ExternalProject_jfreereport_libserializer.mk|2 +-
 jfreereport/ExternalProject_jfreereport_libxml.mk   |2 +-
 jfreereport/ExternalProject_jfreereport_sac.mk  |2 +-
 languagetool/ExternalProject_languagetool.mk|2 +-
 rhino/ExternalProject_rhino.mk  |2 +-
 saxon/ExternalProject_saxon.mk  |2 +-
 solenv/gbuild/gbuild.mk |8 
 tomcat/ExternalProject_tomcat.mk|2 +-
 22 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 940db0cb1b3d0c4c38493c002cff2ad24f59afee
Author: Michael Meeks 
Date:   Wed Oct 10 11:52:28 2012 +0100

more icerun annotation to stop parallel java builds from exploding

Change-Id: Ie05eeb89e79663674e223339918239facf49603a

diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk 
b/apache-commons/ExternalProject_apache_commons_codec.mk
index cf3a284..950c2f4 100644
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -21,7 +21,7 @@ $(eval $(call 
gb_ExternalProject_register_targets,apache_commons_codec,\
 $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
cd "$(call gb_UnpackedTarball_get_dir,apache_commons_codec)" && \
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-   "$(ANT)" \
+   $(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
-Dbuild.label="build-$(RSCREVISION)" \
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk 
b/apache-commons/ExternalProject_apache_commons_httpclient.mk
index 921ae1c..c9bde3f 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -24,7 +24,7 @@ $(eval $(call 
gb_ExternalProject_register_targets,apache_commons_httpclient,\
 $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
cd "$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)" && \
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-   "$(ANT)" \
+   $(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
-Dbuild.label="build-$(RSCREVISION)" \
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk 
b/apache-commons/ExternalProject_apache_commons_lang.mk
index 23c3b56..f2547aa 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -21,7 +21,7 @@ $(eval $(call 
gb_ExternalProject_register_targets,apache_commons_lang,\
 $(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
cd "$(call gb_UnpackedTarball_get_dir,apache_commons_lang)" && \
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-   "$(ANT)" \
+   $(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
-Dbuild.label="build-$(RSCREVISION)" \
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk 
b/apache-commons/ExternalProject_apache_commons_logging.mk
index 81e6ad6..a75558e 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -28,7 +28,7 @@ $(eval $(call 
gb_ExternalProject_register_targets,apache_commons_logging,\
 $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
cd "$(call gb_UnpackedTarball_get_dir,apache_commons_logging)" && \
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-   "$(ANT)" \
+   $(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
-Dbuild.label="build-$(RSCREVISION)" \
diff --git a/beanshell/ExternalProject_beanshell.mk 
b/beanshell/ExternalProject_beanshell.mk
index 0fc720d..983537c 100644
-

[Libreoffice-commits] Changes to 'libreoffice-3-6-3'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-3' available with the following commits:
commit c933676bea1acc61cfc8853a0e327345919b79de
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:46 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I4976818f4d99fb34e4300ebc87e0856a6727e785

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-3'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-3' available with the following commits:
commit 2e1690a37aa176ba63c37476b1dded825ce1d8a2
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:49 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I643b3ba335c63c3e894cfcb66dc905bd26fcab07

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-3'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-3' available with the following commits:
commit 9da8d56adf28c0aac3244207db1c27b9fc5eda4e
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:49 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I04c9badb79e96711c2d5eee1e4136365741ed2c1

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-3'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-3' available with the following commits:
commit 63b4707e8f51ea0c41495195bbf4af147184505a
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:49 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I223392098cfa4dc7bb435133b1e1d851865e10ff

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-3'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-3' available with the following commits:
commit f60e1ebab816984d8a4577d966dac38b9444ca1d
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:49 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' -

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit c933676bea1acc61cfc8853a0e327345919b79de
Author: Fridrich Å trba 
Date:   Wed Oct 10 14:54:46 2012 +0200

Branch libreoffice-3-6-3

This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

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

[ANNOUNCE] Branch libreoffice-3-6-3 created

[Fridrich Strba]

Hi all,

there have been created the libreoffice-3-6-3 branch. It will be used
for fine tuning of the 3.6.3 release.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-6 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-3-6' branch is still active and will be used for the
3.6.4 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan
   http://wiki.documentfoundation.org/Development/Branches


Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-3-6-3 origin/libreoffice-3-6-3

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-6-3 when you have switched to it.  This will
save you some git shouting at you.


Happy hacking,
Fridrich on behalf of the wonderful Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANNOUNCE] Branch libreoffice-3-6-3 created

[Fridrich Strba]

Hi all,

there have been created the libreoffice-3-6-3 branch. It will be used
for fine tuning of the 3.6.3 release.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-6 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-3-6' branch is still active and will be used for the
3.6.4 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan
   http://wiki.documentfoundation.org/Development/Branches


Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-3-6-3 origin/libreoffice-3-6-3

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-6-3 when you have switched to it.  This will
save you some git shouting at you.


Happy hacking,
Fridrich on behalf of the wonderful Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.3.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.3.1' created by Fridrich Å trba 
 at 2012-10-10 14:42 -0700

Tag libreoffice-3.6.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQdXsyAAoJEPQ0oe+v7q6jb8wQAK+G1PGEWrVMsnHiype+6VU/
DcfwyjO3gxAwj8edl3FxaZD1fIk2FQcJ9ZcnMWdt7hwsAlvbRI0NEmcQNV7N4/b5
c9zHjw6tIKmaKFFqEFS8NQ6kTcUdwRzPgfLBw+gExZ45wulpW71r/xaj5mMlSsyb
WwlWhKRmq7WXoDsz2Y/ZpYgZPdpzMvSCP1DEZxLi+2lSmHadfaa67aimehhIb3PK
FQwcfvfBCuWJZx3OByEGSbjgRTFO+PiH0ztvnyJ0YlmZwjyVsD8lf6R4DtNLn1pZ
bHVjm59qnpShFJghJYRhIJ4cDeDC/3Y76WFdMWBJUqkCjty3XuvfhcnANxSGA50v
ixso+HTVPqBcPbYCyYMCiW6PTZcRrZRmmaVzafVepogTpWi6iycSm6rwukGVGySw
EtieQexKvKDYFyBDFrAjEFgXb9EZ7ojtVYWEkYMCDUGUEkaMxPqIAvWYB0yMPPCG
8EdJJUBLNQZmLGn8NiJnZYasquV7J9J22/N0X136UI2q2LB2G1QPyBhXok9JcDT+
h+DTuFSFL/yDeo0OeJDbajdDuoxJx2sUJ8UZV8hQXO8XKZZ1tDuoblPNYMeZ09D5
RKbX18SK0GJEYOEpFcLNki5eg+ohUUw1IAm6KQ/hjDljFF27q1in95TBfk8L9lKC
fddnWKTUjOC6VO/EVvmt
=r/qu
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.3.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.3.1' created by Fridrich Å trba 
 at 2012-10-10 14:42 -0700

Tag libreoffice-3.6.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQdXsyAAoJEPQ0oe+v7q6jAxwP/RNrtzjlt00OHnpUvrC8fYon
vXpFkVkJqKMAPMfltJe97uPjML3YwyHXwUPghtuRpJDHAcc9pqbVYlQDAqXIjkw1
FIeoQtIQqknfMumDvgZkFcuCh8DNL3yGkevTiD1ubaofmFBndU8tqGPMK0vs3oMo
LMj3cCMtQ7cqgMq/gR0/AH0tnvFhGwtKxlcs3AyyXsqyIhd1chFIBZ5pjaC93Z4N
1yVo6B9LavyprZ1xjh0Hm0ChwKRvY16037HjnnbcJdfg13AJ7PgZhHyt+Qgu+wzl
OT6kahVZBFExsXFxB51fNASULejXZ6Nzxdb9e+Xv/PPvAcYUJNMOR05tNB8OIhMQ
ForMjyYoefa1BTI50THzaIbjX/SaGh+EoDNRNsfI2v+n7rtnXx/WlCyyqOS9AKgU
b6r/U+c8nGh5WrT0GOa7BF6Nwzg4bYsjlr9isKhAXVTDnX5G3XHoFNDnHDxEC+tW
GA0EYkG6BXXuQLV18o12U+SZBltNiy6zRJ08XbXBkX12oaaiot4slZhdrIaY83rZ
PD44qwLbexTuqlzAPNnNbZ8PXx2DrwD8AXGmvpfb2R38v5P6rWPuClrL08p0uLfF
4jJZtJJLFjvpOZLMsiDQVuKK2lExV/iqe5tWj1DqqZhy7ea+2QjY0cegAthvv/eH
1M6RMFbY9KFFwkg0ZXcz
=5olH
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.3.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.3.1' created by Fridrich Å trba 
 at 2012-10-10 14:42 -0700

Tag libreoffice-3.6.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQdXsyAAoJEPQ0oe+v7q6jQ6gP/RmM/n76mlWNS7A6Ka09EcNh
y/i6crMYOXXh1lGHykRHmXIzQoYzjVWV7MO6wngWS5xdVB4u+IKWptUWnfrIki/Q
TFG99gEzkYyxumJoOxHgTpNHrmgz9xdYEbMLEj01B2feIuG9ElSHJxvHDCbACaJr
jj2Aqmoz4AXI8WLNMkAi0zYRuG8NM1r91IqTO5/KszWN0Bhq7sopGurTbCw3dunf
TKSMbjWeNCuikMKlE0pz22lH956+3U+FptKsWjKAr8EhRxDWGB4GMIg5p8ehCbuu
U+os2KyS90QfdTmsdP7ftuLzt+CdoCEPSn3FnTT7CI46NuGaJKUWsH9H4GMoZcLc
xZkiJkHsFycsH1+Bv9uf+aUT0gXdUZkZD5l85LFv8O8ZN7qOBQ/LtKOmvYSA29Su
tvf6uCLnel/e+bU1j+JLF7mn83Og777yfp0qsV+MyJcxkNyJcfPA1Uq89SALNJQ1
lY/e3Yd0RrTF+J1hQZ/44KRP6sVW4lhJ/l8s7tt8/eZdaWszELw7vmqmVfqSK3MU
JHmUSQ3L/HkPYhYOhRCJM2J0YlkYu4s9HlnCnmdOc2AJy87NVaMZdNYPFyVtm1L2
M+sdVWI7abIilXjNFrajRKT3d4MjltMYEHFRlpu56yPDXPqp+T7f/lusK1SvoSAi
qzxHND2X0iI7Ybc3c4ke
=MaiU
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.3.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.3.1' created by Fridrich Å trba 
 at 2012-10-10 14:42 -0700

Tag libreoffice-3.6.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQdXsyAAoJEPQ0oe+v7q6jpCEP/jCvuV5mbXxhfDdNctUK/iGl
yZQMi4GLap0ZrjqZ2kfsKp0c/tp0a1GLm3z0Nf9Njx/mlAZLIiyOdvnh+a+q5OVA
WdC6nHsHwdgrcm/KGNOAvWaV/p/ZVRYVKn8Dc+Prw3xF8AI93h+1a/X59iPidweP
hMla4poH+l2PPjvQyRmYdXNSN5NQc5pVURpmxU8tR0koUsJDk/2u1dnO2VgsHsc1
bExSruGCJFaFByCuPou8yK+L01tkA2vlmXK1cvx7dXiseQ4bs/jt/pI/BmDSGk2W
hNY8nZuX4MI8+4huj6eXJ4B+CXY/mbOsiJ1Mp4TkmFGC+bFfEl/CLmxwIv68dWP4
qmgYKt6B5LHInWYc15SEkEiwrWKZVl8vyTl/8ZeqimquKASqhVEJ5bH9yAeYPlbN
ech69JqG/+vZzi/A25EyhJ+XUgKjmekclpfEtu4NUV2ma4cN/KD6zoeVSelQcagG
+xJBMZiDA1XgN0xRyiOqKFhkIpSaq1B3+f6HpjA01IFY9CvDQYSrmVsuzDLUB6gT
5yKwf3fCH6JHFIIQxm2FND0+U/m0oqKgxik2jbhT4lVunt4IKG0hmdiYm531IGgS
ShpgA8IMFt5NlR6WMjMr+IGM3V3JWVxzd7Q+iIzfmoTKxu/JlvcZ+7khDpRS0/Ez
ZWXzQLBl6JfTIdT5o4VT
=3jjo
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.3.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.3.1' created by Fridrich Å trba 
 at 2012-10-10 14:42 -0700

Tag libreoffice-3.6.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQdXsyAAoJEPQ0oe+v7q6jC1YP/i4ei1ymU/ASuyqCWaPl56Ef
JiHZDTPht2YvgzYb5tWjp2fDQ+qOqv1rUUOL5nqajJe078FZ5raBdxfrh1RJlJfR
Ke9EK6LM2+LO7Mo5ZopFIKA8XzqgGsrtahh0yqruVsV8mhP8h5/RTqxp0HLOBkbj
Xd9PVViphrEnRn75UkjCFh82MKu99rYSidQUWUYj3VyKUaS6OdOMEdXFNu61cR5Q
3SLd2bN605Hib3VMhrG1jcDRDAidWZZL6MRzVMyipkBIOTp/9U2jt7cRZjmhZzEe
4ihcWg7+NJNrVEGvmF9e3slUsRqRQkJXyLNgYH/4BVZo0M2r8WfZrZJ7T6uUTCTz
VV4Dr+5N9hfZL610fqlr50vnsxB9hySsvKanDIOyPFxTspwRhUzFTqk0YirEMzoR
3JR2K2OgM2gUkK4ZE+PcbAopGj9KNX9kH3S5ez+9TX9mlyRdomk8/g5Gogr3rJP7
IhitcjaC8Dbql2yuPyYaJfyoV0kHDsHdCQ5yEKGLz9BnYibRZBffdCvohCYNreHp
aKJiZkPb+xr39yRT+v89fDJyhSLAKLqGU06Zdht0DGXTvm6HhTvA1lL3jiFro8+k
WCtKc35qkvD4B+1Xsmc1L2i46YXVAz3vCNim/SOZ8T23mcByFqTF6fS8qqUMdReN
v5uKd78oBTMkbyG7qjEI
=G8xv
-END PGP SIGNATURE-

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

[ANNOUNCE] libreoffice-3.6.3.1 tag created

[Fridrich Strba]

Hi,

there have been created the libreoffice-3.6.3.1 tag (aka rc1). The
corresponding official builds will be available within next few days.

See the attached list of changes against 3.6.2.2[*].


Now, you might switch your current 3-6 or 3-6-3 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-3.6.3.1 libreoffice-3.6.3.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
Give them an hour or so to arrive :) They will be available from the
official page together with the builds.


See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#3.6_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria

[*] The list contains fixes from 3.6.2.2. It is created using
libreoffice/core/bin/lo-commit-stat. It parses output from git log and
does not match cherry-picked commits. We might get better results with
'git cherry' or another approach. Feel free to send patches :-)


Best Regards,
Petr


bnc#707779 fix overflowing of left margin value in editeng when negative. [Jan Holesovsky]
bnc#780296 xlsx fix cyclic referenced defined names partially fixes [Noel Power]
bnc#781166 xlsx fix cyclic referenced defined names partially fixes [Noel Power]
fdo#30711 ODF export: "text:name" is mandatory on bookmarks: [Michael Stahl]
fdo#31405 CommandType is a LONG, so use a sal_Int32 to retrieve it [Lionel Elie Mamane]
fdo#37529 clear DataColumns read-only information when we clear DataColumns [Lionel Elie Mamane]
fdo#39856 fix DOCX import of unicode 0xNN0d when it's a separate run [Miklos Vajna]
fdo#40686 crash with 0 dyaLinePitch in .docx [Caolán McNamara]
fdo#41992 avoid writing empty p:childTnLst elements, fixes rest of [Radek Doulik]
fdo#42450 fix crash in SwXTextSection::attach: [Michael Stahl]
fdo#44278 fix leaked image when import docx [Cédric Bosdonnat]
fdo#44721 protect against negative calculated height value [Lionel Elie Mamane]
fdo#44832 fix regression in chart complex category placements. [Kohei Yoshida]
fdo#45366 exception while importing xlsx. [Muthu Subramanian, Fridrich Å trba]
fdo#45700 sw ODF export: workaround corrupted table model: [Michael Stahl]
fdo#46071 do not hide windows based on nil "Visible" property [Stephan Bergmann]
fdo#46074 do not hide windows based on nil "Visible" property [Stephan Bergmann]
fdo#46100 limit polynomial degree in the dialog, related [Markus Mohrhard]
fdo#46278 misc comment import/export fixes [Noel Power]
fdo#47275 fix crash on Mac when a11y in use, and avoid infinite loop, [Tor Lillqvist]
fdo#49571 ODF import: ignore "text:enable-numbering" attribute [Michael Stahl]
fdo#49655 fix RTF import of text in the middle of table definition [Miklos Vajna]
fdo#49677 ODF export: always add xlink:type attribute [Michael Stahl]
fdo#49678 ODF export: add svg:viewBox to draw:connector [Michael Stahl]
fdo#49819 do not consider timestamp differences as corruption [Fridrich Å trba]
fdo#49876 ODF export: do not export font-size="0pt" [Michael Stahl]
fdo#50539 fix import of RTF_CHCBPAT with value 0 [Miklos Vajna]
fdo#51074 start table cells with "| |" [Stephan Bergmann]
fdo#51252 don't access broken service mgr during bootstrap failure [Stephan Bergmann]
fdo#52022 simple/LargeControlPoints actually can have nil values [Stephan Bergmann]
fdo#52268 splash: change color and position of messages [Ivan Timofeev]
fdo#52389 fix RTF import of paragraph without RTF_PAR at the end of the doc [Miklos Vajna]
fdo#52475 fix import of RTF_CHCBPAT with value 0 [Miklos Vajna]
fdo#52535 rows with cond formats don't have empty background, [Markus Mohrhard]
fdo#53006 displaying help/version early on UNX requires service manager [Stephan Bergmann]
fdo#53009 for msi installer, only default-select a subset of dictionaries [Stephan Bergmann]
fdo#53520 fix for Portuguese spelling files [Stephan Bergmann, Olivier Hallot, David Tardon]
fdo#53673 fix for layout problems with version 3.6 and up [Winfried Donkers]
fdo#54232 set encoding of Romanian MSI tables to UTF-8 [Andras Timar]
fdo#54276 speed up packaging on Windows significantly [Andras Timar]
fdo#54349 shrink to used area for duplicate codn format, [Markus Mohrhard]
fdo#54362 update acor_pt-PT.dat and fix [Olivier Hallot]
fdo#54385 displaying help/version early on UNX requires service manager [Stephan Bergmann]
fdo#54417 fix blacklist buggy Intel driver for dxcanvas [Thorsten Behrens]
fdo#54553 broadcaster cells are empty, [Markus Mohrhard]
fdo#54555 set conditional format range for xls import, [Markus Mohrhard]
fdo#54558 fix vell value import from ooxml with array formulas, [Markus Mohrhard]
fdo#54609 exception while importing xlsx. [Muthu Subramanian, Fridrich Å trba]
fdo#54648 WW8 export: test that FlyFrm actually has layout frm [Michael Stahl]
fdo#54661 rows with cond formats don't have empty background, [Markus Mohrhard]
fdo#54749 don't add old cond formats if new ones are already loaded, [Markus Mohrhard]
fdo#54785 new release libcdr 0.0.9, fixe

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source

[Libreoffice Gerrit user]

 oox/source/ppt/slidefragmenthandler.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 997b202528730abc4b47510befa19a44131a37f4
Author: Radek Doulik 
Date:   Tue Oct 9 11:24:28 2012 +0200

added safety check

Change-Id: I05ca3e5b176202d26c2f2e45cc674ea54934a30b

diff --git a/oox/source/ppt/slidefragmenthandler.cxx 
b/oox/source/ppt/slidefragmenthandler.cxx
index 85d3c9b..9f98742 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -151,7 +151,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
 case A_TOKEN( overrideClrMapping ):
 case PPT_TOKEN( clrMap ):   // CT_ColorMapping
 {
-oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( 
clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( 
*mpSlidePersistPtr->getClrMap() ) );
+oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == 
PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() ) ? new 
oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( 
*mpSlidePersistPtr->getClrMap() ) );
 ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, 
rAttribs.getFastAttributeList(), *pClrMapPtr );
 mpSlidePersistPtr->setClrMap( pClrMapPtr );
 return ret;
commit 0800dd9982c50ee953b103ca73f3781e324a6acc
Author: Radek Doulik 
Date:   Mon Oct 8 18:03:18 2012 +0200

implement a:overrideClrMapping (fixes n#783202)

Change-Id: Ib6c0fd6d9b64f2bff446f919c58027fea76a00cb

diff --git a/oox/source/ppt/slidefragmenthandler.cxx 
b/oox/source/ppt/slidefragmenthandler.cxx
index 952a57c..85d3c9b 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -148,9 +148,10 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
 }
 break;
 
+case A_TOKEN( overrideClrMapping ):
 case PPT_TOKEN( clrMap ):   // CT_ColorMapping
 {
-oox::drawingml::ClrMapPtr pClrMapPtr( new oox::drawingml::ClrMap() 
);
+oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( 
clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( 
*mpSlidePersistPtr->getClrMap() ) );
 ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, 
rAttribs.getFastAttributeList(), *pClrMapPtr );
 mpSlidePersistPtr->setClrMap( pClrMapPtr );
 return ret;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - instsetoo_native/util solenv/inc

[Libreoffice Gerrit user]

 instsetoo_native/util/openoffice.lst |   40 +--
 solenv/inc/minor.mk  |4 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit ddc9f466c26d40007db069054c6fc43a43319cb4
Author: Fridrich Å trba 
Date:   Wed Oct 10 16:52:42 2012 +0200

bump product version to 3.6.3.1+, release number to 1

Change-Id: Ie46423f68c2404ff3237ef0979c72413ab72bdfe

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 39e896b..c7222f0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 3.6.3.0
+UREPACKAGEVERSION 3.6.3.1
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.3.0
+ABOUTBOXPRODUCTVERSION 3.6.3.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.3.0
+ABOUTBOXPRODUCTVERSION 3.6.3.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION 1
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.6
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .3.1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.3.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSIO

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - instsetoo_native/util solenv/inc

[Libreoffice Gerrit user]

 instsetoo_native/util/openoffice.lst |   40 +--
 solenv/inc/minor.mk  |2 -
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit a4b919d0a38bb70f0999fe493cdf54e4a4386681
Author: Fridrich Å trba 
Date:   Wed Oct 10 16:55:24 2012 +0200

bump product version to 3.6.4.0+, release number to 0

Change-Id: If01ce8335a0f872425c3fb7cbdad84c289377451

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 39e896b..2e05997 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 3.6.3.0
+UREPACKAGEVERSION 3.6.4.0
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.3.0
+ABOUTBOXPRODUCTVERSION 3.6.4.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.3.0
+ABOUTBOXPRODUCTVERSION 3.6.4.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION 1
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.6
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .3.0
+SHORT_PRODUCTEXTENSION .4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.3.0
+PACKAGEVERSION 3.6.4.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION

[Libreoffice-commits] .: vcl/source

[Libreoffice Gerrit user]

 vcl/source/control/edit.cxx   |4 +++-
 vcl/source/window/builder.cxx |3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40796af946498d7fb69396dc7b07be40790863df
Author: Caolán McNamara 
Date:   Wed Oct 10 16:07:25 2012 +0100

map GtkTextView to VCLMultiLineEdit

Change-Id: I05c4b4d50400035a2542e375a773ed6d867187e6

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index eb40448..d271051 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -230,8 +230,10 @@ void Edit::SetMaxWidthInChars(sal_Int32 nMinWidthInChars)
 
 bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-chars")))
+if (rKey == "width-chars")
 SetMaxWidthInChars(rValue.toInt32());
+else if (rKey == "editable")
+SetReadOnly(!toBool(rValue));
 else
 return Control::set_property(rKey, rValue);
 return true;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5ab64b3..40c0b71 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -698,6 +699,8 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK);
 else if (name == "GtkDrawingArea")
 pWindow = new Window(pParent);
+else if (name == "GtkTextView")
+pWindow = new VCLMultiLineEdit(pParent);
 else
 {
 sal_Int32 nDelim = name.indexOf(':');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] 766 gerrit patch, fix appendAscii in bastype2.cxx

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/854

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/854/1

766 gerrit patch, fix appendAscii in bastype2.cxx

Change-Id: I4409d1b0585a8c52cba14d1e67ccf776c6070c8a
---
M basctl/source/basicide/bastype2.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4409d1b0585a8c52cba14d1e67ccf776c6070c8a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

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

[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

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

New commits:
commit e1d8f611021d04a0f48101d8416bd0f1ff3eb07c
Author: Radek Doulik 
Date:   Wed Oct 10 17:23:52 2012 +0200

fix text rotation for txXfrm element, fixes n#783433

Change-Id: I82a14170ce8d58184b1a86f7fc0f9e9d93238c92

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a9f0062..6debbcb 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -562,7 +562,7 @@ Reference< XShape > Shape::createAndInsert(
 if( getTextBody() )
 {
 sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >( 
getTextBody()->getTextProperties().moRotation.get( 0 ) );
-mpCustomShapePropertiesPtr->setTextRotateAngle( 
-nTextRotateAngle / 6 );
+mpCustomShapePropertiesPtr->setTextRotateAngle( 
nTextRotateAngle / 6 );
 }
 
 SAL_INFO("oox", "==cscode== shape name: '" << msName << "'");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 10 commits - cppuhelper/Library_cppuhelper.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_findsofficepath.mk cppuhelper/StaticLibrary_findsofficepath.mk dbaccess/Librar

[Libreoffice Gerrit user]

 Repository.mk   |1 
 cppuhelper/Library_cppuhelper.mk|8 +-
 cppuhelper/Module_cppuhelper.mk |2 -
 cppuhelper/Package_findsofficepath.mk   |   34 
 cppuhelper/StaticLibrary_findsofficepath.mk |   21 +
 dbaccess/Library_sdbt.mk|3 +-
 desktop/source/splash/splash.cxx|1 
 desktop/unx/splash/unxsplash.cxx|3 --
 odk/source/unoapploader/unx/makefile.mk |3 +-
 odk/source/unoapploader/win/makefile.mk |3 +-
 sc/source/ui/vba/vbasheetobject.cxx |1 
 sc/source/ui/vba/vbasheetobjects.cxx|1 
 starmath/Library_smd.mk |5 
 svx/Library_textconversiondlgs.mk   |4 +++
 sw/inc/unotxdoc.hxx |1 
 ucb/Library_srtrs1.mk   |4 +++
 ucb/Library_ucpext.mk   |4 +++
 17 files changed, 48 insertions(+), 51 deletions(-)

New commits:
commit 76987f83c84b4cc7163f9065a7eed219eefa39a1
Author: David Tardon 
Date:   Wed Oct 10 13:50:20 2012 +0200

replace findsofficepath.obj by static lib

Change-Id: I652ac46aec72a92667995353efa637f0a2310672

diff --git a/Repository.mk b/Repository.mk
index 70cf306..1914420 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -651,6 +651,7 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 codemaker_java \
 cosv \
 dtobj \
+   findsofficepath \
 headless \
 libeay32 \
 npsoenv \
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 59020c2..9a76127 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,cppuhelper))
 
 $(eval $(call 
gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
 
-$(eval $(call gb_Library_use_packages,cppuhelper,\
-   cppuhelper_inc \
-))
-
 $(eval $(call gb_Library_use_internal_comprehensive_api,cppuhelper,\
cppuhelper \
udkapi \
@@ -51,8 +47,8 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_cobjects,cppuhelper,\
-   cppuhelper/source/findsofficepath \
+$(eval $(call gb_Library_use_static_libraries,cppuhelper,\
+   findsofficepath \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cppuhelper,\
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index 1fd498b..b28a863 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
CustomTarget_cppuhelper_allheaders \
InternalUnoApi_cppuhelper \
Library_cppuhelper \
-   Package_findsofficepath \
Package_inc \
Package_unorc \
+   StaticLibrary_findsofficepath \
 ))
 
 $(eval $(call gb_Module_add_check_targets,cppuhelper,\
diff --git a/cppuhelper/Package_findsofficepath.mk 
b/cppuhelper/Package_findsofficepath.mk
deleted file mode 100644
index b3b0e90..000
--- a/cppuhelper/Package_findsofficepath.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-# UGLY HACK for odk/source/unoapploader/ where we need findsofficepath.o
-$(eval $(call 
gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source))
-
-$(eval $(call 
gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o))
-$(eval $(call 
gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk 
b/cppuhelper/StaticLibrary_findsofficepath.mk
new file mode 100644
index 000..a33c13a
--- /dev/null
+++ b/cppuhelper/StaticLibrary_findsofficepath.mk
@@ -

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 44e8a8240a3a1cce747f1998e617f8dd4621a992
Author: Noel Power 
Date:   Wed Oct 10 16:49:35 2012 +0100

fix for fdo#53814 Revert "there should be no need any more for this check"

This reverts commit bea018a7040c36e91487b27c7b59c6c8a970bf5f.

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 2e1c57d..28c5342 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -387,10 +387,14 @@ short ScTable::CompareCell( sal_uInt16 nSort,
 if (pCell1)
 {
 eType1 = pCell1->GetCellType();
+if (eType1 == CELLTYPE_NOTE)
+pCell1 = NULL;
 }
 if (pCell2)
 {
 eType2 = pCell2->GetCellType();
+if (eType2 == CELLTYPE_NOTE)
+pCell2 = NULL;
 }
 
 if (pCell1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6] fix for fdo#53814

[Noel Power]

I'm in two minds whether this should be a MAB, indeed it is annoying ;-)
in anycase I would recommend to please cherry-pick the following revert
http://cgit.freedesktop.org/libreoffice/core/commit/?id=44e8a8240a3a1cce747f1998e617f8dd4621a992

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

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

[Libreoffice Gerrit user]

 sc/inc/document.hxx  |5 -
 sc/source/core/data/documen2.cxx |1 -
 2 files changed, 6 deletions(-)

New commits:
commit 4266d4e9489ecf16ed336a1498cc9e81d9b3ab1f
Author: Kohei Yoshida 
Date:   Wed Oct 10 12:11:53 2012 -0400

Remove a flag that nobody uses.

Change-Id: Ia18640961e43de28ee08b43358483029db966987

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f02f028..390002e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -358,9 +358,6 @@ private:
 
 boolbIsEmbedded;// display/adjust 
Embedded area?
 
-// no SetDirty for ScFormulaCell::CompileTokenArray but at the end of
-// ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
-boolbNoSetDirty;
 // no broadcast, construct no listener during insert from a different
 // Doc (per filter or the like ), not until CompileAll / CalcAfterLoad
 boolbInsertingFromOtherDoc;
@@ -1550,8 +1547,6 @@ public:
 SC_DLLPUBLIC sal_uInt32  GetRangeOverflowType() const{ 
return nRangeOverflowType; }
 
 // for broadcasting/listening
-voidSetNoSetDirty( bool bVal ) { bNoSetDirty = bVal; }
-boolGetNoSetDirty() const { return bNoSetDirty; }
 voidSetInsertingFromOtherDoc( bool bVal ) { 
bInsertingFromOtherDoc = bVal; }
 boolIsInsertingFromOtherDoc() const { return 
bInsertingFromOtherDoc; }
 voidSetLoadingMedium( bool bVal );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 526655b..c0e9466 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -184,7 +184,6 @@ ScDocument::ScDocument( ScDocumentMode  eMode,
 bIsUndo( eMode == SCDOCMODE_UNDO ),
 bIsVisible( false ),
 bIsEmbedded( false ),
-bNoSetDirty( false ),
 bInsertingFromOtherDoc( false ),
 bLoadingMedium( false ),
 bImportingXML( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx|3 -
 l10ntools/source/po.cxx |   92 +++-
 2 files changed, 53 insertions(+), 42 deletions(-)

New commits:
commit 9ebb37f39bb85b1b900916c54ffd4e82f79186a0
Author: Zolnai Tamás 
Date:   Wed Oct 10 14:21:58 2012 +0200

Relocate KeyId to PoEntry

KeyId is PoEntry specific attribute rather than
part of GenPoEntry. In GenPoEntry it is just
part of extracted comment.
Four character long helptext/x-comment can lead to
incorrect behaviour during file reading.
With checking it in sdf-po constructor we can prevent
this kind of po comming into existence.

Change-Id: I48cc8f34d2c1ca8b86baea25384f5b697f16dd66

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 9163e6a..d1112e1 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -29,7 +29,6 @@ private:
 OStringm_sTransStr;
 bool   m_bFuzzy;
 bool   m_bNull;
-OStringm_sKeyId;
 
 public:
 
@@ -45,7 +44,6 @@ public:
 virtual OString getTransStr() const { return m_sTransStr; }
 virtual boolgetFuzzy() const{ return m_bFuzzy; }
 virtual boolisNull() const  { return m_bNull; }
-virtual OString getKeyId() const{ return m_sKeyId; }
 
 virtual voidsetWhiteSpace(const OString& rWhiteSpace);
 virtual voidsetExtractCom(const OString& rExtractCom);
@@ -54,7 +52,6 @@ public:
 virtual voidsetUnTransStr(const OString& rUnTransStr);
 virtual voidsetTransStr(const OString& rTransStr);
 virtual voidsetFuzzy(const bool bFuzzy);
-virtual voidgenKeyId();
 
 virtual voidwriteToFile(std::ofstream& rOFStream) const;
 virtual voidreadFromFile(std::ifstream& rIFStream);
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 0a5ae28..0416ad0 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -31,24 +31,6 @@
 
 namespace
 {
-//Generate KeyId
-static OString lcl_GenKeyId(const OString& rGenerator)
-{
-boost::crc_32_type aCRC32;
-aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
-sal_uInt32 nCRC = aCRC32.checksum();
-//Use all readable ASCII charachter exclude xml special tags: ",',&,<,>
-const OString sSymbols = 
"!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
-char sKeyId[5];
-for( short nKeyInd = 0; nKeyInd < 4; ++nKeyInd )
-{
-sKeyId[nKeyInd] = sSymbols[(nCRC & 255) % 89];
-nCRC >>= 8;
-}
-sKeyId[4] = '\0';
-return OString(sKeyId);
-}
-
 //Escape text
 static OString lcl_EscapeText(const OString& rText,
const OString& rUnEscaped= POUNESCAPED,
@@ -126,7 +108,6 @@ GenPoEntry::GenPoEntry()
 , m_sTransStr( OString() )
 , m_bFuzzy( false )
 , m_bNull( false )
-, m_sKeyId( OString() )
 {
 }
 
@@ -171,21 +152,15 @@ void GenPoEntry::setFuzzy(const bool bFuzzy)
 m_bFuzzy = bFuzzy;
 }
 
-//Set keyid
-void GenPoEntry::genKeyId()
-{
-m_sKeyId = lcl_GenKeyId( m_sReference + m_sContext + m_sUnTransStr );
-}
-
 //Write to file
 void GenPoEntry::writeToFile(std::ofstream& rOFStream) const
 {
 if ( !m_sWhiteSpace.isEmpty() )
 rOFStream << m_sWhiteSpace.getStr();
 if ( !m_sExtractCom.isEmpty() )
-rOFStream << "#. " << m_sExtractCom.getStr() << std::endl;
-if ( !m_sKeyId.isEmpty() )
-rOFStream << "#. " << m_sKeyId.getStr() << std::endl;
+rOFStream
+<< "#. "
+<< m_sExtractCom.replaceAll("\n","\n#. ").getStr() << std::endl;
 if ( !m_sReference.isEmpty() )
 rOFStream << "#: " << m_sReference.getStr() << std::endl;
 if ( m_bFuzzy )
@@ -217,10 +192,11 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
 OString sLine = OString(sTemp.data(),sTemp.length());
 if (sLine.startsWith("#. "))
 {
-if (sLine.getLength()==7)
-m_sKeyId = sLine.copy(3);
-else
-m_sExtractCom = sLine.copy(3);
+if( !m_sExtractCom.isEmpty() )
+{
+m_sExtractCom += "\n";
+}
+m_sExtractCom += sLine.copy(3);
 }
 else if (sLine.startsWith("#: "))
 {
@@ -253,14 +229,30 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
 break;
 getline(rIFStream,sTemp);
 }
-if( m_sKeyId.isEmpty() && !m_sUnTransStr.isEmpty() )
-genKeyId();
  }
 
 //Class PoEntry
 
 namespace
 {
+//Generate KeyId
+static OString lcl_GenKeyId(const OString& rGenerator)
+{
+boost::crc_32_type aCRC32;
+aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
+sal_uInt32 nCRC = aCRC32.checksum();
+//Use all readable ASCII charachter excl

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx|3 ---
 l10ntools/source/po.cxx |   15 +++
 2 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit a76c979c1771566e806db67e44f387bb68b862cc
Author: Zolnai Tamás 
Date:   Wed Oct 10 15:08:46 2012 +0200

Delete WhiteSpace member of GenPoEntry

This member allows us to use more
kind of whitespace between po entries but
we use one end line everywhere so this variable
is unneeded.

Change-Id: I4e3c9040ca73580fd01484bb91325a9df04cb4e4

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index d1112e1..fa43b51 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -21,7 +21,6 @@ class GenPoEntry
 {
 private:
 
-OStringm_sWhiteSpace;
 OStringm_sExtractCom;
 OStringm_sReference;
 OStringm_sContext;
@@ -36,7 +35,6 @@ public:
 virtual ~GenPoEntry();
 //Default copy constructor and copy operator work well
 
-virtual OString getWhiteSpace() const   { return m_sWhiteSpace; }
 virtual OString getExtractCom() const   { return m_sExtractCom; }
 virtual OString getReference() const{ return m_sReference; }
 virtual OString getContext() const  { return m_sContext; }
@@ -45,7 +43,6 @@ public:
 virtual boolgetFuzzy() const{ return m_bFuzzy; }
 virtual boolisNull() const  { return m_bNull; }
 
-virtual voidsetWhiteSpace(const OString& rWhiteSpace);
 virtual voidsetExtractCom(const OString& rExtractCom);
 virtual voidsetReference(const OString& rReference);
 virtual voidsetContext(const OString& rContext);
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 0416ad0..e1c978d 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -100,8 +100,7 @@ namespace
 
 //Default constructor
 GenPoEntry::GenPoEntry()
-: m_sWhiteSpace( OString() )
-, m_sExtractCom( OString() )
+: m_sExtractCom( OString() )
 , m_sReference( OString() )
 , m_sContext( OString() )
 , m_sUnTransStr( OString() )
@@ -117,11 +116,6 @@ GenPoEntry::~GenPoEntry()
 }
 
 //Set class members
-void GenPoEntry::setWhiteSpace(const OString& rWhiteSpace)
-{
-m_sWhiteSpace = rWhiteSpace;
-}
-
 void GenPoEntry::setExtractCom(const OString& rExtractCom)
 {
 m_sExtractCom = rExtractCom;
@@ -155,8 +149,8 @@ void GenPoEntry::setFuzzy(const bool bFuzzy)
 //Write to file
 void GenPoEntry::writeToFile(std::ofstream& rOFStream) const
 {
-if ( !m_sWhiteSpace.isEmpty() )
-rOFStream << m_sWhiteSpace.getStr();
+if ( rOFStream.tellp() != 0 )
+rOFStream << std::endl;
 if ( !m_sExtractCom.isEmpty() )
 rOFStream
 << "#. "
@@ -183,7 +177,6 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
 m_bNull = true;
 return;
 }
-m_sWhiteSpace = "\n";
 OString* pLastMsg = 0;
 std::string sTemp;
 getline(rIFStream,sTemp);
@@ -414,7 +407,6 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
 {
 throw INVALIDSDFLINE;
 }
-m_aGenPo.setWhiteSpace("\n");
 
 m_aGenPo.setReference(vParts[SOURCEFILE].
 copy(vParts[SOURCEFILE].lastIndexOf("\\")+1));
@@ -629,7 +621,6 @@ PoHeader::PoHeader(  std::ifstream& rOldPo )
 assert( rOldPo.is_open() );
 m_aGenPo.readFromFile( rOldPo );
 
-m_aGenPo.setWhiteSpace( OString() );
 const OString sExtractCom = m_aGenPo.getExtractCom();
 m_aGenPo.setExtractCom(
 sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/lngmerge.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 06175e8b19625cb5a43b1ae5ae63e419cee7e053
Author: Zolnai Tamás 
Date:   Wed Oct 10 15:30:40 2012 +0200

Correct lngmerge not to work with eof

Change-Id: Ibf80a31ea2c03ff2882e71a45acb71d9c9a16482

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index b0282f5..efc6c81 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -50,10 +50,10 @@ LngParser::LngParser(const rtl::OString &rLngFile,
 if (aStream.is_open())
 {
 bool bFirstLine = true;
+std::string s;
+std::getline(aStream, s);
 while (!aStream.eof())
 {
-std::string s;
-std::getline(aStream, s);
 rtl::OString sLine(s.data(), s.length());
 
 if( bFirstLine )
@@ -64,6 +64,7 @@ LngParser::LngParser(const rtl::OString &rLngFile,
 }
 
 pLines->push_back( new rtl::OString(sLine) );
+std::getline(aStream, s);
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#55367 wrong convertion factor for "tspm"

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/855

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/855/1

Resolves: fdo#55367 wrong convertion factor for "tspm"

Change-Id: I80fd050e1bbdc0386c13e0afbeeb404e14b2694b
Reviewed-on: https://gerrit.libreoffice.org/849
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
---
M scaddins/source/analysis/analysishelper.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80fd050e1bbdc0386c13e0afbeeb404e14b2694b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Eike Rathke 

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

[Libreoffice-commits] .: 4 commits - solenv/gbuild tubes/qa tubes/source

[Libreoffice Gerrit user]

 solenv/gbuild/CppunitTest.mk |   12 +-
 tubes/qa/test_manager.cxx|   79 ++-
 tubes/source/manager.cxx |   13 ++-
 3 files changed, 42 insertions(+), 62 deletions(-)

New commits:
commit 5fe772a23f7de0a75849fa6d770a1ca6dd00bdea
Author: Matúš Kukan 
Date:   Wed Oct 10 20:50:23 2012 +0200

tubes: use only one test method; and also setUp and tearDown

Change-Id: I48ae990a870dc6e5c56e901485cb142b51426637

diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 04ad98c..5e2ccf7 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -49,20 +49,15 @@ class TestTeleTubes: public CppUnit::TestFixture
 {
 public:
 
-TestTeleTubes();
-~TestTeleTubes();
-// This could happen in costructor wasn't there TestTeleTubes instance for 
each test:
-void testContactList();
+virtual void setUp();
+virtual void tearDown();
+
 void testSession();
-void testFailAlways();
 
-// Order is significant.
+// There is only one method because the code in setUp
+// and tearDown is expected to be executed only once.
 CPPUNIT_TEST_SUITE( TestTeleTubes );
-CPPUNIT_TEST( testContactList );
 CPPUNIT_TEST( testSession );
-#if 0
-CPPUNIT_TEST( testFailAlways ); // test failure displays SAL_LOG, 
uncomment for debugging
-#endif
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -70,8 +65,6 @@ class TestCollaboration;
 // static, not members, so they actually survive cppunit test iteration
 static TestCollaboration*   mpCollaboration1 = NULL;
 static TestCollaboration*   mpCollaboration2 = NULL;
-static TpAccount*   mpOffererAccount = NULL;
-static TpContact*   mpAccepterContact = NULL;
 //static bool mbFileSentSuccess = false;
 static bool mbPacketReceived = false;
 static OUString maTestConfigIniURL;
@@ -97,7 +90,7 @@ static gboolean timed_out( void * )
 return FALSE;
 }
 
-TestTeleTubes::TestTeleTubes()
+void TestTeleTubes::setUp()
 {
 g_timeout_add_seconds (10, timed_out, NULL);
 maTestConfigIniURL = OUString( "file://" +
@@ -122,8 +115,16 @@ TestTeleTubes::TestTeleTubes()
 CPPUNIT_ASSERT( TeleManager::init( true));
 }
 
-void TestTeleTubes::testContactList()
+/* FIXME: do we need the possibility to pass function to 
Collaboration::SendFile() ?
+static void lcl_FileSent( bool success, void * )
 {
+mbFileSentSuccess = success;
+}
+*/
+
+void TestTeleTubes::testSession()
+{
+// First try to get account and contact
 AccountContactPairV pairs = TeleManager::getContacts();
 /* Both our accounts are meant to be signed in, and they both should be
  * capable of LibreOffice tubes because this test runs after we register
@@ -132,7 +133,9 @@ void TestTeleTubes::testContactList()
 "Make sure both your test accounts are signed in "
 "and are on each other's contact lists",
 pairs.size() > 0 );
-CPPUNIT_ASSERT(!mpAccepterContact);
+
+TpAccount* mpOffererAccount = NULL;
+TpContact* mpAccepterContact = NULL;
 
 for (guint i = 0; i < pairs.size(); i++)
 {
@@ -160,25 +163,19 @@ void TestTeleTubes::testContactList()
 "Make sure both your test accounts are signed in "
 "and are on each other's contact lists",
 mpAccepterContact);
-}
-
-/* FIXME: do we need the possibility to pass function to 
Collaboration::SendFile() ?
-static void lcl_FileSent( bool success, void * )
-{
-mbFileSentSuccess = success;
-}
-*/
 
-void TestTeleTubes::testSession()
-{
+// Now we can start session
 TeleConference* pConference = NULL;
-CPPUNIT_ASSERT( mpOffererAccount != 0);
-CPPUNIT_ASSERT( mpAccepterContact != 0);
 pConference = TeleManager::startBuddySession( mpOffererAccount, 
mpAccepterContact);
 CPPUNIT_ASSERT( pConference != NULL);
 mpCollaboration1->SetConference( pConference );
 mpCollaboration1->SendFile( mpAccepterContact, maTestConfigIniURL );
 
+g_object_unref(mpOffererAccount);
+mpOffererAccount = NULL;
+g_object_unref(mpAccepterContact);
+mpAccepterContact = NULL;
+
 //while (!mbFileSentSuccess)
 //g_main_context_iteration( NULL, TRUE);
 
@@ -196,16 +193,8 @@ void TestTeleTubes::testSession()
 g_main_context_iteration( NULL, TRUE);
 }
 
-TestTeleTubes::~TestTeleTubes()
+void TestTeleTubes::tearDown()
 {
-if (mpOffererAccount) {
-g_object_unref(mpOffererAccount);
-mpOffererAccount = NULL;
-}
-if (mpAccepterContact) {
-g_object_unref(mpAccepterContact);
-mpAccepterContact = NULL;
-}
 // Closes the TeleConference in destructor:
 delete mpCollaboration1;
 delete mpCollaboration2;
@@ -213,11 +202,6 @@ TestTeleTubes::~TestTeleTubes()
 TeleManager::finalize();
 }
 
-void TestTeleTubes::testFailAlways()
-{
-CPPUNIT_ASSERT( false);
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION( TestTeleTubes);
 
 }
commit 1ad0aef2ab81eeb96396bd0bce12

Re: comment about using constructor and destructor in cppunit tests

[Matúš Kukan]

Hello there,

On 28 September 2012 01:28, Markus Mohrhard
 wrote:
> Hey Matus,
>
> I just saw that you started using the constructor and the destructor
> in the tubes unit test. It would be a better idea to move this into
> setUp and tearDown ...

Fixed with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5fe772a23f7de0a75849fa6d770a1ca6dd00bdea
Thanks for noticing,

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

Re: need help with unit test and process service factory

[Matúš Kukan]

On 28 September 2012 11:26, Michael Meeks  wrote:
> If we can create a unit test that doesn't require any of that, it'd be
> great of course. Having said that, I was not a great fan of the way
> those unit tests work in the 1st instance with that manual spin the loop
>  times type stuff that is hyper fragile - or did we fix that ?

Do you mean g_main_context_iteration ?
It's used both in the real code and unit test.
>From what I understood, it's how telepathy framework works and it
can't be avoided.

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

Re: need help with unit test and process service factory

[Matúš Kukan]

On 28 September 2012 15:43, Michael Meeks  wrote:
> IMHO it would be better to write unit tests to test the protocol
> fragments we get out of the calc core, and ensure that these continue to
> work nicely :-) "run a stream of commands" "save document" "diff output"
> etc.

Nice idea for next unit test. :-)
We probably also want to expand the protocol first.

> I love unit tests more than most, but - there are some limits to the
> harnesses people can easily construct out there.
>
> Of course - if we had a small / fall-back TCP / local socket version 
> we
> could do some testing via that but ... it's not really going to test
> much more than the above is it ?

It's more like documentation what app like sc needs to do I think.

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

Re: need help with unit test and process service factory

[Michael Meeks]

On Wed, 2012-10-10 at 21:15 +0200, Matúš Kukan wrote:
> On 28 September 2012 11:26, Michael Meeks  wrote:
> > If we can create a unit test that doesn't require any of that, it'd 
> > be
> > great of course. Having said that, I was not a great fan of the way
> > those unit tests work in the 1st instance with that manual spin the loop
> >  times type stuff that is hyper fragile - or did we fix that ?
> 
> Do you mean g_main_context_iteration ?
> It's used both in the real code and unit test.

It shouldn't be used in the real code - we should integrate with the
glib mainloop that is plugged into VCL :-)

> From what I understood, it's how telepathy framework works and it
> can't be avoided.

The problem is a careless use of an iteration; if we ran the mainloop
until an asynchronous callback quit it - that would be -much- less of a
problem :-) The root problem is trying to 2nd guess how many main-loop
iterations to call - which is non documented, non deterministic and
guarenteed to change between minor releases :-)

ATB,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: odk/source

[Libreoffice Gerrit user]

 odk/source/unoapploader/win/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 274c28a15cc07ed1f4a95a81f7e5edf343028e46
Author: Matúš Kukan 
Date:   Wed Oct 10 22:14:59 2012 +0200

odk: try to fix Windows build

Change-Id: I626f2cbc4bdf30e73e6c24c1b9040c0f6d24eda9

diff --git a/odk/source/unoapploader/win/makefile.mk 
b/odk/source/unoapploader/win/makefile.mk
index b30608f..3c573b4 100644
--- a/odk/source/unoapploader/win/makefile.mk
+++ b/odk/source/unoapploader/win/makefile.mk
@@ -41,7 +41,7 @@ APP1TARGET= $(TARGET)
 APP1OBJS=   $(OBJ)$/unoapploader.obj
 APP1STDLIBS=findsofficepath.lib
 
-APP1STDLIBS=\
+APP1STDLIBS+=\
 $(ADVAPI32LIB)
 
 # --- Targets --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

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

New commits:
commit cd9d51a36cc3106d4124855874af657615a93061
Author: Noel Power 
Date:   Wed Oct 10 16:49:35 2012 +0100

fix for fdo#53814 Revert "there should be no need any more for this check"

This reverts commit bea018a7040c36e91487b27c7b59c6c8a970bf5f.

Change-Id: Id554a8f05b82f146a505ac0a39afe14a3161291c
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 15087c5..7be749e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -386,10 +386,14 @@ short ScTable::CompareCell( sal_uInt16 nSort,
 if (pCell1)
 {
 eType1 = pCell1->GetCellType();
+if (eType1 == CELLTYPE_NOTE)
+pCell1 = NULL;
 }
 if (pCell2)
 {
 eType2 = pCell2->GetCellType();
+if (eType2 == CELLTYPE_NOTE)
+pCell2 = NULL;
 }
 
 if (pCell1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6] [PUSHED 3-6] fix for fdo#53814

[Kohei Yoshida]

On 10/10/2012 11:57 AM, Noel Power wrote:

I'm in two minds whether this should be a MAB, indeed it is annoying ;-)
in anycase I would recommend to please cherry-pick the following revert
http://cgit.freedesktop.org/libreoffice/core/commit/?id=44e8a8240a3a1cce747f1998e617f8dd4621a992


Yup, makes sense. Pushed to 3-6 with my sign-off.

If people think it's worthy of 3-6-3, we need two more sign-offs to push 
this to 3-6-3.


BTW, we definitely need a test for this case.  We already have one test 
case in testSort() in sc/qa/unit/ucalc.cxx, adding another test case 
involving empty cells would prevent future regression for this 
particular use case.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx|   49 ++
 l10ntools/source/po.cxx |  157 +---
 2 files changed, 131 insertions(+), 75 deletions(-)

New commits:
commit 8a3ee4e765d4cf849ba0dae811789d633823573e
Author: Zolnai Tamás 
Date:   Wed Oct 10 18:37:17 2012 +0200

Move GenPoEntry out of header

GenPoEntry is part of implementation rather than
an autonom class thus its place is in cxx file.
Because of pointer members we have to override
copy constructor and copy operator.
In PoHeader class these methods are unneeded
so make it non-copyable.
The m_bIsinitialized member's meaning widen with
that m_aGenPo points an object. So check it not just
in getter but in setter methods too.

Change-Id: I26ebb885c81d14820076e0d46625c60cc1cf7984

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index fa43b51..2e371b4 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -16,49 +16,13 @@
 
 class PoOfstream;
 class PoIfstream;
-
-class GenPoEntry
-{
-private:
-
-OStringm_sExtractCom;
-OStringm_sReference;
-OStringm_sContext;
-OStringm_sUnTransStr;
-OStringm_sTransStr;
-bool   m_bFuzzy;
-bool   m_bNull;
-
-public:
-
-GenPoEntry();
-virtual ~GenPoEntry();
-//Default copy constructor and copy operator work well
-
-virtual OString getExtractCom() const   { return m_sExtractCom; }
-virtual OString getReference() const{ return m_sReference; }
-virtual OString getContext() const  { return m_sContext; }
-virtual OString getUnTransStr() const   { return m_sUnTransStr; }
-virtual OString getTransStr() const { return m_sTransStr; }
-virtual boolgetFuzzy() const{ return m_bFuzzy; }
-virtual boolisNull() const  { return m_bNull; }
-
-virtual voidsetExtractCom(const OString& rExtractCom);
-virtual voidsetReference(const OString& rReference);
-virtual voidsetContext(const OString& rContext);
-virtual voidsetUnTransStr(const OString& rUnTransStr);
-virtual voidsetTransStr(const OString& rTransStr);
-virtual voidsetFuzzy(const bool bFuzzy);
-
-virtual voidwriteToFile(std::ofstream& rOFStream) const;
-virtual voidreadFromFile(std::ifstream& rIFStream);
-};
+class GenPoEntry;
 
 class PoEntry
 {
 private:
 
-GenPoEntry m_aGenPo;
+GenPoEntry* m_pGenPo;
 bool m_bIsInitialized;
 
 public:
@@ -76,7 +40,9 @@ public:
 PoEntry(const OString& rSDFLine,
 const TYPE eType = TTEXT);
 ~PoEntry();
-//Default copy constructor and copy operator work well
+
+PoEntry( const PoEntry& rPo );
+PoEntry&operator=( const PoEntry& rPo );
 
 OString getSourceFile() const;
 OString getGroupId() const;
@@ -95,11 +61,11 @@ public:
 
 };
 
-class PoHeader
+class PoHeader: private boost::noncopyable
 {
 private:
 
-GenPoEntry m_aGenPo;
+GenPoEntry* m_pGenPo;
 bool m_bIsInitialized;
 
 public:
@@ -113,7 +79,6 @@ public:
 PoHeader( const OString& rExtSrc );
 PoHeader( std::ifstream& rOldPo );
 ~PoHeader();
-//Default copy constructor and copy operator work well
 
 OString getLanguage() const;
 };
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index e1c978d..59e206b 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -29,6 +29,43 @@
 
 //Class GenPoEntry
 
+class GenPoEntry
+{
+private:
+
+OStringm_sExtractCom;
+OStringm_sReference;
+OStringm_sContext;
+OStringm_sUnTransStr;
+OStringm_sTransStr;
+bool   m_bFuzzy;
+bool   m_bNull;
+
+public:
+
+GenPoEntry();
+virtual ~GenPoEntry();
+//Default copy constructor and copy operator work well
+
+virtual OString getExtractCom() const   { return m_sExtractCom; }
+virtual OString getReference() const{ return m_sReference; }
+virtual OString getContext() const  { return m_sContext; }
+virtual OString getUnTransStr() const   { return m_sUnTransStr; }
+virtual OString getTransStr() const { return m_sTransStr; }
+virtual boolgetFuzzy() const{ return m_bFuzzy; }
+virtual boolisNull() const  { return m_bNull; }
+
+virtual voidsetExtractCom(const OString& rExtractCom);
+virtual voidsetReference(const OString& rReference);
+virtual voidsetContext(const OString& rContext);
+virtual voidsetUnTransStr(const OString& rUnTransStr);
+virtual voidsetTransStr(const OString& rTransStr)

Re: Gtk-WARNING **: /opt/libreoffice3.6/program/../ure-link/lib/libstdc++.so.6: version `GLIBCXX_3.4.11' not found (required by /usr/lib/i386-linux-gnu/gtk-2.0/2.10.0/engines/liboxygen-gtk.so)

[Ruslan Kabatsayev]

On Wed, Oct 10, 2012 at 12:41 AM, ChrSchultz  wrote:
> I created a symbolic link from the system libstdc++.so.6 to the
> /opt/libreoffice3.6/ure/lib/libstdc++.so.6 and the are no  warnings more ...
Just remove /opt/libreoffice3.6/ure/lib/libstdc++.so.6 or better yet
don't install stdlib part of libreoffice distribution.

>
> Many greatings
> Christoph
>
>
>
> --
> View this message in context: 
> http://nabble.documentfoundation.org/Gtk-WARNING-opt-libreoffice3-6-program-ure-link-lib-libstdc-so-6-version-GLIBCXX-3-4-11-not-found-re-tp3995424p4012391.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 mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |   42 
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 4073a5b91605163cda9d3bdcb3c048c70b23b0ff
Author: Xisco Fauli 
Date:   Wed Oct 10 23:40:40 2012 +0200

pyfax: Make toggle buttons work again

Change-Id: Ie408274ffea5539568fb98c44fa993d3de14a2d6

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 3185736..58fa46f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -180,9 +180,9 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 self.resources.resFaxWizardDialog_title,
 self.resources.resTemplateDescription)
 self.myFaxDoc.killEmptyUserFields()
-self.myFaxDoc.keepLogoFrame = (self.chkUseLogo.State is not 0)
+self.myFaxDoc.keepLogoFrame = bool(self.chkUseLogo.State)
 self.myFaxDoc.keepTypeFrame = \
-(self.chkUseCommunicationType.State is not 0)
+bool(self.chkUseCommunicationType.State)
 self.myFaxDoc.killEmptyFrames()
 self.bSaveSuccess = OfficeDocument.store(self.xMSF,
 TextDocument.xTextDocument, self.sPath, "writer8_template")
@@ -601,36 +601,36 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 def chkUseLogoItemChanged(self):
 if self.myFaxDoc.hasElement("Company Logo"):
 self.myFaxDoc.switchElement("Company Logo",
-(self.chkUseLogo.State is not 0))
+bool(self.chkUseLogo.State))
 
 def chkUseSubjectItemChanged(self):
 if self.myFaxDoc.hasElement("Subject Line"):
 self.myFaxDoc.switchElement("Subject Line",
-(self.chkUseSubject.State is not 0))
+bool(self.chkUseSubject.State))
 
 def chkUseDateItemChanged(self):
 if self.myFaxDoc.hasElement("Date"):
 self.myFaxDoc.switchElement("Date",
-(self.chkUseDate.State is not 0))
+bool(self.chkUseDate.State))
 
 def chkUseFooterItemChanged(self):
 try:
-bFooterPossible = (self.chkUseFooter.State is not 0) \
+bFooterPossible = bool(self.chkUseFooter.State) \
 and bool(self.getControlProperty("chkUseFooter",
 PropertyNames.PROPERTY_ENABLED))
-if self.chkFooterNextPages.State is not 0:
+if bool(self.chkFooterNextPages.State):
 self.myFaxDoc.switchFooter("First Page", False,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
 self.txtFooter.Text)
 self.myFaxDoc.switchFooter("Standard", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
 self.txtFooter.Text)
 else:
 self.myFaxDoc.switchFooter("First Page", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
 self.txtFooter.Text)
 self.myFaxDoc.switchFooter("Standard", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
 self.txtFooter.Text)
 
 #enable/disable roadmap item for footer page
@@ -649,43 +649,43 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
 def txtFooterTextChanged(self):
 self.myFaxDoc.switchFooter("First Page", True,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
 self.txtFooter.Text)
 
 def chkUseSalutationItemChanged(self):
 self.myFaxDoc.switchUserField("Salutation",
-self.lstSalutation.Text, (self.chkUseSalutation.State is not 0))
+self.lstSalutation.Text, bool(self.chkUseSalutation.State))
 self.setControlProperty("lstSalutation",
 PropertyNames.PROPERTY_ENABLED,
-self.chkUseSalutation.State is not 0)
+bool(self.chkUseSalutation.State))
 
 def lstSalutationItemChanged(self):
 self.myFaxDoc.switchUserField("Salutation",
-self.lstSalutation.Text, (self.chkUseSalutation.State is not 0))
+self.lstSalutation.Text, bool(self.chkUseSalutation.State))
 
 def chkUseCommunicationItemChanged(self):
 self.myFaxDoc.switchUserField("CommunicationType",
 self.lstCommunicationType.Text,
-(self.chkUseCommunicationType.State is not 0))
+bool(self.chkUseCommunicationType.State))
 self.setControlProperty("lstCommunicationType",
 PropertyNames.PROP

[Libreoffice-commits] .: filter/source

[Libreoffice Gerrit user]

 filter/source/svg/svgexport.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 7d122d0cef4ecdeea0d11e619ec77aa7431344d9
Author: Thorsten Behrens 
Date:   Thu Oct 11 00:18:47 2012 +0200

Cleanup svg export namespace handling

All smil animations are inside the http://www.w3.org/2000/svg NS
for svg - ODF places e.g. animateMotion into smil, their path attr
though into svg. Flattened namespace now into only default (svg) and
the ooo prefix. Killed all superfluous NS decls, creating SvXMLExport
with EXPORT_META only adds XML_NP_XLINK, XML_NP_DC, XML_NP_META, and
XML_NP_GRDDL to the known-namespaces map.

Change-Id: Ib54900aaee0eda3a5c5dc618d836df8bd8eb25fc

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index d8f3a84..a0ff05b 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -330,12 +330,13 @@ SVGExport::SVGExport(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
 const Reference< XDocumentHandler >& rxHandler,
 const Sequence< PropertyValue >& rFilterData )
-: SvXMLExport( util::MeasureUnit::MM_100TH, xServiceFactory )
+: SvXMLExport( util::MeasureUnit::MM_100TH,
+   xServiceFactory,
+   xmloff::token::XML_TOKEN_INVALID,
+   EXPORT_META|EXPORT_PRETTY )
 , mrFilterData( rFilterData )
 {
 SetDocHandler( rxHandler );
-sal_uInt16 nExportFlags = getExportFlags() | EXPORT_PRETTY;
-setExportFlags( nExportFlags );
 GetDocHandler()->startDocument();
 }
 
@@ -834,15 +835,9 @@ sal_Bool SVGFilter::implExportDocument()
 // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", 
OUString::valueOf( 28.222 ) );
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", 
B2UCONST( "round" ) );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( 
"http://xml.openoffice.org/svg/export"; ) );
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", B2UCONST( 
"http://www.w3.org/2000/svg"; ) );
+mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( 
"http://xml.openoffice.org/svg/export"; ) );
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", B2UCONST( 
"http://www.w3.org/1999/xlink"; ) );
-
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:draw", B2UCONST( 
"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" ) );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:presentation", 
B2UCONST( "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" ) );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:smil", B2UCONST( 
"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" ) );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:anim", B2UCONST( 
"urn:oasis:names:tc:opendocument:xmlns:animation:1.0" ) );
-
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", B2UCONST( 
"preserve" ) );
 
 mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, 
"svg", sal_True, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#42974 build process to auto-copy MS VCRT files

[Mat M]

Hello all,

I eventually tackled my first #fdo, here:  
https://bugs.freedesktop.org/show_bug.cgi?id=42974


Since it is checked by configure, I decided to update configure so it  
copies the files when found on the system.
And then, I thought: We provide moz/zipped files in  
http://dev-www.libreoffice.org/mozilla/, why not download them if they are  
not here and we need them ? So I did.


Well, even now, I am not sure configure should *download* anything, but  
well, we have no official pre-script, and since we check for it there, we  
cannot wait "make fetch" to do it. Or could we ?


Regards

Oh, I forgot:
All of my present & future contributions to LibreOffice may be licensed  
under the MPL/LGPLv3+ dual license


--
Mat M

0001-Proposal-for-fdo-42974-and-moz-zipped-also.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/Library_sc.mk sc/Library_scui.mk sc/source

[Libreoffice Gerrit user]

 sc/Library_sc.mk|1 
 sc/Library_scui.mk  |1 
 sc/inc/scabstdlg.hxx|7 --
 sc/source/ui/app/scdll.cxx  |1 
 sc/source/ui/attrdlg/scdlgfact.cxx  |8 --
 sc/source/ui/attrdlg/scdlgfact.hxx  |7 --
 sc/source/ui/inc/reffact.hxx|1 
 sc/source/ui/inc/xmlsourcedlg.hrc   |8 ++
 sc/source/ui/inc/xmlsourcedlg.hxx   |   22 ---
 sc/source/ui/src/xmlsourcedlg.src   |   37 +++-
 sc/source/ui/view/cellsh1.cxx   |   12 --
 sc/source/ui/view/reffact.cxx   |4 +++
 sc/source/ui/view/tabvwsh.cxx   |1 
 sc/source/ui/view/tabvwshc.cxx  |7 ++
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   35 +++---
 15 files changed, 114 insertions(+), 38 deletions(-)

New commits:
commit f56d9195b960e7fdbcc968b19f77bf3c912f6f8a
Author: Kohei Yoshida 
Date:   Wed Oct 10 20:45:55 2012 -0400

Turned the xml source dialog into a reference dialog.

Change-Id: Ifb3ebd3c0166343f42dd53bcee83c6b31c84f081

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 9bc420f..089e7f2 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -567,6 +567,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/view/viewfunc \
sc/source/ui/view/viewutil \
sc/source/ui/view/waitoff \
+   sc/source/ui/xmlsource/xmlsourcedlg \
 ))
 
 $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c78faca..0cc4099 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 sc/source/ui/pagedlg/tphf \
 sc/source/ui/pagedlg/tptable \
 sc/source/ui/styleui/styledlg \
-sc/source/ui/xmlsource/xmlsourcedlg \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5c04cec..22261ce 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -334,11 +334,6 @@ public:
 virtual bool IsDateConversionSet() const = 0;
 };
 
-class AbstractScXMLSourceDlg : public VclAbstractDialog
-{
-public:
-};
-
 //---Scabstract fractory ---
 class ScAbstractDialogFactory
 {
@@ -537,8 +532,6 @@ public:
 virtual SfxAbstractTabDialog * CreateScSortDlg( Window*  pParent, 
//add for ScSortDlg
 const SfxItemSet* 
pArgSet,int nId ) = 0;
 
-virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, 
ScDocument* pDoc, int nId) = 0;
-
 // for tabpage
 virtual CreateTabPage   GetTabPageCreatorFunc( sal_uInt16 nId 
) = 0;
 virtual GetTabPageRangesGetTabPageRangesFunc( sal_uInt16 nId ) 
= 0;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 651b46a..22e704b 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -257,6 +257,7 @@ void ScDLL::Init()
 
sal::static_int_cast(ScTabViewShell::GetInterfaceId()), pMod);
 ScSolverDlgWrapper  ::RegisterChildWindow(false, pMod);
 ScOptSolverDlgWrapper   ::RegisterChildWindow(false, pMod);
+ScXMLSourceDlgWrapper   ::RegisterChildWindow(false, pMod);
 ScNameDlgWrapper::RegisterChildWindow(false, pMod);
 ScNameDefDlgWrapper::RegisterChildWindow(false, pMod);
 ScPivotLayoutWrapper::RegisterChildWindow(false, pMod);
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index d437807..2bca1ff 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -124,7 +124,6 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScXMLSourceDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
 
 // AbstractTabDialog_Impl begin
@@ -1596,13 +1595,6 @@ SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
 return 0;
 }
 
-AbstractScXMLSourceDlg* 
ScAbstractDialogFactory_Impl::CreateScXMLSourceDlg(Window* pParent, ScDocument* 
pDoc, int nId)
-{
-ScXMLSourceDlg* pDlg = (nId == RID_SCDLG_XML_SOURCE) ? new 
ScXMLSourceDlg(pParent, pDoc) : NULL;
-
-return pDlg ? new AbstractScXMLSourceDlg_Impl(pDlg) : NULL;
-}
-
 #undef SfxTabDialog
 #undef AbstractTabDialog_Impl
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index c250582..22d9643 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -390,11 +390,6 @@ class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDl
 virtual bool IsDateConversionSet() const;
 };
 
-class AbstractScXMLSourceD

[Libreoffice-commits] .: 4 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/condformat/condformatdlg.cxx  |   17 -
 sc/source/ui/condformat/condformatdlgentry.cxx |4 ++--
 sc/source/ui/inc/anyrefdg.hxx  |1 +
 sc/source/ui/inc/condformatdlg.hxx |2 +-
 sc/source/ui/miscdlgs/anyrefdg.cxx |   25 ++---
 5 files changed, 38 insertions(+), 11 deletions(-)

New commits:
commit 96cf0a4e97a8725b59d8746192c6e4888a1314b8
Author: Markus Mohrhard 
Date:   Thu Oct 11 04:12:03 2012 +0200

the formula ref edits need 3D references

Change-Id: I360d8244f6b8feee862e9e750859271b741dcf93

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 6bced64..bf4f8b2 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -395,6 +395,7 @@ sal_Bool ScCondFormatDlg::IsRefInputMode() const
 | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF  ABS_SREF \
 | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
+#define ABS_DREF3D  ABS_DREF | SCA_TAB_3D
 
 void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*)
 {
@@ -408,7 +409,13 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, 
ScDocument*)
 RefInputStart(pEdit);
 
 rtl::OUString aRefStr;
-rRef.Format( aRefStr, ABS_DREF, mpDoc, 
ScAddress::Details(mpDoc->GetAddressConvention(), 0, 0) );
+sal_uInt16 n = 0;
+if(mpLastEdit && mpLastEdit != &maEdRange)
+n = ABS_DREF3D;
+else
+n = ABS_DREF;
+
+rRef.Format( aRefStr, n, mpDoc, 
ScAddress::Details(mpDoc->GetAddressConvention(), 0, 0) );
 pEdit->SetRefString( aRefStr );
 }
 }
commit 2134399f0e462fb6721f20c58fcd8470110ff875
Author: Markus Mohrhard 
Date:   Thu Oct 11 04:00:05 2012 +0200

lock table only for the range edit field, not for the formula ones

Change-Id: I08880d97d880227cb47d929701e666a49aad5c57

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index f23bf21..6bced64 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -378,6 +378,14 @@ void ScCondFormatDlg::RefInputDone( sal_Bool bForced )
 ScAnyRefDlg::RefInputDone(bForced);
 }
 
+sal_Bool ScCondFormatDlg::IsTableLocked() const
+{
+if(mpLastEdit && mpLastEdit != &maEdRange)
+return sal_False;
+
+return sal_True;
+}
+
 sal_Bool ScCondFormatDlg::IsRefInputMode() const
 {
 return maEdRange.IsEnabled();
diff --git a/sc/source/ui/inc/condformatdlg.hxx 
b/sc/source/ui/inc/condformatdlg.hxx
index 3b3cfb3..194d60c 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -138,7 +138,7 @@ public:
 virtual void SetReference(const ScRange&, ScDocument*);
 virtual sal_Bool IsRefInputMode() const;
 virtual void SetActive();
-virtual sal_Bool IsTableLocked() const { return sal_True; }
+virtual sal_Bool IsTableLocked() const;
 
 void InvalidateRefData();
 
commit 68a60bc98a6ad2467a17a917881745cf9310e90f
Author: Markus Mohrhard 
Date:   Thu Oct 11 03:48:50 2012 +0200

dat bars should use automatic as default

Change-Id: I67fe25cb62d701d7267932923e94f10e44853ac4

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 865cfcc..fa47cc0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -980,8 +980,8 @@ void ScDataBarFrmtEntry::Init()
 mpDataBarData.reset(new ScDataBarFormatData());
 mpDataBarData->mpUpperLimit.reset(new ScColorScaleEntry());
 mpDataBarData->mpLowerLimit.reset(new ScColorScaleEntry());
-mpDataBarData->mpLowerLimit->SetType(COLORSCALE_MIN);
-mpDataBarData->mpUpperLimit->SetType(COLORSCALE_MAX);
+mpDataBarData->mpLowerLimit->SetType(COLORSCALE_AUTO);
+mpDataBarData->mpUpperLimit->SetType(COLORSCALE_AUTO);
 mpDataBarData->maPositiveColor = COL_LIGHTBLUE;
 }
 
commit b4f430074cfce0bda32dddfb4d0251ea5aec83ab
Author: Markus Mohrhard 
Date:   Thu Oct 11 03:48:33 2012 +0200

allow ref edit fields that are not direct children of the ScAnyRefDlg

Change-Id: I966b67b9f62a8c1c3b9dc3394befe48358cbd34e

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 7aa3207..247edc0 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -70,6 +70,7 @@ class ScFormulaReferenceHelper
 Point   aOldEditPos;// Original position of the 
input field
 SizeaOldEditSize;   // Original size of the input 
field
 Point   aOldButtonPos;  // Original position of the 
button
+Window* mpOldEditParent;// Original parent of the edit 
field and the button
 
 sal_BoolbEnableColorRe

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 21ccb6b4d93282fbd93d6764ae29e0f1af7b2f68
Author: Markus Mohrhard 
Date:   Thu Oct 11 05:56:47 2012 +0200

fix the highlighting of the range in the pivot table dialog

Change-Id: Ied6b4e562fad652c3fdb3ad7c46b6b40684a4dc9

diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 0a22a3f..2ff4e10 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -105,7 +105,7 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Window* pPar
 aFlAreas( this, ScResId( FL_OUTPUT ) ),
 
 aFtInArea   ( this, ScResId( FT_INAREA) ),
-aEdInPos( this, ScResId( ED_INAREA) ),
+aEdInPos( this, this, ScResId( ED_INAREA) ),
 aRbInPos( this, ScResId( RB_INAREA ), &aEdInPos, this ),
 
 aLbOutPos   ( this, ScResId( LB_OUTAREA ) ),
@@ -1742,7 +1742,7 @@ void ScDPLayoutDlg::SetActive()
 if ( pEditActive == &aEdInPos )
 EdInModifyHdl( NULL );
 else if ( pEditActive == &aEdOutPos )
-EdModifyHdl( NULL );
+EdModifyHdl( NULL );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/xmlsourcedlg.hxx   |8 +++
 sc/source/ui/src/xmlsourcedlg.src   |7 +--
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   71 +---
 3 files changed, 76 insertions(+), 10 deletions(-)

New commits:
commit a94b5f1d038beb809c9201f49b32bd3465a79b6d
Author: Kohei Yoshida 
Date:   Thu Oct 11 00:20:46 2012 -0400

Get the reference edit box to work properly.

Change-Id: Ifd01fe05312c0ece867100019a9f84162e5778c4

diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index ee8225c..c145f8b 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -54,7 +54,8 @@ class ScXMLSourceDlg : public ScAnyRefDlg
 
 ScDocument* mpDoc;
 
-bool mbRefMode;
+formula::RefEdit* mpActiveEdit;
+bool mbDlgLostFocus;
 
 public:
 ScXMLSourceDlg(
@@ -63,6 +64,7 @@ public:
 
 virtual sal_Bool IsRefInputMode() const;
 virtual void SetReference(const ScRange& rRange, ScDocument* pDoc);
+virtual void Deactivate();
 virtual void SetActive();
 virtual sal_Bool Close();
 
@@ -70,7 +72,11 @@ private:
 
 void SelectSourceFile();
 void LoadSourceFileStructure(const OUString& rPath);
+void HandleGetFocus(Control* pCtrl);
+void HandleLoseFocus(Control* pCtrl);
 
+DECL_LINK(GetFocusHdl, Control*);
+DECL_LINK(LoseFocusHdl, Control*);
 DECL_LINK(BtnPressedHdl, Button*);
 };
 
diff --git a/sc/source/ui/src/xmlsourcedlg.src 
b/sc/source/ui/src/xmlsourcedlg.src
index d4ef5ce..4119601 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -50,7 +50,7 @@ ModelessDialog RID_SCDLG_XML_SOURCE
 
 FixedText FT_MAPPED_CELL_TITLE
 {
-Pos = MAP_APPFONT( 12, 50 );
+Pos = MAP_APPFONT( 12, 52 );
 Size = MAP_APPFONT ( 100 , 8 ) ;
 
 Text [ en-US ] = "";
@@ -59,15 +59,14 @@ ModelessDialog RID_SCDLG_XML_SOURCE
 Edit ED_MAPPED_CELL
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 63 ) ;
+Pos = MAP_APPFONT ( 12 , 66 ) ;
 Size = MAP_APPFONT ( 69 , 12 ) ;
 TabStop = TRUE ;
 };
 
-
 ImageButton BTN_MAPPED_CELL
 {
-Pos = MAP_APPFONT ( 83 , 62 ) ;
+Pos = MAP_APPFONT ( 83 , 65 ) ;
 Size = MAP_APPFONT ( 13 , 15 ) ;
 TabStop = FALSE ;
 QuickHelpText [ en-US ] = "Shrink" ;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 37e6c72..3a07997 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -34,8 +34,8 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maFtSourceFile(this, ScResId(FT_SOURCE_FILE)),
 maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)),
 maFtMappedCellTitle(this, ScResId(FT_MAPPED_CELL_TITLE)),
-maEdit(this, ScResId(ED_MAPPED_CELL)),
-maBtnRb(this, ScResId(BTN_MAPPED_CELL)),
+maEdit(this, this, ScResId(ED_MAPPED_CELL)),
+maBtnRb(this, ScResId(BTN_MAPPED_CELL), &maEdit, this),
 maLbTree(this, ScResId(LB_SOURCE_TREE)),
 maBtnCancel(this, ScResId(BTN_CANCEL)),
 maImgFileOpen(ScResId(IMG_FILE_OPEN)),
@@ -45,13 +45,21 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maStrCellLink(ScResId(STR_CELL_LINK).toString()),
 maStrRangeLink(ScResId(STR_RANGE_LINK).toString()),
 mpDoc(pDoc),
-mbRefMode(false)
+mpActiveEdit(&maEdit),
+mbDlgLostFocus(false)
 {
 maBtnSelectSource.SetModeImage(maImgFileOpen);
 FreeResource();
 
 maBtnSelectSource.SetClickHdl(LINK(this, ScXMLSourceDlg, BtnPressedHdl));
 
+Link aLink = LINK(this, ScXMLSourceDlg, GetFocusHdl);
+maEdit.SetGetFocusHdl(aLink);
+maBtnRb.SetGetFocusHdl(aLink);
+aLink = LINK(this, ScXMLSourceDlg, LoseFocusHdl);
+maEdit.SetLoseFocusHdl(aLink);
+maBtnRb.SetLoseFocusHdl(aLink);
+
 maFtMappedCellTitle.SetText(maStrCellLink);
 }
 
@@ -61,16 +69,43 @@ ScXMLSourceDlg::~ScXMLSourceDlg()
 
 sal_Bool ScXMLSourceDlg::IsRefInputMode() const
 {
-return mbRefMode;
+return mpActiveEdit != NULL;
 }
 
 void ScXMLSourceDlg::SetReference(const ScRange& rRange, ScDocument* pDoc)
 {
+if (!mpActiveEdit)
+return;
+
+if (rRange.aStart != rRange.aEnd)
+RefInputStart(mpActiveEdit);
+
+OUString aStr;
+rRange.aStart.Format(aStr, SCA_ABS_3D, pDoc, pDoc->GetAddressConvention());
+mpActiveEdit->SetRefString(aStr);
+}
+
+void ScXMLSourceDlg::Deactivate()
+{
+mbDlgLostFocus = true;
 }
 
 void ScXMLSourceDlg::SetActive()
 {
-GrabFocus();
+if (mbDlgLostFocus)
+{
+mbDlgLostFocus = false;
+if (mpActiveEdit)
+{
+mpActiveEdit->GrabFocus();
+}
+}
+else
+{
+GrabFocus();
+}
+
+RefInputDone();
 }
 
 sal_Bool ScXMLSourceDlg::Close()
@@ -114,6 +149,32 @@ void ScXMLSourceDlg::LoadSourceFileStructure(const 
OUString& rPath)
 maLbTree, rPath, maImgElemDefault, maImgElemRepeat, 
maImgElemAttribute);
 }
 

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

[Libreoffice Gerrit user]

 formula/inc/formula/funcutl.hxx|1 -
 formula/source/ui/dlg/funcutl.cxx  |8 +---
 sc/source/ui/condformat/condformatdlgentry.cxx |6 +++---
 sc/source/ui/dbgui/validate.cxx|4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 27f1ba57e21df720553b2a8b321c2d0af58bc9f3
Author: Markus Mohrhard 
Date:   Thu Oct 11 06:29:26 2012 +0200

kill RefEdit constructor that does not initialize the highlighting

Change-Id: I5c277526fdf376bfa96466e25975388edc3c7950

diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index c1e7c8b..24729eb 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -44,7 +44,6 @@ protected:
 
 public:
 RefEdit( Window* _pParent,IControlReferenceHandler* 
pParent, const ResId& rResId );
-RefEdit( Window* pParent, const ResId& rResId );
 virtual ~RefEdit();
 
 voidSetRefString( const XubString& rStr );
diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index d97398d..edbfee0 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -86,7 +86,7 @@ void ValWnd::SetValue( const String& rStrVal )
 //
 
 ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
-:   RefEdit( pParent, rResId ),
+:   RefEdit( pParent, NULL, rResId ),
 pEdPrev ( NULL ),
 pEdNext ( NULL ),
 pSlider ( NULL ),
@@ -854,12 +854,6 @@ RefEdit::RefEdit( Window* 
_pParent,IControlReferenceHandler* pParent, const ResI
 aTimer.SetTimeout( SC_ENABLE_TIME );
 }
 
-RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
-Edit( pParent, rResId ),
-pAnyRefDlg( NULL )
-{
-}
-
 RefEdit::~RefEdit()
 {
 aTimer.SetTimeoutHdl( Link() );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index fa47cc0..447e97b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -139,8 +139,8 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit)
 ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, 
const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ):
 ScCondFrmtEntry( pParent, pDoc, rPos ),
 maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ),
-maEdVal1( this, ScResId( ED_VAL1 ) ),
-maEdVal2( this, ScResId( ED_VAL2 ) ),
+maEdVal1( this, static_cast(pParent->GetParent()), ScResId( 
ED_VAL1 ) ),
+maEdVal2( this, static_cast(pParent->GetParent()), ScResId( 
ED_VAL2 ) ),
 maFtStyle( this, ScResId( FT_STYLE ) ),
 maLbStyle( this, ScResId( LB_STYLE ) ),
 maWdPreview( this, ScResId( WD_PREVIEW ) )
@@ -375,7 +375,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, 
ScDocument* pDoc, const
 maFtStyle( this, ScResId( FT_STYLE ) ),
 maLbStyle( this, ScResId( LB_STYLE ) ),
 maWdPreview( this, ScResId( WD_PREVIEW ) ),
-maEdFormula( this, ScResId( ED_FORMULA ) )
+maEdFormula( this, static_cast(pParent->GetParent()), 
ScResId( ED_FORMULA ) )
 {
 Init();
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 5fc701a..390ad17 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -323,10 +323,10 @@ ScTPValidationValue::ScTPValidationValue( Window* 
pParent, const SfxItemSet& rAr
 maFtValue ( this, ScResId( FT_VALUE ) ),
 maLbValue ( this, ScResId( LB_VALUE ) ),
 maFtMin   ( this, ScResId( FT_MIN ) ),
-maEdMin   ( this, ScResId( EDT_MIN ) ),
+maEdMin   ( this, NULL, ScResId( EDT_MIN ) ),
 maEdList  ( this, ScResId( EDT_LIST ) ),
 maFtMax   ( this, ScResId( FT_MAX ) ),
-maEdMax   ( this, ScResId( EDT_MAX ) ),
+maEdMax   ( this, NULL, ScResId( EDT_MAX ) ),
 maFtHint  ( this, ScResId( FT_SOURCEHINT ) ),
 maStrMin  ( ScResId( SCSTR_VALID_MINIMUM ) ),
 maStrMax  ( ScResId( SCSTR_VALID_MAXIMUM ) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/xmlsourcedlg.hxx   |4 +++
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   37 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit d6508155a14e786cacca720191a3b85a8c0f86fd
Author: Kohei Yoshida 
Date:   Thu Oct 11 01:22:21 2012 -0400

Use sensible directory path for file picker, handle tree item select.

Change-Id: I2638b1d870ee6b7e6c8697a38df07872184df8c6

diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index c145f8b..965dae7 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -52,6 +52,8 @@ class ScXMLSourceDlg : public ScAnyRefDlg
 rtl::OUString maStrCellLink;
 rtl::OUString maStrRangeLink;
 
+rtl::OUString maSrcPath;
+
 ScDocument* mpDoc;
 
 formula::RefEdit* mpActiveEdit;
@@ -74,10 +76,12 @@ private:
 void LoadSourceFileStructure(const OUString& rPath);
 void HandleGetFocus(Control* pCtrl);
 void HandleLoseFocus(Control* pCtrl);
+void TreeItemSelected();
 
 DECL_LINK(GetFocusHdl, Control*);
 DECL_LINK(LoseFocusHdl, Control*);
 DECL_LINK(BtnPressedHdl, Button*);
+DECL_LINK(TreeItemSelectHdl, void*);
 };
 
 #endif
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 3a07997..cc255b8 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -16,6 +16,9 @@
 #include "filter.hxx"
 #include "reffact.hxx"
 
+#include "unotools/pathoptions.hxx"
+#include "tools/urlobj.hxx"
+
 #include 
 #include 
 #include 
@@ -60,6 +63,8 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maEdit.SetLoseFocusHdl(aLink);
 maBtnRb.SetLoseFocusHdl(aLink);
 
+aLink = LINK(this, ScXMLSourceDlg, TreeItemSelectHdl);
+maLbTree.SetSelectHdl(aLink);
 maFtMappedCellTitle.SetText(maStrCellLink);
 }
 
@@ -125,6 +130,19 @@ void ScXMLSourceDlg::SelectSourceFile()
 if (!xFilePicker.is())
 return;
 
+if (maSrcPath.isEmpty())
+// Use default path.
+xFilePicker->setDisplayDirectory(SvtPathOptions().GetWorkPath());
+else
+{
+// Use the directory of current source file.
+INetURLObject aURL(maSrcPath);
+aURL.removeSegment();
+aURL.removeFinalSlash();
+OUString aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
+xFilePicker->setDisplayDirectory(aPath);
+}
+
 if (xFilePicker->execute() != ui::dialogs::ExecutableDialogResults::OK)
 // File picker dialog cancelled.
 return;
@@ -133,10 +151,11 @@ void ScXMLSourceDlg::SelectSourceFile()
 if (!aFiles.getLength())
 return;
 
+maSrcPath = aFiles[0];
 // There should only be one file returned from the file picker.
-maFtSourceFile.SetText(aFiles[0]);
+maFtSourceFile.SetText(maSrcPath);
 
-LoadSourceFileStructure(aFiles[0]);
+LoadSourceFileStructure(maSrcPath);
 }
 
 void ScXMLSourceDlg::LoadSourceFileStructure(const OUString& rPath)
@@ -163,6 +182,14 @@ void ScXMLSourceDlg::HandleLoseFocus(Control* /*pCtrl*/)
 {
 }
 
+void ScXMLSourceDlg::TreeItemSelected()
+{
+SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
+OUString aName = maLbTree.GetEntryText(pEntry);
+fprintf(stdout, "ScXMLSourceDlg::TreeItemSelected:   name = '%s'\n",
+rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
+}
+
 IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl)
 {
 HandleGetFocus(pCtrl);
@@ -182,4 +209,10 @@ IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn)
 return 0;
 }
 
+IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl)
+{
+TreeItemSelected();
+return 0;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Remove commented code and empty methods

[Thomas Arnhold (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/844

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a79e521399a07873030f021a97c01cf8d2e81d7
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: José Guilherme Vanz 
Gerrit-Reviewer: José Guilherme Vanz 
Gerrit-Reviewer: Thomas Arnhold 

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

[PATCH] add a README files

[Manal Alhassoun (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/852

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/852/1

add a README files

Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034
---
A binaryurp/README
A ct2n/README
A drawinglayer/README
A fontconfig/README
A freetype/README
A gdk-pixbuf/README
A gettext/README
A git-hooks/README
A glib/README
A i18npool/README
10 files changed, 57 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Manal Alhassoun 

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

Fwd: getting started with bug 45904

[vikash kumar]

Hiii all,

I am a 2012 cse graduate with an interest in c++ development. I was
thinking about fixing the bug number as mentioned above. But i am new to
bugzilla and each time i open a new bug, there ain;t any description of it
only some comments by the users. What should i do to get started with the
development. My c++ skills are of a recent grad.

Thank you

-- 
with best regards,

vikash kumar
B-218,
HALL-1
Final Year UG Student
Department of Computer Science & Engineering
IIITDM Jabalpur (M.P. )
Phone : +91- 89 82 47 43 02
e-Mail : vikas...@iiitdmj.ac.in






-- 
with best regards,

vikash kumar
B-218,
HALL-1
Final Year UG Student
Department of Computer Science & Engineering
IIITDM Jabalpur (M.P. )
Phone : +91- 89 82 47 43 02
e-Mail : vikas...@iiitdmj.ac.in
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: Fix fdo#55142 - use proper output offsets.

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/853

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/853/1

Fix fdo#55142 - use proper output offsets.

Change-Id: I49cd72a91cd31ddc8b3d57000210523a73926d1f
---
M vcl/aqua/source/gdi/salatslayout.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49cd72a91cd31ddc8b3d57000210523a73926d1f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Thorsten Behrens 

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

getting started with libreoffice development or a mentor

[vikash kumar]

Hello everyone,

I am vikash, a recent cse graduate and a old linux and libreoffice user. I
am looking to contribute to the project, but last 1 week of attempts on the
source code and the bugs haven't taught me anything. I feel like a camel
lost in the desert. I am new to open source software development and have
been coding for almost last 3 years in c++ during my academic career.

Please help me get involved in the project. I would really appreciate if
someone would like to be my mentor to get me started.

Other helps like what should i study and prepare to get involved in the
development process would also be very helpful. All in all i just need the
directions to become a part of this community.

Thank you for taking your time to go through this.

-- 
with best regards,

vikash kumar
B-218,
HALL-1
Final Year UG Student
Department of Computer Science & Engineering
IIITDM Jabalpur (M.P. )
Phone : +91- 89 82 47 43 02
e-Mail : vikas...@iiitdmj.ac.in
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: [libreoffice-accessibility] Latest Libo Won't Play Nice with myJRE

[V Stuart Foote]

David,
 
I spent yesterday working through some of the permutations.
 
I resolved a couple of my own questions.  First, that  Python based NVDA 
functions independent of the Java Runtime Environment - Java Access Bridge. 
 
NVDA does require the JRE and Java Access Bridge to properly control programs 
that are implemented with the Java Access Bridge API, unfortunately that 
includes LibreOffice. 
 
But NVDA will remain functional with the JRE & JAB removed. NVDA only needs to 
be momentarily shut down when uninstalling the JAB & JRE and can be restarted 
as the uninstall completes.
 
=-=-=
 
Another issue, per-user LibreOffice profile from past installation attempts or 
prior versions must be removed.  
 
Uninstallation of LibreOffice leaves the per-user configuration files intact. 
 
This is intentional from the LibreOffice developers perspective--but it 
adversely affects installation or re-installation of LibreOffice with 
accessibility tools and needs to be rebuilt cleanly.
 
The per-user configuration is located at:
 
C:\Users\\AppData\Roaming\LibreOffice
 
Simply delete the LibreOffice folder and subfolders. And proceed with removal 
and reinstallation of the JRE, enabling the JAB, and lastly installing 
LibreOffice with AT enabled.
 
=-=-=
 
Finally, I am curious as to how incomplete the Flat Review LibreOffice JAB 
based Assistive Technology tools are compared to the Windows IAccessible2 based 
tools, or Linux AT-SPI based, or even the Apple Accessibility API based 
renderings.
 
Since IBM continues to develop and distribute the Lotus Symphony suite, current 
release is 3.0.1 and is free to download and  use.
 
http://symphony.lotus.com/software/lotus/symphony/home.nsf/home/ 
  
 
I grabbed a set of Windows installers (32-bit), and the FixPack1 for 3.0.1 from
 
http://www.ibm.com/developerworks/downloads/ls/symphony/ 
 
 
In a side by side comparison using NVDA and the same .odt document -- the 
IAccessible2 based Symphony clearly accessed more of the MSAA-IAccessible roles 
than did the Java Access Bridge based LibreOffice.  Cursor navigation, and 
object based mode functioned--as did reporting of font changes, style and 
header levels and voicing of program annotations like spelling errors. Clearly 
under NVDA Symphony Document is more useable as an editor. Similar results in 
the Spreadsheet compared to Calc.
 
=-=-=
 
I'm going to press on and do the same comparison between a Linux Orca session 
of LibreOffice's  AT-SPI based interface, and Symphony (in both Windows and 
Linux versions)--but suspect it will simply confirm there are serious 
shortcomings to the Java Access Bridge -- UNO a11y  role mappings in 
LibreOffice on the Windows side. 
 
I can't say if this has been the state since inception, or is a recent change 
but will have a little better feel of what roles are working in Linux  with ATK 
side versus in Windows with JAB and may then be able to rationally present the 
case of regression or needed enhancement to the developers. There is an open 
metabug on the Linux AT-SPI ATK AT-SPI2 side for Orca  , maybe we need 
something similar on the Windows JAB side.( 
https://bugs.freedesktop.org/show_activity.cgi?id=36549 )
 
=-=-=
 
In the interim, until the Java Access Bridge based Windows functions are 
corrected--or until LibreOffice moves fully to and UNO a11y role -  
IAccessible2  role mapping under the IBM Symphony contribution--you may want to 
look at using the free IBM Symphony 3.0.1--of course that leaves you without 
Draw, Base or an Equation editor.
 
Stuart
 
p.s.  CC'd to the Dev list--looking to contact whomever has the best grasp of 
the JRE Java Access Bridge based Assistive Technologies used on the Windows 
side mappings of the UNO a11y  roles.  Difficult to tell what is not working as 
intended, versus what has never been implemented, versus issues with the JRE 
and Java Access Bridge. What I know for sure is that other than the missing 
enhancements of IAccessible2, LibreOffice for Windows is not meeting its AT 
functional goals.



From: David Goldfield [mailto:dgold...@asb.org]
Sent: Tue 10/9/2012 7:44 AM
To: V Stuart Foote
Subject: RE: [libreoffice-accessibility] Latest Libo Won't Play Nice with myJRE



Hello.
I uninstalled the components in the order in which you suggested.  Using 
another installed screen reader I reinstalled all software in the order 
suggested and ensured that the a.t. support checkbox was checked when 
installing Libreoffice 3.6.  I also enabled JAB via the control panel under 
accessibility settings but I still find that I have no access with LO 3.6 and 
NVDA 2012.2.1.
David


David Goldfield
Computer Technology Instructor
919 Walnut Street
4th Floor
Philadelphia, PA  19107

215-627-0600 ext 3277
FAX:  215-922-0692

mailto:dgold...@asb.org
http://www.asb.org  


Servin

Blanket license statement

[Pierre-Eric Pelloux-Prayer]

Hi,

All of my past & future contributions to LibreOffice may be licensed 
under the MPL/LGPLv3+ dual license.


Pierre-Eric Pelloux-Prayer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice