[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 2 commits - cppuhelper/source toolkit/source

[Libreoffice Gerrit user]

 cppuhelper/source/shlib.cxx|   11 ---
 toolkit/source/awt/vclxtoolkit.cxx |   20 +++-
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 917af42bfea8dbebba247ba7d55725f7f55986be
Author: Tor Lillqvist 
Date:   Thu Oct 4 07:08:51 2012 +0300

Link directly to CreateWindow (in svtools) when DISABLE_DYNLOADING

Change-Id: Iaf1f6c0fc76b97b1cfca63edfb91d5a39988c8c0

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index bea6a74..b8355cc 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -509,12 +509,14 @@ VCLXToolkit::~VCLXToolkit()
 
 void SAL_CALL VCLXToolkit::disposing()
 {
+#ifndef DISABLE_DYNLOADING
 if ( hSvToolsLib )
 {
 osl_unloadModule( hSvToolsLib );
 hSvToolsLib = NULL;
 fnSvtCreateWindow = NULL;
 }
+#endif
 
 {
 osl::Guard< osl::Mutex > aGuard( getInitMutex() );
@@ -1046,8 +1048,16 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 return pNewWindow;
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" { static void SAL_CALL thisModule() {} }
 
+#else
+
+extern "C" Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const 
::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits 
nWinBits );
+
+#endif
+
 css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 const css::awt::WindowDescriptor& rDescriptor,
 WinBits nForceWinBits )
@@ -1080,8 +1090,13 @@ css::uno::Reference< css::awt::XWindowPeer > 
VCLXToolkit::ImplCreateWindow(
 // (do this _before_ creating it on our own: The old mechanism (extended 
toolkit in SvTools) did it this way,
 // and we need to stay compatible)
 // try to load the lib
-if ( !fnSvtCreateWindow && !hSvToolsLib )
+if ( !fnSvtCreateWindow
+#ifndef DISABLE_DYNLOADING
+ && !hSvToolsLib
+#endif
+ )
 {
+#ifndef DISABLE_DYNLOADING
 ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
 #ifdef LIBO_MERGELIBS

"merged",
@@ -1096,6 +,9 @@ css::uno::Reference< css::awt::XWindowPeer > 
VCLXToolkit::ImplCreateWindow(
 ::rtl::OUString aFunctionName( "CreateWindow" );
 fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol( 
hSvToolsLib, aFunctionName.pData );
 }
+#else
+fnSvtCreateWindow = CreateWindow;
+#endif
 }
 // ask the SvTool creation function
 if ( fnSvtCreateWindow )
commit 9d3486f487685fef575a83e6a82940257b7b071f
Author: Tor Lillqvist 
Date:   Thu Oct 4 07:08:02 2012 +0300

Disable-dynloading updates to component list

Change-Id: Idf092958e46a2ad9d56541c90c5a2beb44baff48

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index a3d4cae..f6a93f7 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -466,11 +466,13 @@ extern "C"
 extern void * reflection_component_getFactory( const sal_Char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * sfx_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * svl_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * tk_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * stocservices_component_getFactory( const sal_Char * 
pImplName, void * pServiceManager, void * pRegistryKey );
 extern void * i18npool_component_getFactory( const sal_Char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * ucb_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * ucpfile_component_getFactory( const sal_Char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * utl_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * vcl_component_getFactory( const sal_Char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * xstor_component_getFactory( const sal_Char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 }
 #endif
@@ -529,24 +531,27 @@ Reference< XInterface > SAL_CALL 
loadSharedLibComponentFactory(
 oslGenericFunction pSym = NULL;
 
 #ifdef DISABLE_DYNLOADING
+
 // First test library names that aren't app-specific.
 static lib_to_component_mapping non_app_specific_map[] = {
 { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory },
 { "bootstrap.uno.a", bootstrap_component_getFactory },
 { "configmgr.uno.a", configmgr_component_getFactory },
-{ "expwrap.uno.a", expwrap_component_getFactory },
-{ "fastsax.uno.a", fastsax_component_getFactory },
-{ "intro

[Libreoffice-commits] Changes to 'feature/cond-format-rework'

[Libreoffice Gerrit user]

New branch 'feature/cond-format-rework' available with the following commits:
commit 0dd9b80fec96a7a33e29a25643b5868f55eaf9c3
Author: Markus Mohrhard 
Date:   Thu Oct 4 05:56:37 2012 +0200

also highlight invalid ranges

Change-Id: I51c725319acb0547963feddf18c0fb34aa6e4f25

commit fced51bd779c6504a58ea5f658f51195196154e2
Author: Markus Mohrhard 
Date:   Thu Oct 4 05:22:00 2012 +0200

add range edit box to cond format dialog

Change-Id: I913c844b08f2fd01963c60c4ffa948fc128a5897

commit dd8959d7607f8d395c239585c4ad4c2a4b95a73f
Author: Markus Mohrhard 
Date:   Thu Oct 4 04:34:10 2012 +0200

replace some pointers with boost::scoped_ptr

Change-Id: I5c263cd95262fae2f75069cb441752bbf7ce61f8

commit 8abd55d57b5b37c630bfaa61a57a916fc0b20703
Author: Markus Mohrhard 
Date:   Thu Oct 4 04:27:42 2012 +0200

only set a new cond format list if it really changed

Change-Id: I820d1f083edb09abb262beba1536b1b1acba3321

commit 762f55efc9ff50cc209119df0df310154d807559
Author: Markus Mohrhard 
Date:   Thu Oct 4 04:10:37 2012 +0200

faster repaint after cond format dialog

Change-Id: Id5894efd385ad20c7a544142ce4fa4ec5d4ef062

commit 499ef12300c90b34a4a1815ce4250f679bacbe9f
Author: Markus Mohrhard 
Date:   Thu Oct 4 03:59:48 2012 +0200

after setting a ScConditionalFormatList repainting is necessary

Change-Id: I7283974ae8f12bd49c6ab806b1b052074f13a932

commit e2e28313015a5ffd0f8f2dbbd3d365229f7c192f
Author: Markus Mohrhard 
Date:   Thu Oct 4 03:53:37 2012 +0200

more work on getting cell attributes and cond formats in sync

Change-Id: If10059a6d2b8d2449a01fe09eb2efb9ccea55806

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

[PATCH] More ::rtl::OUString cleanup in basctl

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/760

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/760/1

More ::rtl::OUString cleanup in basctl

Change-Id: If7cefe8d2e188e65a465a25a5d5f77e6daebcd17
---
M basctl/source/basicide/basidesh.cxx
M basctl/source/basicide/basobj2.cxx
2 files changed, 46 insertions(+), 47 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7cefe8d2e188e65a465a25a5d5f77e6daebcd17
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

[PATCH] old Mac linker is picky about argument order - static libs l...

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/759

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/759/1

old Mac linker is picky about argument order - static libs last

and also after stuff that references external symbols, as it only looks
for symbols it has encountered so far in the object files. Stuff that
comes after the specified library then results in symbols not found
despite the lib being on the commandline earlier.

(another solution than reordering the arguments would be to use
-Wl,-all_load)

Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0
---
M solenv/gbuild/platform/macosx.mk
1 file changed, 3 insertions(+), 3 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

[PUSHED] OUString and RTL_CONSTASCII_US... cleanup in basctl

[Olivier Hallot (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/741

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I440d245d013873ec2830280ad01a4d0625fc4c1a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Olivier Hallot 
Gerrit-Reviewer: Ricardo Montania 

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

[Libreoffice-commits] .: basctl/source

[Libreoffice Gerrit user]

 basctl/source/basicide/basicbox.cxx|4 +-
 basctl/source/basicide/basicrenderable.cxx |   36 +-
 basctl/source/basicide/baside2.cxx |   56 ++---
 basctl/source/basicide/baside2.hxx |   20 +-
 4 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit db1af9a43458bd7cc9995c3c4e901ddad4e79c8d
Author: Ricardo Montania 
Date:   Mon Oct 1 13:03:37 2012 -0300

OUString and RTL_CONSTASCII_US... cleanup in basctl

Change-Id: I440d245d013873ec2830280ad01a4d0625fc4c1a
Reviewed-on: https://gerrit.libreoffice.org/741
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 2cc65d1..5d278c2 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -237,9 +237,9 @@ void LibBox::FillBox()
 void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation 
eLocation )
 {
 // get a sorted list of library names
-Sequence< ::rtl::OUString > aLibNames = rDocument.getLibraryNames();
+Sequence< OUString > aLibNames = rDocument.getLibraryNames();
 sal_Int32 nLibCount = aLibNames.getLength();
-const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
+const OUString* pLibNames = aLibNames.getConstArray();
 
 for ( sal_Int32 i = 0 ; i < nLibCount ; ++i )
 {
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 9fe4ae7..5200c8c 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -46,31 +46,31 @@ Renderable::Renderable (BaseWindow* pWin)
 
 // show Subgroup for print range
 vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
-aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"PrintRange" ) );
+aPrintRangeOpt.maGroupHint = "PrintRange" ;
 aPrintRangeOpt.mbInternalOnly = true;
 m_aUIProperties[0].Value = setSubgroupControlOpt("printrange",
-rtl::OUString(aStrings.GetString(0)), rtl::OUString(), aPrintRangeOpt);
+OUString(aStrings.GetString(0)), OUString(), aPrintRangeOpt);
 
 // create a choice for the range to print
-rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( 
"PrintContent" ) );
-Sequence< rtl::OUString > aChoices( 2 );
-Sequence< rtl::OUString > aHelpIds( 2 );
-Sequence< rtl::OUString > aWidgetIds( 2 );
+OUString aPrintContentName( "PrintContent" );
+Sequence< OUString > aChoices( 2 );
+Sequence< OUString > aHelpIds( 2 );
+Sequence< OUString > aWidgetIds( 2 );
 aChoices[0] = aStrings.GetString( 1 );
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ;
 aChoices[1] = aStrings.GetString( 2 );
-aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
-aWidgetIds[0] = rtl::OUString("printallpages");
-aWidgetIds[1] = rtl::OUString("printpages");
-m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
rtl::OUString(),
+aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ;
+aWidgetIds[0] = "printallpages" ;
+aWidgetIds[1] = "printpages" ;
+m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
aHelpIds, aPrintContentName,
aChoices, 0);
 
 // create a an Edit dependent on "Pages" selected
 vcl::PrinterOptionsHelper::UIControlOptions 
aPageRangeOpt(aPrintContentName, 1, true);
-m_aUIProperties[2].Value = setEditControlOpt("pagerange", rtl::OUString(),
- rtl::OUString(), "PageRange",
- rtl::OUString(), 
aPageRangeOpt);
+m_aUIProperties[2].Value = setEditControlOpt("pagerange", OUString(),
+ OUString(), "PageRange",
+ OUString(), aPageRangeOpt);
 }
 
 Renderable::~Renderable()
@@ -80,7 +80,7 @@ Renderable::~Renderable()
 Printer* Renderable::getPrinter()
 {
 Printer* pPrinter = NULL;
-Any aValue( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"RenderDevice" ) ) ) );
+Any aValue( getValue( "RenderDevice" ) );
 Reference xRenderDevice;
 
 if( aValue >>= xRenderDevice )
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 sal_Int64 nContent = getIntValue( "PrintContent", -1 );
 if( nContent == 1 )
 {
-rtl::OUString aPageRange( getStringValue( "PageRange" ) );
+OUString aPageRange( getStringValue( "PageRange" ) );
   

[Libreoffice-commits] .: bug/bug

[Rob Snelders]

 bug/bug/bug.js  |   15 ++-
 bug/bug/test.js |8 +---
 2 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit c247d268474d62fdbab76cb671203c4385d9a5ea
Author: Rob Snelders 
Date:   Wed Oct 3 23:58:22 2012 +0200

- Revert wrong changes of last commit
- correct indenting

diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 9a1ab1e..c6f5966 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -233,21 +233,10 @@
 state_submit_element: 'html',
 
 state_submit: function() {
- $.bug.logged_in().done(function(status) {
-if(status) {
-$.bug.submit_bug();
-} else {
-   $.bug.error_set("You're not logged in. Please login first");
-$.bug.state_signin();
-}
-   });
-   },
-
-   submit_bug: function() {
 var element = $('.state_submit');
 if(!element.hasClass('initialized')) {
- $.bug.ajax('GET', $.bug.url + 
'/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED').pipe(function(data){
-   $.bug.token = data.match(//)[1];
+$.bug.ajax('GET', $.bug.url + 
'/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED').pipe(function(data){
+$.bug.token = data.match(//)[1];
 });
 
 var form = $('.submission_form form');
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 1a36df2..f6a3e24 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -241,12 +241,6 @@ test("state_submit", function() {
 equal(element.css('display'), 'none');
 ok(!element.hasClass('initialized'), 'is not initialized');
 $.bug.state_submit();
-
-/*$.bug.ajax = function(type, url) {
-return $.Deferred().resolve('logged in ok');
-};
-
-$.bug.state_submit();
 equal(element.css('display'), 'block');
 ok(element.hasClass('initialized'), 'is initialized');
 $.bug.state_component();
@@ -308,7 +302,7 @@ test("state_submit", function() {
 equal($('.error').text(), error, 'error is set');
 
 $.bug.state_success = state_success;
-$.bug.ajax = $.ajax;*/
+$.bug.ajax = $.ajax;
 });
 
 test("state_success", function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 7 commits - bug/bug bug/bug.xhtml

[Rob Snelders]

 bug/bug.xhtml   |1 +
 bug/bug/bug.js  |   17 +
 bug/bug/test.js |7 +++
 3 files changed, 25 insertions(+)

New commits:
commit abaa1d52d080490ec04e881c1d3636ac2fa440f8
Author: Rob Snelders 
Date:   Mon Oct 1 23:02:08 2012 +0200

new bugzilla demands a token. That works now.

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index f4c4e05..fe365be 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -181,6 +181,7 @@ Platform (if different from the browser):
 
 
 
+
 
 
 
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index a0be19d..9a1ab1e 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -94,6 +94,7 @@
 },
 
 url: '',
+   token: '',
 
 state_signin_error_regexps: [/CLASS="THROW_ERROR">([^<]*)/i],
 state_signin_success_regexp: /LOG&NBSP;OUT<\/A>([^<]*)/i,
@@ -232,8 +233,23 @@
 state_submit_element: 'html',
 
 state_submit: function() {
+ $.bug.logged_in().done(function(status) {
+if(status) {
+$.bug.submit_bug();
+} else {
+   $.bug.error_set("You're not logged in. Please login first");
+$.bug.state_signin();
+}
+   });
+   },
+
+   submit_bug: function() {
 var element = $('.state_submit');
 if(!element.hasClass('initialized')) {
+ $.bug.ajax('GET', $.bug.url + 
'/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED').pipe(function(data){
+   $.bug.token = data.match(//)[1];
+});
+
 var form = $('.submission_form form');
 $.bug.error_clear();
 form.attr('action', $.bug.url + '/post_bug.cgi');
@@ -248,6 +264,7 @@
 var short_desc = $('.state_subcomponent 
.active_subcomponent .chosen').attr('data') + ': ' + $('.state_description 
.short').val();
 var comment = $('.state_description .long').val();
 $("body").css("cursor", "progress");
+$('input[name="token"]', form).val($.bug.token);
 $('input[name="component"]', form).val(component);
 $('input[name="version"]', form).val(version);
 $('input[name="short_desc"]', form).val(short_desc);
diff --git a/bug/bug/test.js b/bug/bug/test.js
index defb842..1a36df2 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -241,6 +241,12 @@ test("state_submit", function() {
 equal(element.css('display'), 'none');
 ok(!element.hasClass('initialized'), 'is not initialized');
 $.bug.state_submit();
+
+/*$.bug.ajax = function(type, url) {
+return $.Deferred().resolve('logged in ok');
+};
+
+$.bug.state_submit();
 equal(element.css('display'), 'block');
 ok(element.hasClass('initialized'), 'is initialized');
 $.bug.state_component();
@@ -302,6 +308,7 @@ test("state_submit", function() {
 equal($('.error').text(), error, 'error is set');
 
 $.bug.state_success = state_success;
+$.bug.ajax = $.ajax;*/
 });
 
 test("state_success", function() {
commit 633869eb45ed46a1b67c1b559499b55ac1b64d53
Merge: 1c1aa6c... 213529e...
Author: Rob Snelders 
Date:   Fri Aug 17 17:29:56 2012 +0200

Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/website

commit 1c1aa6cff807d54b1ea42997ac74428289334503
Author: Rob Snelders 
Date:   Fri Aug 17 00:07:06 2012 +0200

Reset the error-message when submitting the bug

diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 0565d84..a0be19d 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -235,6 +235,7 @@
 var element = $('.state_submit');
 if(!element.hasClass('initialized')) {
 var form = $('.submission_form form');
+$.bug.error_clear();
 form.attr('action', $.bug.url + '/post_bug.cgi');
 form.submit(function() {
 if($(element).hasClass('inprogress')) {
commit 70a0477efcaf401642db916cb76acccb00bb6246
Author: Rob Snelders 
Date:   Fri Aug 17 00:03:50 2012 +0200

Hides the username that is printed for testing

diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index a932f2a..f81aa9b 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -610,3 +610,7 @@ body {
 background: url('images/select-right.png') repeat-y top right;
 padding-right: 12px;
 }
+
+.username {
+display: hidden;
+}
commit 8bf699575bbb4c8231ec757a5a19550e97efb147
Author: Rob Snelders 
Date:   Wed Aug 15 22:30:39 2012 +0200

fdo#53082 - BUGZILLAASSISTANT: Improve exception handling for unavailable 
Bugzilla

diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index fdd14ec..0565d84 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -32,15 +32,25 @@
} else {
  message = url + '(' + $.param(args) + ') XHR e

[Libreoffice-commits] .: 3 commits - wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/common/FileAccess.py|   59 ++
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py  |   29 ++---
 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py |   63 ++-
 3 files changed, 68 insertions(+), 83 deletions(-)

New commits:
commit 60211510d3a1c2f96bb6f6e96895f003d6beef74
Author: Xisco Fauli 
Date:   Wed Oct 3 22:59:03 2012 +0200

pywizard: localise listbox at runtime

Change-Id: I667976f7f76776cc3ef76abe9935271a7a0c2923

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py 
b/wizards/com/sun/star/wizards/common/FileAccess.py
index a213b7e..0364a0d 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -307,7 +307,7 @@ class FileAccess(object):
 return False
 
 @classmethod
-def getFolderTitles(self, xMSF, FilterName, FolderName):
+def getFolderTitles(self, xMSF, FilterName, FolderName, resDict):
 #Returns and ordered dict containing the template's name and path
 
 LocLayoutFiles = {}
@@ -321,12 +321,17 @@ class FileAccess(object):
 FilterName = None
 else:
 FilterName += "-"
-
+
 for i in nameList:
 fileName = self.getFilename(i)
 if FilterName is None or fileName.startswith(FilterName):
 xDocInterface.loadFromMedium(i, tuple())
-LocLayoutFiles[xDocInterface.Title] = i
+if xDocInterface.Title in resDict:
+# localise string at runtime
+title = resDict[xDocInterface.Title]
+else:
+title = xDocInterface.Title
+LocLayoutFiles[title] = i
 
 except Exception, exception:
 traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index b128a95..ae73800 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -299,9 +299,9 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 "/wizard/fax")
 self.sWorkPath = FileAccess.getOfficePath2(xMSF, "Work", "", "")
 self.BusinessFiles = FileAccess.getFolderTitles(xMSF, "bus",
-self.sFaxPath)
+self.sFaxPath, self.resources.dictBusinessTemplate)
 self.PrivateFiles = FileAccess.getFolderTitles(xMSF, "pri",
-self.sFaxPath)
+self.sFaxPath, self.resources.dictPrivateTemplate)
 
 self.setControlProperty("lstBusinessStyle", "StringItemList",
 tuple(self.BusinessFiles.keys()))
@@ -327,17 +327,17 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 self.myFaxDoc.updateDateFields()
 
 def initializeSalutation(self):
-#'Saludation' dropdown list
+#'Saludation' listbox
 self.setControlProperty("lstSalutation", "StringItemList",
 tuple(self.resources.SalutationLabels))
 
 def initializeGreeting(self):
-#'Complimentary Close' dropdown list
+#'Complimentary Close' listbox
 self.setControlProperty("lstGreeting", "StringItemList",
 tuple(self.resources.GreetingLabels))
 
 def initializeCommunication(self):
-#'Type of message' dropdown list
+#'Type of message' listbox
 self.setControlProperty("lstCommunicationType", "StringItemList",
 tuple(self.resources.CommunicationLabels))
 
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index 33bda56..7cf3703 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -140,6 +140,26 @@ class FaxWizardDialogResources(Resource):
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47),
 FaxWizardDialogResources.resConsist3PlaceHolder : self.getResText(
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)}
+
+#Create a dictionary for localising the private template
+self.dictPrivateTemplate = {
+"Bottle" : self.getResText(
+FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
+"Lines" : self.getResText(
+FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
+"Marine" : self.getResText(
+FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)}
+
+#Create a dictionary for localising the business template
+self.dictBusinessTemplate = {
+"Classic Fax" : self.getResText(
+FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52),
+"Classic Fax from Private" : self.getResText(
+

[Libreoffice-commits] .: Branch 'feature/vs2012' - configure.in

[Libreoffice Gerrit user]

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

New commits:
commit 6457404e915c13b7f8d67291e1b7a6ce6ba7991a
Author: Peter Foley 
Date:   Wed Oct 3 16:58:15 2012 -0400

download rebase if needed for all sdk versions

Change-Id: I1417d243c94438c36158b0d5f873fa939b7d7642

diff --git a/configure.in b/configure.in
index 8a786cb..a1b119a 100644
--- a/configure.in
+++ b/configure.in
@@ -9114,7 +9114,7 @@ dnl Check for Micorosft rebase.exe
 dnl =
 if test "$build_os" = "cygwin"; then
AC_PATH_PROG([REBASE], [rebase])
-if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a 
"$WINDOWS_SDK_VERSION" = "80"; then
+if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \); then
 REBASE=download
AC_SUBST(REBASE)
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW] try to improve automatic detection for Windows building

[julien2412]

Hello,

I'm giving a try again to Windows compilation.
I've got the same problem as some months before for cl.exe detection
It seems /proc/registry from Cygwin doesn't map Windows Vista registry.

Any idea?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/REVIEW-try-to-improve-automatic-detection-for-Windows-building-tp3522110p4010896.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ca821bf466759347089dd1938162bcd5fdd3ae00
Author: Tor Lillqvist 
Date:   Wed Oct 3 23:23:38 2012 +0300

Don't try to make binaries that run on ancient OS when using current tools

For some reason the current Clang linker doesn't like that and
misbehaves, Apple bug 12075544. It is unclear whether binaries built
using a modern Xcode and SDK to run on 10.4 actually would run on 10.4
anyway.

Change-Id: Id15da5eaa4bb95af9cf6d98a658c510f4a786185

diff --git a/configure.in b/configure.in
index 3b54b1a..01960af 100644
--- a/configure.in
+++ b/configure.in
@@ -2693,7 +2693,12 @@ if test "$_os" = "Darwin"; then
 AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
 
 if test "$with_macosx_version_min_required" = ""; then
-with_macosx_version_min_required="10.4"
+case $with_macosx_sdk in
+10.4|10.5)
+with_macosx_version_min_required="10.4";;
+*)
+with_macosx_version_min_required="10.6";;
+esac
 fi
 
 if test "$with_macosx_version_max_allowed" = ""; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using bool in rtl::OUStringBuffer::append

[Stephan Bergmann]

On 10/03/2012 07:00 PM, Markus Mohrhard wrote:

after I got tinderbox mail complaining about ambiguous overload for
rtl::OUStringBuffer::append(bool) I wanted to ask if we could add a
rtl::OUStringBuffer::append(bool) method or if there are reasons
against it. From what I can see it could in the end even share the
implementation with the sal_Bool variant just needs an own method in
rtl::OUStringBuffer.


the overloads of OUStringBuffer::append are pretty horrible already
(e.g. append(sal_Bool) vs. append(char) or append(sal_Unicode) which is
always accidentally invoked when you pass a short);  but adding
append(bool) won't make that any worse than it is.


Seems like append(bool) is not possible without adjusting a lot of
places. The commit seems to have caused some test failures and
crashes. I reverted it for now.


...which only goes to show what a horrible mess C++ is in practice. 
bool is rather special, but you easily forget to consider all the 
consequences of that.  Turns out that code like


  aBuf.append( pElementType->pTypeName );

(typelib_static_sequence_type_init, 
cppu/source/typelib/static_types.cxx), where pElementType->pTypeName is 
of type rtl_uString*, now chooses for overload resolution the standard 
boolean conversion from rtl_uString* to bool (yielding true, so 
appending "true" to aBuf) rather than the user-defined conversion by 
constructor from rtl_uString* to rtl::OUString.


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

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1d9803bacc4dc650a2ccf1c7a76e0e61759d1d27
Author: Tor Lillqvist 
Date:   Wed Oct 3 22:53:16 2012 +0300

Use also the ASMOBJECTS

Change-Id: Iee09fc308097ab0a5f73e321da30b7e301b9f4dd

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 7636cef..fb4ba18 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -162,6 +162,7 @@ define gb_LinkTarget__command_dynamiclink
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
+   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
@@ -180,6 +181,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
+   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 l10ntools/inc/lngmerge.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39bcbb571158af926a1db8d49f1d87156a9b62ae
Author: Zolnai Tamás 
Date:   Wed Oct 3 14:20:18 2012 +0200

Add new signature of isNextGroup

in header to be consistant with implementation

Change-Id: I2b2e68c4805ab575a8ee2d1ca835d79f8fe9cc45

diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 6391d1c..3995bd7 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -44,7 +44,7 @@ private:
 sal_Bool bULF;
 std::vector aLanguages;
 
-bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in);
+bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in);
 void ReadLine(const rtl::OString &rLine_in,
 OStringHashMap &rText_inout);
 void WriteSDF(std::ofstream &aSDFStream, OStringHashMap &rText_inout,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 3.6 drawing issue

[julien2412]

Hello,

It's the dev mailing forum here so it's about patches, building, etc.
You may find help on user forum here:
http://nabble.documentfoundation.org/Users-f1639498.html

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/3-6-drawing-issue-tp4010862p4010865.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Very slow cold start due to mass of Spelling Dictionaries

[Andras Timar]

Hello Fernand,

2012/10/3 Fernand Vanrie :
> The annoying slow cold start is simply due to the mass off Spelling
> Dictionaries who are standard installed as Extensions.
> After deleting the not-needed maps in the share/Extensions directory, LO
> start in a Glimp. We had complains from our users  (compared to OO) , so we
> made a script to delete most off this Dictionaries and now they love LO :-)
> It could be handy to explain the reason off the slow start and deliver a
> tool  for the less technical users ?
>

LibreOffice will not install all dictionaries by default starting from
version 3.6.3, so your problem has been solved already.

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

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

[Libreoffice Gerrit user]

 scp2/source/impress/module_ogltrans.ulf |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d378badd6149c88d70f60ef0b87339ffc009cb2d
Author: Zolnai Tamás 
Date:   Wed Oct 3 13:49:27 2012 +0200

Cleanup in module_ogltrans.ulf

Change-Id: I73eda85dc958b1744ba7cd4de3dbb0691f91a940

diff --git a/scp2/source/impress/module_ogltrans.ulf 
b/scp2/source/impress/module_ogltrans.ulf
index 4415d47..98ef95f 100644
--- a/scp2/source/impress/module_ogltrans.ulf
+++ b/scp2/source/impress/module_ogltrans.ulf
@@ -16,7 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-MODULE_OPTIONAL_OGLTRANS
 
 [STR_NAME_MODULE_OPTIONAL_OGLTRANS]
 en-US = "OpenGL slide transitions for %PRODUCTNAME Impress"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

3.6 drawing issue

[Steven Howe]

I created an object of three squares. Copied it. Then I needed one of
the interior squares, so selected one of the copies. There was no
ungroup menu choice.

Selecting the next copy, then next; same result. In time I worked back
to the original. That would ungroup.

Is this a bug?

Version information:
3.6.1.2 (build ID: e29a214)
OS linux, Fedora 17 (although the Libreoffice version was downloaded
from Libreoffice.org)

java: java-1.7.0-openjdk-1.7.0.6-2.3.1.fc17.2.x86_64


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

[Libreoffice-commits] .: l10ntools/inc

[Libreoffice Gerrit user]

 l10ntools/inc/lngmerge.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61137e5fe3478116129c748f991e8f1712564174
Author: Tor Lillqvist 
Date:   Wed Oct 3 20:50:01 2012 +0300

Make isNextGroup() declaration match implementation

Change-Id: I5d8a00b83fd4e9f67b98b86818d1e2180d36e69a

diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 6391d1c..3995bd7 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -44,7 +44,7 @@ private:
 sal_Bool bULF;
 std::vector aLanguages;
 
-bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in);
+bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in);
 void ReadLine(const rtl::OString &rLine_in,
 OStringHashMap &rText_inout);
 void WriteSDF(std::ofstream &aSDFStream, OStringHashMap &rText_inout,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - l10ntools/source scp2/source

[Libreoffice Gerrit user]

 l10ntools/source/lngmerge.cxx  |   21 -
 scp2/source/math/registryitem_math.ulf |1 -
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 3bde7aa0943c76cf0b8063f9c03f7b15edd749b1
Author: Zolnai Tamás 
Date:   Wed Oct 3 12:50:21 2012 +0200

Delete german text from registryitem_math.ulf

Change-Id: Ic6a6706062bc82d5e4096d0a6aa7b52a8988f1bc

diff --git a/scp2/source/math/registryitem_math.ulf 
b/scp2/source/math/registryitem_math.ulf
index ce4e2fb..0b987cb 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -24,4 +24,3 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
 
 [STR_REG_VAL_OO_FORMULA]
 en-US = "OpenDocument Formula"
-de = "OpenDocument Formel"
commit 2146c00da07a0c632028cf41c4c1a5a687d82ffe
Author: Zolnai Tamás 
Date:   Wed Oct 3 12:37:19 2012 +0200

Ulfex ignores comments during extraction too

During string extraction this does not cause
real problem but causes unnecessary operations.
Plus make isNextGroup not to change sLine_in
parameter.

Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index fcab696..b0282f5 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -146,12 +146,12 @@ void LngParser::WriteSDF(std::ofstream &aSDFStream,
}
 }
 
-bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in)
+bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString 
&sLine_in)
 {
-sLine_in = sLine_in.trim();
-if ((sLine_in[0] == '[') && (sLine_in[sLine_in.getLength() - 1] == ']'))
+const OString sLineTrim = sLine_in.trim();
+if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']'))
 {
-sGroup_out = getBracketedContent(sLine_in).trim();
+sGroup_out = getBracketedContent(sLineTrim).trim();
 return true;
 }
 return false;
@@ -160,10 +160,13 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, 
rtl::OString &sLine_in)
 void LngParser::ReadLine(const rtl::OString &rLine_in,
 OStringHashMap &rText_inout)
 {
-rtl::OString sLang(rLine_in.getToken(0, '=').trim());
-if (!sLang.isEmpty()) {
-rtl::OString sText(rLine_in.getToken(1, '"'));
-rText_inout[sLang] = sText;
+if (!rLine_in.match(" *") && !rLine_in.match("/*"))
+{
+rtl::OString sLang(rLine_in.getToken(0, '=').trim());
+if (!sLang.isEmpty()) {
+rtl::OString sText(rLine_in.getToken(1, '"'));
+rText_inout[sLang] = sText;
+}
 }
 }
 
commit 8ca8ea20e0aeeb26f085cbf331bf92003e1e9648
Author: Zolnai Tamás 
Date:   Wed Oct 3 10:25:46 2012 +0200

Correct ulfex to ignore comments

Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 264b50c..fcab696 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -232,7 +232,7 @@ sal_Bool LngParser::Merge(
 {
 sal_Int32 n = 0;
 rtl::OString sLang(sLine.getToken(0, '=', n));
-if (n == -1)
+if (n == -1 || static_cast(sLine.match("/*")))
 {
 ++nPos;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OUString is mutable?

[Michael Stahl]

On 03/10/12 18:19, Lubos Lunak wrote:
> On Monday 01 of October 2012, Michael Stahl wrote:
>> On 01/10/12 11:40, Noel Grandin wrote:
>>> On 2012-10-01 10:15, Stephan Bergmann wrote:
 While that argument is irrelevant in a C/C++ context, immutability is
 also an important concept when reasoning about multi-threaded code.
 Therefore, the distinction between OUString and OUStringBuffer IMO
 does make sense after all.
>>>
>>> I don't see how the design helps you in a multithreaded context.
>>> If you share an OUString instance between two threads, either thread
>>> could assign to it, replacing it's contents, and invalidating what the
>>> other thread sees.
>>
>> but if you share 2 copies of an OUString instance in 2 threads, they
>> could access the one underlying buffer concurrently without issue, and
>> when they want to point their copy at a different value, they can do
>> that independently of the other -- again, OUString works in exactly the
>> same way as a pointer to an immutable object here, if you copy the
>> pointer you can dereference it without issue and point your copy to a
>> different object; you only need a lock if you don't copy the pointer and
>> share a single pointer that one thread may update (which depending on
>> the situation may be necessary, say you don't just want to save memory
>> but actually always want the threads to point to the same value).
> 
>  Either I don't get what immutable actually means in this context (in which 
> case I'd like to be enlightened), or you are talking about things that 
> actually have nothing to do with immutability. OUString is not the same like 
> a pointer to an immutable object, because this object contains a reference 
> count (that obviously does change, for example when you point your OUString 
> copy to it). What you describe is possible with OUString, but not because of 
> immutability, but because OUString (or the internal object rather) is 
> ref-counted copy-on-write. It should be perfectly possible to have a normally 
> mutable OUString with the same abilities.

AFAIK the rtl_uString inside the OUString is mutable by itself, but the
OUString does not expose any of that mutability to its clients, which
means that for the purpose of our discussion it is in fact immutable[1].

the reference count does not fundamentally change the situation in
practice (only in theory :) because nobody who isn't insane would
manipulate it from outside of an OUString, while programmers likely
would manipulate the buffer content if it were easy to do.

... the intarwebs say that the C++ standard committee has outlawed COW
as an implementation strategy in C++11 for std::string, which is of
course mutable:

http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2668.htm

in any case i agree with you that this thread-safety benefit is
relatively minor and by itself not a reason to prefer immutability for
OUString, since we could just drop the reference count and always do
deep copies instead.

>  As such, as far as I can tell, immutable OUString is only a complication 
> with 
> no practical advantages.

please read my other mail for other benefits...

>>> So it's really not any safer than using an OUStringBuffer.
>>> It just gives the illusion of safety.
>>
>> doesn't seem any more illusory than other things C++ programmers are
>> used to.
> 
> [citation needed]

[1] of course in practice in C++ immutability can only be an illusion
and mutability is just a const_cast away...

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

[Libreoffice-commits] .: expat/expat-2.1.0.patch fontconfig/fontconfig-2.8.0.patch

[Libreoffice Gerrit user]

 expat/expat-2.1.0.patch   |   90 ++
 fontconfig/fontconfig-2.8.0.patch |   20 
 2 files changed, 110 insertions(+)

New commits:
commit 78c7bbc3ce92493ca98c605f92733e31ad87ef70
Author: Tor Lillqvist 
Date:   Wed Oct 3 15:21:15 2012 +0300

Use different symbol names in the two expat variants we build

We need to be able to link both into one binary in the
disable-dynloading case.

Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f

diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch
index 875e41d..28d6322 100644
--- a/expat/expat-2.1.0.patch
+++ b/expat/expat-2.1.0.patch
@@ -92,3 +92,93 @@
 +.INCLUDE :  set_wntx64.mk
 +.INCLUDE :target.mk
 +.INCLUDE :  tg_wntx64.mk
+--- misc/expat-2.1.0/lib/expat_external.h
 misc/build/expat-2.1.0/lib/expat_external.h
+@@ -86,9 +86,11 @@
+ typedef unsigned short XML_Char;
+ typedef char XML_LChar;
+ #endif /* XML_UNICODE_WCHAR_T */
++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16
+ #else  /* Information is UTF-8 encoded. */
+ typedef char XML_Char;
+ typedef char XML_LChar;
++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8
+ #endif /* XML_UNICODE */
+ 
+ #ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
+--- misc/expat-2.1.0/lib/expat.h
 misc/build/expat-2.1.0/lib/expat.h
+@@ -15,6 +15,73 @@
+ #include 
+ #include "expat_external.h"
+ 
++#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent)
++#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString)
++#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion)
++#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo)
++#define XML_ExternalEntityParserCreate 
EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate)
++#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel)
++#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase)
++#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer)
++#define XML_GetCurrentByteCount 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount)
++#define XML_GetCurrentByteIndex 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex)
++#define XML_GetCurrentColumnNumber 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber)
++#define XML_GetCurrentLineNumber 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber)
++#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode)
++#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList)
++#define XML_GetIdAttributeIndex 
EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex)
++#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext)
++#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus)
++#define XML_GetSpecifiedAttributeCount 
EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount)
++#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree)
++#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc)
++#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc)
++#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse)
++#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer)
++#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate)
++#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS)
++#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM)
++#define XML_ParserFree EXPAT_CHARTYPE_DECORATE(XML_ParserFree)
++#define XML_ParserReset EXPAT_CHARTYPE_DECORATE(XML_ParserReset)
++#define XML_ResumeParser EXPAT_CHARTYPE_DECORATE(XML_ResumeParser)
++#define XML_SetAttlistDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetAttlistDeclHandler)
++#define XML_SetBase EXPAT_CHARTYPE_DECORATE(XML_SetBase)
++#define XML_SetCdataSectionHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetCdataSectionHandler)
++#define XML_SetCharacterDataHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetCharacterDataHandler)
++#define XML_SetCommentHandler EXPAT_CHARTYPE_DECORATE(XML_SetCommentHandler)
++#define XML_SetDefaultHandler EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandler)
++#define XML_SetDefaultHandlerExpand 
EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandlerExpand)
++#define XML_SetDoctypeDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetDoctypeDeclHandler)
++#define XML_SetElementDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetElementDeclHandler)
++#define XML_SetElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementHandler)
++#define XML_SetEncoding EXPAT_CHARTYPE_DECORATE(XML_SetEncoding)
++#define XML_SetEndCdataSectionHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndCdataSectionHandler)
++#define XML_SetEndDoctypeDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndDoctypeDeclHandler)
++#define XML_SetEndElementHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndElementHandler)
++#define XML_SetEndNamespaceDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndNamespaceDeclHandler)
++#define XML_SetEntityDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEntityDeclHandler)
++#define XML_SetExternalEntityRefHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetExternal

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

[Libreoffice Gerrit user]

 scp2/source/math/registryitem_math.ulf |1 -
 1 file changed, 1 deletion(-)

New commits:
commit adfa2653be936a36131b5130d166193bd990a4cf
Author: Zolnai Tamás 
Date:   Wed Oct 3 12:50:21 2012 +0200

Delete german text from registryitem_math.ulf

Change-Id: Ic6a6706062bc82d5e4096d0a6aa7b52a8988f1bc

diff --git a/scp2/source/math/registryitem_math.ulf 
b/scp2/source/math/registryitem_math.ulf
index ce4e2fb..0b987cb 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -24,4 +24,3 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
 
 [STR_REG_VAL_OO_FORMULA]
 en-US = "OpenDocument Formula"
-de = "OpenDocument Formel"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using bool in rtl::OUStringBuffer::append

[Markus Mohrhard]

Hey,


>>
>> after I got tinderbox mail complaining about ambiguous overload for
>> rtl::OUStringBuffer::append(bool) I wanted to ask if we could add a
>> rtl::OUStringBuffer::append(bool) method or if there are reasons
>> against it. From what I can see it could in the end even share the
>> implementation with the sal_Bool variant just needs an own method in
>> rtl::OUStringBuffer.
>
> the overloads of OUStringBuffer::append are pretty horrible already
> (e.g. append(sal_Bool) vs. append(char) or append(sal_Unicode) which is
> always accidentally invoked when you pass a short);  but adding
> append(bool) won't make that any worse than it is.
>

Seems like append(bool) is not possible without adjusting a lot of
places. The commit seems to have caused some test failures and
crashes. I reverted it for now.

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

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

[Libreoffice Gerrit user]

 l10ntools/source/lngmerge.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 85c93d57c46d02c66b6e604feb867d3ae1abac4e
Author: Zolnai Tamás 
Date:   Wed Oct 3 12:37:19 2012 +0200

Ulfex ignores comments during extraction too

During string extraction this does not cause
real problem but causes unnecessary operations.
Plus make isNextGroup not to change sLine_in
parameter.

Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index fcab696..b0282f5 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -146,12 +146,12 @@ void LngParser::WriteSDF(std::ofstream &aSDFStream,
}
 }
 
-bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in)
+bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString 
&sLine_in)
 {
-sLine_in = sLine_in.trim();
-if ((sLine_in[0] == '[') && (sLine_in[sLine_in.getLength() - 1] == ']'))
+const OString sLineTrim = sLine_in.trim();
+if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']'))
 {
-sGroup_out = getBracketedContent(sLine_in).trim();
+sGroup_out = getBracketedContent(sLineTrim).trim();
 return true;
 }
 return false;
@@ -160,10 +160,13 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, 
rtl::OString &sLine_in)
 void LngParser::ReadLine(const rtl::OString &rLine_in,
 OStringHashMap &rText_inout)
 {
-rtl::OString sLang(rLine_in.getToken(0, '=').trim());
-if (!sLang.isEmpty()) {
-rtl::OString sText(rLine_in.getToken(1, '"'));
-rText_inout[sLang] = sText;
+if (!rLine_in.match(" *") && !rLine_in.match("/*"))
+{
+rtl::OString sLang(rLine_in.getToken(0, '=').trim());
+if (!sLang.isEmpty()) {
+rtl::OString sText(rLine_in.getToken(1, '"'));
+rText_inout[sLang] = sText;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] don't pretend to be 1.4 compatible, when the baseline is 1.5

[Michael Stahl (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/758

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/rtl/ustrbuf.hxx |   19 ---
 1 file changed, 19 deletions(-)

New commits:
commit 78225f2ebeb30c853395240f7cc87926349aa975
Author: Markus Mohrhard 
Date:   Wed Oct 3 18:57:54 2012 +0200

Revert "add rtl::OUStringBuffer::append(bool)"

This reverts commit 563fa900ba22bf83dfa58e67807ed0337f810576.

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 0b4586b..a11dff1 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -501,25 +501,6 @@ public:
 }
 
 /**
-Appends the string representation of the bool
-argument to the string buffer.
-
-The argument is converted to a string as if by the method
-String.valueOf, and the characters of that
-string are then appended to this string buffer.
-
-@param   b   a bool.
-@return  this string buffer.
-
-@since LibreOffice 3.7
- */
-OUStringBuffer & append(bool b)
-{
-sal_Unicode sz[RTL_USTR_MAX_VALUEOFBOOLEAN];
-return append( sz, rtl_ustr_valueOfBoolean( sz, b ) );
-}
-
-/**
 Appends the string representation of the sal_Bool
 argument to the string buffer.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: saxon/build.xml saxon/ExternalProject_saxon.mk

[Libreoffice Gerrit user]

 saxon/ExternalProject_saxon.mk |3 +--
 saxon/build.xml|   25 +++--
 2 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit afe9178a8ddb6f458f1e0e67a3b6711deed46f79
Author: Christian Lohmaier 
Date:   Wed Oct 3 18:23:27 2012 +0200

don't pretend to be 1.4 compatible, when the baseline is 1.5

also pass java-target-version from environment
as the source version doesn't change by miracle in external modules,
keep that in the build.xml (and only there)

Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c
Reviewed-on: https://gerrit.libreoffice.org/758
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
index a5c983b..ad2f9cb 100644
--- a/saxon/ExternalProject_saxon.mk
+++ b/saxon/ExternalProject_saxon.mk
@@ -28,9 +28,8 @@ $(call gb_ExternalProject_get_state_target,saxon,build) :
)\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
-   ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-   -Dant.build.javac.target=$(JAVA_TARGET_VER) \
) \
+   -Dant.build.javac.target=$(JAVA_TARGET_VER) \
$(if $(debug),-Dbuild.debug="on") \
-Dsolarbindir=$(OUTDIR)/bin jar-bj && \
touch $@
diff --git a/saxon/build.xml b/saxon/build.xml
index c9026f7..a6e7714 100644
--- a/saxon/build.xml
+++ b/saxon/build.xml
@@ -139,10 +139,7 @@
 
 
 
-
-
-
-
+
 
 
 
-
 
+optimize="${build.optimize}" srcdir="${temp-src-j.dir}" 
source="${build.compiler.source}">
 
 
 
@@ -441,8 +433,7 @@ http\://www.w3.org/2001/XMLSchema: 
com.saxonica.jaxp.SchemaFactoryImpl
 
 
+optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" 
source="${build.compiler.source}">
 
 
 
@@ -456,8 +447,7 @@ http\://www.w3.org/2001/XMLSchema: 
com.saxonica.jaxp.SchemaFactoryImpl
 
 
+optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" 
source="${build.compiler.source}">
 
 
 
@@ -789,8 +779,7 @@ http\://www.w3.org/2001/XMLSchema: 
com.saxonica.jaxp.SchemaFactoryImpl
 
+source="${build.compiler.source}">
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Error building on windows XP SP3 using cygwin

[Flavio Moringa]

I guys,

I'm having this error building 3.6.2 on Windows (using cygwin):

###
[ build CUT ] filter_tiff_test
S=C:/libre362 && O=$S/solver/wntmsci12.pro &&
W=$S/workdir/wntmsci12.pro &&  mkdir -p $W/CppunitTest/ &&
(PATH="${PATH}:/cygdrive/c/libre362/solver/wntmsci12.pro/bin"
DBGSV_ERROR_OUT=shell  STAR_RESOURCEPATH=$O/bin/
$O/bin/cppunit/cppunittester.exe
$W/LinkTarget/CppunitTest/test_filter_tiff_test.dll --headless
"-env:CONFIGURATION_LAYERS=xcsxcu:file:///$O/xml/registry"
"-env:UNO_TYPES=file:///$O/bin/udkapi.rdb file:///$O/bin/offapi.rdb"
"-env:UNO_SERVICES=file:///$O/xml/ure/services.rdb
file:///$O/xml/component/configmgr/source/configmgr.component"
-env:URE_INTERNAL_LIB_DIR=file:///$O/bin
-env:LO_LIB_DIR=file:///$O/bin --protector unoexceptionprotector.dll
unoexceptionprotector --protector unobootstrapprotector.dll
unobootstrapprotector   > $W/CppunitTest/filter_tiff_test.test.log
2>&1 || (cat $W/CppunitTest/filter_tiff_test.test.log && echo; echo
"Error: a unit test failed, please do one of:"; echo; echo "export
DEBUGCPPUNIT=TRUE# for exception catching"; echo "export
GDBCPPUNITTRACE=\"gdb --args\" # for interactive debugging"; echo
"export VALGRIND=memcheck# for memory checking" ; echo
"and retry." && false))
[ build CUT ] hwpfilter_test_hwpfilter

This application has requested the Runtime to terminate it in an unusual way.
Please contact the application's support team for more information.

Error: a unit test failed, please do one of:

export DEBUGCPPUNIT=TRUE# for exception catching
export GDBCPPUNITTRACE="gdb --args" # for interactive debugging
export VALGRIND=memcheck# for memory checking
and retry.
make[2]: *** 
[C:/libre362/workdir/wntmsci12.pro/CppunitTest/extensions_test_update.test]
Error 1
make[2]: *** Waiting for unfinished jobs
make[2]: Leaving directory `/cygdrive/c/libre362/tail_build'
make[1]: *** [tail_build] Error 2
make[1]: Leaving directory `/cygdrive/c/libre362'
make: *** [tail_build] Error 2

###


Should I run a:
make -sr all

to bypass test checking? Any thoughts on how to fix it? Can't run valgrind
on cygwin

Cheers
-- 
*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] don't pretend to be 1.4 compatible, when the baseline is 1.5

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/758

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/758/1

don't pretend to be 1.4 compatible, when the baseline is 1.5

also pass java-target-version from environment
as the source version doesn't change by miracle in external modules,
keep that in the build.xml (and only there)

Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c
---
M saxon/ExternalProject_saxon.mk
M saxon/build.xml
2 files changed, 8 insertions(+), 20 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

Re: OUString is mutable?

[Norbert Thiebaud]

On Wed, Oct 3, 2012 at 11:19 AM, Lubos Lunak  wrote:
> On Monday 01 of October 2012, Michael Stahl wrote:
>> On 01/10/12 11:40, Noel Grandin wrote:
>> > On 2012-10-01 10:15, Stephan Bergmann wrote:
>> >> While that argument is irrelevant in a C/C++ context, immutability is
>> >> also an important concept when reasoning about multi-threaded code.
>> >> Therefore, the distinction between OUString and OUStringBuffer IMO
>> >> does make sense after all.
>> >
>> > I don't see how the design helps you in a multithreaded context.
>> > If you share an OUString instance between two threads, either thread
>> > could assign to it, replacing it's contents, and invalidating what the
>> > other thread sees.
>>
>> but if you share 2 copies of an OUString instance in 2 threads, they
>> could access the one underlying buffer concurrently without issue, and
>> when they want to point their copy at a different value, they can do
>> that independently of the other -- again, OUString works in exactly the
>> same way as a pointer to an immutable object here, if you copy the
>> pointer you can dereference it without issue and point your copy to a
>> different object; you only need a lock if you don't copy the pointer and
>> share a single pointer that one thread may update (which depending on
>> the situation may be necessary, say you don't just want to save memory
>> but actually always want the threads to point to the same value).
>
>  Either I don't get what immutable actually means in this context (in which
> case I'd like to be enlightened), or you are talking about things that
> actually have nothing to do with immutability. OUString is not the same like
> a pointer to an immutable object, because this object contains a reference
> count

No it does not... the underlying rtl_uString (the part that _is_
immutable) is ref-counted
but OUString itself is not.

iow: a given OUString may be changed to point to a rlt_ustring
instance or another, but cannot mess with the one it points to

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

[Libreoffice-commits] .: binfilter/legacysmgr

[Libreoffice Gerrit user]

 binfilter/legacysmgr/source/legacy/makefile.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit aa3f37a002b4e0c26ab24df2a91514df359f0254
Author: Stephan Bergmann 
Date:   Wed Oct 3 13:05:52 2012 +0200

Remove commented-out COMPnTYPELIST use

Change-Id: Ie95fc031d55f3db1e565cead25b8decb4f8d5210

diff --git a/binfilter/legacysmgr/source/legacy/makefile.mk 
b/binfilter/legacysmgr/source/legacy/makefile.mk
index f78c939..8121c1a 100644
--- a/binfilter/legacysmgr/source/legacy/makefile.mk
+++ b/binfilter/legacysmgr/source/legacy/makefile.mk
@@ -23,7 +23,6 @@ TARGET = legacy_binfilters
 USE_DEFFILE = TRUE
 NO_BSYMBOLIC = TRUE
 ENABLE_EXCEPTIONS = TRUE
-# COMP1TYPELIST = $(TARGET)
 
 # --- Settings -
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Very slow cold start due to mass of Spelling Dictionaries

[Fernand Vanrie]

The annoying slow cold start is simply due to the mass off Spelling 
Dictionaries who are standard installed as Extensions.
After deleting the not-needed maps in the share/Extensions directory, LO 
start in a Glimp. We had complains from our users (compared to OO) , so 
we made a script to delete most off this Dictionaries and now they love 
LO :-)
It could be handy to explain the reason off the slow start and deliver a 
tool  for the less technical users ?


Greetz

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

problem building branch 3.6.x

[Maxime de Roucy]

Hello

I have to work on a 3.6.x problem that doesn't appear in the master
branch.

I can build the master branch just fine with :
git clean -dfx
git pull
export PYTHON=python2
install_dir="/home/myuser/libreoffice/$1"
./autogen.sh --prefix="$install_dir/usr" \
 --exec-prefix="$install_dir/usr" --sysconfdir="$install_dir/etc" \
 --libdir="$install_dir/usr/lib" --mandir="$install_dir/usr/share/man" \
 --enable-debug --enable-dbgutil \
 --without-doxygen --disable-zenity
make

I use archlinux.

If I checkout to a 3.6 branch the build fail with :
#
…
  internal build errors:

ERROR: error 512 occurred while
making /home/max/libreoffice/3_6/dictionaries/prj

 it seems that the error is inside 'dictionaries', please re-run build
 inside this module to isolate the error and/or test your fix:

build_error.log should contain the captured output of the failed
module(s)

---
To rebuild a specific module:

make dictionaries.clean # optional
make dictionaries
…
#

If I execute :
make dictionaries.clean
make dictionaries

It fail with :
#
=
(1/1) Building module dictionaries
=
Entering /home/max/libreoffice/3_6/dictionaries/prj

---
force_dmake_to_error
Error: No makefile.mk found!
---
dmake:  Error executing 'force_dmake_to_error': No such file or
directory
dmake:  Error code -1, while making 'no_traget'

---
Oh dear - something failed during the build - sorry !
  For more help with debugging build errors, please see the section in:
http://wiki.documentfoundation.org/Development

  internal build errors:

ERROR: error 65280 occurred while
making /home/max/libreoffice/3_6/dictionaries/prj

 it seems that the error is inside 'dictionaries', please re-run build
 inside this module to isolate the error and/or test your fix:

build_error.log should contain the captured output of the failed
module(s)
#

Can you help me please ?

Thank you in advance.

-- 
Maxime de Roucy
Groupe LINAGORA - OSSA
80 rue Roque de Fillol
92800 PUTEAUX
Tel. : 0033(0)642004909



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

Re: OUString is mutable?

[Lubos Lunak]

On Monday 01 of October 2012, Michael Stahl wrote:
> On 01/10/12 11:40, Noel Grandin wrote:
> > On 2012-10-01 10:15, Stephan Bergmann wrote:
> >> While that argument is irrelevant in a C/C++ context, immutability is
> >> also an important concept when reasoning about multi-threaded code.
> >> Therefore, the distinction between OUString and OUStringBuffer IMO
> >> does make sense after all.
> >
> > I don't see how the design helps you in a multithreaded context.
> > If you share an OUString instance between two threads, either thread
> > could assign to it, replacing it's contents, and invalidating what the
> > other thread sees.
>
> but if you share 2 copies of an OUString instance in 2 threads, they
> could access the one underlying buffer concurrently without issue, and
> when they want to point their copy at a different value, they can do
> that independently of the other -- again, OUString works in exactly the
> same way as a pointer to an immutable object here, if you copy the
> pointer you can dereference it without issue and point your copy to a
> different object; you only need a lock if you don't copy the pointer and
> share a single pointer that one thread may update (which depending on
> the situation may be necessary, say you don't just want to save memory
> but actually always want the threads to point to the same value).

 Either I don't get what immutable actually means in this context (in which 
case I'd like to be enlightened), or you are talking about things that 
actually have nothing to do with immutability. OUString is not the same like 
a pointer to an immutable object, because this object contains a reference 
count (that obviously does change, for example when you point your OUString 
copy to it). What you describe is possible with OUString, but not because of 
immutability, but because OUString (or the internal object rather) is 
ref-counted copy-on-write. It should be perfectly possible to have a normally 
mutable OUString with the same abilities.

 As such, as far as I can tell, immutable OUString is only a complication with 
no practical advantages.

> > So it's really not any safer than using an OUStringBuffer.
> > It just gives the illusion of safety.
>
> doesn't seem any more illusory than other things C++ programmers are
> used to.

[citation needed]


-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: expat/README

[Libreoffice Gerrit user]

 expat/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 703009d0c5f03c48d5e092bd88d5f8db2f9ebdbb
Author: Andras Timar 
Date:   Wed Oct 3 18:11:45 2012 +0200

typo

Change-Id: I4fc3f6ca51d9ce0a18539b4911f6ddf06694b039

diff --git a/expat/README b/expat/README
index 9289284..52496b9 100644
--- a/expat/README
+++ b/expat/README
@@ -4,7 +4,7 @@ When we build expat internally ("bundled"), we build two 
variants: One
 that has an "ASCII" (actually UTF-8) API, another that has a "Unicode"
 (meaning UTF-16) API. Additionally, expat is split into two parts,
 expat_xmlparse and expat_xmltok. It's the former which has the two
-variabts, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16).
+variants, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16).
 
 Code that uses expat then declares in its .mk file which one it wants
 to use. See the magic in ../RepositoryExternal.mk, where in the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] gbuildification of languagetool

[Michael Stahl (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/753

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: config_host.mk.in configure.in languagetool/ExternalProject_languagetool.mk languagetool/Makefile languagetool/makefile.mk languagetool/Module_languagetool.mk languagetool/Pac

[Libreoffice Gerrit user]

 Makefile.top |2 
 RepositoryModule_ooo.mk  |1 
 config_host.mk.in|1 
 configure.in |2 
 languagetool/ExternalProject_languagetool.mk |   33 +
 languagetool/Makefile|7 ++
 languagetool/Module_languagetool.mk  |   22 +
 languagetool/Package_languagetool.mk |   16 ++
 languagetool/UnpackedTarball_languagetool.mk |   19 
 languagetool/makefile.mk |   64 ---
 languagetool/prj/build.lst   |3 -
 languagetool/prj/d.lst   |1 
 12 files changed, 103 insertions(+), 68 deletions(-)

New commits:
commit a51b09f105dd69837654cf2afa93124d5ecd25ff
Author: David Ostrovsky 
Date:   Wed Oct 3 00:21:51 2012 +0200

gbuildification of languagetool

It is not clear how to remove a file:
REMOVE_FILES=openoffice/images/dialogh.png.
Let it for now in place.

Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0
Reviewed-on: https://gerrit.libreoffice.org/753
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/Makefile.top b/Makefile.top
index 8e1833f..3e6f2c4 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -93,6 +93,7 @@ jurt\
 jvmaccess\
 jvmfwk\
 l10ntools\
+languagetool\
 libcdr\
 libcmis\
 libmspub\
@@ -221,7 +222,6 @@ icu\
 instsetoo_native\
 jfreereport\
 jpeg\
-languagetool\
 libcroco\
 libexttextcat\
 libgsf\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index a8153e1..8be0d6e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 jvmaccess \
 jvmfwk \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
+   $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
libcdr \
libcmis \
libmspub \
diff --git a/config_host.mk.in b/config_host.mk.in
index 9052d70..48710b1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,6 +291,7 @@ export KDE_GLIB_CFLAGS=@KDE_GLIB_CFLAGS@
 export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@
 export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
 export KDE_LIBS=@KDE_LIBS@
+export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
 export L10N_MODULE=@L10N_MODULE@
 export LCMS2_CFLAGS=@LCMS2_CFLAGS@
 export LCMS2_LIBS=@LCMS2_LIBS@
diff --git a/configure.in b/configure.in
index f8ccb94..3b54b1a 100644
--- a/configure.in
+++ b/configure.in
@@ -10898,10 +10898,12 @@ AC_MSG_CHECKING([for LanguageTool extension 
integration])
 if test "x$enable_ext_languagetool" = "xyes" -a 
"x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
 BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
+
LANGUAGETOOL_TARBALL="b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
 fi
+AC_SUBST(LANGUAGETOOL_TARBALL)
 
 dnl ===
 dnl Test whether to include oooblogger extension
diff --git a/languagetool/ExternalProject_languagetool.mk 
b/languagetool/ExternalProject_languagetool.mk
new file mode 100644
index 000..60b70e6
--- /dev/null
+++ b/languagetool/ExternalProject_languagetool.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/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,languagetool))
+
+$(eval $(call gb_ExternalProject_use_unpacked,languagetool,languagetool))
+
+$(eval $(call gb_ExternalProject_register_targets,languagetool,\
+   build \
+))
+
+$(call gb_ExternalProject_get_state_target,languagetool,build) :
+   cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
+   "$(ANT)" \
+   -q \
+   -f build.xml \
+   -Dbuild.label="build-libreoffice" \
+   $(if $(filter yes,$(JAVACISGCJ))\
+   ,-Dbuild.compiler=gcj \
+   ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+   -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+   ) \
+   $(if $(debug),-Dbuild.debug="on") \
+   -Dsolver.ooo.dir="$(OUTDIR_FOR_BUILD)/bin" dist && \
+   touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/languagetool/Makefile b/languagetool/Makefile
new file mode 100644
index 000..ccb1c85
--- /dev/null
+++ b/languagetool/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set

[PUSHED] $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/...

[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/757

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 
Gerrit-Reviewer: Luboš Luňák 

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

[Libreoffice-commits] .: saxon/ExternalProject_saxon.mk

[Libreoffice Gerrit user]

 saxon/ExternalProject_saxon.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 088a01467372a945e7f311678d3cf529cab72dcd
Author: Christian Lohmaier 
Date:   Wed Oct 3 17:15:30 2012 +0200

$SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/bin

Otherwise build won't find jsr173_1.0_api.jar, breaking the build when
using JDK 1.5 (i.e. Mac PPC and others)

Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27
Reviewed-on: https://gerrit.libreoffice.org/757
Reviewed-by: Luboš Luňák 
Tested-by: Luboš Luňák 

diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
index 03f0b94..a5c983b 100644
--- a/saxon/ExternalProject_saxon.mk
+++ b/saxon/ExternalProject_saxon.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,saxon,build) :
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
) \
$(if $(debug),-Dbuild.debug="on") \
-   -Dsolarbindir=$(SOLARBINDIR) jar-bj && \
+   -Dsolarbindir=$(OUTDIR)/bin jar-bj && \
touch $@
 
 # 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: Easy Hack FDO 53146

[Joel Madero]

I changed the name of the bug also to better reflect the problem

On Wed, Oct 3, 2012 at 8:47 AM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey,
>
> 2012/10/3 Kohei Yoshida :
> > On 10/03/2012 11:39 AM, Joel Madero wrote:
> >>
> >> Proper function is supposed to turn a text string into it's proper form
> >> which is a capitalized first letter for each word. So:
> >
> >
> > So it's a cell function, or normal auto-correct?
> >
> > Nevermind it's a cell function I just found out.
> >
> > Yup it's reproducible.
> >
>
> I'll add a comment to the bug report. The OpenFormula spec is not
> clear about how to handle this case and even contains a comment that
> this should be clarified.
>
> Regards,
> Markus
>



-- 
*Joel Madero*
LibO QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Easy Hack FDO 53146

[Markus Mohrhard]

Hey,

2012/10/3 Kohei Yoshida :
> On 10/03/2012 11:39 AM, Joel Madero wrote:
>>
>> Proper function is supposed to turn a text string into it's proper form
>> which is a capitalized first letter for each word. So:
>
>
> So it's a cell function, or normal auto-correct?
>
> Nevermind it's a cell function I just found out.
>
> Yup it's reproducible.
>

I'll add a comment to the bug report. The OpenFormula spec is not
clear about how to handle this case and even contains a comment that
this should be clarified.

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

Re: Easy Hack FDO 53146

[Kohei Yoshida]

On 10/03/2012 11:39 AM, Joel Madero wrote:

Proper function is supposed to turn a text string into it's proper form
which is a capitalized first letter for each word. So:


So it's a cell function, or normal auto-correct?

Nevermind it's a cell function I just found out.

Yup it's reproducible.

Kohei

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

Re: Easy Hack FDO 53146

[Joel Madero]

But, I just found out that MS Excel has the same problem, this shouldn't be
the case so they have the same bug ;) If this is "working as planned" the
plan isn't good as no one could ever possibly want a capitalized letter
after an apostrophe

Regards,
Joel

On Wed, Oct 3, 2012 at 8:39 AM, Joel Madero  wrote:

> Proper function is supposed to turn a text string into it's proper form
> which is a capitalized first letter for each word. So:
>
> this is a bad sentence -- turns into -- This Is A Bad Sentence
>
> Imagine a book title or the name of a proper noun. So, "don't mess with
> me" should be "Don't Mess With Me" (I know weird example).
>
> Strange that you can't reproduce, I'm able to, wonder if it's a
> localization issue?
>
> Regards,
> Joel
>
>
>
> On Wed, Oct 3, 2012 at 8:36 AM, Kohei Yoshida wrote:
>
>> On 10/03/2012 11:24 AM, Joel Madero wrote:
>>
>>> https://bugs.freedesktop.org/**show_bug.cgi?id=53146
>>>
>>> Another one that easily can be an easy hack but needs the appropriate
>>> comments by a dev and someone to accept being the "go to" if the person
>>> who takes it needs help.
>>>
>>
>> My problem is
>>
>> 1. I don't know what's meant by the "'Proper' function", and
>> 2. Assuming that this is an auto-correct issue, I can't reproduce this
>> (on Linux, using the development build).
>>
>> Kohei
>>
>> --
>> Kohei Yoshida, LibreOffice hacker, Calc
>>
>
>
>
> --
> *Joel Madero*
> LibO QA Volunteer
> jmadero@gmail.com
>
>
>


-- 
*Joel Madero*
LibO QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Easy Hack FDO 53146

[Joel Madero]

Proper function is supposed to turn a text string into it's proper form
which is a capitalized first letter for each word. So:

this is a bad sentence -- turns into -- This Is A Bad Sentence

Imagine a book title or the name of a proper noun. So, "don't mess with me"
should be "Don't Mess With Me" (I know weird example).

Strange that you can't reproduce, I'm able to, wonder if it's a
localization issue?

Regards,
Joel



On Wed, Oct 3, 2012 at 8:36 AM, Kohei Yoshida wrote:

> On 10/03/2012 11:24 AM, Joel Madero wrote:
>
>> https://bugs.freedesktop.org/**show_bug.cgi?id=53146
>>
>> Another one that easily can be an easy hack but needs the appropriate
>> comments by a dev and someone to accept being the "go to" if the person
>> who takes it needs help.
>>
>
> My problem is
>
> 1. I don't know what's meant by the "'Proper' function", and
> 2. Assuming that this is an auto-correct issue, I can't reproduce this (on
> Linux, using the development build).
>
> Kohei
>
> --
> Kohei Yoshida, LibreOffice hacker, Calc
>



-- 
*Joel Madero*
LibO QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Easy Hack FDO 53146

[Kohei Yoshida]

On 10/03/2012 11:24 AM, Joel Madero wrote:

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

Another one that easily can be an easy hack but needs the appropriate
comments by a dev and someone to accept being the "go to" if the person
who takes it needs help.


My problem is

1. I don't know what's meant by the "'Proper' function", and
2. Assuming that this is an auto-correct issue, I can't reproduce this 
(on Linux, using the development build).


Kohei

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

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

[Libreoffice Gerrit user]

 sw/inc/pam.hxx   |   12 ++--
 sw/source/core/crsr/crsrsh.cxx   |   30 +++---
 sw/source/core/crsr/crstrvl.cxx  |   10 +-
 sw/source/core/crsr/findattr.cxx |6 +++---
 sw/source/core/crsr/findtxt.cxx  |4 ++--
 sw/source/core/crsr/pam.cxx  |   36 ++--
 sw/source/core/crsr/swcrsr.cxx   |   22 +++---
 sw/source/core/crsr/trvlfnfl.cxx |4 ++--
 sw/source/core/crsr/trvlreg.cxx  |4 ++--
 sw/source/core/crsr/trvltbl.cxx  |   11 ++-
 sw/source/core/crsr/unocrsr.cxx  |6 +++---
 sw/source/core/inc/pamtyp.hxx|2 +-
 12 files changed, 74 insertions(+), 73 deletions(-)

New commits:
commit f0b5e02b323ac7520c9e1ec77ba603291e7ed325
Author: Takeshi Abe 
Date:   Thu Oct 4 00:15:11 2012 +0900

sal_Bool to bool

Change-Id: I6a4c4f4c8129100770ca976d508ca3a98e67a846

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 3f49310..83e3489 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -74,12 +74,12 @@ struct SW_DLLPUBLIC SwPosition
 */
 SwDoc * GetDoc() const;
 
-sal_Bool operator < (const SwPosition &) const;
-sal_Bool operator > (const SwPosition &) const;
-sal_Bool operator <=(const SwPosition &) const;
-sal_Bool operator >=(const SwPosition &) const;
-sal_Bool operator ==(const SwPosition &) const;
-sal_Bool operator !=(const SwPosition &) const;
+bool operator < (const SwPosition &) const;
+bool operator > (const SwPosition &) const;
+bool operator <=(const SwPosition &) const;
+bool operator >=(const SwPosition &) const;
+bool operator ==(const SwPosition &) const;
+bool operator !=(const SwPosition &) const;
 };
 
 
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e026f9b..f37a4b7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -491,7 +491,7 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool 
bAPI)
 if( pBlockCrsr )
 pBlockCrsr->clearPoints();
 
-const sal_Bool bWasAtLM =
+const bool bWasAtLM =
 ( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() );
 
 sal_Bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
@@ -1160,11 +1160,11 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
 // always switch off all cursors when painting
 SwRect aRect( rRect );
 
-sal_Bool bVis = sal_False;
+bool bVis = false;
 // if a cursor is visible then hide the SV cursor
 if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) )
 {
-bVis = sal_True;
+bVis = true;
 pVisCrsr->Hide();
 }
 
@@ -1512,7 +1512,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool 
bIdleEnd )
 // are we perhaps in a protected / hidden Section ?
 {
 SwShellCrsr* pShellCrsr = getShellCrsr( true );
-sal_Bool bChgState = sal_True;
+bool bChgState = true;
 const SwSectionNode* pSectNd = 
pShellCrsr->GetNode()->FindSectionNode();
 if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
 ( !IsReadOnlyAvailable() &&
@@ -1526,7 +1526,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool 
bIdleEnd )
 // everything protected/hidden -> special mode
 if( bAllProtect && !IsReadOnlyAvailable() &&
 pSectNd->GetSection().IsProtectFlag() )
-bChgState = sal_False;
+bChgState = false;
 else
 {
 eMvState = MV_NONE; // state for cursor travelling
@@ -1590,15 +1590,15 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, 
sal_Bool bIdleEnd )
 
 
 SwRect aOld( aCharRect );
-sal_Bool bFirst = sal_True;
+bool bFirst = true;
 SwCntntFrm *pFrm;
 int nLoopCnt = 100;
 SwShellCrsr* pShellCrsr = getShellCrsr( true );
 
 do {
-sal_Bool bAgainst;
+bool bAgainst;
 do {
-bAgainst = sal_False;
+bAgainst = false;
 pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
 &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), 
sal_False );
 // if the Frm doesn't exist anymore, the complete Layout has to be
@@ -1624,13 +1624,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, 
sal_Bool bIdleEnd )
  !pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
 {
 // look for a valid position
-sal_Bool bChgState = sal_True;
+bool bChgState = true;
 if( !FindValidCntntNode(!HasDrawView() ||
 0 == 
Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
 {
 // everything is protected / hidden -> special Mode
 if( bAllProtect )
-bChgState = sal_False;
+bChgState = false;

Easy Hack FDO 53146

[Joel Madero]

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

Another one that easily can be an easy hack but needs the appropriate
comments by a dev and someone to accept being the "go to" if the person who
takes it needs help.


Regards,
Joel

-- 
*Joel Madero*
LibO QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/...

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/757

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/757/1

$SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/bin

Otherwise build won't find jsr173_1.0_api.jar, breaking the build when
using JDK 1.5 (i.e. Mac PPC and others)

Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27
---
M saxon/ExternalProject_saxon.mk
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

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

[Libreoffice Gerrit user]

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

New commits:
commit 789a2df93fba80f6acb616d648ae40f65ef53e70
Author: Fridrich Å trba 
Date:   Wed Oct 3 17:12:31 2012 +0200

bump product version to 3.5.7.2+, release number to 2

Change-Id: Id5e81fd989168b8bfe319947d7b17c8070a1327a

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0d4c943..b1f971c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.7
-   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .2+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.7
-   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .2+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc2
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.7
-   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .2+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc2
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc2
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc2
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc2
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc2
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  rc1
+   SHORT_PRODUCTEXTENSION  rc2
 POSTVERSIONEXTENSION
  

[TRIAGE] Weekly Update

[Joel Madero]

Hi All,

Here are the stats from this week, we are clearly showing a down trend and
need more people to consistently get involved. Average bug length is up to
almost 4 months since open date and is almost 3 months since last change to
bug (comment, etc). If we could get 20 people to commit to JUST
CONFIRMING (no backtrace, no logs -- just verify that you see the bug and
mark as NEW with a quick comment) 10 bugs a week we would be in much better
shape. Confirming most bugs takes no more than 3-5 minutes.


   Date Number of Unconfirmed Bugs > 30 Days Old Average Length of Days
Since Opened Average Length of time Since Last Change Median Length of Days
Since Opened Median Length of time Since Last Change  4/9/2012 893 100 64 87
52  10/9/2012 845 103 65 86 50  17/9/2012 847 102 62 81 44  24/9/2012 890
110 66 82 46  3/10/2012 909 113 66 81 48


Important links:

Google Docs Collaboration:
https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E#gid=1

Triaging Event Doodle: http://doodle.com/3tfr888ma5cgkww4


Regards,
Joel





-- 
*Joel Madero*
LibO QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ed34f8137e1ec4f58151eba74507102192cb8fd
Author: Rene Engelhard 
Date:   Wed Oct 3 16:05:51 2012 +0200

fix POPPLER_NOT_0_20_0 check

0.20x is affected, not only 0.20. I think this should be checked
here only, though if it was 100% sure a poppler bug. But this
is at least better to the broken check before..

Change-Id: If01a4329d18d317371be11d63c66b3487f5f556b

diff --git a/configure.in b/configure.in
index 45c3d85..f8ccb94 100644
--- a/configure.in
+++ b/configure.in
@@ -9704,8 +9704,8 @@ if test "x$enable_ext_pdfimport" != "xno" -a 
"x$enable_extension_integration" !=
   SYSTEM_POPPLER=YES
   PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
   # sdext test fails with 0.20.0
-  PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler != 0.20.0,
-, [AC_MSG_ERROR([Poppler 0.20.0 is broken, do not use 
--with-system-poppler or use a different version])])
+  PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler < 0.20.0,
+, [AC_MSG_ERROR([Poppler 0.20.x is broken, do not use 
--with-system-poppler or use a different version])])
   AC_LANG_PUSH([C++])
   save_CXXFLAGS=$CXXFLAGS
   save_CPPFLAGS=$CPPFLAGS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] libreoffice-3.5.7.2 tag created (3.5.7-rc2)

[Fridrich Strba]

Hi,

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

See the attached list of changes against 3.5.7 rc1[*].


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

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

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


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

[*] The list contains fixes from 3.5.7 rc1. 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,
Fridrich


rhbz#861680 fix crash on tables in substreams [Miklos Vajna]
* {{rhbz|861680}} fix crash on tables in substreams [Miklos Vajna]
+ binfilter
+ version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2) [Fridrich Å trba]
+ core
+ bump product version to 3.5.7-rc2, release number to 2 [Fridrich Å trba]
+ bump product version to 3.5.7.1+, release number to 1 [Fridrich Å trba]
+ fix crash on tables in substreams (rhbz#861680) [Miklos Vajna]
+ version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2) [Fridrich Å trba]
+ dictionaries
+ version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2) [Fridrich Å trba]
+ help
+ version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2) [Fridrich Å trba]
+ translations
+ version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2) [Fridrich Å trba]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 l10ntools/source/merge.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit afcfb2fb26282e6e490922cca27d089b0980d071
Author: Zolnai Tamás 
Date:   Wed Oct 3 10:31:34 2012 +0200

One little correction

Change-Id: I675bd8a966b2c1654cd6547fc380a51925578835

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 5738565..23609e0 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -196,7 +196,7 @@ MergeDataFile::MergeDataFile(
 }
 catch( PoHeader::Exception& aException )
 {
-if( aException = PoHeader::NOLANG )
+if( aException == PoHeader::NOLANG )
 {
 printf(
 "Warning : %s' header not has language specification\n",
___
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 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3bf6418a86cb0d9771f3a7b715e894bc02ae313
Author: Zolnai Tamás 
Date:   Wed Oct 3 10:25:46 2012 +0200

Correct ulfex to ignore comments

Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 264b50c..fcab696 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -232,7 +232,7 @@ sal_Bool LngParser::Merge(
 {
 sal_Int32 n = 0;
 rtl::OString sLang(sLine.getToken(0, '=', n));
-if (n == -1)
+if (n == -1 || static_cast(sLine.match("/*")))
 {
 ++nPos;
 }
___
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/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/orcusfilters.hxx |5 -
 sc/source/filter/inc/orcusfiltersimpl.hxx   |4 +++-
 sc/source/filter/orcus/orcusfiltersimpl.cxx |   17 +
 sc/source/ui/inc/xmlsourcedlg.hxx   |4 ++--
 sc/source/ui/src/xmlsourcedlg.src   |6 ++
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   12 
 6 files changed, 32 insertions(+), 16 deletions(-)

New commits:
commit 159319f96eeb88bc11b86ea2bfd47d90a3bd050a
Author: Kohei Yoshida 
Date:   Wed Oct 3 10:33:09 2012 -0400

Use different icon for recurring elements.

Change-Id: I3869e4a1f2f4b68d57641395daaf79d911a1a891

diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 2379c67..2ec5a49 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -14,6 +14,7 @@
 
 class ScDocument;
 class SvTreeListBox;
+class Image;
 
 /**
  * Collection of orcus filter wrappers.
@@ -25,7 +26,9 @@ public:
 
 virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const 
= 0;
 
-virtual bool loadXMLStructure(const rtl::OUString& rPath, SvTreeListBox& 
rTree) const = 0;
+virtual bool loadXMLStructure(
+   SvTreeListBox& rTreeCtrl, const rtl::OUString& rPath,
+   const Image& rImgDefaultElem, const Image& rImgRepeatElem) const = 0;
 };
 
 #endif
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx 
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index f51f00f..311b6e0 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -17,7 +17,9 @@ class ScOrcusFiltersImpl : public ScOrcusFilters
 public:
 virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const;
 
-virtual bool loadXMLStructure(const rtl::OUString& rPath, SvTreeListBox& 
rTree) const;
+virtual bool loadXMLStructure(
+   SvTreeListBox& rTreeCtrl, const rtl::OUString& rPath,
+   const Image& rImgDefaultElem, const Image& rImgRepeatElem) const;
 };
 
 #endif
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 721e5ee..8453043 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -175,12 +175,18 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, 
const OUString& rPath) cons
 
 void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
-   const orcus::xml_structure_tree::element_name& rElemName, bool bRepeat, 
SvLBoxEntry* pParent)
+   const orcus::xml_structure_tree::element_name& rElemName, bool bRepeat, 
const Image& rImgRepeatElem, SvLBoxEntry* pParent)
 {
 // TODO: Make use of bRepeat flag.
 
 OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
 SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
+if (bRepeat)
+{
+rTreeCtrl.SetExpandedEntryBmp(pEntry, rImgRepeatElem);
+rTreeCtrl.SetCollapsedEntryBmp(pEntry, rImgRepeatElem);
+}
+
 if (pParent)
 rTreeCtrl.Expand(pParent);
 
@@ -192,12 +198,13 @@ void populateTree(
 for (; it != itEnd; ++it)
 {
 orcus::xml_structure_tree::element aElem = rWalker.descend(*it);
-populateTree(rTreeCtrl, rWalker, *it, aElem.repeat, pEntry);
+populateTree(rTreeCtrl, rWalker, *it, aElem.repeat, rImgRepeatElem, 
pEntry);
 rWalker.ascend();
 }
 }
 
-bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& rTreeCtrl) const
+bool ScOrcusFiltersImpl::loadXMLStructure(
+   SvTreeListBox& rTreeCtrl, const rtl::OUString& rPath, const Image& 
rImgDefaultElem, const Image& rImgRepeatElem) const
 {
 INetURLObject aURL(rPath);
 OString aSysPath = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8);
@@ -217,12 +224,14 @@ bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& 
rPath, SvTreeListBox&
 aXmlTree.parse(&aStrm[0], aStrm.size());
 
 rTreeCtrl.Clear();
+rTreeCtrl.SetDefaultCollapsedEntryBmp(rImgDefaultElem);
+rTreeCtrl.SetDefaultExpandedEntryBmp(rImgDefaultElem);
 
 orcus::xml_structure_tree::walker aWalker = aXmlTree.get_walker();
 
 // Root element.
 orcus::xml_structure_tree::element aElem = aWalker.root();
-populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, NULL);
+populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, 
rImgRepeatElem, NULL);
 }
 catch (const std::exception&)
 {
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 6e32d12..b6fb2ba 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -23,8 +23,6 @@ class ScDocument;
 
 class ScXMLSourceTree : public SvTreeListBox
 {
-Image maImgElemDefault;
-Image maImgElemRepeat;
 public:
 ScXMLSourceTree(Window* pParent, const ResId& rResId);
 };
@@ -42,6 +40,8 @@ class ScXMLSourceDlg : public ModalDia

Remove unused methods

[Marcos Souza (via Code Review)]

Marcos Souza has abandoned this change.

Change subject: Remove unused methods
..


Patch Set 1: Abandoned

Already applied in master

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I8fc47c39ede4e5b06af2144667ede5e9c2d5b397
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 

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

[PUSHED 3-6] Re: [PATCH][REVIEW 3-6] fdo#52268: splash: change color and position of messages

[Jan Holesovsky]

Hi Ivan,

Ivan Timofeev píše v Út 02. 10. 2012 v 21:00 +0400:

> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=a9097843e6b2935dcab9f038b80e5a51bc5cfc94
> 
> oh, right, I forgot about that, thanks! You have my sign-off.
[...]
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=509d964e985b58ddc4c20ccc163809a6f3623d8a
[...]
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d25eea6949196d2275d8b2bd484e6dab0163a33
> 
> Could you please cherry-pick these two commits to 3-6 as well?

Thank you, pushed all 3 to libreoffice-3-6 :-)

All the best,
Kendy

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - configure.in desktop/source

[Libreoffice Gerrit user]

 configure.in |   14 ++
 desktop/source/splash/splash.cxx |1 +
 2 files changed, 15 insertions(+)

New commits:
commit c3064a250a912cb9b02419981a3f6a0b55899f2b
Author: Ivan Timofeev 
Date:   Tue Oct 2 20:53:27 2012 +0400

splash screen: fix RTL mode

Change-Id: I6a00cba8fda11351ed5340f21678c330ce028a2d
Signed-off-by: Jan Holesovsky 

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 6678aa8..48510b1 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -157,6 +157,7 @@ SplashScreen::SplashScreen()
 , _yoffset(18)
 {
 loadConfig();
+_vdev.EnableRTL(IsRTLEnabled());
 }
 
 SplashScreen::~SplashScreen()
commit 73331a70d4337a48901742627fb80a45dec2
Author: Ivan Timofeev 
Date:   Tue Oct 2 20:43:41 2012 +0400

correct help string: horizontal -> vertical

Change-Id: Id67da9d90a8fa21b99733c448fc32e81c6f1ab46
Signed-off-by: Jan Holesovsky 

diff --git a/configure.in b/configure.in
index f862327..b2ae537 100644
--- a/configure.in
+++ b/configure.in
@@ -1831,7 +1831,7 @@ AC_ARG_WITH(intro-progressbar-text-color,
 
 AC_ARG_WITH(intro-progressbar-text-baseline,
 AS_HELP_STRING([--with-intro-progressbar-text-baseline],
-[Set horizontal position of progress bar text on intro screen. Value 
in decimal format.])
+[Set vertical position of progress bar text on intro screen. Value in 
decimal format.])
 [
   Usage: --with-intro-progressbar-text-baseline=250
 ],,)
commit 4256f704057d13c5a95461c4cf0a404ede551286
Author: Jan Holesovsky 
Date:   Tue Oct 2 16:00:09 2012 +0200

Help text for newly introduced switches.

Change-Id: I3f148d0dd61adc7008fdf64d077818c22a0e7d09
Signed-off-by: Ivan Timofeev 

diff --git a/configure.in b/configure.in
index 651963a..f862327 100644
--- a/configure.in
+++ b/configure.in
@@ -1822,6 +1822,20 @@ AC_ARG_WITH(intro-progressbar-frame-color,
   Usage: 
--with-intro-progressbar-frame-color=207,208,211
 ],,)
 
+AC_ARG_WITH(intro-progressbar-text-color,
+AS_HELP_STRING([--with-intro-progressbar-text-color],
+[Set color of progress bar text on intro screen. Comma separated RGB 
values in decimal format.])
+[
+  Usage: 
--with-intro-progressbar-text-color=207,208,211
+],,)
+
+AC_ARG_WITH(intro-progressbar-text-baseline,
+AS_HELP_STRING([--with-intro-progressbar-text-baseline],
+[Set horizontal position of progress bar text on intro screen. Value 
in decimal format.])
+[
+  Usage: --with-intro-progressbar-text-baseline=250
+],,)
+
 AC_ARG_WITH(flat-logo-svg,
 [  --with-flat-logo-svgAllows specification of the flat Logo SVG.
 
___
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/filter/orcus/orcusfiltersimpl.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit a017989394f3e420647678d0b7e8eb882794c6ed
Author: Kohei Yoshida 
Date:   Wed Oct 3 10:00:36 2012 -0400

Pass the 'repeat' flag of each element too, for recurring elements.

Change-Id: I2d5ad0724b45d448b18a04ec58f5f06c7aa86e2b

diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index b07647b..721e5ee 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -175,8 +175,10 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const 
OUString& rPath) cons
 
 void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
-   const orcus::xml_structure_tree::element_name& rElemName, SvLBoxEntry* 
pParent)
+   const orcus::xml_structure_tree::element_name& rElemName, bool bRepeat, 
SvLBoxEntry* pParent)
 {
+// TODO: Make use of bRepeat flag.
+
 OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
 SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
 if (pParent)
@@ -189,8 +191,8 @@ void populateTree(
 orcus::xml_structure_tree::element_names_type::const_iterator itEnd = 
aChildElements.end();
 for (; it != itEnd; ++it)
 {
-rWalker.descend(*it);
-populateTree(rTreeCtrl, rWalker, *it, pEntry);
+orcus::xml_structure_tree::element aElem = rWalker.descend(*it);
+populateTree(rTreeCtrl, rWalker, *it, aElem.repeat, pEntry);
 rWalker.ascend();
 }
 }
@@ -220,7 +222,7 @@ bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& 
rPath, SvTreeListBox&
 
 // Root element.
 orcus::xml_structure_tree::element aElem = aWalker.root();
-populateTree(rTreeCtrl, aWalker, aElem.name, NULL);
+populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, NULL);
 }
 catch (const std::exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/doctemplates.cxx |4 
 sfx2/source/doc/docvor.cxx   |   16 
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 02394b10d348aeabcbaceaa7659794a6b74a3768
Author: Cédric Bosdonnat 
Date:   Wed Oct 3 15:38:54 2012 +0200

n#782597: Allow adding external templates

Change-Id: I56d5a716795b7303a77194964a612c550f25eeec

diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 25ed459..281e1c7 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -678,8 +678,6 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const 
OUString& rURL, OUString&
 }
 catch ( Exception& )
 {
-// the document is not a StarOffice document
-return sal_False;
 }
 
 try
@@ -2014,7 +2012,6 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const 
OUString& rGroupName,
 // Get the content type
 OUString aTitle, aType, aTargetURL2, aFullName;
 
-// only StarOffice documents are acceptable
 sal_Bool bDocHasTitle = sal_False;
 if( !getTitleFromURL( rSourceURL, aTitle, aType, bDocHasTitle ) )
 return sal_False;
@@ -2573,7 +2570,6 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& 
rList,
 if ( aChildTitle.compareToAscii( "sfx.tlx" ) == 0 || 
aChildTitle == "groupuinames.xml" )
 continue;
 
-// only StarOffice templates are accepted
 sal_Bool bDocHasTitle = sal_False;
 if( !getTitleFromURL( aTargetURL, aChildTitle, aType, 
bDocHasTitle ) )
 continue;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index cf016f3..2c28cd3 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1548,7 +1548,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, 
const String& rFileNam
 pFileDlg->SetDisplayDirectory( aObj.GetMainURL( 
INetURLObject::NO_DECODE ) );
 }
 
-pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ImportHdl ) 
);
+pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ExportHdl ) 
);
 
 return aPath;
 }
@@ -1592,18 +1592,18 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool 
bOpen, const String& rFileNam
 // add filters of modules which are installed
 SvtModuleOptions aModuleOpt;
 if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-sFilterExt += DEFINE_CONST_UNICODE( "*.ott;*.stw;*.oth" );
+sFilterExt += DEFINE_CONST_UNICODE( 
"*.ott;*.stw;*.oth;*.dot;*.dotm;*.dotx" );
 if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
 {
 if ( sFilterExt.Len() > 0 )
 sFilterExt += ';';
-sFilterExt += DEFINE_CONST_UNICODE( "*.ots;*.stc" );
+sFilterExt += DEFINE_CONST_UNICODE( "*.ots;*.stci;*.xlt;*.xltm;*.xltm" 
);
 }
 if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
 {
 if ( sFilterExt.Len() > 0 )
 sFilterExt += ';';
-sFilterExt += DEFINE_CONST_UNICODE( "*.otp;*.sti" );
+sFilterExt += DEFINE_CONST_UNICODE( "*.otp;*.sti;*.pot;*.potm;*.potx" 
);
 }
 if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
 {
@@ -1644,7 +1644,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, 
const String& rFileNam
 pFileDlg->SetDisplayDirectory( aObj.GetMainURL( 
INetURLObject::NO_DECODE ) );
 }
 
-pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ExportHdl ) 
);
+pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ImportHdl ) 
);
 
 return aPaths;
 }
@@ -2225,9 +2225,9 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AddFiles_Impl, Button *, 
pButton )
 
 //-
 
-IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl)
+IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl)
 {
-DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" );
+DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ExportHdl(): no file dialog" );
 
 if ( ERRCODE_NONE == pFileDlg->GetError() )
 {
@@ -2262,7 +2262,7 @@ IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl)
 
 //-
 
-IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl)
+IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl)
 {
 DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" );
 ::com::sun::star::uno::Sequence< ::rtl::OUString > aPaths;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[found PUSHED master+3.6] Re: [PATCH] fix for fdo#53673 label documents broken since version 3.6.0

[Jan Holesovsky]

Hi Winfried,

Winfried Donkers píše v Pá 28. 09. 2012 v 12:23 +0200:

> Attached is a fix for bug 53673.
> 
> Possibly the deeper cause of the bug is in Writer document
> save-functions, therefor I do not intend to close the bug after this
> fax has been pushed.

Thanks a lot for the fix!  Cedric pushed that yesterday (both to master
and libreoffice-3-6), just forgot to notify you :-)

All the best,
Kendy


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

Re: [PUSHED][PATCH] fix for fdo#53673 label documents broken since version 3.6.0

[Cedric Bosdonnat]

Hello Winfried,

Thanks for your patch. It seems correct to me, and I pushed it to master
and libreoffice-3.6.

--
Cedric

On Fri, 2012-09-28 at 12:23 +0200, Winfried Donkers wrote:
> Attached is a fix for bug 53673.
> 
> Possibly the deeper cause of the bug is in Writer document
> save-functions, therefor I do not intend to close the bug after this
> fax has been pushed.
> 
>  
> 
> The fix is a simplification of the code and produces documents with
> frames that represent the labels in a better way. Before this fix, the
> frames represented a label including its left/bottom gap to the next
> label as a margin. After this fix, the frames represent the label
> itself and the frames are positioned on the coorect location (anchored
> to the page).
> 
>  
> 
> (Not yet via gerrit; I must study on ssh keys first…)
> 
>  
> 
>  
> 
>  
> 
> Winfried
> 
>  
> 
> 
> ___
> 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] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/orcus/orcusfiltersimpl.cxx |   32 ++--
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 5ccf7847b43018e4afdbac1c94dffe22ab1dabc5
Author: Kohei Yoshida 
Date:   Wed Oct 3 09:51:52 2012 -0400

A little cleanup.

Change-Id: I04ac6b95fec116f13507f8f012320d522120fef3

diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 0afaee4..b07647b 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -173,12 +173,14 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, 
const OUString& rPath) cons
 return true;
 }
 
-void populateTree(SvTreeListBox& rTree, orcus::xml_structure_tree::walker& 
rWalker, const orcus::xml_structure_tree::element_name& rElemName, SvLBoxEntry* 
pParent)
+void populateTree(
+   SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
+   const orcus::xml_structure_tree::element_name& rElemName, SvLBoxEntry* 
pParent)
 {
 OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
-SvLBoxEntry* pEntry = rTree.InsertEntry(aName, pParent);
+SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
 if (pParent)
-rTree.Expand(pParent);
+rTreeCtrl.Expand(pParent);
 
 orcus::xml_structure_tree::element_names_type aChildElements;
 rWalker.get_children(aChildElements);
@@ -188,12 +190,12 @@ void populateTree(SvTreeListBox& rTree, 
orcus::xml_structure_tree::walker& rWalk
 for (; it != itEnd; ++it)
 {
 rWalker.descend(*it);
-populateTree(rTree, rWalker, *it, pEntry);
+populateTree(rTreeCtrl, rWalker, *it, pEntry);
 rWalker.ascend();
 }
 }
 
-bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& rTree) const
+bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& rTreeCtrl) const
 {
 INetURLObject aURL(rPath);
 OString aSysPath = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8);
@@ -207,10 +209,18 @@ bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& 
rPath, SvTreeListBox&
 return false;
 
 orcus::xmlns_repository aNsRepo; // xml namespace repository.
-orcus::xml_structure_tree aTree(aNsRepo);
+orcus::xml_structure_tree aXmlTree(aNsRepo);
 try
 {
-aTree.parse(&aStrm[0], aStrm.size());
+aXmlTree.parse(&aStrm[0], aStrm.size());
+
+rTreeCtrl.Clear();
+
+orcus::xml_structure_tree::walker aWalker = aXmlTree.get_walker();
+
+// Root element.
+orcus::xml_structure_tree::element aElem = aWalker.root();
+populateTree(rTreeCtrl, aWalker, aElem.name, NULL);
 }
 catch (const std::exception&)
 {
@@ -218,14 +228,6 @@ bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& 
rPath, SvTreeListBox&
 return false;
 }
 
-rTree.Clear();
-
-orcus::xml_structure_tree::walker aWalker = aTree.get_walker();
-
-// Root element.
-orcus::xml_structure_tree::element aElem = aWalker.root();
-populateTree(rTree, aWalker, aElem.name, NULL);
-
 return true;
 }
 
___
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/filter/orcus/orcusfiltersimpl.cxx |   54 ++--
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |9 
 2 files changed, 51 insertions(+), 12 deletions(-)

New commits:
commit c90b17535f7580f55e670305bd5ca3bbfc0636d3
Author: Kohei Yoshida 
Date:   Wed Oct 3 09:47:07 2012 -0400

Populate the tree box with real xml structure tree.

Change-Id: Ia91340cee5e25b118ae72a62e0d94cdc976bc14e

diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index e5c5507..0afaee4 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -17,6 +17,9 @@
 #define __ORCUS_STATIC_LIB
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -170,14 +173,59 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, 
const OUString& rPath) cons
 return true;
 }
 
-bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& /*rTree*/) const
+void populateTree(SvTreeListBox& rTree, orcus::xml_structure_tree::walker& 
rWalker, const orcus::xml_structure_tree::element_name& rElemName, SvLBoxEntry* 
pParent)
+{
+OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
+SvLBoxEntry* pEntry = rTree.InsertEntry(aName, pParent);
+if (pParent)
+rTree.Expand(pParent);
+
+orcus::xml_structure_tree::element_names_type aChildElements;
+rWalker.get_children(aChildElements);
+
+orcus::xml_structure_tree::element_names_type::const_iterator it = 
aChildElements.begin();
+orcus::xml_structure_tree::element_names_type::const_iterator itEnd = 
aChildElements.end();
+for (; it != itEnd; ++it)
+{
+rWalker.descend(*it);
+populateTree(rTree, rWalker, *it, pEntry);
+rWalker.ascend();
+}
+}
+
+bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& rTree) const
 {
 INetURLObject aURL(rPath);
 OString aSysPath = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8);
 const char* path = aSysPath.getStr();
-fprintf(stdout, "ScOrcusFiltersImpl::loadXMLStructure:   path = '%s'\n", 
path);
 
-// TODO: Load the tree box.
+// TODO: Use our own stream loading call instead of one from orcus.
+std::string aStrm;
+orcus::load_file_content(path, aStrm);
+
+if (aStrm.empty())
+return false;
+
+orcus::xmlns_repository aNsRepo; // xml namespace repository.
+orcus::xml_structure_tree aTree(aNsRepo);
+try
+{
+aTree.parse(&aStrm[0], aStrm.size());
+}
+catch (const std::exception&)
+{
+// Parsing of this XML file failed.
+return false;
+}
+
+rTree.Clear();
+
+orcus::xml_structure_tree::walker aWalker = aTree.get_walker();
+
+// Root element.
+orcus::xml_structure_tree::element aElem = aWalker.root();
+populateTree(rTree, aWalker, aElem.name, NULL);
+
 return true;
 }
 
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e94d132..39ccbe5 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -29,15 +29,6 @@ ScXMLSourceTree::ScXMLSourceTree(Window* pParent, const 
ResId& rResId) :
 {
 SetDefaultExpandedEntryBmp(maImgElemDefault);
 SetDefaultCollapsedEntryBmp(maImgElemDefault);
-
-SvLBoxEntry* p = InsertEntry(OUString("Test1"));
-p = InsertEntry(OUString("Test2"));
-SvLBoxEntry* pPar = p;
-p = InsertEntry(OUString("Test3"), p);
-Expand(pPar);
-pPar = p;
-p = InsertEntry(OUString("Test4"), p);
-Expand(pPar);
 }
 
 ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent, ScDocument* pDoc) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: expat/README

[Libreoffice Gerrit user]

 expat/README |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 325309a7774e10fea79d92f424ae398ea242d142
Author: Tor Lillqvist 
Date:   Wed Oct 3 16:39:54 2012 +0300

Mention the disable-dynloading issue

Change-Id: I6d2349b8c4d97d266faebdb630c65e0441e25b18

diff --git a/expat/README b/expat/README
index 1af9889..9289284 100644
--- a/expat/README
+++ b/expat/README
@@ -36,5 +36,14 @@ libexpat in builds where that is used, why is a separate 
Unicode one
 needed when an internal expat is used? Good question. Next
 question. Patches welcome.
 
+Another interesting issue is the disable-dynloading case: When we link
+all needed LO code into one executable (as for iOS apps) or into one
+shared library (as in a tentative approach for Android apps) there is
+a problem with linking two libraries (ascii_expat_xmlparse and
+expat_xmlparse) that contain exactly the same symbols... Obviously
+just the one that happens to be mentioned first on the linking command
+line gets linked in, and code that then thinks it is calling the other
+one will mysteriously crash or silently fail. Working on that...
+
 From:
 [http://expat.sourceforge.net/]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: expat/README

[Libreoffice Gerrit user]

 expat/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bd77ca9974b9467df38921c55ed80b3e5d3dae3
Author: Tor Lillqvist 
Date:   Wed Oct 3 16:29:13 2012 +0300

s/UCS2/UTF-16

Change-Id: I2be40b7897c3277e2d8673b440aa6dd682086267

diff --git a/expat/README b/expat/README
index a3f8399..1af9889 100644
--- a/expat/README
+++ b/expat/README
@@ -1,4 +1,4 @@
-Simple SAX parser library with added UCS2 support.
+Simple SAX parser library with added UTF-16 support.
 
 When we build expat internally ("bundled"), we build two variants: One
 that has an "ASCII" (actually UTF-8) API, another that has a "Unicode"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: translations/CustomTarget_translate.mk

[Libreoffice Gerrit user]

 translations/CustomTarget_translate.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90b5d08e5f9e727693085c56684b6009ad945392
Author: Stephan Bergmann 
Date:   Wed Oct 3 15:27:26 2012 +0200

Missing backslash at end of line

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index e7aeab7..0bb96dd 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -62,7 +62,7 @@ $(translations_DIR)/merge.done : \
 $(translations_DIR)/sdf-l10n/%.sdf : \
$(translations_DIR)/sdf-template/en-US.sdf \
$(OUTDIR_FOR_BUILD)/bin/po2lo \
-   | $(translations_DIR)/sdf-l10n/.dir
+   | $(translations_DIR)/sdf-l10n/.dir \
  $(gb_PYTHONTARGET)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
$(call gb_Helper_abbreviate_dirs, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: expat/README

[Libreoffice Gerrit user]

 expat/README |   36 
 1 file changed, 36 insertions(+)

New commits:
commit a29217cc273de1faad8c3522bc23a11d650addbf
Author: Tor Lillqvist 
Date:   Wed Oct 3 16:17:34 2012 +0300

More information

Change-Id: I9f9a85cbe74dfb22a2dff67e8a0b7dd4eca6ebf6

diff --git a/expat/README b/expat/README
index 9d39ccf..a3f8399 100644
--- a/expat/README
+++ b/expat/README
@@ -1,4 +1,40 @@
 Simple SAX parser library with added UCS2 support.
 
+When we build expat internally ("bundled"), we build two variants: One
+that has an "ASCII" (actually UTF-8) API, another that has a "Unicode"
+(meaning UTF-16) API. Additionally, expat is split into two parts,
+expat_xmlparse and expat_xmltok. It's the former which has the two
+variabts, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16).
+
+Code that uses expat then declares in its .mk file which one it wants
+to use. See the magic in ../RepositoryExternal.mk, where in the
+expat_utf16 case -DXML_UNICODE is passed when compiling source code
+that wants to use the UTF-16 variant.
+
+Now, this sounds fairly clear so far.
+
+But wait. LO can also be conigured to use a *system* expat
+library. The System expat library is only available as one variant,
+the "ASCII" one. (But the library is still called just "libexpat", no
+"ascii" in the name, that is just LO/OO's convention.) So how does
+this work then, how can the code that wants to use the UTF-16 expat
+API then actually use the "ASCII" (UTF-8) expat API? Well, in the
+SYSTEM_EXPAT case no -DXML_UNICODE is used, so the code needs to check
+that and adapt. So in the system libexpat case, mentioning expat_utf16
+in a .mk file doesn't mean any UTF-16-using libexpat would actually be
+used.
+
+Yeah, this is silly, confusing, etc.
+
+Furthermore, at least Debian actually *does* have also a "Unicode"
+expat library, called libexpatw. Debian's LO does not use that,
+though. (Using it would require modifications to the LO build
+machinery.)
+
+Now, if LO manages just fine with just the UTF-8 (or, "ASCII") system
+libexpat in builds where that is used, why is a separate Unicode one
+needed when an internal expat is used? Good question. Next
+question. Patches welcome.
+
 From:
 [http://expat.sourceforge.net/]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 53673, which changed state.

Bug 53673 Summary: [LABELS][MAILMERGE] Labels broken with mailmerge
https://bugs.freedesktop.org/show_bug.cgi?id=53673

   What|Removed |Added

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

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

[Libreoffice-commits] .: mdds/UnpackedTarball_mdds.mk

[Libreoffice Gerrit user]

 mdds/UnpackedTarball_mdds.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit da7f5e0e946e4bad87da06754709ac29eea9ab81
Author: David Tardon 
Date:   Wed Oct 3 15:04:41 2012 +0200

adjust patch level for mdds too

Change-Id: I9826efc4733d1351047a35a13eaf4730da7859bb

diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index fd0d4a1..00da864 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
+
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-gcc-bug.patch \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android-single-dso' - expat/expat-2.1.0.patch fontconfig/fontconfig-2.8.0.patch

[Libreoffice Gerrit user]

 expat/expat-2.1.0.patch   |   90 ++
 fontconfig/fontconfig-2.8.0.patch |   20 
 2 files changed, 110 insertions(+)

New commits:
commit dafb49509556970367caa84257aa4852c3727ba9
Author: Tor Lillqvist 
Date:   Wed Oct 3 15:21:15 2012 +0300

Use different symbol names in the two expat variants we build

We need to be able to link both into one binary in the
disable-dynloading case.

Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f

diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch
index 875e41d..28d6322 100644
--- a/expat/expat-2.1.0.patch
+++ b/expat/expat-2.1.0.patch
@@ -92,3 +92,93 @@
 +.INCLUDE :  set_wntx64.mk
 +.INCLUDE :target.mk
 +.INCLUDE :  tg_wntx64.mk
+--- misc/expat-2.1.0/lib/expat_external.h
 misc/build/expat-2.1.0/lib/expat_external.h
+@@ -86,9 +86,11 @@
+ typedef unsigned short XML_Char;
+ typedef char XML_LChar;
+ #endif /* XML_UNICODE_WCHAR_T */
++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16
+ #else  /* Information is UTF-8 encoded. */
+ typedef char XML_Char;
+ typedef char XML_LChar;
++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8
+ #endif /* XML_UNICODE */
+ 
+ #ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
+--- misc/expat-2.1.0/lib/expat.h
 misc/build/expat-2.1.0/lib/expat.h
+@@ -15,6 +15,73 @@
+ #include 
+ #include "expat_external.h"
+ 
++#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent)
++#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString)
++#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion)
++#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo)
++#define XML_ExternalEntityParserCreate 
EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate)
++#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel)
++#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase)
++#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer)
++#define XML_GetCurrentByteCount 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount)
++#define XML_GetCurrentByteIndex 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex)
++#define XML_GetCurrentColumnNumber 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber)
++#define XML_GetCurrentLineNumber 
EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber)
++#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode)
++#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList)
++#define XML_GetIdAttributeIndex 
EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex)
++#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext)
++#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus)
++#define XML_GetSpecifiedAttributeCount 
EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount)
++#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree)
++#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc)
++#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc)
++#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse)
++#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer)
++#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate)
++#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS)
++#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM)
++#define XML_ParserFree EXPAT_CHARTYPE_DECORATE(XML_ParserFree)
++#define XML_ParserReset EXPAT_CHARTYPE_DECORATE(XML_ParserReset)
++#define XML_ResumeParser EXPAT_CHARTYPE_DECORATE(XML_ResumeParser)
++#define XML_SetAttlistDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetAttlistDeclHandler)
++#define XML_SetBase EXPAT_CHARTYPE_DECORATE(XML_SetBase)
++#define XML_SetCdataSectionHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetCdataSectionHandler)
++#define XML_SetCharacterDataHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetCharacterDataHandler)
++#define XML_SetCommentHandler EXPAT_CHARTYPE_DECORATE(XML_SetCommentHandler)
++#define XML_SetDefaultHandler EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandler)
++#define XML_SetDefaultHandlerExpand 
EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandlerExpand)
++#define XML_SetDoctypeDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetDoctypeDeclHandler)
++#define XML_SetElementDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetElementDeclHandler)
++#define XML_SetElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementHandler)
++#define XML_SetEncoding EXPAT_CHARTYPE_DECORATE(XML_SetEncoding)
++#define XML_SetEndCdataSectionHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndCdataSectionHandler)
++#define XML_SetEndDoctypeDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndDoctypeDeclHandler)
++#define XML_SetEndElementHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndElementHandler)
++#define XML_SetEndNamespaceDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEndNamespaceDeclHandler)
++#define XML_SetEntityDeclHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetEntityDeclHandler)
++#define XML_SetExternalEntityRefHandler 
EXPAT_CHARTYPE_DECORATE(XML_SetExternal

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper.cxx |   18 --
 writerfilter/source/dmapper/PropertyMap.hxx  |2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 3413841785496171a7a91a371355a7efc6ca0a2f
Author: Luboš Luňák 
Date:   Thu Sep 20 18:26:03 2012 +0200

probably a rather ugly hack for inline text frame in a table (bnc#780851)

Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 64618bf..c5a42a9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1273,8 +1273,22 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 case  
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center  :nIntValue = 
text::VertOrientation::CENTER;break;
 case  
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom  :
 case  
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_outside :nIntValue = 
text::VertOrientation::BOTTOM;break;
-case  
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline  ://todo: what to do with 
inline - no avail. in WW97 and WW2007
-//no break;
+case  
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline  :
+{
+// HACK: This is for bnc#780851, where a table has 
one cell that has w:framePr,
+// which causes that paragraph to be converted to 
a text frame, and the original
+// paragraph object no longer exists, which makes 
table creation fail and futhermore
+// it would be missing in the table layout anyway. 
So actually no letting that paragraph
+// be a text frame "fixes" it. I'm not sure what 
"inline" is supposed to mean in practice
+// anyway, so as long as this doesn't cause 
trouble elsewhere ...
+PropertyMapPtr pContext = 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
+if( pContext.get() )
+{
+ParagraphPropertyMap* pParaContext = 
dynamic_cast< ParagraphPropertyMap* >( pContext.get() );
+pParaContext->SetFrameMode(false);
+}
+nIntValue = text::VertOrientation::NONE;
+}
 default:nIntValue = text::VertOrientation::NONE;
 }
 pParaProperties->SetyAlign( nIntValue );
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx 
b/writerfilter/source/dmapper/PropertyMap.hxx
index fc88ddb..d19988a 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -305,7 +305,7 @@ public:
 
 int operator==(const ParagraphProperties&); //does not compare the 
starting/ending range, m_sParaStyleName and m_nDropCapLength
 
-voidSetFrameMode() { m_bFrameMode = true; }
+voidSetFrameMode( bool set = true ) { m_bFrameMode = set; }
 boolIsFrameMode()const { return m_bFrameMode; }
 
 void SetDropCap( sal_Int32 nSet ) { m_nDropCap = nSet; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6] follow up to previous patches for fdo#52998 fdo#52999

[Noel Power]

On 03/10/12 09:51, Michael Meeks wrote:

Hi Noel,

On Thu, 2012-08-16 at 13:56 +0100, Noel Power wrote:

while the previous patches improved things ( and the comments
(re)imported nicely into calc ) the export xlsx didn't load so nicely in
Excel

Hey ho - shame no-one reviewed this in time for 3.6 and it dropped
between the cracks. Any other un-reviewed back-ports that you're aware
of Noel ? :-)
short answer is I don't know, tend to fire and forget, I will try and 
check back


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

Re: Adjusting an Array Range in Calc

[Jan Holesovsky]

Hi Lars,

Lars Callenbach píše v Pá 21. 09. 2012 v 23:10 +0200:

> Are there other C++ functions that need to be included in the defintion of the
> addin? Something seems to be missing ...

Thank you for the detailed description!  Unfortunately I myself do not
know the answer :-( - adding Calc experts + component expert to CC,
hopefully somebody of them will be able to help you.

All the best,
Kendy

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

[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |2 +-
 writerfilter/source/dmapper/GraphicImport.cxx |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ecb252af18f64b99f4ecfe34512dedfb7655fb40
Author: Cédric Bosdonnat 
Date:   Wed Oct 3 14:38:04 2012 +0200

testShadow: test shadow width to be non-0 to avoid precision errors

Change-Id: I956f2c7f55d7e4966971bc310858967298d2933d

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ceb2381..acc2097 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -990,7 +990,7 @@ void Test::testShadow()
 
 table::ShadowFormat aShadow;
 xPropertySet->getPropertyValue("ShadowFormat") >>= aShadow;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(273), sal_Int32(aShadow.ShadowWidth));
+CPPUNIT_ASSERT(sal_Int32(aShadow.ShadowWidth) > 0);
 }
 
 void Test::testN782061()
commit f1fc7c5655dde547b721b3afffabcd8bdbe0add2
Author: Cédric Bosdonnat 
Date:   Wed Oct 3 14:11:31 2012 +0200

fdo#44278: fix leaked image when import docx

Unused temporary XShape need to be disposed to avoid remaining garbage
in the document.

Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index cbd59f9..9042f80 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -922,6 +922,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
uno::makeAny( aSize.Height ) );
 xGraphProps->setPropertyValue("Width",
uno::makeAny( aSize.Width ) );
+
+// We need to drop the shape here somehow
+uno::Reference< lang::XComponent > 
xShapeComponent( xShape, uno::UNO_QUERY );
+xShapeComponent->dispose( );
 }
 }
 catch( const beans::UnknownPropertyException & )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: apache-commons/UnpackedTarball_apache_commons_codec.mk boost/UnpackedTarball_boost.mk

[Libreoffice Gerrit user]

 apache-commons/UnpackedTarball_apache_commons_codec.mk |2 ++
 boost/UnpackedTarball_boost.mk |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit d8253f42ac7ce665fe6f3235a0a55f33ce71c3de
Author: David Tardon 
Date:   Wed Oct 3 14:37:11 2012 +0200

fix application of patches

Change-Id: I912be00b8dafc046b229967e66f8f32e2c14a0be

diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk 
b/apache-commons/UnpackedTarball_apache_commons_codec.mk
index 17d7e50..64a29e3 100644
--- a/apache-commons/UnpackedTarball_apache_commons_codec.mk
+++ b/apache-commons/UnpackedTarball_apache_commons_codec.mk
@@ -11,6 +11,8 @@ $(eval $(call 
gb_UnpackedTarball_UnpackedTarball,apache_commons_codec))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,apache_commons_codec,3))
+
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\
 build.xml \
 ))
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 7e3f0f2..584d479 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -48,6 +48,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3))
+
 $(eval $(call gb_UnpackedTarball_add_patches,boost,\
$(foreach patch,$(boost_patches),boost/$(patch)) \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make sw.check doesn't work?

[Jan Holesovsky]

Hi Noel,

Noel Grandin píše v Út 18. 09. 2012 v 11:11 +0200:

> I can do 'make sw' and 'make sw.subsequentcheck' from the top level, but 
> 'make sw.check' doesn't work.
> 
> cd sw && make check

I wondered the same thing just yesterday, so here we go:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=fc62c7727a08dfb8ce171845b30fb0cd937918fc

Regards,
Kendy

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

[Libreoffice-commits] .: Makefile.top solenv/gbuild

[Libreoffice Gerrit user]

 Makefile.top  |3 +++
 solenv/gbuild/gbuild.help.txt |1 +
 2 files changed, 4 insertions(+)

New commits:
commit fc62c7727a08dfb8ce171845b30fb0cd937918fc
Author: Jan Holesovsky 
Date:   Wed Oct 3 14:31:34 2012 +0200

Allow also make .check.

Change-Id: I55257cc5dbdffdc2dd9f9222a120f0a322dda7c8

diff --git a/Makefile.top b/Makefile.top
index bb4f73e..8e1833f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -270,6 +270,9 @@ $(1).all: bootstrap fetch
) \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
 
+$(1).check:
+   cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) check 
gb_PARTIALBUILD=T
+
 $(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean 
gb_PARTIALBUILD=T
 
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 3b15639..b6707eb 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -39,6 +39,7 @@ AVAILABLE TARGETS
debugrun starts the dev-install instance and allows tests to be 
run
 against it
 build the named module
+   .check   run unittests of the named module
.clean   clean the named module
.all build the named module and the pre-requisite modules 
for it
.deliver for dmake modules only, deliver the named module
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - hsqldb/ExternalProject_hsqldb.mk solenv/gbuild

[Libreoffice Gerrit user]

 hsqldb/ExternalProject_hsqldb.mk |5 +
 solenv/gbuild/UnpackedTarball.mk |2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6ded01b0762554e2d90fef6557a0cdae2e0c7a2b
Author: David Tardon 
Date:   Wed Oct 3 14:11:10 2012 +0200

two shall be the number thou shalt count

Change-Id: If84003c6a95cee0fd6e4e985ec0655f7074b0851

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index c96d4ce..7312362 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -100,7 +100,7 @@ endef
 
 # This is what dmake patches use. Once all external modules are
 # converted, it is better to be changed to 1.
-gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
+gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2
 
 gb_UnpackedTarball_CONVERTTODOS = \
$(gb_AWK) 'sub("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1)
commit ce7372c3bd8755accf1bc1db1f44bd78d1a55421
Author: David Tardon 
Date:   Thu Sep 27 08:44:14 2012 +0200

do not overcomplicate this

Change-Id: I08add6a39547dd1a674b0efd52d6d4d257b92557

diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk
index b9144b6..c45725e 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/hsqldb/ExternalProject_hsqldb.mk
@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,hsqldb))
 
 $(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb))
@@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) :
"$(ANT)" \
-q \
-f build/build.xml \
-   -Dbuild.label="build-$(RSCREVISION)" \
+   -Dbuild.label="build-libreoffice" \
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] gbuildification of rhino

[David Tardon]

Hi,

On Wed, Oct 03, 2012 at 01:23:41PM +0200, David Tardon wrote:
> Hi,
> 
> On Wed, Oct 03, 2012 at 11:37:17AM +0200, David Ostrovsky wrote:
> > Hi Norbert,
> > 
> > On 03.10.2012 01:09, Norbert Thiebaud wrote:
> > >David,
> > >
> > >to answer your question on IRC.
> > >
> > >yes the default patchlevel for gbuild is 3, because most fo the patch
> > >we had are like that...
> > really?
> > 
> > Currently, in dmake build system all patches are applied with patch level 2.
> > The wrong default patch level (3) in gbuild UnpackedTarball.mk
> > gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
> > wasn't show up until rhino gbuildification, because in rhino there are two
> > build.xml files in different locations. With wrong patch level 3 the
> > wrong build.xml
> > was picked up and rejected.
> > 
> > grep patch in solenv/inc give that:
> > tg_ext.mk:[...] patch $(PATCHFLAGS) -p2 [...]
> 
> Yes, but notice from _where_ the patch is applied. In gbuild it is from
> the project's unpacked dir, while in dmake it is one level up. Therefore
> in gbuild we have to strip one level more.
> 
> > 
> > To fix that in gbuild would be as easy as:
> > gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2
> 
> Which would break apache-commons, beanshell and all other modules
> converted up to now that have old-style patches in them .-)

That is actually not true I have always thought that patch used the
new file (the '+++' line). Well, I have been wrong :-) The reality is
more complicated; the selection is described in patch(1) as follows
(shortened):

"First, patch takes an ordered list of candidate file names as follows:
 
 · If the header is that of a context diff, patch takes the old and new
   file  names  in  the  header.  A name is ignored if it does not have
   enough slashes to satisfy the -pnum or --strip=num option.  The name
   /dev/null is also ignored.
 
[...]
 
 · For the purpose of the following rules, the candidate file names are
   considered to be in the order (old, new, index), regardless  of  the
   order that they appear in the header.
 
Then patch selects a file name from the candidate list as follows:
 
 · If  some  of  the named files exist, patch selects the first name if
   conforming to POSIX, and the best name otherwise.
 
[...]
 
To  determine  the  best  of a nonempty list of file names, patch first
takes all the names with the fewest path name components; of those,  it
then  takes all the names with the shortest basename; of those, it then
takes all the shortest names; finally, it  takes  the  first  remaining
name."

The problematic hunk in this case is
--- misc/rhino1_5R5/toolsrc/build.xml   2004-03-25 21:54:34.0
+0100
+++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-01-17
20:46:44.0 +0100

The situation would be as follows:
1) dmake:
- uses -p2
- patch is applied from a dir above rhino1_5R5

patch considers toolsrc/build.xml and rhino1_5R5/toolsrc/build.xml ;
only the later exists and is selected.

2. gbuild:
- uses -p3
- patch is applied from inside rhino1_5R5

patch considers build.xml and toolsrc/build.xml; both of them exist
(because there is top-level build.xml), the former has fewer name
components and is selected. BAANG!

I am changing the default patch level from 3 to 2 on this evidence.

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-3.5.7.2' created by Fridrich Å trba 
 at 2012-10-03 13:06 -0700

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

iQIcBAABAgAGBQJQbCpLAAoJEPQ0oe+v7q6jDhcP/2KwcMdhirxTY8PUyXnF5cH8
+Rg/5JXDlSJNLom8YmDIKt3LQ9hFOR2hcIHeeHHJkel4hx84dFaDwv2JeaIGewTy
dP1ayTmWrn8U4gQlHuozSFC/gwAZVQK6BQLOxPT2O6uNMu8p3WV8AMWgGlyukNIo
BdsvmLC9hb2vop/94jTXypqmipocxgHjLU6p2hcwQfFXo7mGJNYbJtNWalHVTe1Z
EYzPj8cxOCJWPLxVRsTgpWVIsA2sznXv7++s2XBG3oUXNf1yTicKlg2arTR22R2a
0iPSZfi6oU7oZHOrUay7HsnVrSNqBbNrOcdWlg8n4DEFx8HopKBohyjITfH5hT6o
YE1d+XzRqaxzauF8zJPnDBhR1ZcX/t+Jfy/9s2d2eyZbPmpPuPeoPbPwBMetrONG
YQXMCeNorSiTDIuVOQgI0ZUk664s9rBvjJan8KhTuciJhRyxyOkqJsLIbs0jyK0B
6IX5AJcRt8VXYQrC2dekj17sT0QFrXJhyIYp+J51dtEykQuJEP8SRDjYfboA9J1T
ngcGe2EDyIQk/Sw9q699LJ2mKqxv2QJEkqoc5K6kv5DDGhRwAX8lQvAlSKcanOcf
hdiTSAgDHCGd9drD0PDF61b6wD1OqLtkKZlU1fmfoRdZENx/8ihB73O+KSzQo8o5
63e3gaXoO5CJT2VAGtRC
=haL+
-END PGP SIGNATURE-

Changes since libreoffice-3.5.7.1:
Fridrich Å trba (1):
  Version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2)

---
 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.5.7.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.5.7.2' created by Fridrich Å trba 
 at 2012-10-03 13:06 -0700

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

iQIcBAABAgAGBQJQbCpLAAoJEPQ0oe+v7q6j82oQAJMBel5e9Xd3bptX7Vr4QMpH
5Ud8Wixdvz3L/7iif6g6nCsjIMDzd44uukpQPRWOHzmYzFdfd0LqdfJ7TokYsiJD
Gb6MfSffEo5QtOy/pMUKC3jSmBy71s0U1JFKnUDTmR5lBd8imSSQ9GYDY8Ygey4X
gfroZEQ7ln0eKWWFb0l41h2Ib0+iVjdAgAHun/1zHeVFbepn+erF/b4INYL68HK4
eZ0YMB9/p4dmBzKtYcFQ2Ij+LYxGhqFVgpd911Zx10l935Fjsr+U/q0U83dg5ysh
gz6vGc3RESLY8KH4WLzC0gIAiNUBsHSmkugZyQife4DxA/iKe2KhZYlxfVhbCtXr
JJHk3DxARFU0sl+DhnNDhriL4rrTmhgVyeKjTMKyTThCVZwzRh9OrKQ9IH7C9zCP
b2oexhqyj+SFHTtMMIzeTjn02oUakEpitPzhLU2bRm+a+TEfvO/QaOP+7uRHDqq4
vHVK8x9uU7pHZELA9QcJPHADwYzysXXGruwG8u62/1UTdEFX58G/agia4Kvj5Soc
NmuOiyt9JVm8/NhPIEm/yutZkmjHXPEgiEpRwnlo0bI+xZh5SsUZAZ+3OC3BZToR
12i4BstCkFagZlhz/hBixtuxflP/1yf+G6GN1KeQDC4m8Xd6h/VFgyhGeg9xE+4B
4GgIpoR5oYrVWdXAMaZY
=AUfy
-END PGP SIGNATURE-

Changes since libreoffice-3.5.7.1:
Fridrich Å trba (1):
  Version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2)

---
 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.5.7.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.5.7.2' created by Fridrich Å trba 
 at 2012-10-03 13:06 -0700

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

iQIcBAABAgAGBQJQbCpLAAoJEPQ0oe+v7q6jj6EP+QHRlBaJSqo4V9sD7tVXyMj/
1itTYvLjhm8xIGZOM3YXKY8BDdmBZvOz8qkuYqZ0gaKqiWoCSK0tjrlDrDPMiuBy
VF+wzyAJYeSXvUQZkNs8GqH/eEELQaVaoXQoUz5tJHDdtx3d3ny6N8QpmUDE7J4b
occgKvQR89qBAt08z9wFcvx0zBfBNFy0PBBWQZhYdWB5JlJVYkzFTtNWCVqCyEu6
IMG+dOzXTz6IIsEdm8He1AB0rm71ykC8lxOOBfBXIQMLQtzOe8xEa2PXyN4Fv0J+
xBJcEAU7VYuvFYDjWrZdBw7S/t9OL2p2d3OOnFMQ1lq5Iih83W/7SaWTSe7ucCVI
JuM7reRAR3/nlobvHRCkCOtKPykjmnhXPG/hWoWbOs6F1SX+4OzbT68kFCT2JV4w
ZmQkVIfOkzQ0PKCekxKJJVSP52MGR1qoVQsEqlXhUBvblfLegK8RXSB2dQ3xwzHD
Y3UZn4Cw0xrJFBGlhnM3OdKrjnq5hWk5THK9Dl4Q29CUQEady5zRx0cxfYO6CPVz
8XgWuzdPNqLMmfAzr96Sw7+0zwpuxK1+JKXghjcHFKc43zI8u/W3sqZhbN1+tKHC
eyKB6gNSiG/aWPSpSJIk4DLDqRRjfHjR2OqGAbPtVpGjzH0frAgUTKHqd3QPmuft
unHT00LGGLmFgbNvSQq8
=HHVW
-END PGP SIGNATURE-

Changes since libreoffice-3.5.7.1:
Fridrich Å trba (1):
  Version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2)

---
 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.5.7.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.5.7.2' created by Fridrich Å trba 
 at 2012-10-03 13:06 -0700

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

iQIcBAABAgAGBQJQbCpLAAoJEPQ0oe+v7q6j+LoQAIhPITkQA+/1NTfoCZMg6IQN
1R9+cAlodA+wGUPGNFBPETMZQTI4cnOkGukx2nwydwyASXqaCCAtizlQDkukzNlA
7Etc2nu3gmLJpIVGyBstZ56wj73mzsl6+zBb/qzoIvI7lesVbeHP8boc+geuu/Lp
sN6gA9c9xvlXqEyUo6wUEYmOZblqA8Q0JjgjKHGXTJxvuZsFIVu8Q0uodfAXZH//
yOUEporgdq2doenM1oqqz6703a6aUFdigTaLEb/vc95SwjqZCU9LwJwJwVsYmOrA
7oFwxVAbyBTDRdCZ4CNJKfm2+wuzoC49E14YOMD+qPFjMEJowJvF/qFfcbKljDKH
xYTTowhOBdkPSSN3Abvk5Uih7xkR64uiBPgfaLkG/MvgO0SiOsAAoGGIrntAxb7I
FSePBnRyxJFaBlTxqvNr8S5IiaG9Vt3bzIas4YiNp0K9spZfyiC6EtFjle1YATf6
5hxLp3uRunMvWMpM5dox9ydnz9RGK2TN9l8OpXydCajrLMbESv4fAffudPzbSmYl
ToKWU2uu+XLKPCfJBnLeBbyAZycobypWpuTtUSm/NmsaTE+PqBJ5e45mp14qAXJ6
lZ9Fabkm5wjLaIEaaF/KaXfu8DGAfUtftO60QOqCuYw/81oUo/ALZYzsxWNtkGzf
uA0vLso8zGBcEWBv8VZt
=45fE
-END PGP SIGNATURE-

Changes since libreoffice-3.5.7.1:
Fridrich Å trba (1):
  Version 3.5.7.2, tag libreoffice-3.5.7.2 (3.5.7-rc2)

---
 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.5.7.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.5.7.2' created by Fridrich Å trba 
 at 2012-10-03 13:06 -0700

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

iQIcBAABAgAGBQJQbCpLAAoJEPQ0oe+v7q6jnhMP/1xjbnXRO9izc8LM+AhKQgRf
8Qr3pTMZp7jfliSqKG7NixvjEyHNDyOglUvXnIYLiiKihOwIosGlHC9zt9kLFYq3
r4SqvqRefd/Cql8fVx0Aj57tlhMBLYVoBDymjRnQKwbhVvMmHxvzKmhO/yTaWB8F
qw6SgKHpkzUkjkvyqXF1NSRT6T3k52zgPfDW04/DorPRI+gvAjxMQVeTbifCpJ6U
SAav0mjNxswJ26vMwDa3Y21FCqWzbenC4+4gYacZTwtKKVyBlW9QjCwxEiM/oYfY
uYENk7RZaNTVLBxa9ZsqIYKdUD7Ej03WPKhfOmL6HnRTbacy6nPTLuGl4/SYUmNJ
zAtuZLtEdrHX/e3Pe31xKehieZdkAFIpswPuKTCri8AJTQJfU7KDOEGXgzG7K9+j
rI4vBpnotRY8JR2hJb8iUnVKbUkTNR2JoltyDTHBHpfxXAVVCsvalSdP8TOYzdfD
gb/TxlJ2YNCejWhSkYf1aWlW9Xj+FDUwW9GVrWyjkoIxk0rnb7M92LoZulajT+p3
+xa8YLctmNk4gBzvDrgycSpsJDukyGWoC5B4e/+aBDip7pe+BHDsJkI8uE9GUIN/
C4mS5lnY69Upy4Zni8iUxmXR97buS+EhDKYTxssdsgli/k8gKjYEkJqifg7YnNiV
WPVu8HivDwj66f7oUP1S
=12w7
-END PGP SIGNATURE-

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

Re: [PATCH] gbuildification of rhino

[David Tardon]

Hi,

On Wed, Oct 03, 2012 at 11:37:17AM +0200, David Ostrovsky wrote:
> Hi Norbert,
> 
> On 03.10.2012 01:09, Norbert Thiebaud wrote:
> >David,
> >
> >to answer your question on IRC.
> >
> >yes the default patchlevel for gbuild is 3, because most fo the patch
> >we had are like that...
> really?
> 
> Currently, in dmake build system all patches are applied with patch level 2.
> The wrong default patch level (3) in gbuild UnpackedTarball.mk
> gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
> wasn't show up until rhino gbuildification, because in rhino there are two
> build.xml files in different locations. With wrong patch level 3 the
> wrong build.xml
> was picked up and rejected.
> 
> grep patch in solenv/inc give that:
> tg_ext.mk:[...] patch $(PATCHFLAGS) -p2 [...]

Yes, but notice from _where_ the patch is applied. In gbuild it is from
the project's unpacked dir, while in dmake it is one level up. Therefore
in gbuild we have to strip one level more.

> 
> To fix that in gbuild would be as easy as:
> gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2

Which would break apache-commons, beanshell and all other modules
converted up to now that have old-style patches in them .-)

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Bug 37361 depends on bug 46805, which changed state.

Bug 46805 Summary: large autocorrect database make LibO freeze when start typing
https://bugs.freedesktop.org/show_bug.cgi?id=46805

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

[Bug 54157] LibreOffice 3.7 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||55570

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

Re: [PATCH] gbuildification of rhino

[David Ostrovsky]

Hi Norbert,

On 03.10.2012 01:09, Norbert Thiebaud wrote:

David,

to answer your question on IRC.

yes the default patchlevel for gbuild is 3, because most fo the patch
we had are like that...

really?

Currently, in dmake build system all patches are applied with patch level 2.
The wrong default patch level (3) in gbuild UnpackedTarball.mk
gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
wasn't show up until rhino gbuildification, because in rhino there are two
build.xml files in different locations. With wrong patch level 3 the 
wrong build.xml

was picked up and rejected.

grep patch in solenv/inc give that:
tg_ext.mk:[...] patch $(PATCHFLAGS) -p2 [...]

To fix that in gbuild would be as easy as:
gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2

With that fix in place, we could just remove
$(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2))
from UnpackedTarball_rhino.mk

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

[REVIEW-3-6] fix for fdo#55565 regression

[Noel Power]

please consider this patch

http://cgit.freedesktop.org/libreoffice/core/commit/?id=fdb42c397f1d15d05a74492a233df72d832cab1c

for inclusion into 3.6

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

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/core/text/xmldump.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b6aea86fe368746ea23a2fe669b1689f4d6f43e8
Author: Miklos Vajna 
Date:   Wed Oct 3 11:11:48 2012 +0200

SwFrm::dumpAsXmlAttributes: dump Fmt pointer

Change-Id: Id9030f5a260fbfce88b6b238e075a7358993b355

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index ec6408c..e3ae11a 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -384,6 +384,7 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
 SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this;
 rtl::OUString aFmtName = pHeadFootFrm->GetFmt()->GetName();
 xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), 
"%s", BAD_CAST(rtl::OUStringToOString(aFmtName, 
RTL_TEXTENCODING_UTF8).getStr()));
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", 
pHeadFootFrm->GetFmt());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

 oox/source/export/drawingml.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit fdb42c397f1d15d05a74492a233df72d832cab1c
Author: Noel Power 
Date:   Wed Oct 3 10:04:29 2012 +0100

fix for fdo#55565 regression, failure to export vertical text in shape

Change-Id: If3d6413b1fb9e02dc26f930634f84712d7d08ca3

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ce9ff77..db61ef9 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1241,6 +1241,27 @@ void DrawingML::WriteText( Reference< XInterface > 
rXIface  )
 }
 }
 
+if ( GETA( CustomShapeGeometry ) )
+{
+Sequence< PropertyValue > aProps;
+if ( mAny >>= aProps )
+{
+for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems; 
++i )
+{
+sal_Int32 nTextRotateAngle = 0;
+if ( aProps[ i ].Name.equals( "TextPreRotateAngle" ) && ( 
aProps[ i ].Value >>= nTextRotateAngle ) )
+{
+if ( nTextRotateAngle == -90 )
+{
+sWritingMode = "vert";
+bVertical = sal_True;
+}
+break;
+}
+}
+}
+}
+
 TextHorizontalAdjust eHorizontalAlignment( TextHorizontalAdjust_CENTER );
 bool bHorizontalCenter = false;
 GET( eHorizontalAlignment, TextHorizontalAdjust );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - dbaccess/source sc/source sd/source svx/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/tablespage.cxx   |2 
 dbaccess/source/ui/misc/WTypeSelect.cxx |2 
 sc/source/ui/dbgui/tpsort.cxx   |4 
 sd/source/ui/dlg/tpaction.cxx   |2 
 svx/source/form/navigatortree.cxx   |   19 --
 vcl/inc/vcl/builder.hxx |   81 +
 vcl/source/control/button.cxx   |2 
 vcl/source/window/builder.cxx   |  265 +---
 8 files changed, 238 insertions(+), 139 deletions(-)

New commits:
commit 4b5837d7a1f7c6e5e0e9981c0e5fb8eb7b50f586
Author: Caolán McNamara 
Date:   Wed Oct 3 09:34:06 2012 +0100

XubString->OUString

Change-Id: I40a4efb5ffed5f8592651ef70eb99d4285a7cddd

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index da67a61..c0a1517 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -457,9 +457,8 @@ namespace svxform
 {
 case SID_FM_NEW_FORM:
 {
-XubString aStr(SVX_RES(RID_STR_FORM));
-XubString 
aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
-aUndoStr.SearchAndReplace(rtl::OUString('#'), 
aStr);
+OUString aStr(SVX_RESSTR(RID_STR_FORM));
+OUString aUndoStr = 
SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr);
 
 pFormModel->BegUndo(aUndoStr);
 // der Slot war nur verfuegbar, wenn es genau 
einen selektierten Eintrag gibt und dieser die Root
@@ -470,9 +469,8 @@ namespace svxform
 }   break;
 case SID_FM_NEW_HIDDEN:
 {
-XubString aStr(SVX_RES(RID_STR_CONTROL));
-XubString 
aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
-aUndoStr.SearchAndReplace(rtl::OUString('#'), 
aStr);
+OUString aStr(SVX_RESSTR(RID_STR_CONTROL));
+OUString aUndoStr = 
SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr);
 
 pFormModel->BegUndo(aUndoStr);
 // dieser Slot war guletig bei (genau) einem 
selektierten Formular
@@ -1002,9 +1000,8 @@ namespace svxform
 // innerhalb eines Undo ...
 if (pFormModel)
 {
-XubString aStr(SVX_RES(RID_STR_CONTROL));
-XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
-aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr);
+OUString aStr(SVX_RESSTR(RID_STR_CONTROL));
+OUString aUndoStr = 
SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr);
 pFormModel->BegUndo(aUndoStr);
 }
 
@@ -1078,7 +1075,7 @@ namespace svxform
 
 if( bUndo )
 {
-XubString 
strUndoDescription(SVX_RES(RID_STR_UNDO_CONTAINER_REPLACE));
+OUString 
strUndoDescription(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REPLACE));
 pFormModel->BegUndo(strUndoDescription);
 }
 
@@ -1482,7 +1479,7 @@ namespace svxform
 
 //
 // BasisNamen erzeugen
-rtl::OUString aBaseName;
+OUString aBaseName;
 if( pEntryData->ISA(FmFormData) )
 aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME );
 else if( pEntryData->ISA(FmControlData) )
commit cad78399e403e3635de06775c0c50bf24f74ecd8
Author: Caolán McNamara 
Date:   Tue Oct 2 22:41:14 2012 +0100

support loading certain stock images as button symbols

Change-Id: I475a4bc7e0686fa17beceb68f1aed016ef158117

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index a84f6d1..112e293 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -23,16 +23,16 @@ class NumericFormatter;
 class VCL_DLLPUBLIC VclBuilder
 {
 public:
-typedef std::map stringmap;
+typedef std::map stringmap;
 typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
 private:
 struct WinAndId
 {
-rtl::OString m_sID;
+OString m_sID;
 Window *m_pWindow;
 sal_Int32 m_nPosition;
 bool m_bOwned;
-WinAndId(const rtl::OString &rId, Window *pWindow)
+WinAndId(const OString &rId, Window *pWindow)
 : m_sID(rId)
 , m_pWindow(pWindow)
 , m_nPosition(-1)
@@ -44,15 +44,15 @@ private:
 
 struct ListStore
 {
-typedef std::vector row;
+typedef std::vector row;
 std::vector m_aEntries;
 };
 
 struct ModelAndId
 {
-rtl::OString m_sID;
+OString m_sID;
 ListStore *m_pModel;
-ModelAndId(const rtl::OString &rId, ListStor

Re: bundled saxon considered harmful

[Norbert Thiebaud]

On Wed, Oct 3, 2012 at 3:40 AM, David Tardon  wrote:
> Hi all,
>
> 2. a repo on github or similar
> PROS:
> * distance from libreoffice. It is not part of our project, so we are not
>   obliged in any way to ship it :-)
> CONS:
> * no automatic commit rights (but who would want to commit to the
>   project anyway? :-)
>
> This also needs license cleanup first, as the related files are still
> under the old LGPL3 license.

Why? if that become truly an extension, it can be on whatever license
no ? so just leave it as LGPL3...

Note: I already have setup a mirror of our repos on gitosis, if that help.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-5-7]: rhbz#861680 fix crash on tables in substreams

[Norbert Thiebaud (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/756

Approvals:
  Norbert Thiebaud: Looks good to me, approved
  Michael Meeks: Verified; Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39d486e3c69546519e232943f50675402b7bb595
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5-7
Gerrit-Owner: Miklos Vajna 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Norbert Thiebaud 

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

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

[Libreoffice Gerrit user]

 filter/source/msfilter/eschesdo.cxx |   10 +-
 oox/source/export/vmlexport.cxx |   28 +++-
 sc/source/filter/xcl97/xcl97rec.cxx |   13 +
 3 files changed, 49 insertions(+), 2 deletions(-)

New commits:
commit 46f9e6ce6b9fc6c21c1d682a35954523ed435647
Author: Noel Power 
Date:   Thu Aug 9 11:15:43 2012 +0100

misc comment import/export fixes

Cherry pick the rest of the commit ...

a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added
support for shadow element with attributes, shadow color, shadow obscured )
b) use proper fillcolor attribute
c) detect whether note/comment is shown on import
d) export state of note ( shown/hidden )

text position still not perfect, we still are missing some attributes to 
control
that.

Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea

Conflicts:
oox/source/export/vmlexport.cxx
sc/source/filter/xcl97/xcl97rec.cxx

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index bbd63d5..32d5680 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -208,7 +208,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 
 if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( "IsFontwork" ) ) &&
 ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
-rObj.GetType().EqualsAscii( "drawing.Measure" ) || 
rObj.GetType().EqualsAscii( "drawing.Caption" ) )
+rObj.GetType().EqualsAscii( "drawing.Measure" ) )
 {
 rObj.SetType( String( RTL_CONSTASCII_STRINGPARAM(
 "drawing.dontknow" ),
@@ -614,6 +614,14 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ), sal_False ) )
 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
 }
+else if ( rObj.GetType().EqualsAscii( "drawing.Caption" ))
+{
+rObj.SetAngle( 0 );
+mpEscherEx->OpenContainer( ESCHER_SpContainer );
+ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
+}
 else if ( rObj.GetType().EqualsAscii( "drawing.dontknow" ))
 {
 rObj.SetAngle( 0 );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 8c758b4..0345a33 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -534,7 +534,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const Rectangle& rRect
 }
 
 if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) )
-impl_AddColor( pAttrList, XML_color, nValue );
+impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue 
);
 
 if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
 impl_AddColor( pAttrList, XML_color2, nValue );
@@ -669,6 +669,32 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const Rectangle& rRect
 if ( !it->nPropValue )
 m_pShapeStyle->append( ";visibility:hidden" );
 break;
+case ESCHER_Prop_shadowColor:
+case ESCHER_Prop_fshadowObscured:
+{
+sal_uInt32 nValue = 0;
+bool bShadow = false;
+bool bObscured = false;
+if ( rProps.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) )
+{
+bShadow = (( nValue & 0x20002 ) == 0x20002 );
+bObscured = (( nValue & 0x10001 ) == 0x10001 );
+}
+if ( bShadow )
+{
+sax_fastparser::FastAttributeList *pAttrList = 
m_pSerializer->createAttrList();
+impl_AddBool( pAttrList, XML_on, bShadow );
+impl_AddBool( pAttrList, XML_obscured, bObscured );
+
+if ( rProps.GetOpt( ESCHER_Prop_shadowColor, nValue ) )
+impl_AddColor( pAttrList, XML_color, nValue );
+
+m_pSerializer->singleElementNS( XML_v, XML_shadow, 
XFastAttributeListRef( pAttrList ) );
+bAlreadyWritten[ ESCHER_Prop_fshadowObscured ] = true;
+bAlreadyWritten[ ESCHER_Prop_shadowColor ] = true;
+}
+}
+break;
 default:
 #if OSL_DEBUG_LEVEL > 0
 fprintf( stderr, "TODO VMLExport::Commit(), unimpl

[PUSHED 3-6] follow up to previous patches for fdo#52998 fdo#52999

[Michael Meeks]

Hi Noel,

On Thu, 2012-08-16 at 13:56 +0100, Noel Power wrote:
> while the previous patches improved things ( and the comments 
> (re)imported nicely into calc ) the export xlsx didn't load so nicely in 
> Excel

Hey ho - shame no-one reviewed this in time for 3.6 and it dropped
between the cracks. Any other un-reviewed back-ports that you're aware
of Noel ? :-)

Anyhow - I tested and merged the rest of this today,

Thanks,

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] .: Branch 'libreoffice-3-5-7' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 414599ada2fa2288f9849569b75fba39ed83
Author: Miklos Vajna 
Date:   Wed Oct 3 09:57:12 2012 +0200

rhbz#861680 fix crash on tables in substreams

Background: the old RTF filter in 3.4 supported tables in substreams
(headers, footers, etc), while 3.5.5 did not, so even if this is
technically a new feature, it got backported to -3-5. As the bugreport
states, this caused problems in the docx import. Instead of trying to
find out where was the problem (it's already fixed in -3-6 and master,
and I forgot how it happened), just disable this feature for DOCX, where
this never worked, so doing so does not cause any regression.

Change-Id: I39d486e3c69546519e232943f50675402b7bb595
Reviewed-by: Fridrich Strba 
Reviewed-on: https://gerrit.libreoffice.org/756
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-by: Norbert Thiebaud 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d533cad..fbb986a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -554,7 +554,8 @@ public:
 
 void appendTableHandler( )
 {
-if (m_pTableHandler.get())
+// For -3-5, support tables in substreams only for RTF
+if (m_pTableHandler.get() && IsRTFImport())
 m_aTableManagers.top()->setHandler(m_pTableHandler);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits