MAKE_RESTARTS interference with trap SIGINT

[Norbert Thiebaud]

Since I've chased that one for a while, I'll share here that pita:

I have a wrapper script around a make fo LO (tinderbox scripting)... I
have added soem refinement so that it handle gracefully a Ctrl-C while
it is running
to that effect I've installed a signal handler in bash using 'trap'
on, among other SIGINT
That was the shell script can detect that a build was aborted in the
middle of thing, and can take prophylactic actions... like notifying
gerrot or the tindebox server that that build has been 'aborted'

The gotcha is that the regular Makefile try first to make sure that
Makefile is up-to-date, and then re-start itself... it dies that
whether or not the Makefile is out-of-date...
but apparently make use SIGINT to do its restart... and that is
apparently picked-up by bash... so the result is that make make sure
that Makefile is up-to-date, and then... stop.
Not exactly a great thing for a tinderbox script :-)

The work around is to set MAKE_RESTARTS=1 _before_ invoking make...
that way make believe that this is a 'restart' already and skip the
whole 'make sure Makefile is up to date', which in this case is
guaranteed to be (configure is systematically ran before make)

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

master start a JRE 7 even if the default JRE is 6

[Jean-Baptiste Faure]

Hi,

As I worked on a memory leak
(https://bugs.freedesktop.org/show_bug.cgi?id=64237), I added the
following command in the script I use to launch LO 4.1 :
ulimit -S -v 200
The idea was to make LO crash before it has eaten all the available memory.
I tried several values and for 2GB, I got JVM 7 crash reports. The
reason of the crash is not enough memory to continue.

What is weird, is that my default Java is Java 6 and LO is configured to
use Java 6. I have both OpenJDK 6 and OpenJDK 7 on my PC.

It seems that official builds (LO 4.0.3.3) does not start a JVM at
launch time.

Do you know why my builds do that ?

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: fd#44621 : OSX DND opens drawer Query

[Thorsten Behrens]

Manik Malhotra wrote:
 I'm not really sure which module is taking care of this, I found
 these two files:
 http://opengrok.libreoffice.org/xref/core/vcl/aqua/source/dtrans/DropTarget.cxx

Yep, that sounds about right - DropTarget::performDragOperation seems
to be the method performing the actual drop. I'd start with a
breakpoint there.

HTH,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to remake a modified source codes, not the first time, based on source codes core which has been made successfully?

[leo2013]

I checked again and found that:
using the make module-name, for example,
If I modify the module named desktop, I will use: xxx/core make desktop
And it shows as below:
===
xxx/core* make desktop*
cd xxx/core/desktop  /usr/bin/make -j 4 -rs
[build DEP] LNK:Executable/soffice.bin
[build C  ] desktop/source/app/main.c
[build CHK] loaded modules: desktop
...
[build LNK] Executable/soffice.bin
[build MOD] desktop
[build ALL] top level modules: desktop
[build ALL] loaded modules: desktop
... It can save some time.

I run the command:
xxx/core *./install/program/soffice*
No effects work in the results.
Next, there are two methods which can get to the same goal.
/Method-1:/
And I used *make dev-install*. It works well;
/Method-2:/
And I used make dev-install-nocheck (or *make dev-install -o build*)
And then,run the command:
xxx/core *./install/program/soffice*. It works well.
Obviously, method-2 is part of method1, so that it can save some time.
And what the side effect of the method-2 was, I couldn't meet it yet.






--
View this message in context: 
http://nabble.documentfoundation.org/How-to-remake-a-modified-source-codes-not-the-first-time-based-on-source-codes-core-which-has-been-m-tp4053499p4054020.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: fdo#41572 Making it possible to add custom animation to master slides

[Thorsten Behrens]

Janit Anjaria wrote:
 it would be great if someone can guide if i am going swrong
 somewhere.

Hi Janit,

a bit hard to tell without further explanations to the intended use of
the code. A few comments in the header would already go a long
way. Also, I suggest to make it a habit for new files to add the
LibreOffice license header from TEMPLATE.SOURCECODE.HEADER right from
the start. ;)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] zoomandviewlayout.ui widget

[Aliah Almusaireae (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3794

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3794/1

zoomandviewlayout.ui widget

Change-Id: I8d607a5960ffc3c69ffa97ca3e2ebae555044581
---
A sd/uiconfig/sdraw/ui/zoomandviewlayout.ui
1 file changed, 368 insertions(+), 0 deletions(-)



diff --git a/sd/uiconfig/sdraw/ui/zoomandviewlayout.ui 
b/sd/uiconfig/sdraw/ui/zoomandviewlayout.ui
new file mode 100644
index 000..2bdf4d0
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/zoomandviewlayout.ui
@@ -0,0 +1,368 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=zoomandviewlayout
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesZoom amp; View Layout/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox3
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing12/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area3
+property name=can_focusFalse/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkRadioButton id=radiobutton1
+property name=label 
translatable=yesO_ptimal/property
+property name=visibleTrue/property
+property name=can_focusTrue/property

[PATCH] oleobject.ui widget

[Aliah Almusaireae (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3795

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3795/1

oleobject.ui widget

Change-Id: I716cfd924c20fba026c88a90344fd0af2d91e959
---
A sd/uiconfig/sdraw/ui/oleobject.ui
1 file changed, 168 insertions(+), 0 deletions(-)



diff --git a/sd/uiconfig/sdraw/ui/oleobject.ui 
b/sd/uiconfig/sdraw/ui/oleobject.ui
new file mode 100644
index 000..8b6b302
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/oleobject.ui
@@ -0,0 +1,168 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=oleobject
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesInsert OLE Object/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox4
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing12/property
+child
+  object class=GtkBox id=box3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkRadioButton id=radiobutton1
+property name=label translatable=yesCreate 
_new/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
+property name=xalign0/property
+property name=activeTrue/property
+property name=draw_indicatorTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkRadioButton id=radiobutton2
+property name=label translatable=yesCreate _from 
file/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
+property name=xalign0/property
+property name=draw_indicatorTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area4
+property name=can_focusFalse/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property

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

[Miklos Vajna]

 xmlsecurity/source/helper/xsecctl.hxx   |2 
 xmlsecurity/source/helper/xsecparser.cxx|   56 +---
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |   55 +--
 3 files changed, 51 insertions(+), 62 deletions(-)

New commits:
commit 3155a8e60f64f88e8abb5a6877cb2fa55986402e
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 6 09:24:01 2013 +0200

xmlsecurity: drop no longer needed RTL_ASCII_USTRINGPARAM macro

Change-Id: Ia08688ef3c262ba4379213231032c73404ae748b

diff --git a/xmlsecurity/source/helper/xsecctl.hxx 
b/xmlsecurity/source/helper/xsecctl.hxx
index 40f47ac..48f0a78 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -108,8 +108,6 @@
 #define INITIALIZED   1
 #define FAILTOINITIALIZED 2
 
-#define RTL_ASCII_USTRINGPARAM( asciiStr ) asciiStr, strlen( asciiStr ), 
RTL_TEXTENCODING_ASCII_US
-
 // forward declaration
 class XSecParser;
 
diff --git a/xmlsecurity/source/helper/xsecparser.cxx 
b/xmlsecurity/source/helper/xsecparser.cxx
index 85557a1..230789c 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -27,8 +27,6 @@
 namespace cssu = com::sun::star::uno;
 namespace cssxs = com::sun::star::xml::sax;
 
-#define RTL_ASCII_USTRINGPARAM( asciiStr ) asciiStr, strlen( asciiStr ), 
RTL_TEXTENCODING_ASCII_US
-
 XSecParser::XSecParser(
 XSecController* pXSecController,
 const cssu::Reference cssxs::XDocumentHandler  xNextHandler )
@@ -40,13 +38,11 @@ XSecParser::XSecParser(
 
 OUString XSecParser::getIdAttr(const cssu::Reference cssxs::XAttributeList  
xAttribs )
 {
-OUString ouIdAttr = xAttribs-getValueByName(
-OUString(RTL_ASCII_USTRINGPARAM(id)));
+OUString ouIdAttr = xAttribs-getValueByName(OUString(id));
 
 if (ouIdAttr == NULL)
 {
-ouIdAttr = xAttribs-getValueByName(
-OUString(RTL_ASCII_USTRINGPARAM(Id)));
+ouIdAttr = xAttribs-getValueByName(OUString(Id));
 }
 
 return ouIdAttr;
@@ -93,7 +89,7 @@ void SAL_CALL XSecParser::startElement(
 m_pXSecController-collectToVerify( ouIdAttr );
 }
 
-if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) )
+if ( aName == TAG_SIGNATURE )
 {
 m_pXSecController-addSignature();
 if (ouIdAttr != NULL)
@@ -101,9 +97,9 @@ void SAL_CALL XSecParser::startElement(
 m_pXSecController-setId( ouIdAttr );
 }
 }
-else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) )
+else if ( aName == TAG_REFERENCE )
 {
-OUString ouUri = 
xAttribs-getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI)));
+OUString ouUri = xAttribs-getValueByName(ATTR_URI);
 DBG_ASSERT( ouUri != NULL, URI == NULL );
 
 if (ouUri.startsWith(CHAR_FRAGMENT))
@@ -122,13 +118,13 @@ void SAL_CALL XSecParser::startElement(
 m_bReferenceUnresolved = true;
 }
 }
-else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_TRANSFORM)))
+else if (aName == TAG_TRANSFORM)
 {
 if ( m_bReferenceUnresolved )
 {
-OUString ouAlgorithm = 
xAttribs-getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM)));
+OUString ouAlgorithm = 
xAttribs-getValueByName(ATTR_ALGORITHM);
 
-if (ouAlgorithm != NULL  ouAlgorithm == 
OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N)))
+if (ouAlgorithm != NULL  ouAlgorithm == ALGO_C14N)
 /*
 * a xml stream
 */
@@ -138,41 +134,39 @@ void SAL_CALL XSecParser::startElement(
 }
 }
 }
-else if (aName == 
OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
+else if (aName == TAG_X509ISSUERNAME)
 {
 m_ouX509IssuerName = OUString();
 m_bInX509IssuerName = true;
 }
-else if (aName == 
OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
+else if (aName == TAG_X509SERIALNUMBER)
 {
 m_ouX509SerialNumber = OUString();
 m_bInX509SerialNumber = true;
 }
-else if (aName == 
OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
+else if (aName == TAG_X509CERTIFICATE)
 {
 m_ouX509Certificate = OUString();
 m_bInX509Certificate = true;
 }
-else if (aName == 
OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)))
+else if (aName == TAG_SIGNATUREVALUE)
 {
 m_ouSignatureValue = OUString();
 m_bInSignatureValue = true;
 }
-else if (aName == 
OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
+else if (aName == 

[PATCH] Up-cast conversion constructor for css::uno::Reference

[Stephan Bergmann (via Code Review)]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a rebased change.  Please visit

https://gerrit.libreoffice.org/3699

to look at the new rebased patch set (#2).

Change subject: Up-cast conversion constructor for css::uno::Reference
..

Up-cast conversion constructor for css::uno::Reference

Based on a previous patch by Noel Grandin,
https://gerrit.libreoffice.org/#/c/3613/, and borrowing from
boost::is_base_and_derived (see comment in include/com/sun/star/uno/Reference.h)
to avoid including Boost headers in URE headers.

Change-Id: Iade5af144dd73ef03bd7d96000134c7a66a5e591
---
M cppu/qa/test_reference.cxx
M include/com/sun/star/uno/Reference.h
M include/com/sun/star/uno/Reference.hxx
M sd/source/core/CustomAnimationEffect.cxx
4 files changed, 122 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3699/2
-- 
To view, visit https://gerrit.libreoffice.org/3699
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Iade5af144dd73ef03bd7d96000134c7a66a5e591
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 16343a0d850d0753acb36ff6b05985a9b60eca13
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 4 12:49:08 2012 +0100

Related: rhbz#862467 band-aid when creating embedded object fails

Change-Id: Ie5ecc8f56636e692a6e17a2e8fab0cefd46cdfb4
(cherry picked from commit 0f3f9cb63056715845d9c3565bde69470c73efb2)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9667c79..097fb3f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2451,6 +2451,9 @@ void OOXMLFastContextHandlerMath::process()
 comphelper::EmbeddedObjectContainer container;
 rtl::OUString aName;
 uno::Reference embed::XEmbeddedObject  ref = 
container.CreateEmbeddedObject( name.GetByteSequence(), aName );
+assert(ref.is());
+if (!ref.is())
+return;
 uno::Reference uno::XInterface  component( ref-getComponent(), 
uno::UNO_QUERY );
 // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast 
directly to the target class,
 // so help it with an intermediate cast. I'm not sure what exactly the problem 
is, seems to be unrelated
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 embeddedobj/source/commonembedding/persistence.cxx |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 06b4b58f52c32af535bc1692e7dbc0e5ee561b9d
Author: Tor Lillqvist t...@iki.fi
Date:   Mon May 6 10:47:20 2013 +0300

No need for conditionality has been turned on since 2004

Change-Id: I0e1708f1102dab8e0424d12b50da25f726e8a5f6

diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index ca43e92..8e9cb80 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -56,8 +56,6 @@
 
 #include tools/diagnose_ex.h
 
-#define USE_STORAGEBASED_DOCUMENT
-
 using namespace ::com::sun::star;
 
 
@@ -259,7 +257,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const 
uno::Reference embed::X
 m_xParentStorage = xNewParentStorage;
 m_aEntryName = aNewName;
 
-#ifdef USE_STORAGEBASED_DOCUMENT
 // the linked document should not be switched
 if ( !m_bIsLink )
 {
@@ -267,7 +264,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const 
uno::Reference embed::X
 if ( xDoc.is() )
 SwitchDocToStorage_Impl( xDoc, m_xObjectStorage );
 }
-#endif
 
 try {
 if ( xComponent.is() )
@@ -494,11 +490,7 @@ uno::Reference util::XCloseable  
OCommonEmbeddedObject::LoadDocumentFromStorag
 }
 
 uno::Reference frame::XLoadable  xLoadable( xDocument, uno::UNO_QUERY );
-uno::Reference document::XStorageBasedDocument  xDoc
-#ifdef USE_STORAGEBASED_DOCUMENT
-( xDocument, uno::UNO_QUERY )
-#endif
-;
+uno::Reference document::XStorageBasedDocument  xDoc( xDocument, 
uno::UNO_QUERY );
 if ( !xDoc.is()  !xLoadable.is() ) ///BUG: This should be || instead of 
 ?
 throw uno::RuntimeException();
 
@@ -744,7 +736,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const 
uno::Reference embed:
 if ( !xStorage.is() )
 throw uno::RuntimeException(); // TODO:
 
-#ifdef USE_STORAGEBASED_DOCUMENT
 uno::Reference document::XStorageBasedDocument  xDoc;
 {
 osl::MutexGuard aGuard( m_aMutex );
@@ -773,7 +764,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const 
uno::Reference embed:
 SwitchDocToStorage_Impl( xDoc, xStorage );
 }
 else
-#endif
 {
 // store document to temporary stream based on temporary file
 uno::Reference  io::XInputStream  xTempIn = 
StoreDocumentToTempStream_Impl( nStorageFormat, aBaseURL, aHierarchName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help with saving state to vector with arbitrary length

[Albert Thuswaldner]

Hi,
While removing the limit of 3 sort criteria in Calc, I more or less
intentionally left out fixing the saving of state.

The state is set here:
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/cellsh2.cxx#507

and retrived here:
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/cellsh2.cxx#429

As can be seen in the code above the state is only saved for 3 sort
criteria. The state is kept by six RIDs FN_PARAM_1 to FN_PARAM_6, one
integer to keep record of the position in the dropdown list, and one
boolean to hold the sort order for each criteria.

How do I solve this now when the there can be an arbitary number of
sort criteria? Is it possible to save the state as two vectors
one integer vector, and one bool vector? Vectors with arbitrary lengths.

Thanks for your help.

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

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

[Riccardo Magliocchetti]

 configure.ac |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2ac38d1eac981a411f89b666c6f72aef88fa1f73
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Mon May 6 10:31:32 2013 +0200

configure: with --enable-headless disable opengl by default

Change-Id: Ia09d30c7ffe6b8597c6b23921feed07151aab04c

diff --git a/configure.ac b/configure.ac
index 0be1aa4..af43cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9641,6 +9641,8 @@ if test -z $enable_opengl; then
 # As such with some suitable minor tweaks the Mac OpenGL transitions 
code would presumably
 # build fine for iOS, too, but let's leave that for later
 enable_opengl=no
+elif test $enable_headless = yes; then
+enable_opengl=no
 else
 enable_opengl=yes
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ccache-msvc - what version are the patches against? Won't apply to 3.1.8

[Christian Lohmaier]

Hi Peter, *,

I tried to use the ccache 3.x basd patched version from
http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/ccache-msvc
recently, but the build fails, since ccache won't find the compiler
when it is given as a windows-style path (as it is forced in
openssl/nmake-using stuff).

The patched ccache 2.4 (the previous version, and the one linked from
https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies
) doesn't have this problem, so I thought I'd patch ccache to behave
like ccache2.4 when trying to find the real compiler.

But the patches that are claimed to be against ccache 3.1.8 won't apply.
$ git am ../ccache-msvc/patches/*
Applying: make MSVC work
fatal: corrupt patch at line 26
Patch failed at 0001 make MSVC work

trying to manually apply it to get more details:

$ patch -p1  ../ccache-msvc/patches/0001-make-MSVC-work.patch
patching file ccache.c
Hunk #1 succeeded at 87 (offset -2 lines).
Hunk #2 succeeded at 522 (offset -52 lines).
Hunk #3 succeeded at 532 with fuzz 2 (offset -62 lines).
Hunk #4 FAILED at 614.
Hunk #5 succeeded at 563 (offset -61 lines).
Hunk #6 succeeded at 1248 with fuzz 2 (offset -137 lines).
Hunk #7 succeeded at 1261 with fuzz 2 (offset -137 lines).
Hunk #8 succeeded at 1431 (offset -160 lines).
Hunk #9 succeeded at 1460 (offset -160 lines).
1 out of 9 hunks FAILED -- saving rejects to file ccache.c.rej
patching file ccache.h
Hunk #1 succeeded at 52 (offset -1 lines).

With that fuzzyness/huge offsets and a failed chunk, I wonder what
version the patches really are based on.

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 
2013-05-06 10:09 -0700

Tag libreoffice-4.1.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh3MvAAoJEPQ0oe+v7q6j8vEP+QHaRD4ZCytEcbzWvcBjvESH
wBIliMoFa36TMfJ5XnJkIjlDEZwtxU0q8fNTUtqOiMe9FTc98bWEp03TiehvjTTP
4NhCfCzXn13CL67yEfLHknD4h334dnJide6NWMpx2Toyw8AtyuVmuWYQbLz1XMFd
OWKcsLfGUq+Yc4Z/ZoXxwi02DDsjrF6GsSVo/wVM2FZMzmryluR81uCb45Md0fYH
D5gzRb4j6J2qp/AmRbq2aYVBLHaZKVz9ZIb+Ow4nbgEfSMLfGw3zjTorPR+SCujU
NGm0+4S+UtuwnRYUB1MxcC9g2XTR4IGU0gPP5tey+Bw+GsvdOMNxD6ggp99nvZN1
JjKmh8RS5Db1I4yhNvD3M08LlY2rI0ngbMQkWsKQAEDtYOpxg1yDGPEM0hYsPR+7
TYsQjE4sK7WyaxYdPdLC8fKSsP39fEtZAnWVbHai06CDb+vKuEisTru5Io7nD/zK
m9VJZTPaHgYUbuuOrzWZO9itRLmcXb3syQEpyKEoaPNaDPjhBJno5rki0IKzmXJw
u1pPhhFq79ic/za3Kalum0Ls80LKnV6gcWKp9e4UBVpgzPvCYr8sFe8fs32SmAqK
rlEYqB+hG+C+gkfvUJJon9VCJ4litlnRRKrsrLYtVJH2PnBUuZShDSZb2uzwRMsS
8MrX9Qk8q3LHlLgG+//x
=3FVB
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 
2013-05-06 10:09 -0700

Tag libreoffice-4.1.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh3MwAAoJEPQ0oe+v7q6j0RcP/itpVA+HXD0PqsgYHP0QQqQI
n8hjwolgwZMS1TQQLLlXIkgHhdgRmLLXIWGFRIViMsgJ25XXpWZQUhblkNxVkj6N
rN9xdwhIG2EOsHXoSEsXGleW/iRk2BcuZ4oFCxcu8a7x+soQpEJG2JDjO9SL7Fmz
qW+qp754DAjry9qEtA+uRpnEQBDaVZxunDu076FcXpfHD8Rhk+Ni9cmrGHQ07n2h
jC+VjurMi99vdum9RQEP/HIhRsEZD9t0CzkZEhAKQqsmz0xZhWPchkJC5Gr1pzFk
yF1/a9mZeD7WS48A/MsZ7n7yIoOsngkB5SRRqd2+u+ud/+PJPfAkV2AULvK8A1O2
w+3CHn6IuoM9yMVtwtwSm6kCveMQSB6BYj3Ax9h6G5GvpalK9547RJ7yuCLlSuCX
BMWvrYLnAASueApUws76OEkdCopeJ+BVto1/P1nB9JxRCu4XmItxnnQQFpuWoD6+
Q1rZ0Al6Zux0a5W4m0OEyn4x/i8GoGtaklK6iPBpQPvXuNiwhxWwJ+fc0B8vko+h
sA8qKpdh8Q/LTMcsBxMUlWreKNZHuiNOlJZWGgUChNm/aD6jBYaDLYyZbmLzS4hF
3/XfWivD2JCpkwxC8wXKpZuzTe44/REiBsxVQMg/Rkksvi7MB1WQb+PrZk1L8/Rp
0uD0UwJk7DbzQRpd795t
=ROov
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 
2013-05-06 10:09 -0700

Tag libreoffice-4.1.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh3MwAAoJEPQ0oe+v7q6j3n8P/jnC+8ViPl7vTHhi1PuHINTB
kwxDpVNixvudcCN2k8KKlsK0MrXAP77Yq6b+xMFCT73lWDesx+Y6TtgIXn6MnWl8
vW+oFIpELi0VQm5JbWf35bB8QjPRHJnJHDOKcYRFZ49XJF5EhqR48xbL01peo1mj
/ZNcd0VZ0MrliNnyWi583e3b9lvMZ1IIDUzjgYPpq8u8Fm8PNz+5cp41k79idA6/
kL+KUXWNebncvrnxPjzZOOTKZjzUnQgEFY7YthvQzHrfpvta/XSo2pVE1kzsgpnC
K1qiPrtYMdgUrv7fcTmH5h78owuM6/3rjiQaBLTjFljKqoRQTHQOpvrETYdv7+0R
/tXi5D9CYLfvpWLOUbJNs4dzyY7l8P1+lbFEhRwrmijj2HQAIdcgKRW9sGnFfdD3
8HwisWs0M1Sp0Pi8Oa7vQW+2h01ga18tOFSLeWDMxwsTO4XNGVvCOs7BxS4X46zT
sM6hITyoepKyWuVQ3aCwxsbpRJflognf3ZwDAA8VfsBTCbmBozy91KFmTNQUjXQT
KjVmDi41g5yvGF22I0dwHo7se7g6Un1eF1WMtiXnJvwdXxTxgSt38YbLAWEHFL4T
nj1zgh1SMvvkJVTpJogSSsrHdLnuQ6FkqpN5BSTovWHsrDOa9gxsoNh2SMQw+cL2
/xRyFyD6B7A6oh5sNjmH
=cU+f
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 
2013-05-06 10:09 -0700

Tag libreoffice-4.1.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh3MwAAoJEPQ0oe+v7q6jMGwP/02TXzqCnYYZo5LeUcriq+P9
nilFIDcvva55vJT/m5xsiRMqFgWHqKWCB8ZEQQPQFBOOQIOC+JbopxGuSrKcQpPZ
yL2XzHiXXwswCjojVv3bid2NG8DqIGkYz0w2HDq3gDReiT+hPXO3bx5+KJJLzIF+
WYIn72gtTmCu1DC3sLWQ+k6NwOYPqOwr6mUtHtjh3xWhl3QY6giI3qAq9Eax5StZ
6X3Ga6rrrF7DxbvQ28eTJWd91UISjvdSmtEoYn86VJYhNE/waJJk0lFDwQPkWi+k
6+rFBMiciqocQgSKWMRDEubs+I8ornRQFIq44X3jBOfA7eENe1KjFgxESEM2ZAY6
nFmPXyb6Ze5+cU56ddDuPQNZ5OstZTi3dsA67+lptl3h/gNtbhHKkcuHXxydwP0I
vyhGvxTpoLywrlnm79znhnC4XTze2MLOpWd6dzMCErAYQCqE9Zm/Ivklk7dGTe7r
kigH9akwXd0d6fQx/R0ZJu+GgOCN5PrtlFtlx8OqOtDWijUowHr0xFmwOwobjEMX
yamgYpkTZx8Uf1iJZ5AmGBF4GH0Mju2wi8kSk7cWplOQrANege1yRyY/M4cmsHlb
OAL+PBIgzGHCxXrxEFESyQzg3ahWKDinbkc0g443qYtml6rUB//1aP5bI1jBQSOM
lap1GgeeqD/ouCWY63bt
=Ys7E
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: 5 commits - offapi/com offapi/UnoApi_offapi.mk sfx2/source sw/CppunitTest_sw_ooxmlexport.mk sw/CppunitTest_sw_rtfimport.mk udkapi/com vcl/source vcl/unx

[Noel Grandin]

 offapi/UnoApi_offapi.mk   |3 
 offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl |   39 ++
 offapi/com/sun/star/graphic/Primitive2DTools.idl  |8 -
 sfx2/source/appl/appmisc.cxx  |   63 
--
 sw/CppunitTest_sw_ooxmlexport.mk  |1 
 sw/CppunitTest_sw_rtfimport.mk|1 
 udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl|4 
 vcl/source/gdi/outdev.cxx |   20 +--
 vcl/source/gdi/svgdata.cxx|   60 
-
 vcl/source/window/window.cxx  |   57 
-
 vcl/unx/gtk/fpicker/SalGtkPicker.cxx  |6 
 11 files changed, 144 insertions(+), 118 deletions(-)

New commits:
commit 46662428b2b17043e1d09c4107e7a5c0cf490b86
Author: Noel Grandin n...@peralex.com
Date:   Fri May 3 17:23:20 2013 +0200

fdo#46808, Convert graphic::Primitive2DTools to new style

Change-Id: I9719b43dbf98cfca29638f54cc907e48c7ad28b7

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1e5b2112..c426138 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -189,6 +189,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
GraphicObject \
GraphicProvider \
+   Primitive2DTools \
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
DefaultHelpProvider \
@@ -938,7 +939,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic
GraphicRasterizer \
GraphicRendererVCL \
MediaProperties \
-   Primitive2DTools \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
ChapterCollator \
diff --git a/offapi/com/sun/star/graphic/Primitive2DTools.idl 
b/offapi/com/sun/star/graphic/Primitive2DTools.idl
index 75209fd..a99b460 100644
--- a/offapi/com/sun/star/graphic/Primitive2DTools.idl
+++ b/offapi/com/sun/star/graphic/Primitive2DTools.idl
@@ -27,13 +27,7 @@ module com { module sun { module star { module graphic
 /** Service that describes the necessary interfaces and properties
 for tooling involved with XPrimitive2D interfaces
  */
-
-service Primitive2DTools
-{
-/** Interface to render B2DPrimitives to a XBitmap
-*/
-interface ::com::sun::star::graphic::XPrimitive2DRenderer;
-};
+service Primitive2DTools : XPrimitive2DRenderer;
 
 } ; } ; } ; } ;
 
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index f6d1597..06f18fb 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -30,7 +30,7 @@
 #include com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/frame/XFrame.hpp
-#include com/sun/star/graphic/XPrimitive2DRenderer.hpp
+#include com/sun/star/graphic/Primitive2DTools.hpp
 #include com/sun/star/util/XURLTransformer.hpp
 #include com/sun/star/frame/XFramesSupplier.hpp
 #include com/sun/star/uno/Reference.h
@@ -218,44 +218,39 @@ bool SfxApplication::loadBrandSvg(const char *pName, 
BitmapEx rBitmap, int nWid
 
 // UNO dance to render from drawinglayer
 // -
-uno::Reference lang::XMultiServiceFactory  
xFactory(::comphelper::getProcessServiceFactory());
-const OUString aServiceName(com.sun.star.graphic.Primitive2DTools);
+uno::Reference uno::XComponentContext  
xContext(::comphelper::getProcessComponentContext());
 
 try
 {
-const uno::Reference graphic::XPrimitive2DRenderer  
xPrimitive2DRenderer(
-xFactory-createInstance(aServiceName),
-uno::UNO_QUERY_THROW);
-
-if(xPrimitive2DRenderer.is())
+const uno::Reference graphic::XPrimitive2DRenderer  
xPrimitive2DRenderer =
+graphic::Primitive2DTools::create( xContext );
+
+// cancel out rasterize's mm2pixel conversion
+// see fFactor100th_mmToInch in
+// drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+const double fFakeDPI=2.54 * 1000.0;
+
+geometry::RealRectangle2D aRealRect(
+0, 0,
+nWidth, nWidth / fAspectRatio);
+
+const uno::Reference rendering::XBitmap  xBitmap(
+xPrimitive2DRenderer-rasterize(
+drawinglayer::primitive2d::Primitive2DSequence(xTransformRef, 
1),
+uno::Sequence beans::PropertyValue (),
+fFakeDPI,
+fFakeDPI,
+aRealRect,
+50));
+
+if(xBitmap.is())
 {
-// cancel out rasterize's mm2pixel conversion
-// see 

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

[Albert Thuswaldner]

 sc/source/ui/dbgui/tpsort.cxx |   40 
 sc/source/ui/inc/tpsort.hxx   |1 +
 2 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit b9cd66b970a2b76d6f07ead71b9df7a9232ff5af
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date:   Sat May 4 01:39:24 2013 +0200

fdo#51828 - UI: Sort: can use more than 3 criteria once only - additional 
fix

Change-Id: I569766945d96eae74479e310d674c9420e9a2b4b
Reviewed-on: https://gerrit.libreoffice.org/3772
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6731e71..fd62073 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -184,7 +184,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet /* 
rArgSet */ )
 {
 maSortKeyItems[i].m_pLbSort-SelectEntryPos( GetFieldSelPos(
 aSortData.maKeyState[i].nField ) );
-
 (aSortData.maKeyState[i].bAscending)
 ? maSortKeyItems[i].m_pBtnUp-Check()
 : maSortKeyItems[i].m_pBtnDown-Check();
@@ -234,6 +233,10 @@ void ScTabPageSortFields::Reset( const SfxItemSet /* 
rArgSet */ )
 pDlg-SetByRows ( bSortByRows );
 pDlg-SetHeaders( bHasHeader );
 }
+
+// Make sure that there is always a last undefined sort key
+if ( maSortKeyItems[nSortKeyCount - 1].m_pLbSort-GetSelectEntryPos()  0 )
+SetLastSortKey( nSortKeyCount );
 }
 
 // ---
@@ -443,6 +446,25 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW 
nField )
 return nFieldPos;
 }
 
+void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
+{
+// Extend local SortParam copy
+const ScSortKeyState atempKeyState = { false, 0, true };
+aSortData.maKeyState.push_back( atempKeyState );
+
+// Add Sort Key Item
+++nSortKeyCount;
+maSortKeyCtrl.AddSortKey( nSortKeyCount );
+maSortKeyItems[nItem].m_pLbSort-SetSelectHdl(
+ LINK( this, ScTabPageSortFields, SelectHdl ) );
+
+FillFieldLists( nItem );
+
+// Set Status
+maSortKeyItems[nItem].m_pBtnUp-Check();
+maSortKeyItems[nItem].m_pLbSort-SelectEntryPos( 0 );
+}
+
 // ---
 // Handler:
 //-
@@ -451,26 +473,12 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb 
)
 {
 OUString aSelEntry = pLb-GetSelectEntry();
 ScSortKeyItems::iterator pIter;
-sal_uInt16 nSortKeyIndex = nSortKeyCount;
 
 // If last listbox is enabled add one item
 if ( maSortKeyItems.back().m_pLbSort == pLb )
 if ( aSelEntry != aStrUndefined )
 {
-// Extend local SortParam copy
-const ScSortKeyState atempKeyState = { false, 0, true };
-aSortData.maKeyState.push_back( atempKeyState );
-
-// Add Sort Key Item
-++nSortKeyCount;
-maSortKeyCtrl.AddSortKey( nSortKeyCount );
-maSortKeyItems[nSortKeyIndex].m_pLbSort-SetSelectHdl( LINK( this, 
ScTabPageSortFields, SelectHdl ) );
-
-FillFieldLists( nSortKeyIndex );
-
-// Set Status
-maSortKeyItems[nSortKeyIndex].m_pBtnUp-Check();
-maSortKeyItems[nSortKeyIndex].m_pLbSort-SelectEntryPos( 0 );
+SetLastSortKey( nSortKeyCount );
 return 0;
 }
 
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 8ce4a42..b230581 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -95,6 +95,7 @@ private:
 voidInit();
 voidFillFieldLists  ( sal_uInt16 nStartField );
 sal_uInt16  GetFieldSelPos  ( SCCOLROW nField );
+voidSetLastSortKey( sal_uInt16 nItem );
 
 // Handler 
 DECL_LINK( SelectHdl, ListBox * );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Convert EMFP_DEBUG to SAL_INFO, etc.

[Tor Lillqvist (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/3782

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6db0021807634070cfa2fee0f07e32d235b3d2f3
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

[PUSHED] fdo#51828 - UI: Sort: can use more than 3 criteria once only...

[Markus Mohrhard (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/3772

Approvals:
  Markus Mohrhard: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I569766945d96eae74479e310d674c9420e9a2b4b
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com

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

[ANNOUNCE] libreoffice-4.1.0.0.alpha1 tag created

[Petr Mladek]

Hi,

there have been created the libreoffice-4.1.0.0.alpha1 tag. The
corresponding official builds will be available within next few days.

PURPOSE:
This release in intended only for internal testing. The main
purpose is to test that we are able to create release builds from
master and that they are usable for testing. We will not push it on
mirrors. Please, do not announce the builds widely.

I will upload the list of commits and fixed bugs later today. The
script is still running :-) Well, the list of new features is more
interesting in this case, see
http://wiki.documentfoundation.org/ReleaseNotes/4.1


Now, you might switch your current master source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-4.1.0.0.alpha1 libreoffice-4.1.0.0.alpha1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/


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


Best Regards,
Petr

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

Re: [ANNOUNCE] libreoffice-4.1.0.0.alpha1 tag created

[Fridrich Strba]

When trying to build it with all languages on windows, I get:

$ /opt/lo/bin/make.exe
/opt/lo/bin/make -j 1 -rs -f C:/master/Makefile.gbuild
/cygdrive/c/master/helpcontent2/AllLangHelp_sbasic.mk:12: ***
gb_Package__check: Package HelpTarget/sbasic/af has not been defined.  Stop.
make: *** [build] Error 2

Anybody knowledgeable in gbuild has any idea?

F.


On 06/05/13 11:59, Petr Mladek wrote:
 Hi,
 
 there have been created the libreoffice-4.1.0.0.alpha1 tag. The
 corresponding official builds will be available within next few days.
 
 PURPOSE:
 This release in intended only for internal testing. The main
 purpose is to test that we are able to create release builds from
 master and that they are usable for testing. We will not push it on
 mirrors. Please, do not announce the builds widely.
 
 I will upload the list of commits and fixed bugs later today. The
 script is still running :-) Well, the list of new features is more
 interesting in this case, see
 http://wiki.documentfoundation.org/ReleaseNotes/4.1
 
 
 Now, you might switch your current master source tree to it using:
 
 ./g fetch --tags
 ./g checkout -b tag-libreoffice-4.1.0.0.alpha1 libreoffice-4.1.0.0.alpha1
 
 Linux distro packages might find source tarballs at
 http://dev-builds.libreoffice.org/pre-releases/src/
 
 
 See also the schedule at 
 http://wiki.documentfoundation.org/ReleasePlan#4.1_release
 and release criteria at http://wiki.documentfoundation.org/Release_Criteria
 
 
 Best Regards,
 Petr
 
 ___
 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] core.git: rhino/OfficeScriptInfo.java

[Stephan Bergmann]

 rhino/OfficeScriptInfo.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70100b82906ea7382c0697d4a781e48e4dcbf83d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 12:10:05 2013 +0200

Hashtable - HashMap

Change-Id: Ib5c49240e76ebe7fd9a651cd7c6d6041171fc541

diff --git a/rhino/OfficeScriptInfo.java b/rhino/OfficeScriptInfo.java
index a71a68e..cb65f33 100644
--- a/rhino/OfficeScriptInfo.java
+++ b/rhino/OfficeScriptInfo.java
@@ -28,7 +28,7 @@
 
 package org.mozilla.javascript.tools.debugger;
 import java.net.URL;
-import java.util.Hashtable;
+import java.util.HashMap;
 import org.mozilla.javascript.Scriptable;
 
 public class OfficeScriptInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppcanvas/source/mtfrenderer/emfplus.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e50ef531021ea2322ebaf5109f6fe758e65d27b0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 12:19:05 2013 +0200

Fix adaption to SAL_INFO

Change-Id: I12e32c0323e21946b795ca7f2af392930f55eed6

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 814c55e..693a57c 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1451,16 +1451,14 @@ namespace cppcanvas
 }
 case EmfPlusRecordTypeFillPolygon:
 {
-#if OSL_DEBUG_LEVEL  1
 sal_uInt8 index = flags  0xff;
-#endif
 sal_uInt32 brushIndexOrColor;
 sal_Int32 points;
 
 rMF  brushIndexOrColor;
 rMF  points;
 
-SAL_INFO(cppcanvas.emf, EMF+ FillPolygon in 
slot:   index   points:   points);
+SAL_INFO(cppcanvas.emf, EMF+ FillPolygon in 
slot:   +index   points:   points);
 SAL_INFO(cppcanvas.emf, EMF+\t:   ((flags  
0x8000) ? color : brush index)   0x  std::hex  brushIndexOrColor);
 
 EMFPPath path (points, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

psprint::CompatMetricOverride - can I kill it?

[Noel Grandin]

Hi

Looking at the code in

  vcl/generic/fontmanager/fontmanager.cxx

at line 2877, something like this (simplified)

  bool PrintFontManager::readOverrideMetrics()
  {
  getProcessServiceFactory()-createInstance( 
com.sun.star.psprint.CompatMetricOverride ),


But I do not find this service anywhere in the codebase.

It appears to have been introduced in this commit:
   commit 01cf48436df2cc3f01d1c57cc4348fc037ef
   Author: Kurt Zenker k...@openoffice.org
   Date:   Wed Jun 20 09:07:44 2007 +
   INTEGRATION: CWS compmetric (1.77.2); FILE MERGED
   2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed
   2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards 
compatibility service for metrics


But the commit did not introduce the associated service.

Regards, Noel Grandin

Disclaimer: http://www.peralex.com/disclaimer.html


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

[Libreoffice-commits] dev-tools.git: scripts/qawrangler-stats.py

[Marc Garcia]

 scripts/qawrangler-stats.py |  147 +++-
 1 file changed, 119 insertions(+), 28 deletions(-)

New commits:
commit 75083a0e822d25ae7c3dfd3c86b335440d0a60b6
Author: Marc Garcia garcia.m...@gmail.com
Date:   Mon Apr 29 12:40:37 2013 +0200

qa wranglers script file refactored

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/scripts/qawrangler-stats.py b/scripts/qawrangler-stats.py
index f73c38e..8b1c52f 100755
--- a/scripts/qawrangler-stats.py
+++ b/scripts/qawrangler-stats.py
@@ -1,44 +1,135 @@
 #!/usr/bin/env python3
+#
+# 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/.
+#
+# qawrangler-stats.py
+#
+# Returns statistics of most active wranglers and reporters for a given
+# month.
+#
+# For usage information, run:
+#   qawrangler-stats.py -h
+#
 
-import sys, re
+import sys
+import re
+import datetime
 import gzip
+import argparse
+import csv
 from urllib.request import urlopen, URLError
 from io import BytesIO
-from collections import Counter
+from collections import Counter, OrderedDict
 
-month = ''
-if len(sys.argv) = 2:
-month = sys.argv[1]
+URL = 'http://lists.freedesktop.org/archives/libreoffice-bugs/{}.txt.gz'
+ENTITIES = OrderedDict({
+'changers': re.compile(r'^(.+)\schanged:$', re.MULTILINE),
+'reporters': re.compile(r'^\s*Reporter:\s(.+)$', re.MULTILINE),
+'commentators': re.compile(r'^--- Comment #\d+ from (.+) ---$',
+re.MULTILINE),
+})
 
-url = 'http://lists.freedesktop.org/archives/libreoffice-bugs/' + month + 
'.txt.gz'
-print('Downloading ' + url)
+def get_parser():
+Returns an argparse instance, setting the arguments for the script
+parser = argparse.ArgumentParser(
+description='LibreOffice contributor statistics')
+parser.add_argument('-m', '--month', dest='month', type=int,
+default=datetime.date.today().month,
+help='month to generate statistics from (default is current month)')
+parser.add_argument('-y', '--year', dest='year', type=int,
+default=datetime.date.today().year,
+help='year to generate statistics from (default is current year)')
+parser.add_argument('-n', '--num', dest='num', type=int, default=None,
+help='number of top contributors of each category (default is all)')
+parser.add_argument('--csv', dest='csv', action='store_true',
+help='output information in CSV format')
 
-try:
-response = urlopen(url)
-buf = BytesIO(response.read())
-gz = gzip.GzipFile(fileobj=buf)
+return parser
 
-txt = gz.read().decode('us-ascii')
-gz.close()
+def get_fname(date):
+Returns the `Libreoffice-bugs Archives' file name for a given a @date
+datetime object. Note that only year and month are relevant, day is
+ignored
+return '{}-{}'.format(date.year, date.strftime('%B'))
 
-reportedby = re.compile(r'^.*Reporter:.(.*)$', re.MULTILINE)
-reporters = re.findall(reportedby, txt)
+def get_data(url):
+Fetches and uncompresses the `Libreoffice-bugs Archives' file given its
+@url. The return of the function is the content of the gile as a string
+try:
+resp = urlopen(url)
+except URLError:
+sys.stderr.write('Error fetching {}'.format(url))
+sys.exit(1)
+else:
+with gzip.GzipFile(fileobj=BytesIO(resp.read())) as f:
+return f.read().decode('us-ascii')
 
-wrangledby = re.compile(r'^.*(.*) changed:$', re.MULTILINE)
-wranglers = re.findall(wrangledby, txt)
+def get_entity_values(data, pattern, num):
+Returns the first @num matches of a @pattern in the @data string. If
+@num is None, all matches are returned
+values = re.findall(pattern, data)
+return Counter(values).most_common(num)
 
-topreporters = Counter(reporters).most_common(30)
-topwranglers = Counter(wranglers).most_common(30)
+def nice_print(values_dict, num_output, date):
+Prints to stdout the output of the script in a human readable way.
+@values_dict is a dict containing a key for each entity (e.g. wranglers,
+reporters, etc), and as values, a list of tuples containing the name and
+the number of occurrences. An example:
 
-print('\n=== ' + month[5:] + ' ' + month[:4] + '===')
-print('\n--- Top 30 reporters ---')
-for reporter in topreporters:
-print('{0:40}{1:5d}'.format(reporter[0], reporter[1]))
+ {
+'wranglers': [
+('Wrangler 1 wrangler1@his_email.com', 30),
+# 30 is the number of times he wrangled
+('Wrangler 2 wrangler2@his_email.com', 15),
+]
+ }
 
-print('\n--- Top 30 wranglers ---')
-for wrangler in topwranglers:
-print('{0:40}{1:5d}'.format(wrangler[0], wrangler[1]))
+@num_output is the number of top values in each 

[PATCH] configure: reguire libjpeg 8

[Riccardo Magliocchetti (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3796

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3796/1

configure: reguire libjpeg 8

b5a9cc71 introduced the use of JERR_BAD_CROP_SPEC which is available
since libjpeg8.

Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
---
M configure.ac
1 file changed, 14 insertions(+), 0 deletions(-)



diff --git a/configure.ac b/configure.ac
index af43cac..4f6a102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7175,6 +7175,20 @@
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
 AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+AC_MSG_CHECKING([[libjpeg version is 8 or greater]])
+   AC_PREPROC_IFELSE([ AC_LANG_SOURCE(
+ [[
+#include stdio.h
+#include jpeglib.h
+#if JPEG_LIB_VERSION  80
+#error wrong version
+#endif
+int main(int c, char**v) { return 0; }
+ ]]) ],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+   AC_MSG_ERROR(jpeg library version = 8 required)
+  ])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
 AC_MSG_RESULT([internal])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com

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

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

[Miklos Vajna]

 sw/qa/extras/ww8export/data/fdo42144.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx |9 +
 sw/source/filter/ww8/wrtw8sty.cxx|2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 4144cd5a851466778004af9de98dbcfb019067bb
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 6 13:01:27 2013 +0200

fdo#42144 WW8 export: avoid writing pointless empty footers

Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.

Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a

diff --git a/sw/qa/extras/ww8export/data/fdo42144.odt 
b/sw/qa/extras/ww8export/data/fdo42144.odt
new file mode 100644
index 000..be94900
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo42144.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 65fcfe2..0c2f769 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -25,6 +25,7 @@ public:
 void testZoom();
 void test56513();
 void testNewPageStylesTable();
+void testFdo42144();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -46,6 +47,7 @@ void Test::run()
 {zoom.doc, Test::testZoom},
 {fdo56513.doc, Test::test56513},
 {new-page-styles.doc, Test::testNewPageStylesTable},
+{fdo42144.odt, Test::testFdo42144},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -140,6 +142,13 @@ void Test::testNewPageStylesTable()
 CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals: Next Year 
(Page 3)***),  parseDump(/root/page[3]/header/txt/text()));
 }
 
+void Test::testFdo42144()
+{
+// Footer wasn't disabled -- instead empty footer was exported.
+uno::Referencebeans::XPropertySet 
xStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, bool(getPropertysal_Bool(xStyle, 
FooterIsOn)));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 17fb01c..8397093 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1183,7 +1183,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export rWrt, 
bool bHeader,
 else if ( rWrt.bWrtWW8 )
 {
 pTxtPos-Append( rCpPos );
-if (rWrt.bHasHdr  nBreakCode!=0)
+if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr)  nBreakCode!=0)
 {
 rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty 
header/footer
 rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for 
end of the stream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re: Patch that refactors QA wrangler script

[Petr Mladek]

Marc Garcia píše v Po 29. 04. 2013 v 12:55 +0200:

 
 Here you have the main changes to it:
  - Made the script more modular
  - Made it more Pythonic
  - Added copyright information
  - Usage information is displayed when called with -h parameter
  - Made it more scalable, as it allows to add new possible information
 (e.g. the platform or the component of reported bugs), by simply
 adding its name and its regular expression to a defined constant
  - Made more customizable. As well as the year and month, it's
 possible to specify by the command line, the number of authors to be
 displayed (-n parameter), or the format of the output (see next point)
  - Added an alternative output as CSV (using the parameter --csv), as
 well as the original human readable output
  - Added a new group to report, commentators, together with existing
 wranglers (renamed changers) and reporters
  - Displaying the full name of the authors (e.g. My Name
 myn...@libreoffice.org instead of simply myn...@libreoffice.org)

These are great changes. I have pushed the patch, see
http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=75083a0e822d25ae7c3dfd3c86b335440d0a60b6

I have only removed the section about Apache from the copyright. The
scrip works only with the bugzilla used by LO. It was primary created
for LO. I see that all developers gave the permissions to contribute
changes under MPL license, so I do not see any contribution from the
Apache project. Or did I miss anything? :-)

Thanks a lot for the improvement.

Best Regards,
Petr

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

[PATCH libreoffice-4-0] fdo#42144 WW8 export: avoid writing pointless empty footers

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3797

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3797/1

fdo#42144 WW8 export: avoid writing pointless empty footers

Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.

(cherry picked from commit 4144cd5a851466778004af9de98dbcfb019067bb)

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

Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
---
A sw/qa/extras/ww8export/data/fdo42144.odt
M sw/qa/extras/ww8export/ww8export.cxx
M sw/source/filter/ww8/wrtw8sty.cxx
3 files changed, 10 insertions(+), 1 deletion(-)



diff --git a/sw/qa/extras/ww8export/data/fdo42144.odt 
b/sw/qa/extras/ww8export/data/fdo42144.odt
new file mode 100644
index 000..be94900
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/fdo42144.odt
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 679f765..6ed1ccd 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -42,6 +42,7 @@
 void testFdo45724();
 void testFdo46020();
 void testFirstHeaderFooter();
+void testFdo42144();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -60,6 +61,7 @@
 {fdo45724.odt, Test::testFdo45724},
 {fdo46020.odt, Test::testFdo46020},
 {first-header-footer.doc, Test::testFirstHeaderFooter},
+{fdo42144.odt, Test::testFdo42144},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -139,6 +141,13 @@
 CPPUNIT_ASSERT_EQUAL(OUString(Even page footer 2),  
parseDump(/root/page[6]/footer/txt/text()));
 }
 
+void Test::testFdo42144()
+{
+// Footer wasn't disabled -- instead empty footer was exported.
+uno::Referencebeans::XPropertySet 
xStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, bool(getPropertysal_Bool(xStyle, 
FooterIsOn)));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index f002c1f..d837181 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1182,7 +1182,7 @@
 else if ( rWrt.bWrtWW8 )
 {
 pTxtPos-Append( rCpPos );
-if (rWrt.bHasHdr  nBreakCode!=0)
+if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr)  nBreakCode!=0)
 {
 rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty 
header/footer
 rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for 
end of the stream

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 42144, which changed state.

Bug 42144 Summary: FILESAVE as .doc (MSO97) looses page bottom margin formatting
https://bugs.freedesktop.org/show_bug.cgi?id=42144

   What|Removed |Added

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

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

Re: New language localization

[Eike Rathke]

Hi Kaïraba,

On Saturday, 2013-05-04 13:37:32 +0100, Kaïraba Cissé wrote:

 N'ko is a right to left language with its own digits. For more information
 see : http://en.wikipedia.org/wiki/N%27Ko_alphabet
 Unicode range : U+07C0–U+07FF
 
 I want to start the localization of libre office in N'ko language.
 Unfortunately, this language is not yet supported.

Please see
https://wiki.documentfoundation.org/LibreOffice_Localization_Guide/Adding_a_New_Language_or_Locale
and submit an RFE as stated under Request a new language/locale to be
added.


 ISO 3166-1 :   not available (standard language)

According to the Ethnologue http://www.ethnologue.com/language/nqo that
would be 'GN' Guinea, we need a default country assignment for locale
data.

  Eike

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


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

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

[Eike Rathke]

 vcl/generic/glyphs/gcach_layout.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit d7676d33f16bf790b35c06b5710f326254387cdc
Author: Eike Rathke er...@redhat.com
Date:   Fri May 3 00:19:59 2013 +0200

adapt to ICU patch https://ssl.icu-project.org/trac/ticket/10107

do not call LayoutEngine::reset()

Calling reset() disposes everything the LayoutEngine knows in its
current state. While this may have prevented some obscure crash during
exit in the past (call was added 2003-03-27), it definitely leads to a
crash if the updated LayoutEngine patch
http://download.icu-project.org/files/icu4c/51.1/icu-51-layout-fix-10107.tgz
is applied as that sets fGlyphStorage=NULL (it doesn't delete
LEGlyphStorage though and thus may leak, but that patch is in the wild
now) and a later call to mpIcuLE-layoutChars() tries to access
fGlyphStorage-...() if mpIcuLE is reused.

For the patch mentioned see
http://site.icu-project.org/download/51#TOC-Known-Issues and
http://bugs.icu-project.org/trac/ticket/10107

Change-Id: I1b8f5c446c174d7d12b896b3ecd2a266645e8abc
(cherry picked from commit 7de7267f4cfcb455aabb09053c7ed681d4591867)

implemented IcuFontFromServerFont::getFontTable(LETag,size_t)

so that ICU versions trying to call
LEFontInstance::getFontTable(LETag,size_t) actually call it instead of
IcuFontFromServerFont::getFontTable(LETag)

See http://site.icu-project.org/download/51#TOC-Known-Issues
NOTE: Applications must implement LEFontInstance::getFontTable(LETag,
size_t length)  in their LEFontInstance subclasses, so that ICU can
properly bounds-check font tables.

See also https://ssl.icu-project.org/trac/ticket/10107

(cherry picked from commit 428bde3591ff2fd2195097040dbe1480f1f4210f)

Conflicts:
vcl/generic/glyphs/gcach_layout.cxx

Change-Id: Ic20b7e8dda4e84734eb6de0ccba82b0dea481d55
Reviewed-on: https://gerrit.libreoffice.org/3755
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index a9f373e..f0d38c6 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -103,6 +103,7 @@ public:
 : mrServerFont( rFont )
 {}
 
+virtual const void* getFontTable(LETag tableTag, size_t length) const;
 virtual const void* getFontTable(LETag tableTag) const;
 virtual le_int32getUnitsPerEM() const;
 virtual float   getXPixelsPerEm() const;
@@ -124,7 +125,7 @@ public:
 
 // ---
 
-const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const
+const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag, size_t  
rLength ) const
 {
 char pTagName[5];
 pTagName[0] = (char)(nICUTableTag  24);
@@ -133,9 +134,10 @@ const void* IcuFontFromServerFont::getFontTable( LETag 
nICUTableTag ) const
 pTagName[3] = (char)(nICUTableTag);
 pTagName[4] = 0;
 
-sal_uLong nLength;
+sal_uLong nLength = 0;
 const unsigned char* pBuffer = mrServerFont.GetTable( pTagName, nLength );
-SAL_INFO(vcl, IcuGetTable(\  pTagName  \) =   pBuffer);
+rLength = static_castsize_t(nLength);
+SAL_INFO(vcl, IcuGetTable(\  pTagName  \) =   pBuffer  , 
len=  rLength);
 SAL_INFO(
 vcl,
 font( h=  mrServerFont.GetFontSelData().mnHeight  , \
@@ -143,6 +145,12 @@ const void* IcuFontFromServerFont::getFontTable( LETag 
nICUTableTag ) const
 return pBuffer;
 }
 
+const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const
+{
+size_t nLength = 0;
+return getFontTable( nICUTableTag, nLength);
+}
+
 // ---
 
 le_int32 IcuFontFromServerFont::getUnitsPerEM() const
@@ -412,7 +420,6 @@ bool IcuLayoutEngine::layout(ServerFontLayout rLayout, 
ImplLayoutArgs rArgs)
 mpIcuLE-getGlyphs( pIcuGlyphs, rcIcu );
 mpIcuLE-getCharIndices( pCharIndices, rcIcu );
 mpIcuLE-getGlyphPositions( pGlyphPositions-fX, rcIcu );
-mpIcuLE-reset(); // TODO: get rid of this, PROBLEM: crash at exit 
when removed
 if( LE_FAILURE(rcIcu) )
 return false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 oox/source/export/drawingml.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ea2f86339a3affa643f0f0d81dc79041af06089f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun May 5 21:35:07 2013 +0200

let us be explicit about default values

Different MSO versions behave differently in respect to the default
values. 2007 is not compliant to OOXML and is what our export filter
expects, 2010+ are compliant to OOXML and therefore our charts look
awful.

Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0
(cherry picked from commit 93abb2082ad3cae1432d69b65a89dace6646785a)
Reviewed-on: https://gerrit.libreoffice.org/3793
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4eefc90..611dcbe 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1500,8 +1500,7 @@ void DrawingML::WriteFill( Reference XPropertySet  
xPropSet )
 FillStyle aFillStyle( FillStyle_NONE );
 xPropSet-getPropertyValue( S( FillStyle ) ) = aFillStyle;
 
-if( aFillStyle == FillStyle_NONE ||
-aFillStyle == FillStyle_HATCH )
+if( aFillStyle == FillStyle_HATCH )
 return;
 
 switch( aFillStyle )
@@ -1515,6 +1514,9 @@ void DrawingML::WriteFill( Reference XPropertySet  
xPropSet )
 case ::com::sun::star::drawing::FillStyle_BITMAP :
 WriteBlipFill( xPropSet, S( FillBitmapURL ) );
 break;
+case ::com::sun::star::drawing::FillStyle_NONE:
+mpFS-singleElementNS( XML_a, XML_noFill, FSEND );
+break;
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] adapt to ICU patch https://ssl.icu-project.org/trac/ticket/1...

[Miklos Vajna (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3755

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic20b7e8dda4e84734eb6de0ccba82b0dea481d55
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

[Markus Mohrhard]

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

New commits:
commit 5672bfda87bce5e05e6ef1ecc20f36b4fc7a92ef
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon May 6 01:11:36 2013 +0200

map full transparent solid fill to no fill, fdo#64224

(cherry picked from commit 6e2292b3cdd032edff21f0016b7f61e9bb420699)

Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 611dcbe..d68ff6b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1503,6 +1503,15 @@ void DrawingML::WriteFill( Reference XPropertySet  
xPropSet )
 if( aFillStyle == FillStyle_HATCH )
 return;
 
+if ( aFillStyle == FillStyle_SOLID  GetProperty( xPropSet, 
OUString(FillTransparence) ) )
+{
+// map full transparent background to no fill
+sal_Int16 nVal = 0;
+xPropSet-getPropertyValue( FillTransparence ) = nVal;
+if ( nVal == 100 )
+aFillStyle = FillStyle_NONE;
+}
+
 switch( aFillStyle )
 {
 case ::com::sun::star::drawing::FillStyle_SOLID :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] let us be explicit about default values

[Miklos Vajna (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3793

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[PUSHED libreoffice-4-0] map full transparent solid fill to no fill, fdo#64224

[Miklos Vajna (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3792


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

[Lionel Elie Mamane]

 reportdesign/source/core/api/FixedLine.cxx|5 -
 reportdesign/source/core/api/FixedText.cxx|5 -
 reportdesign/source/core/api/FormattedField.cxx   |3 +++
 reportdesign/source/core/api/ImageControl.cxx |5 -
 reportdesign/source/core/api/ReportDefinition.cxx |4 
 reportdesign/source/core/api/Shape.cxx|5 -
 6 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit f7eb34071af02e9cfe79f926a69e66992f1c6b20
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri May 3 17:47:24 2013 +0200

fdo#48056 revert part of return correct name for shapetype

Keep hardcoded values as *fallback* only, but trust 
m_aProps.aComponent.m_xShape-getShapeType when present.

Change-Id: I5a024a9bc5f87d226ab3c857817dfe91ad975acb
Reviewed-on: https://gerrit.libreoffice.org/3766
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz

diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index 51dff9d..f211053 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -526,7 +526,10 @@ void SAL_CALL OFixedLine::setSize( const awt::Size aSize 
) throw (beans::Proper
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFixedLine::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 ::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw 
(uno::RuntimeException, beans::UnknownPropertyException)
diff --git a/reportdesign/source/core/api/FixedText.cxx 
b/reportdesign/source/core/api/FixedText.cxx
index 2d127a1..215b89c 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -321,7 +321,10 @@ void SAL_CALL OFixedText::setSize( const awt::Size aSize 
) throw (beans::Proper
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFixedText::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 // 
-
diff --git a/reportdesign/source/core/api/FormattedField.cxx 
b/reportdesign/source/core/api/FormattedField.cxx
index a05fc55..9b47924 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -364,6 +364,9 @@ void SAL_CALL OFormattedField::setSize( const awt::Size 
aSize ) throw (beans::P
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFormattedField::getShapeType(  ) throw 
(uno::RuntimeException)
 {
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
diff --git a/reportdesign/source/core/api/ImageControl.cxx 
b/reportdesign/source/core/api/ImageControl.cxx
index 99081f7..8c71eb7 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -458,7 +458,10 @@ void SAL_CALL OImageControl::setSize( const awt::Size 
aSize ) throw (beans::Pro
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OImageControl::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw 
(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1ae1719..1825836 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2432,6 +2432,10 @@ void 

[PUSHED libreoffice-4-0] fdo#48056 revert part of return correct name for shapetype

[Miklos Vajna (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3766

Approvals:
  Markus Mohrhard: Looks good to me, but someone else must approve
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a024a9bc5f87d226ab3c857817dfe91ad975acb
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

Re: psprint::CompatMetricOverride - can I kill it?

[Michael Stahl]

On 06/05/13 12:46, Noel Grandin wrote:
 Hi
 
 Looking at the code in
 
vcl/generic/fontmanager/fontmanager.cxx
 
 at line 2877, something like this (simplified)
 
bool PrintFontManager::readOverrideMetrics()
{
getProcessServiceFactory()-createInstance( 
 com.sun.star.psprint.CompatMetricOverride ),
 
 But I do not find this service anywhere in the codebase.
 
 It appears to have been introduced in this commit:
 commit 01cf48436df2cc3f01d1c57cc4348fc037ef
 Author: Kurt Zenker k...@openoffice.org
 Date:   Wed Jun 20 09:07:44 2007 +
 INTEGRATION: CWS compmetric (1.77.2); FILE MERGED
 2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed
 2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards 
 compatibility service for metrics
 
 But the commit did not introduce the associated service.

aha... the requested interface is XMaterialHolder... that is strong hint
that some really ugly hack is taking place... i would not be surprised
if the other end of that hack was in the Sun internal repository
(StarOffice only) and this feature is really something we don't want
to maintain at all and was just implemented for one particular customer
back in the day or something like that.


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

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

[Lionel Elie Mamane]

 comphelper/inc/comphelper/classids.hxx |6 ++
 xmloff/source/draw/shapeexport.cxx |3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d69a05d97c8a686ff24bd6d89905dfd3aee6a1cb
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri May 3 18:09:15 2013 +0200

fdo#48056 treat report chart as draw chart

Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
Reviewed-on: https://gerrit.libreoffice.org/3767
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/comphelper/inc/comphelper/classids.hxx 
b/comphelper/inc/comphelper/classids.hxx
index 416715b..4a16e44 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -405,6 +405,12 @@
 // #110743#
 #define BF_SO3_SCH_CLASSID  BF_SO3_SCH_CLASSID_50
 
+// Report chart
+
+#define SO3_RPTCH_CLASSID \
+0x80243D39, 0x6741, 0x46C5, 0x92, 0x6E, 0x06, \
+0x91, 0x64, 0xFF, 0x87, 0xBB
+
 /
 * StarImage
 /
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index a4c71b4..c7d812b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1079,7 +1079,8 @@ void XMLShapeExport::ImpCalcShapeType(const 
uno::Reference drawing::XShape  x
 rtl::OUString sCLSID;
 if(xPropSet-getPropertyValue(OUString(CLSID)) = 
sCLSID)
 {
-if 
(sCLSID.equals(mrExport.GetChartExport()-getChartCLSID()))
+if 
(sCLSID.equals(mrExport.GetChartExport()-getChartCLSID()) ||
+sCLSID.equals(rtl::OUString( SvGlobalName( 
SO3_RPTCH_CLASSID ).GetHexName(
 {
 eShapeType = XmlShapeTypeDrawChartShape;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#48056 treat report chart as draw chart

[Miklos Vajna (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3767

Approvals:
  Markus Mohrhard: Looks good to me, approved
  Miklos Vajna: Verified


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

[David Tardon]

 solenv/gbuild/AllLangHelp.mk |   48 +++
 1 file changed, 40 insertions(+), 8 deletions(-)

New commits:
commit 3992cf60d7f025744e473d5dc97f435a0af4f8f0
Author: David Tardon dtar...@redhat.com
Date:   Mon May 6 13:50:42 2013 +0200

gbuild: only add files to existing help packs

Change-Id: Idea360fdd78f21f5f42500da938340bb1870f29f

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 16fcc67..95910ba 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -76,7 +76,11 @@ endef
 
 # gb_AllLangHelp_set_treefile module treefile
 define gb_AllLangHelp_set_treefile
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_HelpTarget_set_treefile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(gb_AllLangHelp_HELPDIR)/text))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_set_treefile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(gb_AllLangHelp_HELPDIR)/text) 
\
+   ) \
+)
 
 endef
 
@@ -84,7 +88,11 @@ endef
 #
 # gb_AllLangHelp_add_helpfile module file
 define gb_AllLangHelp_add_helpfile
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_HelpTarget_add_helpfile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_add_helpfile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
+   ) \
+)
 
 endef
 
@@ -92,7 +100,11 @@ endef
 #
 # gb_AllLangHelp_add_helpfiles module file(s)
 define gb_AllLangHelp_add_helpfiles
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_HelpTarget_add_helpfiles,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_add_helpfiles,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
+   ) \
+)
 
 endef
 
@@ -100,7 +112,11 @@ endef
 #
 # gb_AllLangHelp_add_localized_file module basedir file
 define gb_AllLangHelp_add_localized_file
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_add_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)/$(lang)/$(3)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_add_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)/$(lang)/$(3)) \
+   ) \
+)
 
 endef
 
@@ -108,7 +124,11 @@ endef
 #
 # gb_AllLangHelp_add_localized_files module basedir file(s)
 define gb_AllLangHelp_add_localized_files
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_add_files,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(addprefix $(2)/$(lang)/,$(3
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_add_files,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(addprefix $(2)/$(lang)/,$(3))) \
+   ) \
+)
 
 endef
 
@@ -118,7 +138,11 @@ endef
 #
 # gb_AllLangHelp_add_helpdir_file module filename file
 define gb_AllLangHelp_add_helpdir_file
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_HelpTarget_add_helpdir_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(3)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_HelpTarget_add_helpdir_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(3)) \
+   ) \
+)
 
 endef
 
@@ -132,7 +156,11 @@ endef
 #
 # gb_AllLangHelp_use_module module other-module
 define gb_AllLangHelp_use_module
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_AllLangHelp__use_module,$(1),$(2),$(lang)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_AllLangHelp__use_module,$(1),$(2),$(lang)) \
+   ) \
+)
 
 endef
 
@@ -156,7 +184,11 @@ endef
 #
 # gb_AllLangHelp_use_linked_module module other-module
 define gb_AllLangHelp_use_linked_module
-$(foreach lang,$(gb_AllLangHelp_LANGS),$(call 
gb_AllLangHelp__use_linked_module,$(1),$(2),$(lang)))
+$(foreach lang,$(gb_AllLangHelp_LANGS),\
+   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
+   $(call gb_AllLangHelp__use_linked_module,$(1),$(2),$(lang)) \
+   ) \
+)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 cui/source/dialogs/winpluginlib.cxx |   31 +--
 1 file changed, 5 insertions(+), 26 deletions(-)

New commits:
commit f577975db513c2108600a1fabd1f7560c95b3db2
Author: Andras Timar ati...@suse.com
Date:   Sat May 4 09:48:27 2013 -0700

fdo#54087 refactor/fix browser plugin detection on Windows

Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.

Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Reviewed-on: https://gerrit.libreoffice.org/3784
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/cui/source/dialogs/winpluginlib.cxx 
b/cui/source/dialogs/winpluginlib.cxx
index ce4ab24..5391375 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,37 +33,18 @@
 extern C {
 int lc_isInstalled(const  char* realFilePath)
 {
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
 char sSoPath[SO_PATH_SIZE];
 char sPluginPath[SO_PATH_SIZE];
 
 LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
 return -1;
 }
 }
-ret = RegOpenKeyEx(hKeySoftware,  MozillaPlugins,  0,  KEY_READ, 
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins,  @sun.com/npsopluginmi;version=1.0,  
0,  KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
 
 if((realFilePath == NULL) || (strlen(realFilePath) == 0) || 
(strlen(realFilePath) = SO_PATH_SIZE))
 ret = -1;
@@ -76,7 +57,7 @@ int lc_isInstalled(const  char* realFilePath)
 if(ret == 0){
 DWORD  dType = REG_SZ;
 DWORD  dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
 if(ret == ERROR_SUCCESS){
 if(strcmp(sPluginPath, sSoPath) == 0)
 ret = 0;
@@ -88,9 +69,7 @@ int lc_isInstalled(const  char* realFilePath)
 }
 else
 ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
 return ret;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - cui/source

[Andras Timar]

 cui/source/dialogs/winpluginlib.cxx |   31 +--
 1 file changed, 5 insertions(+), 26 deletions(-)

New commits:
commit c0126be4cca4a88aa7b5d2a36962e9828c9b2c15
Author: Andras Timar ati...@suse.com
Date:   Sat May 4 09:48:27 2013 -0700

fdo#54087 refactor/fix browser plugin detection on Windows

Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.

Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Reviewed-on: https://gerrit.libreoffice.org/3785
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/cui/source/dialogs/winpluginlib.cxx 
b/cui/source/dialogs/winpluginlib.cxx
index 237e33b..b34d3be 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -42,37 +42,18 @@
 extern C {
 int lc_isInstalled(const  char* realFilePath)
 {
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
 char sSoPath[SO_PATH_SIZE];
 char sPluginPath[SO_PATH_SIZE];
 
 LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
 return -1;
 }
 }
-ret = RegOpenKeyEx(hKeySoftware,  MozillaPlugins,  0,  KEY_READ, 
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins,  @sun.com/npsopluginmi;version=1.0,  
0,  KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
 
 if((realFilePath == NULL) || (strlen(realFilePath) == 0) || 
(strlen(realFilePath) = SO_PATH_SIZE))
 ret = -1;
@@ -85,7 +66,7 @@ int lc_isInstalled(const  char* realFilePath)
 if(ret == 0){
 DWORD  dType = REG_SZ;
 DWORD  dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
 if(ret == ERROR_SUCCESS){
 if(strcmp(sPluginPath, sSoPath) == 0)
 ret = 0;
@@ -97,9 +78,7 @@ int lc_isInstalled(const  char* realFilePath)
 }
 else
 ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
 return ret;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#54087 refactor/fix browser plugin detection on Windows

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[PUSHED libreoffice-3-6] fdo#54087 refactor/fix browser plugin detection on Windows

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

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

[Stephan Bergmann]

 include/vcl/builder.hxx   |   11 ++-
 vcl/source/window/builder.cxx |2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 3def5194ddaf9c4d766b71527874bd1a973b43e5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 14:17:42 2013 +0200

Revert Blind fix for MSVC

9041dac37f912a6f183be9f6b6558f1ef44280c0.  The correct fix was
f4227c822c7f5a4e1e1b3b4e096cb63cf710a3f1 Blind fix for MSVC, take two.

Change-Id: I6c319a0f7a1d3dbcffbd4be8ac02682e5fdd7802

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 51d3efc..bb63cf2 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -31,24 +31,17 @@ class DateField;
 class TimeField;
 class VclMultiLineEdit;
 
-namespace vcl { namespace detail {
-
-class SAL_DLLPUBLIC_TEMPLATE ModuleMap:
-public boost::ptr_mapOUString, osl::Module
-{};
-
-} }
-
 class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
 {
 public:
 typedef std::mapOString, OString stringmap;
 typedef Window* (*customMakeWidget)(Window *pParent, stringmap rVec);
 private:
+typedef boost::ptr_mapOUString, osl::Module ModuleMap;
 //We store these until the builder is deleted, that way we can use the
 //ui-previewer on custom widgets and guarantee the modules they are from
 //exist for the duration of the dialog
-vcl::detail::ModuleMap m_aModuleMap;
+ModuleMap m_aModuleMap;
 
 //If the toplevel window has any properties which need to be set on it,
 //but the toplevel is the owner of the builder, then its ctor
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c3e0a7f..fe8d4ba 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1223,7 +1223,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 OUString sFunction(OStringToOUString(OString(make) + 
name.copy(nDelim+1), RTL_TEXTENCODING_UTF8));
 #ifndef DISABLE_DYNLOADING
 OUString sModule = sModuleBuf.makeStringAndClear();
-vcl::detail::ModuleMap::iterator aI = m_aModuleMap.find(sModule);
+ModuleMap::iterator aI = m_aModuleMap.find(sModule);
 osl::Module* pModule = NULL;
 if (aI == m_aModuleMap.end())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Petr Mladek]

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

New commits:
commit 29884e1f4b3e620d523c6a5c8a3cf72159dc9b24
Author: Petr Mladek pmla...@suse.cz
Date:   Mon May 6 14:18:54 2013 +0200

bump product version to 4.1.0.0.alpha1+

Change-Id: I131364a0c80626b82939b641012abdfd11e9fabe

diff --git a/configure.ac b/configure.ac
index af43cac..75e26bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 solenv/gbuild/Library.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9fc31b75d6ef201d41e15e9bb0f1a4108b29f802
Author: David Tardon dtar...@redhat.com
Date:   Mon May 6 14:22:13 2013 +0200

make sure the output dir exists

Change-Id: I71fac6a4e8283d293a6bd50637ff3a1e6c2ad40d

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 1795be0..e7953c8 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -114,6 +114,7 @@ define gb_Library_add_auxtarget
 $(call gb_LinkTarget_add_auxtarget,$(call 
gb_Library_get_linktargetname,$(1)),$(dir $(call 
gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1/$(notdir 
$(2)))
 $(call gb_Library_get_target,$(1)) : $(2)
 $(2) : $(dir $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,$(1/$(notdir $(2))
+$(2) :| $(dir $(2)).dir
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += $(2)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: psprint::CompatMetricOverride - can I kill it?

[Noel Grandin]

On 2013-05-06 13:40, Michael Stahl wrote:
aha... the requested interface is XMaterialHolder... that is strong 
hint that some really ugly hack is taking place... i would not be 
surprised if the other end of that hack was in the Sun internal 
repository (StarOffice only) and this feature is really something we 
don't want to maintain at all and was just implemented for one 
particular customer back in the day or something like that.


So I can take that as a yes :-)  ?


Disclaimer: http://www.peralex.com/disclaimer.html


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

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

--- Comment #150 from Alex Thurgood ipla...@yahoo.co.uk ---
I am adding bug 36799, it is extremely problematic for OSX users (and
apparently some Linux users), and seems to be linked to page size defaults,
which in turn causes printing to screw up. Unfortunately, it has been around
since LO 3.3.x, and was reset in the initial bugzilla clean-up fiasco. Since
then, it has languished in purgatory.

-- 
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 4.0 most annoying bugs

[bugzilla-daemon]

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

Alex Thurgood ipla...@yahoo.co.uk changed:

   What|Removed |Added

 Depends on||36799

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

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Marcos Paulo de Souza]

 Repository.mk |   18 
 scp2/source/ooo/file_library_ooo.scp  |   37 --
 scp2/source/ooo/module_hidden_ooo.scp |   11 --
 3 files changed, 10 insertions(+), 56 deletions(-)

New commits:
commit d5d7d18d5cbfdc4b96cc705fa9a80525a9f60920
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Fri May 3 10:09:15 2013 -0300

fdo#60924: Move some more libs to autoinstallation

Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Reviewed-on: https://gerrit.libreoffice.org/3758
Reviewed-by: Matúš Kukan matus.ku...@gmail.com
Tested-by: Matúš Kukan matus.ku...@gmail.com

diff --git a/Repository.mk b/Repository.mk
index 13d7e70..e04e7ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -272,6 +272,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 fwk \
 fwl \
fwm \
+guesslang \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
 i18npool \
 hyphen \
@@ -287,6 +288,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 ira \
 itg \
 iti \
+$(if $(SOLAR_JAVA),jdbc) \
+$(if $(ENABLE_KAB),kab1) \
+$(if $(ENABLE_KAB),kabdrv1) \
 localebe1 \
 lng \
 lnth \
@@ -299,6 +303,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 offacc \
 pcr \
 pdffilter \
+res \
 sax \
 sb \
 sdbt \
@@ -316,6 +321,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 svx \
 svxcore \
 sw \
+$(if $(ENABLE_TDEAB),tdeab1) \
+$(if $(ENABLE_TDEAB),tdeabdrv1) \
+textconversiondlgs \
 tk \
 tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -325,6 +333,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 utl \
 uui \
 vcl \
+$(if $(and $(filter unx,$(GUIBASE)),$(filter-out 
MACOSX,$(OS))),vclplug_gen) \
 xmlscript \
 xmlfa \
 xmlfd \
@@ -371,10 +380,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
filtertracer \
flash \
 graphicfilter \
-guesslang \
-   jdbc \
-   kab1 \
-   kabdrv1 \
 log \
MacOSXSpell \
 mork \
@@ -384,7 +389,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 pricing \
 protocolhandler \
 qstart_gtk \
-res \
 rpt \
 rptui \
 rptxml \
@@ -400,13 +404,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 spell \
 sts \
 svgfilter \
-   tdeab1 \
-   tdeabdrv1 \
-textconversiondlgs \
 textfd \
 updatecheckui \
 $(if $(DISABLE_SCRIPTING),,vbahelper) \
-vclplug_gen \
 vclplug_gtk \
 vclplug_gtk3 \
 vclplug_tde \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index b9155e2..2c51db4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -310,16 +310,6 @@ End
 
 #ifdef UNX
 
-#ifdef ENABLE_KAB
-STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
-STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
-#endif
-
-#ifdef ENABLE_TDEAB
-STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
-STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
-#endif
-
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
 LIB_FILE_BODY;
@@ -540,13 +530,6 @@ End
 
 #endif
 
-
-#ifdef SOLAR_JAVA
-
-STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-
-#endif
-
 #ifdef SOLAR_JAVA
 File gid_File_Lib_Hsqldb_2
 LIB_FILE_BODY;
@@ -674,15 +657,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-#if defined(UNX)  ! defined(MACOSX)  ! defined(LIBO_HEADLESS)
-File gid_File_Lib_Vclplug_Gen
-Name = LIBNAME(vclplug_gen);
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
 #if defined(UNX)  ! defined(MACOSX)
 #ifdef ENABLE_GTK
 File gid_File_Lib_Vclplug_Gtk
@@ -794,13 +768,6 @@ End
 
 #endif /* WNT  HAVE_WINDOWS_SDK */
 
-File gid_File_Lib_Res
-Name = LIBNAME(res);
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-End
-
 STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap )
 
 STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
@@ -859,8 +826,6 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
-STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
 LIB_FILE_BODY;
@@ -1071,8 +1036,6 @@ STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
 
 STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
 
-STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-
 STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
 
 #ifndef SYSTEM_OPENSSL
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index dc538fa..cd0c44f 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -156,22 +156,18 @@ Module 

[PUSHED] fdo#60924: Move some more libs to autoinstallation

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

Approvals:
  Matúš Kukan: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Rene Engelhard r...@debian.org

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

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

[Fridrich Štrba]

 solenv/gbuild/AllLangHelp.mk|2 
 writerperfect/source/common/DocumentHandler.cxx |1 
 writerperfect/source/common/WPXSvStream.cxx |5 -
 writerperfect/source/common/WriterPerfectDebug.hxx  |   24 
 writerperfect/source/writer/MSWorksImportFilter.cxx |   13 ++--
 writerperfect/source/writer/MWAWImportFilter.cxx|   45 +++-
 writerperfect/source/writer/WordPerfectImportFilter.cxx |   13 ++--
 7 files changed, 37 insertions(+), 66 deletions(-)

New commits:
commit d526091eb19c264de8014e6ac142819460604373
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon May 6 14:51:07 2013 +0200

WRITER_DEBUG_MSG - SAL_[INFO/WARN]

Change-Id: I8bdcc273b50e35dbbb0e34183a465e370cc5b22c

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 95910ba..095c864 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -17,7 +17,7 @@ gb_AllLangHelp_TRANLATIONSDIR := $(SRCDIR)/translations
 
 # Creates and delivers all language versions of a module.
 
-gb_AllLangHelp_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
+gb_AllLangHelp_LANGS := en-US $(filter-out en-US 
$(WITH_POOR_HELP_LOCALIZATIONS),$(gb_WITH_LANG))
 
 define gb_AllLangHelp__translation_exists
 $(or \
diff --git a/writerperfect/source/common/DocumentHandler.cxx 
b/writerperfect/source/common/DocumentHandler.cxx
index eae820b..4fd98da 100644
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -7,7 +7,6 @@
  * For further information visit http://libwpd.sourceforge.net
  */
 #include DocumentHandler.hxx
-#include WriterPerfectDebug.hxx
 
 #include string.h
 #include com/sun/star/xml/sax/XDocumentHandler.hpp
diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index fca2364..a79ac6c 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -8,7 +8,6 @@
  */
 
 #include WPXSvStream.hxx
-#include WriterPerfectDebug.hxx
 #include tools/stream.hxx
 #include unotools/streamwrap.hxx
 #include unotools/ucbstreamhelper.hxx
@@ -85,7 +84,7 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference 
XInputStream  xStream )
 }
 catch ( ... )
 {
-WRITER_DEBUG_MSG((mnLength = mxSeekable-getLength() threw 
exception\n));
+SAL_WARN(writerperfect, mnLength = mxSeekable-getLength() 
threw exception);
 mnLength = 0;
 }
 }
@@ -161,7 +160,7 @@ int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE 
seekType)
 }
 catch (...)
 {
-WRITER_DEBUG_MSG((mxSeekable-seek(offset) threw exception\n));
+SAL_WARN(writerperfect, mxSeekable-seek(offset) threw exception);
 return -1;
 }
 }
diff --git a/writerperfect/source/common/WriterPerfectDebug.hxx 
b/writerperfect/source/common/WriterPerfectDebug.hxx
deleted file mode 100644
index da363eb..000
--- a/writerperfect/source/common/WriterPerfectDebug.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* WriterPerfectDebug: Debugging information
- *
- * 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/.
- *
- * For further information visit http://libwpd.sourceforge.net
- */
-#ifndef __FILTERINTERNAL_HXX__
-#define __FILTERINTERNAL_HXX__
-
-#include string.h // for strcmp
-
-#ifdef DEBUG
-#include stdio.h
-#define WRITER_DEBUG_MSG(M) printf M
-#else
-#define WRITER_DEBUG_MSG(M)
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx 
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 0c71aaa..4a4500e 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -30,7 +30,6 @@
 
 #include common/DocumentHandler.hxx
 #include common/WPXSvStream.hxx
-#include common/WriterPerfectDebug.hxx
 #include MSWorksImportFilter.hxx
 
 #include iostream
@@ -59,7 +58,7 @@ using com::sun::star::xml::sax::XParser;
 sal_Bool SAL_CALL MSWorksImportFilter::importImpl( const Sequence 
::com::sun::star::beans::PropertyValue  aDescriptor )
 throw (RuntimeException)
 {
-WRITER_DEBUG_MSG((MSWorksImportFilter::importImpl: Got here!\n));
+SAL_INFO(writerperfect, MSWorksImportFilter::importImpl);
 
 sal_Int32 nLength = aDescriptor.getLength();
 const PropertyValue *pValue = aDescriptor.getConstArray();
@@ -98,20 +97,20 @@ throw (RuntimeException)
 sal_Bool SAL_CALL MSWorksImportFilter::filter( const Sequence 
::com::sun::star::beans::PropertyValue  aDescriptor )
 throw (RuntimeException)
 {
-

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Depends on||36799

-- 
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 4.0 most annoying bugs

[bugzilla-daemon]

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

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Depends on|36799   |

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - avmedia/source bridges/source svx/source

[Herbert Dürr]

 avmedia/source/quicktime/player.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk |4 ++--
 svx/source/sidebar/EmptyPanel.src|2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a01c392ef8fa564ce58579632dd41ec3a085327b
Author: Herbert Dürr h...@apache.org
Date:   Mon May 6 11:54:52 2013 +

replace deprecated method NSString::cString()

diff --git a/avmedia/source/quicktime/player.cxx 
b/avmedia/source/quicktime/player.cxx
index 7121308..86329fe 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -148,7 +148,7 @@ bool Player::create( const ::rtl::OUString rURL )
 {
 OSL_TRACE( NSMovie create failed with error %ld (%s),
(long)[pErr code],
-   [[pErr localizedDescription] cString]
+   [[pErr localizedDescription] UTF8String]
);
 }
 [pool release];
commit 80f62d986be5d32935280c0db3fd522a5fda099e
Author: Herbert Dürr h...@apache.org
Date:   Mon May 6 10:54:35 2013 +

allow non-gcc to build the mac-i386 UNO bridge

diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk 
b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
index 49f5fa8..9cad6d8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
@@ -24,7 +24,7 @@
 PRJ=..$/..$/..
 
 PRJNAME=bridges
-TARGET=gcc3_uno
+TARGET=$(COMNAME)_uno
 LIBTARGET=no
 ENABLE_EXCEPTIONS=TRUE
 
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files 
 
-.IF $(COM)$(OS)$(CPU)$(COMNAME) == GCCMACOSXIgcc3
+.IF $(OS)$(CPU) == MACOSXI
 
 .IF $(cppu_no_leak) == 
 CFLAGS += -DLEAK_STATIC_DATA
commit 1f317e0580d267b3cc6b6b410bc3d14a4e70e1fe
Author: Andre Fischer a...@apache.org
Date:   Mon May 6 08:40:39 2013 +

122049: Changed text of 'empty' panel.

diff --git a/svx/source/sidebar/EmptyPanel.src 
b/svx/source/sidebar/EmptyPanel.src
index 1a008f9..6063ed0 100644
--- a/svx/source/sidebar/EmptyPanel.src
+++ b/svx/source/sidebar/EmptyPanel.src
@@ -28,6 +28,6 @@ Control RID_SIDEBAR_EMPTY_PANEL
 {
 Pos = MAP_APPFONT(2,2);
 Size = MAP_APPFONT(100,24);
-Text [en-US] = Properties for the task that you are performing are 
not available in the sidebar at this time.;
+Text [en-US] = Properties for the task that you are performing are 
not available for the current selection;
 };
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

 sw/source/core/txtnode/ndtxt.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 759c301785a703188b52d01ded2f96ff3f6eb7f9
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Sat May 4 17:45:47 2013 +0200

SW : Fix crash by checking find result

Change-Id: I6caf18b110dd0a40f09e185c00cb238261457db3
Reviewed-on: https://gerrit.libreoffice.org/3783
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 437cf44..07f36ef 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3211,7 +3211,10 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode 
rNode, int eMode)
 if (aHiddenMulti.IsSelected(nDummyCharPos))
 continue;
 std::vectorblock::iterator aFind = 
std::find_if(aBlocks.begin(), aBlocks.end(), containsPos(nDummyCharPos));
-aFind-m_aAttrs.push_back(pAttr);
+if (aFind != aBlocks.end())
+{
+aFind-m_aAttrs.push_back(pAttr);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] SW : Fix crash by checking find result

[Eike Rathke (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/3783

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6caf18b110dd0a40f09e185c00cb238261457db3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Jean- Baptiste Faure jbf.fa...@orange.fr
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

Re: [PATCH] fdo#37222 and fdo#37219 Open pdf after Export and added to ...

[Anurag Kanungo]

Hi ,
Yeah i have already done this , but review is left.
You can check new one at

 https://gerrit.libreoffice.org/#/c/3763

And it will require make dev-install tto work .

If possible review and suggest changes any if required

Thanks

On Monday, May 6, 2013, Miklos Vajna (via Code Review) wrote:

 Miklos Vajna has posted comments on this change.

 Change subject: fdo#37222 and fdo#37219  Open pdf after Export and added
 to recent documents.
 ..


 Patch Set 1:

 Instead of using a static field, add a new configuration variable for
 this. Example commit: 64cea833fb9e5534885aa29844255be2ef32db1f

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

 Gerrit-MessageType: comment
 Gerrit-Change-Id: Ief7d2b4413c0964b472e339a0fb46555227d8c6d
 Gerrit-PatchSet: 1
 Gerrit-Project: core
 Gerrit-Branch: master
 Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com
 Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
 Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

[Faisal M . Al-Otaibi]

 sc/source/ui/view/drawview.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5bff7f52075eb3ffe931d1779681262e1820a859
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Sun May 5 09:49:30 2013 +0300

fdo#63878 fix the zoom problem when the sheet are RTL

Change-Id: Ie451b7a84b5481e9209c5b6d6d439844de5082fd
Reviewed-on: https://gerrit.libreoffice.org/3789
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index e249e8c..2fe614c 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -782,6 +782,9 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
 Point aCurPos =  pViewData-GetScrPos(  aOldStt.Col(), aOldStt.Row(), 
eWhich, sal_True );
 Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode );
 Point aGridOff = ( aCurPosHmm - aOldPos );
+// fdo#63878 Fix the X position for RTL Sheet
+if( aGridOff.getX()  0 )
+aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
 pObj-SetGridOffset( aGridOff );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#63878 fix the zoom problem when the sheet are RTL

[Eike Rathke (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/3789

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie451b7a84b5481e9209c5b6d6d439844de5082fd
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
Gerrit-Reviewer: Eike Rathke er...@redhat.com

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

Re: Help with saving state to vector with arbitrary length

[Kohei Yoshida]

Hi Albert,

On 05/06/2013 04:13 AM, Albert Thuswaldner wrote:

Hi,
While removing the limit of 3 sort criteria in Calc, I more or less
intentionally left out fixing the saving of state.

The state is set here:
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/cellsh2.cxx#507

and retrived here:
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/cellsh2.cxx#429

As can be seen in the code above the state is only saved for 3 sort
criteria. The state is kept by six RIDs FN_PARAM_1 to FN_PARAM_6, one
integer to keep record of the position in the dropdown list, and one
boolean to hold the sort order for each criteria.

How do I solve this now when the there can be an arbitary number of
sort criteria? Is it possible to save the state as two vectors
one integer vector, and one bool vector? Vectors with arbitrary lengths.
So, in theory, you could just store the whole ScSortParam and avoid any 
future trouble of having to decompose the sort state in the way 
currently done.  To do that, you need to derive a new class from 
SfxPoolItem that is specifically designed to store ScSortParam, store 
the ScSortParam state to this new class, and put that into rReq.  You 
can keep the new class inside sc since it'd be only used in Calc code.


Doing it this way would also future-proof ourselves against any changes 
we might make to ScSortParam in the future.  It would also eliminates 
having to retrieve the states individually and passing them to 
ScSortParam; you could just pass the whole thing in one step.


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

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

[Faisal M . Al-Otaibi]

 sc/source/ui/view/drawview.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0618ebfa88b1b3eca11f40c173a53680cd41dedd
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Sun May 5 09:49:30 2013 +0300

fdo#63878 fix the zoom problem when the sheet are RTL

Change-Id: Ie451b7a84b5481e9209c5b6d6d439844de5082fd
Reviewed-on: https://gerrit.libreoffice.org/3789
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 5bff7f52075eb3ffe931d1779681262e1820a859)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 6900932..7e4555d 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -791,6 +791,9 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
 Point aCurPos =  pViewData-GetScrPos(  aOldStt.Col(), aOldStt.Row(), 
eWhich, sal_True );
 Point aCurPosHmm = pGridWin-PixelToLogic(aCurPos, aDrawMode );
 Point aGridOff = ( aCurPosHmm - aOldPos );
+// fdo#63878 Fix the X position for RTL Sheet
+if( aGridOff.getX()  0 )
+aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
 pObj-SetGridOffset( aGridOff );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

[Andras Timar]

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

New commits:
commit 1a03b36068e81e8b9c6797067ff490ad4a62f768
Author: Andras Timar ati...@suse.com
Date:   Mon May 6 15:51:35 2013 +0200

Bump for 3.6-21

Change-Id: I10eeed41a85765ce5cdcb075ec3376c283c2d57d

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index c0475c3..064c4d4 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-521
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-521
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-520
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-521
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 1905e1a..58cb948 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:520)
-BUILD=520
+RSCREVISION=360m1(Build:521)
+BUILD=521
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk vcl/source

[Stephan Bergmann]

 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl |   39 
--
 vcl/source/window/window.cxx  |4 -
 3 files changed, 2 insertions(+), 42 deletions(-)

New commits:
commit 690a5546138cb94100868d9303ef7b702b421b8e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 16:05:42 2013 +0200

Revert fdo#46808, Convert SystemClipboardExt service to new style

This reverts commit 135d20caa4178c3a6d7682b547c5da6d58310f01.
Conflicts:
vcl/source/window/window.cxx

There is no implementation of the SystemClipboardExt service, so 
Window::GetClipboard
would now always fail with catching an Exception, instead of trying to 
create a
SystemClipboard if SystemClipboardExt is unavailable.  (I'll clean up the 
unused
SystemClipboardExt in a follow-up commit.)

Change-Id: Ic3c45b148057e174d3487aedb4176549cb28f3c0

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c426138..def1b3a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -94,7 +94,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransf
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer/clipboard,\
SystemClipboard \
-   SystemClipboardExt \
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\
ExtensionManager \
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl 
b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl
deleted file mode 100644
index aa1cfb4..000
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboardExt.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_datatransfer_clipboard_SystemClipboardExt_idl__
-#define __com_sun_star_datatransfer_clipboard_SystemClipboardExt_idl__
-
-#include com/sun/star/datatransfer/clipboard/XClipboard.idl
-
-
-module com { module sun { module star { module datatransfer { module clipboard 
{
-
-
-/**
-@since LibreOffice 4.1
-*/
-published service SystemClipboardExt : XClipboard;
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6822698..279caf8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -85,7 +85,6 @@
 #include com/sun/star/datatransfer/dnd/XDropTarget.hpp
 #include com/sun/star/datatransfer/clipboard/XClipboard.hpp
 #include com/sun/star/datatransfer/clipboard/SystemClipboard.hpp
-#include com/sun/star/datatransfer/clipboard/SystemClipboardExt.hpp
 #include com/sun/star/lang/XInitialization.hpp
 #include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/lang/XServiceName.hpp
@@ -8409,9 +8408,10 @@ uno::Reference XClipboard  Window::GetClipboard()
 {
 try
 {
+uno::Reference XMultiServiceFactory  xFactory( 
comphelper::getProcessServiceFactory() );
 uno::Reference XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 
-mpWindowImpl-mpFrameData-mxClipboard = 
SystemClipboardExt::create( xContext );;
+mpWindowImpl-mpFrameData-mxClipboard = uno::Reference 
XClipboard ( xFactory-createInstance( 
OUString(com.sun.star.datatransfer.clipboard.SystemClipboardExt) ), UNO_QUERY 
);
 
 if( !mpWindowImpl-mpFrameData-mxClipboard.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help app with LibreOffice

[Jan Holesovsky]

Hi gian,

g...@digitaldoc.com.br píše v Po 06. 05. 2013 v 07:15 -0600:

 We have a java application that calls the libreoffice to make creating 
 and editing files. Odt. The test environment is ubuntu + kde. Formerly 
 with OpenOffice our code worked and now does not work with LibreOffice.

By mistake you have sent your question to wrong address; please use
libreoffice@lists.freedesktop.org instead.

 Lines of code that involves connection:
 
 aBean.startOOoConnection (uno: socket, host = 127.0.0.1, port = 8100; 
 urp; StarOffice.NamingService);
 
 aBean.loadFromURL (private: factory / swriter, null);
 
 aBean.aquireSystemWindow ();
 
 
 
 Error 1:
 Could not initialize class 
 com.sun.star.comp.beans.LocalOfficeConnection
 
 Error 2:
 Invalid URL connection UNO

Can you please turn it into a small testcase that developers can try to
see what went wrong, and how to help you?

Thank you,
Kendy

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

[PATCH] Drop String.AppendAscii from filter

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3799

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3799/1

Drop String.AppendAscii from filter

Change-Id: I73f61b9a20297b6b704aca52b1fc9efac563a224
---
M filter/source/graphicfilter/ieps/ieps.cxx
M filter/source/pdf/pdfexport.cxx
2 files changed, 20 insertions(+), 20 deletions(-)



diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index 0ba2dae..5a8fa51 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -404,7 +404,7 @@
 Rectangle aRect( Point( 1, 1 ), Size( nWidth - 2, nHeight - 2 ) );
 aVDev.DrawRect( aRect );
 
-String aString;
+OUString aString;
 int nLen;
 sal_uInt8* pDest = ImplSearchEntry( pBuf, (sal_uInt8*)%%Title:, 
nBytesRead - 32, 8 );
 if ( pDest )
@@ -416,9 +416,9 @@
 sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
 if ( strcmp( (const char*)pDest, none ) != 0 )
 {
-aString.AppendAscii(  Title: );
-aString.AppendAscii( (char*)pDest );
-aString.AppendAscii( \n );
+aString +=  Title:;
+aString += OUString::createFromAscii( (char*)pDest );
+aString += \n;
 }
 pDest[ nLen ] = aOldValue;
 }
@@ -430,9 +430,9 @@
 pDest++;
 nLen = ImplGetLen( pDest, 32 );
 sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
-aString.AppendAscii(  Creator: );
-aString.AppendAscii( (char*)pDest );
-aString.AppendAscii( \n );
+aString +=  Creator:;
+aString += OUString::createFromAscii( (char*)pDest );
+aString += \n;
 pDest[ nLen ] = aOldValue;
 }
 pDest = ImplSearchEntry( pBuf, (sal_uInt8*)%%CreationDate:, nBytesRead - 
32, 15 );
@@ -445,9 +445,9 @@
 sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
 if ( strcmp( (const char*)pDest, none ) != 0 )
 {
-aString.AppendAscii(  CreationDate: );
-aString.AppendAscii( (char*)pDest );
-aString.AppendAscii( \n );
+aString +=  CreationDate:;
+aString += OUString::createFromAscii( (char*)pDest );
+aString += \n;
 }
 pDest[ nLen ] = aOldValue;
 }
@@ -459,8 +459,8 @@
 long nNumber = ImplGetNumber( pDest, nCount );
 if ( nCount  ( (sal_uInt32)nNumber  10 ) )
 {
-aString.AppendAscii(  LanguageLevel: );
-aString.Append( OUString::valueOf( nNumber ) );
+aString +=  LanguageLevel:;
+aString += OUString::valueOf( nNumber );
 }
 }
 aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index c6e2648..23eea97 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -400,20 +400,20 @@
 
 
 // getting the string for the creator
-String aCreator;
+OUString aCreator;
 Reference XServiceInfo  xInfo( mxSrcDoc, UNO_QUERY );
 if ( xInfo.is() )
 {
 if ( xInfo-supportsService( 
com.sun.star.presentation.PresentationDocument ) )
-aCreator.AppendAscii( Impress );
+aCreator += Impress;
 else if ( xInfo-supportsService( 
com.sun.star.drawing.DrawingDocument ) )
-aCreator.AppendAscii( Draw );
+aCreator += Draw;
 else if ( xInfo-supportsService( 
com.sun.star.text.TextDocument ) )
-aCreator.AppendAscii( Writer );
+aCreator += Writer;
 else if ( xInfo-supportsService( 
com.sun.star.sheet.SpreadsheetDocument ) )
-aCreator.AppendAscii( Calc );
+aCreator += Calc;
 else if ( xInfo-supportsService( 
com.sun.star.formula.FormulaProperties  ) )
-aCreator.AppendAscii( Math );
+aCreator += Math;
 }
 
 Reference document::XDocumentPropertiesSupplier  
xDocumentPropsSupplier( mxSrcDoc, UNO_QUERY );
@@ -846,7 +846,7 @@
   OUString sShowOnlineLayout( ShowOnlineLayout );
   uno::Reference beans::XPropertySet  xViewProperties;
 
-if ( aCreator.EqualsAscii( Writer ) )
+if ( aCreator.equalsAscii( Writer ) )
 {
 //i92835 if Writer is in web layout mode this has to be 
switched to normal view and back to web view in the end
 try
@@ -867,7 +867,7 @@
 
 const sal_Int32 nPageCount = xRenderable-getRendererCount( 
aSelection, aRenderOptions );
 
-if ( mbExportNotesPages  aCreator.EqualsAscii( Impress ) )
+

Re: XCheckBox question

[Miklos Vajna]

Hi Alexander,

On Fri, May 03, 2013 at 11:58:19AM +0200, Alexander Thurgood 
alex.thurg...@gmail.com wrote:
 So the question is, where does the actual checkbox come from ? How is it
 drawn, and how would it be possible to get it to be redrawn at any give
 size of the user's choosing ? Or is this something that has never been
 implemented and would require creating a whole new component for the AWT ?

Form controls are on the Draw page of the document, and they are
provided by the com.sun.star.drawing.ControlShape service.

If you search for XControlShape, you can see that it's implemented in
svx:

http://opengrok.libreoffice.org/search?q=com%3A%3Asun%3A%3Astar%3A%3Adrawing%3A%3AXControlShapeproject=coredefs=refs=path=hist=

Each control has a separate model, which is again an UNO object. In case
of checkbox, that's com.sun.star.comp.forms.OCheckBoxModel, the
implementation is probably under forms/source/component/CheckBox.*

I would suggest just adding a new optional Size property to
com/sun/star/awt/UnoControlCheckBoxModel.idl; the real work is of course
letting the code actually take care of that property when painting. :-)

Hope this helps,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Fridrich Štrba]

 solenv/gbuild/AllLangHelp.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bac488a1b9da8812f7b888bd12d774ef75379ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon May 6 16:16:43 2013 +0200

Did not want to push this thing ;)

Change-Id: I2dfaa895a3efefa6fee8d21575f148ef9bba03c3

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 095c864..95910ba 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -17,7 +17,7 @@ gb_AllLangHelp_TRANLATIONSDIR := $(SRCDIR)/translations
 
 # Creates and delivers all language versions of a module.
 
-gb_AllLangHelp_LANGS := en-US $(filter-out en-US 
$(WITH_POOR_HELP_LOCALIZATIONS),$(gb_WITH_LANG))
+gb_AllLangHelp_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
 define gb_AllLangHelp__translation_exists
 $(or \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/dpfilteredcache.cxx|2 +-
 sc/source/core/data/segmenttree.cxx|2 +-
 sc/source/filter/excel/colrowst.cxx|4 ++--
 sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4a8e36d20609f1f7918976d4db13d720524a3c9c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon May 6 10:27:55 2013 -0400

Adjust for API change in mdds 0.8.0.

The return value of search_tree() in flat_segment_tree has changed.

Change-Id: I51d8676bd0621bd43b3f8a8f6be4bf4056d45904

diff --git a/sc/source/core/data/dpfilteredcache.cxx 
b/sc/source/core/data/dpfilteredcache.cxx
index 47adbbe..51bf571 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -172,7 +172,7 @@ void ScDPFilteredCache::fillTable(
 {
 if (nRow  nEndSegment)
 {
-if (!maShowByFilter.search_tree(nRow, bShow, NULL, 
nEndSegment))
+if (!maShowByFilter.search_tree(nRow, bShow, NULL, 
nEndSegment).second)
 {
 OSL_FAIL(Tree search failed!);
 continue;
diff --git a/sc/source/core/data/segmenttree.cxx 
b/sc/source/core/data/segmenttree.cxx
index e74b0fd..b02f164 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -159,7 +159,7 @@ bool ScFlatSegmentsImpl_ValueType, 
_ExtValueType::getRangeData(SCCOLROW nPos,
 if (!maSegments.is_tree_valid())
 maSegments.build_tree();
 
-if (!maSegments.search_tree(nPos, nValue, nPos1, nPos2))
+if (!maSegments.search_tree(nPos, nValue, nPos1, nPos2).second)
 return false;
 
 rData.mnPos1 = nPos1;
diff --git a/sc/source/filter/excel/colrowst.cxx 
b/sc/source/filter/excel/colrowst.cxx
index 53aa04b..bc43a1e 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -208,7 +208,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
 if (GetColFlag(nCol, EXC_COLROW_USED))
 {
 sal_uInt16 nTmp;
-if (maColWidths.search_tree(nCol, nTmp))
+if (maColWidths.search_tree(nCol, nTmp).second)
 nWidth = nTmp;
 }
 
@@ -258,7 +258,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
 for (SCROW i = nPrevRow; i = nRow - 1; ++i)
 {
 SCROW nLast;
-if (!maRowHeights.search_tree(i, nHeight, NULL, 
nLast))
+if (!maRowHeights.search_tree(i, nHeight, NULL, 
nLast).second)
 {
 // search failed for some reason
 return;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 4f7a937..cefa640 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1280,7 +1280,7 @@ sal_Int32 ScRowStyles::GetStyleNameIndex(const sal_Int32 
nTable, const sal_Int32
 r.build_tree();
 sal_Int32 nStyle;
 sal_Int32 nStart, nEnd;
-if (r.search_tree(nField, nStyle, nStart, nEnd))
+if (r.search_tree(nField, nStyle, nStart, nEnd).second)
 {
 // Cache this value for better performance.
 maCache.mnTable = nTable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ww8export/data/fdo42144.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx |9 +
 sw/source/filter/ww8/wrtw8sty.cxx|2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit ea2603200b46f460f34c930770d69db74a164bde
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 6 13:01:27 2013 +0200

fdo#42144 WW8 export: avoid writing pointless empty footers

Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.

(cherry picked from commit 4144cd5a851466778004af9de98dbcfb019067bb)

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

Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
Reviewed-on: https://gerrit.libreoffice.org/3797
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sw/qa/extras/ww8export/data/fdo42144.odt 
b/sw/qa/extras/ww8export/data/fdo42144.odt
new file mode 100644
index 000..be94900
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo42144.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 679f765..6ed1ccd 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -42,6 +42,7 @@ public:
 void testFdo45724();
 void testFdo46020();
 void testFirstHeaderFooter();
+void testFdo42144();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -60,6 +61,7 @@ void Test::run()
 {fdo45724.odt, Test::testFdo45724},
 {fdo46020.odt, Test::testFdo46020},
 {first-header-footer.doc, Test::testFirstHeaderFooter},
+{fdo42144.odt, Test::testFdo42144},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -139,6 +141,13 @@ void Test::testFirstHeaderFooter()
 CPPUNIT_ASSERT_EQUAL(OUString(Even page footer 2),  
parseDump(/root/page[6]/footer/txt/text()));
 }
 
+void Test::testFdo42144()
+{
+// Footer wasn't disabled -- instead empty footer was exported.
+uno::Referencebeans::XPropertySet 
xStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, bool(getPropertysal_Bool(xStyle, 
FooterIsOn)));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index f002c1f..d837181 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1182,7 +1182,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export rWrt, 
bool bHeader,
 else if ( rWrt.bWrtWW8 )
 {
 pTxtPos-Append( rCpPos );
-if (rWrt.bHasHdr  nBreakCode!=0)
+if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr)  nBreakCode!=0)
 {
 rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty 
header/footer
 rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for 
end of the stream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#42144 WW8 export: avoid writing pointless empty footers

[Bosdonnat Cedric (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/3797

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[Libreoffice-commits] core.git: 2 commits - download.lst icu/UnpackedTarball_icu.mk Makefile.fetch solenv/gbuild

[Eike Rathke]

 Makefile.fetch   |1 +
 download.lst |1 +
 icu/UnpackedTarball_icu.mk   |6 ++
 solenv/gbuild/UnpackedTarball.mk |   17 +
 4 files changed, 25 insertions(+)

New commits:
commit bc20557b9ffa774d98846097bb2e4b93e518c4b3
Author: Eike Rathke er...@redhat.com
Date:   Mon May 6 16:56:28 2013 +0200

added ICU 51 layout fix tarball, ticket 10107

With 428bde3591ff2fd2195097040dbe1480f1f4210f this should enable ICU to
bounds-check font tables as mentioned in
http://site.icu-project.org/download/51#TOC-Known-Issues

With this patch also needed is 7de7267f4cfcb455aabb09053c7ed681d4591867
otherwise application will crash.

Change-Id: I42e31778f762afc80ea21c1fb20952eab42791dc

diff --git a/Makefile.fetch b/Makefile.fetch
index 1381a37..e743d62 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -115,6 +115,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,HARFBUZZ,$(HARFBUZZ_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
$(call fetch_Optional,ICU,$(ICU_TARBALL)) \
+   $(call fetch_Optional,ICU,$(ICU_51_LAYOUT_FIX_TARBALL)) \
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLOW_ENGINE_TARBALL)) \
$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLUTE_TARBALL)) 
\
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBBASE_TARBALL)) \
diff --git a/download.lst b/download.lst
index 8839108..1420a5d 100644
--- a/download.lst
+++ b/download.lst
@@ -41,6 +41,7 @@ export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.g
 export HARFBUZZ_TARBALL := 
90855e670c790c1fec4592908be3c0b8-harfbuzz-0.9.16.tar.bz2
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
+export ICU_51_LAYOUT_FIX_TARBALL := 
7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index e0837ac..91e3d56 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -11,6 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
 
+# *ONLY* for ICU 51(.1)!
+# http://site.icu-project.org/download/51#TOC-Known-Issues
+$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
+   $(GNUTAR) -x -z -f $(TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c.10129.wintz.patch \
icu/icu4c.9948.mlym-crash.patch \
commit 38b1b1aa4bf86653dd8363e85eb7e63d19d5b123
Author: David Tardon dtar...@redhat.com
Date:   Fri May 3 16:53:09 2013 +0200

gbuild: add gb_UnpackedTarball_set_pre_action

This function is for running arbitrary command just after unpacking. It
turns out that gb_UnpackedTarball_set_post_action is not enough :-(

Change-Id: Ibad9d7fbcdd2b95a16cc838ad8773eef5c6da019

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 2342dc9..a62b42a 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -131,6 +131,9 @@ $(call gb_Output_announce,$(2),$(true),PAT,2)
 $(call gb_Helper_abbreviate_dirs,\
( \
cd $(3)  \
+   $(if $(UNPACKED_PRE_ACTION),\
+   $(UNPACKED_PRE_ACTION)  \
+   ) \
$(if $(UNPACKED_FILES),\
mkdir -p $(sort $(dir $(UNPACKED_DESTFILES)))  \
$(call 
gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES))  \
@@ -193,6 +196,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : 
UNPACKED_FIX_EOL :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := 
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
 
 $(call gb_UnpackedTarball_get_preparation_target,$(1)) : 
$(gb_Module_CURRENTMAKEFILE)
 $(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call 
gb_UnpackedTarball_get_target,$(1))).dir
@@ -288,6 +292,19 @@ endef
 
 # Set arbitrary shell command to be run during unpack
 #
+# The command is run at the very beginning, in freshly unpacked tarball.
+# The command is run in the unpacked directory. If more than one command
+# is used, care should be taken that the whole command fails if either
+# 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 3 commits - cli_ure/CliLibrary_cli_uno_bridge.mk cli_ure/CustomTarget_cli_uretypes.mk cli_ure/Module_cli_ure.mk cli_ure/Package_cli_uret

[Petr Mladek]

 cli_ure/CliLibrary_cli_uno_bridge.mk |7 +---
 cli_ure/CustomTarget_cli_uretypes.mk |   34 +++
 cli_ure/Module_cli_ure.mk|8 -
 cli_ure/Package_cli_uretypes.mk  |   18 
 cli_ure/source/mono_bridge/cli_uno_bridge_config |   11 +++
 cli_ure/version/version.txt  |4 ++
 solenv/gbuild/CliAssembly.mk |4 +-
 7 files changed, 78 insertions(+), 8 deletions(-)

New commits:
commit 221f54aa0179f5633e85529d1cb1d0b582e0f73f
Author: Petr Mladek pmla...@suse.cz
Date:   Mon May 6 17:07:35 2013 +0200

[mono] add config file for cli_uno_bridge

It is not needed at runtime. I tried to reuse the cli_basetypes config file
but it caused a race condition and random build failures.

Change-Id: I83c963a70701006b48510d26f0301607f128fafa

diff --git a/cli_ure/CliLibrary_cli_uno_bridge.mk 
b/cli_ure/CliLibrary_cli_uno_bridge.mk
index cd4cddd..b3f3c79 100644
--- a/cli_ure/CliLibrary_cli_uno_bridge.mk
+++ b/cli_ure/CliLibrary_cli_uno_bridge.mk
@@ -11,14 +11,11 @@ include $(SRCDIR)/cli_ure/version/version.txt
 
 $(eval $(call gb_CliLibrary_CliLibrary,cli_uno_bridge))
 
-# FIXME: The original code did not use config file at all; How to do this in 
gbuild
-$(eval $(call 
gb_CliLibrary_set_configfile,cli_uno_bridge,cli_ure/source/basetypes/cli_basetypes_config))
+$(eval $(call 
gb_CliLibrary_set_configfile,cli_uno_bridge,cli_ure/source/mono_bridge/cli_uno_bridge_config))
 
 $(eval $(call 
gb_CliLibrary_set_keyfile,cli_uno_bridge,$(SRCDIR)/cli_ure/source/cliuno.snk))
 
-# FIXME: the original code did not use the policy assembly; there is someting 
similar in cli_ure/source/mono_bridge/assemblyinfo
-#How to do this in gbuild?
-$(eval $(call 
gb_CliLibrary_set_policy,cli_uno_bridge,$(CLI_BASETYPES_POLICY_ASSEMBLY),$(CLI_BASETYPES_POLICY_VERSION)))
+$(eval $(call 
gb_CliLibrary_set_policy,cli_uno_bridge,$(CLI_UNO_BRIDGE_POLICY_ASSEMBLY),$(CLI_UNO_BRIDGE_POLICY_VERSION)))
 
 $(eval $(call gb_CliLibrary_add_csfiles,cli_uno_bridge,\
 cli_ure/source/mono_bridge/assemblyinfo \
diff --git a/cli_ure/source/mono_bridge/cli_uno_bridge_config 
b/cli_ure/source/mono_bridge/cli_uno_bridge_config
new file mode 100644
index 000..df2b489
--- /dev/null
+++ b/cli_ure/source/mono_bridge/cli_uno_bridge_config
@@ -0,0 +1,11 @@
+?xml version=1.0?
+configuration
+  runtime
+assemblyBinding xmlns=urn:schemas-microsoft-com:asm.v1
+  dependentAssembly
+assemblyIdentity name=cli_uno_bridge 
publicKeyToken=ce2cb7e279207b9e/
+bindingRedirect oldVersion=CLI_UNO_BRIDGE_OLD_VERSION 
newVersion=CLI_UNO_BRIDGE_NEW_VERSION /
+  /dependentAssembly
+/assemblyBinding
+  /runtime
+/configuration
\ No newline at end of file
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index e24ddc5..b4172c3 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -36,3 +36,7 @@ CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.21.0
 CLI_CPPUHELPER_POLICY_VERSION=22.0.0.0
 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
  
+CLI_UNO_BRIDGE_NEW_VERSION=1.0.0.0
+CLI_UNO_BRIDGE_OLD_VERSION=0.0.1.0-0.0.9.0
+CLI_UNO_BRIDGE_POLICY_VERSION=1.0.0.0
+CLI_UNO_BRIDGE_POLICY_ASSEMBLY=policy.1.0.cli_uno_bridge
commit e52886becf5f42132727688ceae636ad95d9876d
Author: Petr Mladek pmla...@suse.cz
Date:   Mon May 6 17:06:29 2013 +0200

[mono] allow to use the prebuilt ure types

Change-Id: If931617e648310aef4ecb41030ec5d17ebcbf3ce

diff --git a/cli_ure/CustomTarget_cli_uretypes.mk 
b/cli_ure/CustomTarget_cli_uretypes.mk
new file mode 100644
index 000..d97327f
--- /dev/null
+++ b/cli_ure/CustomTarget_cli_uretypes.mk
@@ -0,0 +1,34 @@
+# -*- 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/.
+#
+
+include $(SRCDIR)/cli_ure/version/version.txt
+
+$(eval $(call gb_CustomTarget_CustomTarget,cli_ure/unotypes))
+
+cli_uretypes_CLIDIR := $(call gb_CustomTarget_get_workdir,cli_ure/unotypes)
+
+$(call gb_CustomTarget_get_target,cli_ure/unotypes) : \
+   $(cli_uretypes_CLIDIR)/cli_uretypes.dll \
+   $(cli_uretypes_CLIDIR)/cli_uretypes.config \
+   $(cli_uretypes_CLIDIR)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll
+
+
+$(cli_uretypes_CLIDIR)/cli_uretypes.dll : 
$(OUTDIR)/inc/external/cli/cli_uretypes.dll
+   mkdir -p $(@D)
+   $(GNUCOPY) $? $@
+
+$(cli_uretypes_CLIDIR)/cli_uretypes.config : 
$(OUTDIR)/inc/external/cli/cli_uretypes.config
+   mkdir -p $(@D)
+   $(GNUCOPY) $? $@
+
+$(cli_uretypes_CLIDIR)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll : 
$(OUTDIR)/inc/external/cli/$(CLI_URETYPES_POLICY_ASSEMBLY).dll
+   mkdir -p $(@D)
+   $(GNUCOPY) $ $@
+
+# vim:set 

Re: psprint::CompatMetricOverride - can I kill it?

[Thorsten Behrens]

Noel Grandin wrote:
 So I can take that as a yes :-)  ?
 
yes. :)

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sc/inc/conditio.hxx  |   24 ++--
 sc/source/core/data/conditio.cxx |   28 +++-
 vcl/source/window/window.cxx |   24 ++--
 3 files changed, 31 insertions(+), 45 deletions(-)

New commits:
commit 3f4a63f1492b7b471ad995029244a6a113e6636d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 16:25:08 2013 +0200

Revert abstract type in ptr_container needs this workaround

d3f063cc86b50ac9adf08eb46dd2caf7975ed43c, by instead restricting the use of 
the
Boost pointer containers to non-inline code (watch out for implicitly 
generated
copy ctors and copy assignment ops), thus preventing MSVC from trying to
generate full template instantiations of those containers (similar to
f4227c822c7f5a4e1e1b3b4e096cb63cf710a3f1 Blind fix for MSVC, take two).

Turns out the ScConditionalFormat copy ctor was unused anyway (but the
ScConditionalFormatList copy ctor isn't, so only prevent generation of an
implicit copy assignment op there).

Change-Id: I23303a98df7024dbce95638ac13097b71a9c5c04

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index bcf72c9..9e7e14d 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -31,6 +31,7 @@
 
 #include map
 
+#include boost/noncopyable.hpp
 #include boost/ptr_container/ptr_set.hpp
 #include boost/ptr_container/ptr_vector.hpp
 #include boost/scoped_ptr.hpp
@@ -367,7 +368,7 @@ private:
 //  complete conditional formatting
 //
 
-class SC_DLLPUBLIC ScConditionalFormat
+class SC_DLLPUBLIC ScConditionalFormat: private boost::noncopyable
 {
 ScDocument* pDoc;
 sal_uInt32  nKey;   // Index in attributes
@@ -378,7 +379,6 @@ class SC_DLLPUBLIC ScConditionalFormat
 
 public:
 ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
-ScConditionalFormat(const ScConditionalFormat r);
 ~ScConditionalFormat();
 
 // true copy of formulas (for Ref-Undo / between documents)
@@ -390,8 +390,8 @@ public:
 // don't use the same name as for the const version
 ScRangeList GetRangeList() { return maRanges; }
 
-bool IsEmpty() const { return maEntries.empty(); }
-size_t size() const   { return maEntries.size(); }
+bool IsEmpty() const;
+size_t size() const;
 
 voidCompileAll();
 voidCompileXML();
@@ -434,16 +434,19 @@ public:
 class SC_DLLPUBLIC ScConditionalFormatList
 {
 private:
-boost::ptr_setScConditionalFormat maConditionalFormats;
 typedef boost::ptr_setScConditionalFormat ConditionalFormatContainer;
+ConditionalFormatContainer maConditionalFormats;
+
+void operator =(ScConditionalFormatList const ) SAL_DELETED_FUNCTION;
+
 public:
 ScConditionalFormatList() {}
 ScConditionalFormatList(const ScConditionalFormatList rList);
 ScConditionalFormatList(ScDocument* pDoc, const ScConditionalFormatList 
rList);
 ~ScConditionalFormatList() {}
 
-voidInsertNew( ScConditionalFormat* pNew )
-{ maConditionalFormats.insert(pNew); }
+voidInsertNew( ScConditionalFormat* pNew );
+
 /**
  * Checks that all cond formats have a non empty range.
  * Deletes empty cond formats.
@@ -481,13 +484,6 @@ public:
 void endRendering();
 };
 
-// see 
http://www.boost.org/doc/libs/1_49_0/libs/ptr_container/doc/tutorial.html#cloneability
-//for MSVC we need:
-inline ScFormatEntry* new_clone( const ScFormatEntry rFormat )
-{
-return rFormat.Clone();
-}
-
 #endif
 
 
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index f898cfe..c091cd5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1829,19 +1829,6 @@ ScConditionalFormat::ScConditionalFormat(sal_uInt32 
nNewKey, ScDocument* pDocume
 {
 }
 
-ScConditionalFormat::ScConditionalFormat(const ScConditionalFormat r) :
-pDoc( r.pDoc ),
-nKey( r.nKey ),
-maRanges( r.maRanges )
-{
-for (CondFormatContainer::const_iterator itr = r.maEntries.begin(); itr != 
r.maEntries.end(); ++itr)
-{
-ScFormatEntry* pNewEntry = itr-Clone(r.pDoc);
-maEntries.push_back( pNewEntry );
-pNewEntry-SetParent(this);
-}
-}
-
 ScConditionalFormat* ScConditionalFormat::Clone(ScDocument* pNewDoc) const
 {
 // echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten)
@@ -1890,6 +1877,16 @@ void ScConditionalFormat::AddEntry( ScFormatEntry* pNew )
 pNew-SetParent(this);
 }
 
+bool ScConditionalFormat::IsEmpty() const
+{
+return maEntries.empty();
+}
+
+size_t ScConditionalFormat::size() const
+{
+return maEntries.size();
+}
+
 ScConditionalFormat::~ScConditionalFormat()
 {
 }
@@ -2106,6 +2103,11 @@ 
ScConditionalFormatList::ScConditionalFormatList(ScDocument* pDoc, const ScCondi
 InsertNew( itr-Clone(pDoc) );
 }
 
+void ScConditionalFormatList::InsertNew( ScConditionalFormat* pNew )
+{
+

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

[David Tardon]

 solenv/gbuild/AllLangHelp.mk   |   74 ++---
 solenv/gbuild/extensions/pre_SharedLangList.mk |   10 +++
 2 files changed, 30 insertions(+), 54 deletions(-)

New commits:
commit 2b88585b59091189672695a5a2fbe2c7528d3cf3
Author: David Tardon dtar...@redhat.com
Date:   Mon May 6 14:22:13 2013 +0200

gbuild: predefine list of help packs to build

It does not make sense to repeat the same check many times.

Change-Id: I71fac6a4e8283d293a6bd50637ff3a1e6c2ad40d

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 95910ba..a5547dd 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -7,27 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_AllLangHelp_HELPDIRNAME := helpcontent2
-gb_AllLangHelp_AUXDIRNAME := auxiliary
-gb_AllLangHelp_HELPDIR := $(gb_AllLangHelp_HELPDIRNAME)/source
-gb_AllLangHelp_AUXDIR := $(gb_AllLangHelp_HELPDIR)/$(gb_AllLangHelp_AUXDIRNAME)
-gb_AllLangHelp_TRANLATIONSDIR := $(SRCDIR)/translations
-
 # class AllLangHelp
 
 # Creates and delivers all language versions of a module.
 
-gb_AllLangHelp_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-
-define gb_AllLangHelp__translation_exists
-$(or \
-   $(filter en-US qtz,$(1)),\
-   $(and \
-   $(wildcard $(SRCDIR)/$(gb_AllLangHelp_AUXDIR)/$(1)),\
-   $(wildcard 
$(gb_AllLangHelp_TRANLATIONSDIR)/source/$(1)/$(gb_AllLangHelp_HELPDIRNAME)) \
-   ) \
-)
-endef
+gb_AllLangHelp_HELPDIRNAME := helpcontent2
+gb_AllLangHelp_AUXDIRNAME := auxiliary
+gb_AllLangHelp_HELPDIR := $(gb_AllLangHelp_HELPDIRNAME)/source
+gb_AllLangHelp_AUXDIR := $(gb_AllLangHelp_HELPDIR)/$(gb_AllLangHelp_AUXDIRNAME)
 
 gb_AllLangHelp__get_helpname = $(1)/$(2)
 
@@ -63,9 +50,8 @@ endef
 #
 # gb_AllLangHelp_AllLangHelp module
 define gb_AllLangHelp_AllLangHelp
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang
 
 $(call gb_AllLangHelp_get_target,$(1)) :| $(dir $(call 
gb_AllLangHelp_get_target,$(1))).dir
 
@@ -76,10 +62,8 @@ endef
 
 # gb_AllLangHelp_set_treefile module treefile
 define gb_AllLangHelp_set_treefile
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_HelpTarget_set_treefile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(gb_AllLangHelp_HELPDIR)/text) 
\
-   ) \
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_HelpTarget_set_treefile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(gb_AllLangHelp_HELPDIR)/text) 
\
 )
 
 endef
@@ -88,10 +72,8 @@ endef
 #
 # gb_AllLangHelp_add_helpfile module file
 define gb_AllLangHelp_add_helpfile
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_HelpTarget_add_helpfile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
-   ) \
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_HelpTarget_add_helpfile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
 )
 
 endef
@@ -100,10 +82,8 @@ endef
 #
 # gb_AllLangHelp_add_helpfiles module file(s)
 define gb_AllLangHelp_add_helpfiles
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_HelpTarget_add_helpfiles,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
-   ) \
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_HelpTarget_add_helpfiles,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
 )
 
 endef
@@ -112,10 +92,8 @@ endef
 #
 # gb_AllLangHelp_add_localized_file module basedir file
 define gb_AllLangHelp_add_localized_file
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_HelpTarget_add_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)/$(lang)/$(3)) \
-   ) \
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_HelpTarget_add_file,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)/$(lang)/$(3)) \
 )
 
 endef
@@ -124,10 +102,8 @@ endef
 #
 # gb_AllLangHelp_add_localized_files module basedir file(s)
 define gb_AllLangHelp_add_localized_files
-$(foreach lang,$(gb_AllLangHelp_LANGS),\
-   $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\
-   $(call gb_HelpTarget_add_files,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(addprefix $(2)/$(lang)/,$(3))) \
-   ) \
+$(foreach lang,$(gb_HELP_LANGS),\
+   $(call gb_HelpTarget_add_files,$(call 
gb_AllLangHelp__get_helpname,$(1),$(lang)),$(addprefix $(2)/$(lang)/,$(3))) \
 )
 
 endef
@@ -138,10 +114,8 

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1-buildfix1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1-buildfix1' created by Petr Mladek 
pmla...@suse.cz at 2013-05-06 16:24 -0700

Tag libreoffice-4.1.0.0.alpha1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh8sQAAoJEPQ0oe+v7q6j144P/jsuCknUIoaBGGOfvPf7Mp5B
KB4p7/vZurg3HX+4AmGhHcb0TvtY7emk1ZOZJNIkxBweyMF9J2jEmIM6EhbJDJRJ
VZQcsVjA9Pvnqu/6mwvL3znlRh0GkzNY3te2A1g50iQui+HgC0XJ9NEI0b3HTmRU
6w4npBxGAyQzeFNMEaNHJ1/ZA4bZV2pwF23lev/EUPLsZLLGh2RfRu9zQDvlO+IT
2EKaMLHhdZ1Ot3G9sYefoUAoG539MxP6d3YxW5U/PwR2J/VvSuwIFAuzd82fkYix
QqRlNE84JQw44QaZjBaknCis6GuSZKIuLpfIcsXJogI+zhevefnhJcbp59BcxO+y
yGj0xrRbXzgmd7tA+mQUlDhaQ69rPaKBPLihUsB6+DqehMbXLNA8giYgTtlhtG06
x+xkHBAfNmVUToTyBcVDgQaWxcqZ3L5a+c+sTBn2EL3cAV2ql4Db7fx18k/Lc/A6
mo5oS51cLfNrHs+dApTEMxhr/kVjiK5UohiLM0fEB+Tu7lY5T363phFCy2cIFIMd
p+qD+NadDmftdmJqKouaZ6nLmpiZ+MRNWUIfOqSd7dw+qEIYiTQ9oJS503C5hQBf
3zr8Y+Hi7ugLzHG312oBkNzQuMfzb8kaqJCL6ENO4D6PLwK31LtSnNqR9eGHyflp
/jBMMxBZE2zUMu2wIGab
=VnpM
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.0.alpha1:
Petr Mladek (1):
  Version 4.1.0.0.alpha1, tag libreoffice-4.1.0.0.alpha1-buildfix1

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1-buildfix1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1-buildfix1' created by Petr Mladek 
pmla...@suse.cz at 2013-05-06 16:24 -0700

Tag libreoffice-4.1.0.0.alpha1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh8sQAAoJEPQ0oe+v7q6jbp4QAJ8rsGWp9By6F/aDQ6dnDwEd
rZPxrMpreR9wZazWWhy+jUKWTewhWoAm+CxpH3G7PFZRJgfxCDuaz315/EkzJriX
52GEbRAHB1qIV3y1NvMjnIIyn7/t/SLKGw15BiLcV9UXbhAZtRRtmuIX4b/HP5W4
mKWFTEQpFQGWKODmqnOgMvttRfPUQ/MwVFGuOrnmsOM4zO6ePSaFSgaFNr7levCq
Ii7hBppU49IjmFlcjG09lKaPAN0dOMFwX9Uonerps4rcX7I8yioninYczB6FRynJ
LVEu9e+CBESTW3/xeTH7+BHpx1YszdJ9TWsT6NE2AgJzkKItAlzZsJ7CcaOg9eJ9
0D/6Zbir4LBUQwtUIV0Z0t1VMwo4VXRI/+SIdqK7O5YD0A/k4P6JjT0jHlV5Hq6T
ZC4S2yOSxcr7Qtn+vCZxHyL5QhP3WvMmE5V+Xnv47H8lDf+hFS3kWMbrSfl2KOmT
GcI9tftdT4o5Go2TiQ0/WCO5CiDupds/tU+Fw6X8O8Dc84Tt3qIXDkhVUNF06iJl
PCsAD0nJqjU6HLLNgNDvCpHpy0eMtZxN0a8O3tD+2Pa+JgbV2PdDO8PJD+YQEPnv
/x5DjBOw2P6+Y5LMq1mUm9XTZWGjVwSFl5NMEgUeFf4lnLow7zJJMHPUTRagZxp8
1xcLGu3+hhFyEbXohJ1E
=+9cy
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.0.alpha1:
Petr Mladek (1):
  Version 4.1.0.0.alpha1, tag libreoffice-4.1.0.0.alpha1-buildfix1

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1-buildfix1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1-buildfix1' created by Petr Mladek 
pmla...@suse.cz at 2013-05-06 16:24 -0700

Tag libreoffice-4.1.0.0.alpha1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh8sQAAoJEPQ0oe+v7q6jNxoP/1xB7EEvgiB/h11jZRUetzoq
/5GrEf9dS3OXep8SjzzaKQMPE26TZnszPQMRNshvs59NlXh1pGqYXDBZfdajQM/2
bJ9cKyYOhrUcWu+R3ClB5eMP+DW7KLmzifoMvOGeF4LO0unrxPjmFXT+p4C3DGBo
MVfAiT7r7unQP4ardOvEV+jIs4+VNvitdktwKUHTR5s5mODI+4WzIZfZa27pHspE
RLiaHu+2mD8UeBpfNOngeySD9Y1kDGXktTsICcraqHvjuIs7Sr9fyVpiTHQWKeiH
QeG/miwdHiHhLJQtdenfutLsVGS+899shtv6qpwopOt6NWb1+RVYhX484SYQg1uH
CQJKhKqkuc9jIjex4XVuBrguPqLWVZItomAacgnQgCmVIR6bYu+dPT7UGf1b43Tj
sQmaQX2QEREcePfa/i257r2Bp7Z6F4RL7j1EN9M6FbbE+r+F3gNQxw1wbal14jda
kQDg1wG4ot56Otvb2meBJaaXJJGmNzCOa8EAhp+ZQU7KMSagKj+vkhvaLbxRpN14
X4dPC2xsnkycolvrrEnQwVEaHjZxliw+NlJJS8LPm2JLKQK9k2vT4Sy7SXWUmzNP
9a3hWypXibMtT+HD/nspIaVHradhoA53HIAjFSw4CaVO4wpne3wUhhnIosKiJ45k
yESUVhMzlXjhZdpx3kSO
=npZh
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.0.alpha1:
Petr Mladek (1):
  Version 4.1.0.0.alpha1, tag libreoffice-4.1.0.0.alpha1-buildfix1

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.0.alpha1-buildfix1'

[Petr Mladek]

Tag 'libreoffice-4.1.0.0.alpha1-buildfix1' created by Petr Mladek 
pmla...@suse.cz at 2013-05-06 16:24 -0700

Tag libreoffice-4.1.0.0.alpha1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRh8sQAAoJEPQ0oe+v7q6jn1kQAKomIhASadQLld7PbCKChTjT
F+kgHQ/hncWxyQxrxwt6f2OXZWbWSgOWc+XpGfDxp18bmI0FDSQGfwAeuiufTNWa
p/+2u9Ig7hkKk+AkZgDIy0/PZJozKpF0aiqIznRTRFP2iQ8pYVo5UIQ47trGWrA8
z1WZoGH8e6UEO1T02C0rqB9Gw7w380Q6TaxNi3xVmMKbdwK0AKiRocfNwDE+94A3
47JopkW3JUqYHT4oQWwRWg976Z25Ppjq0WVjA7Kq44MRphaSALGAjbLQvWn9ARsf
StZuuvicOTyj8UFUrScItfq1bbo9eYJZvflM/afmH++zM7d800qnnde6gWSphZwg
xoSHIH9BGkoH5mYtMk94tBer/JOnhP2E7hc0MV9RnmXAhQWiTcJendCLikhZ7fw7
T8unk7T2WK3t112Kdm2xBYSskuPcrqPuRWII8GTf7AikKrtFzqfYrn2bj5/QkfM3
EDnbj7bqzrvBj/W6+ozACbY7RIqdTUATOVkQx0rDv7pYN3s7vG69wg/dZxMIq+K4
OEr3nOQhScc7zammSnwWqeXKK3D7PbeRLx/YPkvBMftmG9WF3P9U2CZi37q+sbDP
fkf7/C4IEMUazDpI4JgDNbi8JOzaqnkiCu4xpnWWr15f+O0th29/KD6RIp7y1wOg
TQok+waerkntoyGcsn39
=KS7d
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.0.alpha1-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - config_host/config_harfbuzz.h.in configure.ac vcl/generic vcl/inc vcl/source

[Khaled Hosny]

 config_host/config_harfbuzz.h.in|6 --
 configure.ac|9 +
 vcl/generic/glyphs/gcach_ftyp.cxx   |2 --
 vcl/generic/glyphs/gcach_layout.cxx |   29 -
 vcl/inc/generic/glyphcache.hxx  |8 
 vcl/inc/sallayout.hxx   |   11 +++
 vcl/source/gdi/sallayout.cxx|2 +-
 7 files changed, 17 insertions(+), 50 deletions(-)

New commits:
commit bff8fa97e16f0f06fddc5545ea36c8bd2b18a580
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon May 6 11:08:29 2013 +0200

Enable HarfBuzz by default

HarfBuzz integration should be functional now, so to give it more wider
testing it is made now a required dependency on non-Windows non-Mac OSs.
By default text layout is now done by HarfBuzz but ICU LayoutEngine is
kept as a fallback and can be enabled with SAL_USE_ICULE env variable.

After 4.1.x is branched, ICU LayoutEngine should be removed completely.

Change-Id: I4fe3beeaf6092f33dd436906c11b83aeafdfbd5d

diff --git a/config_host/config_harfbuzz.h.in b/config_host/config_harfbuzz.h.in
deleted file mode 100644
index b408f52..000
--- a/config_host/config_harfbuzz.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_HARFBUZZ_H
-#define CONFIG_HARFBUZZ_H
-
-#define ENABLE_HARFBUZZ 0
-
-#endif
diff --git a/configure.ac b/configure.ac
index 75e26bd..cda53d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -720,11 +720,6 @@ AC_ARG_ENABLE(graphite,
 [Enables the compilation of Graphite smart font rendering.])
 )
 
-AC_ARG_ENABLE(harfbuzz,
-AS_HELP_STRING([--enable-harfbuzz],
-[Determines whether to use HarfBuzz text layout engine.])
-)
-
 AC_ARG_ENABLE(fetch-external,
 AS_HELP_STRING([--disable-fetch-external],
 [Disables fetching external tarballs from web sources.])
@@ -8482,10 +8477,9 @@ dnl 
===
 dnl HarfBuzz
 dnl ===
 AC_MSG_CHECKING([whether to enable HarfBuzz support])
-if test $_os != WINNT -a $_os != Darwin  test $enable_harfbuzz = 
 -o $enable_harfbuzz != no; then
+if test $_os != WINNT -a $_os != Darwin; then
 AC_MSG_RESULT([yes])
 ENABLE_HARFBUZZ=TRUE
-AC_DEFINE(ENABLE_HARFBUZZ)
 libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz = 0.9.10])
 else
 AC_MSG_RESULT([no])
@@ -11978,7 +11972,6 @@ AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
-AC_CONFIG_HEADERS([config_host/config_harfbuzz.h])
 AC_CONFIG_HEADERS([config_host/config_lgpl.h])
 AC_CONFIG_HEADERS([config_host/config_kde4.h])
 AC_CONFIG_HEADERS([config_host/config_mingw.h])
diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 935a0e5..7df803f 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include config_harfbuzz.h
 #include gcach_ftyp.hxx
 #include sallayout.hxx
 #include salgdi.hxx
@@ -31,10 +30,9 @@
 #include sal/alloca.h
 #include rtl/instance.hxx
 
-#if ENABLE_HARFBUZZ
 #include harfbuzz/hb-icu.h
 #include harfbuzz/hb-ot.h
-#endif
+
 #include layout/LayoutEngine.h
 #include layout/LEFontInstance.h
 #include layout/LELanguages.h
@@ -50,10 +48,7 @@
 ServerFontLayout::ServerFontLayout( ServerFont rFont )
 :   mrServerFont( rFont )
 {
-bUseHarfBuzz = false;
-#if ENABLE_HARFBUZZ
-bUseHarfBuzz = (getenv(SAL_USE_HARFBUZZ) != NULL);
-#endif
+bUseHarfBuzz = (getenv(SAL_USE_ICULE) == NULL);
 }
 
 void ServerFontLayout::DrawText( SalGraphics rSalGraphics ) const
@@ -208,7 +203,6 @@ static bool needNextCode(sal_Unicode cChar)
 return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
 }
 
-#if ENABLE_HARFBUZZ
 static hb_blob_t *getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* 
pUserData)
 {
 char pTagName[5];
@@ -537,7 +531,6 @@ bool HbLayoutEngine::layout(ServerFontLayout rLayout, 
ImplLayoutArgs rArgs)
 
 return true;
 }
-#endif // ENABLE_HARFBUZZ
 
 // ===
 // bridge to ICU LayoutEngine
@@ -1214,12 +1207,10 @@ ServerFontLayoutEngine* 
ServerFont::GetLayoutEngine(bool bUseHarfBuzz)
 {
 // find best layout engine for font, platform, script and language
 if (!mpLayoutEngine) {
-#if ENABLE_HARFBUZZ
 if (bUseHarfBuzz)
 mpLayoutEngine = new HbLayoutEngine(*this);
 else
-#endif
-mpLayoutEngine = new IcuLayoutEngine(*this);
+mpLayoutEngine = new IcuLayoutEngine(*this);
 }
 return mpLayoutEngine;
 }
commit f0393d7ff69011a16b100541ef18e5090544e4a1
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon May 6 16:54:53 2013 +0200

[harfbuzz] Fix 

[Libreoffice-commits] core.git: icu/UnpackedTarball_icu.mk

[Stephan Bergmann]

 icu/UnpackedTarball_icu.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a89aa68483fafb82f1718fef93788523ddf0070d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 6 17:38:09 2013 +0200

Fix for Windows

Change-Id: I236c7887895d26a90c0f39655891d84b97b7b3ba

diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 91e3d56..3e084a9 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
 # *ONLY* for ICU 51(.1)!
 # http://site.icu-project.org/download/51#TOC-Known-Issues
 $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
-   $(GNUTAR) -x -z -f $(TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \
+   $(GNUTAR) -x -z -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - bridges/test i18npool/source javaunohelper/source sdext/source stoc/source svtools/source sw/qa testtools/source toolkit/sou

[Miklos Vajna]

 bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx |4 
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx |2 
 i18npool/source/transliteration/transliteration_Numeric.cxx   |6 -
 javaunohelper/source/bootstrap.cxx|4 
 javaunohelper/source/javaunohelper.cxx|   10 -
 javaunohelper/source/juhx-export-functions.hxx|   47 

 javaunohelper/source/juhx-export-types.hxx|   55 
++
 javaunohelper/source/preload.cxx  |   28 
++---
 sdext/source/presenter/PresenterController.cxx|2 
 stoc/source/registry_tdprovider/functiondescription.cxx   |4 
 stoc/source/registry_tdprovider/methoddescription.cxx |2 
 svtools/source/edit/editsyntaxhighlighter.cxx |4 
 sw/qa/extras/inc/swmodeltestbase.hxx  |   34 
+-
 sw/qa/extras/rtfimport/data/fdo63023.rtf  |   10 +
 sw/qa/extras/rtfimport/rtfimport.cxx  |9 +
 testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx|6 -
 toolkit/source/awt/stylesettings.cxx  |2 
 toolkit/source/awt/vclxwindow1.cxx|   14 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|   11 +-
 19 files changed, 201 insertions(+), 53 deletions(-)

New commits:
commit 6bf2ac6b88d4fd4f1cfe420d7a9c78dc0ab2b90b
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Apr 18 17:07:22 2013 +0200

fdo#63023 incorrect RTF background color in header

(cherry picked from commits 3d4fef85d05269e613316a7af6245f05d207d76e and
08dc5de900b2e5cca9d9443fc5d4ea7756842af9)

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

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index ae0af3d..a4e8213 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -29,6 +29,8 @@
 #include com/sun/star/style/XStyleFamiliesSupplier.hpp
 #include com/sun/star/text/XTextDocument.hpp
 #include com/sun/star/text/XTextRange.hpp
+#include com/sun/star/text/XTextTable.hpp
+#include com/sun/star/table/XCell.hpp
 
 #include test/bootstrapfixture.hxx
 #include unotest/macros_test.hxx
@@ -189,19 +191,39 @@ protected:
 }
 
 // Get paragraph (counted from 1), optionally check it contains the given 
text.
-uno::Reference text::XTextRange  getParagraph( int number, OUString 
content = OUString() ) const
+uno::Referencetext::XTextContent getParagraphOrTable(int number, 
uno::Referencetext::XText xText = uno::Referencetext::XText()) const
 {
-uno::Referencetext::XTextDocument textDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XEnumerationAccess 
paraEnumAccess(textDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess paraEnumAccess;
+if (xText.is())
+paraEnumAccess.set(xText, uno::UNO_QUERY);
+else
+{
+uno::Referencetext::XTextDocument textDocument(mxComponent, 
uno::UNO_QUERY);
+paraEnumAccess.set(textDocument-getText(), uno::UNO_QUERY);
+}
 uno::Referencecontainer::XEnumeration paraEnum = 
paraEnumAccess-createEnumeration();
 for( int i = 1;
  i  number;
  ++i )
 paraEnum-nextElement();
-uno::Reference text::XTextRange  paragraph( paraEnum-nextElement(), 
uno::UNO_QUERY );
+uno::Reference text::XTextContent const 
xElem(paraEnum-nextElement(),
+uno::UNO_QUERY_THROW);
+return xElem;
+}
+
+uno::Reference text::XTextRange  getParagraph( int number, OUString 
content = OUString() ) const
+{
+uno::Referencetext::XTextRange const xParagraph(
+getParagraphOrTable(number), uno::UNO_QUERY_THROW);
 if( !content.isEmpty())
-CPPUNIT_ASSERT_EQUAL( content, paragraph-getString());
-return paragraph;
+CPPUNIT_ASSERT_EQUAL( content, xParagraph-getString());
+return xParagraph;
+}
+
+uno::Referencetext::XTextRange getParagraphOfText(int number, 
uno::Referencetext::XText xText) const
+{
+uno::Referencetext::XTextRange const 
xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
+return xParagraph;
 }
 
 /// Get run (counted from 1) of a paragraph, optionally check it contains 
the given text.
diff --git a/sw/qa/extras/rtfimport/data/fdo63023.rtf 
b/sw/qa/extras/rtfimport/data/fdo63023.rtf
new 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util

[Andras Timar]

 instsetoo_native/util/openoffice.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7511838a0137a72ac8d8c62e39fb4160521b4ac6
Author: Andras Timar ati...@suse.com
Date:   Mon May 6 18:01:09 2013 +0200

Bump for 3.6-21

Change-Id: I6036d71328ed75323227fe40022f698313a261fd

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 064c4d4..8ab15c9 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 20
+WINDOWSPATCHLEVEL 21
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANNOUNCE] libreoffice-4.1.0.0.alpha1 tag created

[Petr Mladek]

Fridrich Strba píše v Po 06. 05. 2013 v 12:03 +0200:
 When trying to build it with all languages on windows, I get:
 
 $ /opt/lo/bin/make.exe
 /opt/lo/bin/make -j 1 -rs -f C:/master/Makefile.gbuild
 /cygdrive/c/master/helpcontent2/AllLangHelp_sbasic.mk:12: ***
 gb_Package__check: Package HelpTarget/sbasic/af has not been defined.  Stop.
 make: *** [build] Error 2

This problems affected only builds where a help localization was
missing. It is fixed by
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3992cf60d7f025744e473d5dc97f435a0af4f8f0

There was another Windows-specific build problem with all languages that
got fixed by 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9fc31b75d6ef201d41e15e9bb0f1a4108b29f802

I have cherry-picked these two commits and crated the tag 

  libreoffice-4.1.0.0.alpha1-buildfix1.

If you build from git, please use:

 ./g fetch --tags
 ./g checkout -b tag-libreoffice-4.1.0.0.alpha1-buildfix1 \
 libreoffice-4.1.0.0.alpha1-buildfix1

If you build from source tarballs, please download the updated ones from

  http://dev-builds.libreoffice.org/pre-releases/src/

and check against the attached signatures to make sure that you have the
right copy.

I am sorry for the inconvenience. The purpose of the alpha build is to
catch these troubles. It is not intended for wide use and building.

The full builds have not finished yet, so there might be more problems.

Best Regards,
Petr


   






libreoffice-4.1.0.0.alpha1.tar.xz.asc
Description: PGP signature


libreoffice-dictionaries-4.1.0.0.alpha1.tar.xz.asc
Description: PGP signature


libreoffice-help-4.1.0.0.alpha1.tar.xz.asc
Description: PGP signature


libreoffice-translations-4.1.0.0.alpha1.tar.xz.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 sc/inc/column.hxx|1 
 sc/inc/document.hxx  |5 ++-
 sc/inc/table.hxx |1 
 sc/qa/unit/ucalc.cxx |   52 +++
 sc/source/core/data/column.cxx   |2 +
 sc/source/core/data/column2.cxx  |5 +++
 sc/source/core/data/document.cxx |8 ++
 sc/source/core/data/table1.cxx   |8 ++
 8 files changed, 80 insertions(+), 2 deletions(-)

New commits:
commit 92fd710a4afc1c386ccfb1956af82b2622e03aff
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon May 6 12:14:04 2013 -0400

Start writing unit test for broadcaster storage. Found  fixed one bug.

Change-Id: Ibc00f3fb4eb188b036b4f3ae70e45cb9c7385fe8

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3c79fa3..e594ba2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -473,6 +473,7 @@ public:
 void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
 
 SvtBroadcaster* GetBroadcaster( SCROW nRow );
+const SvtBroadcaster* GetBroadcaster( SCROW nRow ) const;
 
 private:
 void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 
nDelFlag );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 79a0626..adca7d5 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1950,6 +1950,9 @@ public:
 const double* FetchDoubleArray(
 sc::FormulaGroupContext rCxt, const ScAddress rPos, SCROW nLength ) 
const;
 
+SvtBroadcaster* GetBroadcaster( const ScAddress rPos );
+const SvtBroadcaster* GetBroadcaster( const ScAddress rPos ) const;
+
 private: // CLOOK-Impl-methods
 
 /**
@@ -1967,8 +1970,6 @@ private: // CLOOK-Impl-methods
 ScDocument* mpDoc;
 };
 
-SvtBroadcaster* GetBroadcaster( const ScAddress rPos );
-
 bool TableExists( SCTAB nTab ) const;
 
 voidMergeNumberFormatter(ScDocument* pSrcDoc);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c7b3498..c581228 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -832,6 +832,7 @@ public:
 ScRefCellValue GetRefCellValue( SCCOL nCol, SCROW nRow );
 
 SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow );
+const SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow ) const;
 
 /** Replace behaves differently to the Search; adjust the rCol and rRow 
accordingly.
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3fcc260..27fa863 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -50,6 +50,7 @@
 #include types.hxx
 #include conditio.hxx
 #include globstr.hrc
+#include tokenarray.hxx
 
 #include formula/IFunctionDescription.hxx
 
@@ -119,6 +120,13 @@ public:
  * Another test for formula dependency tracking, inspired by fdo#56278.
  */
 void testFormulaDepTracking2();
+
+/**
+ * More direct test for cell broadcaster management, used to track formula
+ * dependencies.
+ */
+void testCellBroadcaster();
+
 void testFuncParam();
 void testNamedRange();
 void testCSV();
@@ -267,6 +275,7 @@ public:
 CPPUNIT_TEST(testVolatileFunc);
 CPPUNIT_TEST(testFormulaDepTracking);
 CPPUNIT_TEST(testFormulaDepTracking2);
+CPPUNIT_TEST(testCellBroadcaster);
 CPPUNIT_TEST(testFuncParam);
 CPPUNIT_TEST(testNamedRange);
 CPPUNIT_TEST(testCSV);
@@ -1518,6 +1527,49 @@ void Test::testFormulaDepTracking2()
 m_pDoc-DeleteTab(0);
 }
 
+void Test::testCellBroadcaster()
+{
+CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0, 
foo));
+
+AutoCalcSwitch aACSwitch(m_pDoc, true); // turn on auto calculation.
+m_pDoc-SetString(ScAddress(1,0,0), =A1); // B1 depends on A1.
+double val = m_pDoc-GetValue(ScAddress(1,0,0)); // A1 is empty, so the 
result should be 0.
+CPPUNIT_ASSERT_EQUAL(0.0, val);
+
+const SvtBroadcaster* pBC = m_pDoc-GetBroadcaster(ScAddress(0,0,0));
+CPPUNIT_ASSERT_MESSAGE(Cell A1 should have a broadcaster., pBC);
+
+// Change the value of A1 and make sure that B1 follows.
+m_pDoc-SetValue(ScAddress(0,0,0), 1.23);
+val = m_pDoc-GetValue(ScAddress(1,0,0));
+CPPUNIT_ASSERT_EQUAL(1.23, val);
+
+// Move column A down 5 cells. Make sure B1 now references A6, not A1.
+m_pDoc-InsertRow(0, 0, 0, 0, 0, 5);
+ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(1,0,0));
+CPPUNIT_ASSERT_MESSAGE(Expected a formula cell., pFC);
+ScTokenArray* pTokens = pFC-GetCode();
+ScToken* pToken = static_castScToken*(pTokens-First());
+CPPUNIT_ASSERT_MESSAGE(Reference token not found., pToken  
pToken-GetType() == formula::svSingleRef);
+ScSingleRefData rRef = pToken-GetSingleRef();
+CPPUNIT_ASSERT_EQUAL(static_castSCsCOL(-1), rRef.nRelCol);
+CPPUNIT_ASSERT_EQUAL(static_castSCsROW(5), rRef.nRelRow);
+
+// Make sure the broadcaster has also moved.
+pBC = m_pDoc-GetBroadcaster(ScAddress(0,0,0));
+CPPUNIT_ASSERT_MESSAGE(Broadcaster shouldn't exist at A1., !pBC);
+pBC = 

Re: Master branch now requires liborcus 0.5.0 or higher.

[Bjoern Michaelsen]

Hi,

On Mon, May 06, 2013 at 12:19:38AM +0200, Mat M wrote:
 If I have questions about gbuild (and be sure I will :) ), what is
 the preferred way:
 - Asking the list through a dedicated thread
 - Private mails to gbuild experts (Volunteers, one step ahead)
 - Asking list + CCing gbuild experts
 - TOBECONFIRMED tags in the wiki
 - any other mean I did not thought about which is still convenient
 for akser and answerer :)

IMHO the mailing list (if IRC fails) is the right place for this (with results
hopefully ending up on the wiki).

Best,

Bjoern (currently not CEST-scheduled)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - src/docrecord.py src/msodraw.py

[Miklos Vajna]

 src/docrecord.py |4 
 src/msodraw.py   |8 
 2 files changed, 12 insertions(+)

New commits:
commit 84207b43af4f6035baeaeca1ea9d7b869af7daab
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 6 19:00:33 2013 +0200

doc: dump header drawings

diff --git a/src/docrecord.py b/src/docrecord.py
index 34e66cb..7cdd245 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1836,6 +1836,10 @@ class OfficeArtContent(DOCDirStream):
 print 'Drawings type=main offset=%d' % self.pos
 OfficeArtWordDrawing(self).dump()
 print '/Drawings'
+if self.pos  self.mainStream.fcDggInfo + self.size:
+print 'Drawings type=header offset=%d' % self.pos
+OfficeArtWordDrawing(self).dump()
+print '/Drawings'
 assert self.pos == self.mainStream.fcDggInfo + self.size
 print '/officeArtContent'
 
commit e8e75bf4d8a7e3988030ac048a8d2a237fc0618b
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 6 17:47:44 2013 +0200

GroupShape: implement dumpXml()

diff --git a/src/msodraw.py b/src/msodraw.py
index cf07303..082f0a3 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -476,6 +476,14 @@ class FOPT:
 recHdl.appendLine(indent(level)+%s: 
%s%(FOPT.GroupShape.flagNames[i], recHdl.getTrueFalse(bval)))
 flag /= 2
 
+def dumpXml(self, recHdl, prop):
+flag = prop.value
+flagCount = len(FOPT.GroupShape.flagNames)
+for i in xrange(0, flagCount):
+bval = (flag  0x0001)
+recHdl.appendLine('%s value=%s/' % 
(FOPT.GroupShape.flagNames[i], bval))
+flag /= 2
+
 propTable = {
 0x00BF: ['Text Boolean Properties', TextBoolean],
 0x0181: ['Fill Color', FillColor],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 vcl/source/gdi/print2.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d08280cd683b390b19c80b2e56cc6680dbc1f052
Author: Thorsten Behrens tbehr...@suse.com
Date:   Sat May 4 02:26:49 2013 +0200

Debug rendering for PostScript printer backend.

Change-Id: I4581026627fe509895d471f5c28089aaaee85f58

diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 0614a18..2fb7a28 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -641,7 +641,6 @@ static bool ImplIsActionHandlingTransparency( const 
MetaAction rAct )
 }
 }
 
-// remove comment to enable highlighting of generated output
 bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile 
rInMtf, GDIMetaFile rOutMtf,
  long nMaxBmpDPIX, long 
nMaxBmpDPIY,
  bool bReduceTransparency, 
bool bTransparencyAutoMode,
@@ -1341,6 +1340,20 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( 
const GDIMetaFile rInMtf,
 
 rOutMtf.SetPrefMapMode( rInMtf.GetPrefMapMode() );
 rOutMtf.SetPrefSize( rInMtf.GetPrefSize() );
+
+#if OSL_DEBUG_LEVEL  1
+// iterate over all aCCList members and generate rectangles for the 
bounding boxes
+rOutMtf.AddAction( new MetaFillColorAction( COL_WHITE, false ) );
+for( aCurr = aCCList.begin(); aCurr != aLast; ++aCurr )
+{
+if( aCurr-bIsSpecial )
+rOutMtf.AddAction( new MetaLineColorAction( COL_RED, true) );
+else
+rOutMtf.AddAction( new MetaLineColorAction( COL_BLUE, true) );
+
+rOutMtf.AddAction( new MetaRectAction( aMapModeVDev.PixelToLogic( 
aCurr-aBounds ) ) );
+}
+#endif
 }
 return bTransparent;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Tags on BSA

[Joel Madero]

Hi All,

Just a warning that some edits to our wiki seems to have broken our ability
to update BSA. Rob and Robinson are actively trying to solve the problem
but it could be an issue with upcoming release.

I will keep everyone up to date (or Robinson/Rob can reply and let us all
know the status). I think this is a major priority to get solved before
release - apologies that I don't understand the code enough to contribute,
hopefully it's not a major problem.


Best,
Joel

P.S. Robinson - would reverting changes to wiki be best solution until it's
solved? Or you think this will be taken care of in the next few days?

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

Re: New Tags on BSA

[Robinson Tryon]

On Mon, May 6, 2013 at 1:45 PM, Joel Madero jmadero@gmail.com wrote:
 Hi All,

 Just a warning that some edits to our wiki seems to have broken our ability
 to update BSA. Rob and Robinson are actively trying to solve the problem but
 it could be an issue with upcoming release.

 I will keep everyone up to date (or Robinson/Rob can reply and let us all
 know the status). I think this is a major priority to get solved before
 release - apologies that I don't understand the code enough to contribute,
 hopefully it's not a major problem.

If someone can give me a pointer on how to use XSL to pull out one DIV
each from N pages and shove them into a single page, then I think
we'll be all set. The XSL documentation seems a bit dense...

 P.S. Robinson - would reverting changes to wiki be best solution until it's
 solved? Or you think this will be taken care of in the next few days?

I can hack together a wiki page that transcludes a bunch of other wiki
pages, and I think that would do just fine, but I'd view that as just
a temporary solution...

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

Re: New Tags on BSA

[Joel Madero]

Hey Robinson,


 I can hack together a wiki page that transcludes a bunch of other wiki
 pages, and I think that would do just fine, but I'd view that as just
 a temporary solution...


Indeed, I think if we don't have the problem solved in the next 2-3 days
maybe (if it's not a lot of work) we can move forward with a temporary
solution?


Best,
Joel

P.S. Thanks for the update and hopefully you can get the details that you
need

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

Re: New Tags on BSA

[Noel Grandin]

this has some nice XSLT explanations

http://www.w3schools.com/xsl/

with explanations and an on-line executor here
http://www.w3schools.com/xsl/xsl_examples.asp

The hardest part is normally working out the XPath expressions to use
in the match values.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice