[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sfx2/source

2014-05-21 Thread Stephan Bergmann 
 sfx2/source/doc/docmacromode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eeac58b5261e80ded0381e2be7f1fa3e6f0e9bb4
Author: Stephan Bergmann 
Date:   Tue May 20 14:55:40 2014 +0200

Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 39d2b6d..8f87197 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -343,7 +343,7 @@ namespace sfx2
 if( aElement == aStdLibName || aElement == 
aVBAProject )
 {
 Reference < XNameAccess > xLib;
-Any aAny = xContainer->getByName( aStdLibName 
);
+Any aAny = xContainer->getByName( aElement );
 aAny >>= xLib;
 if ( xLib.is() && xLib->hasElements() )
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sfx2/source

2014-03-10 Thread Tarun Kumar 
 sfx2/source/doc/oleprops.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 748a8e9c79760def8ab3d25312dc5118492b501a
Author: Tarun Kumar 
Date:   Fri Mar 7 13:50:40 2014 +0530

fdo#75243: MSO export: save custom properties with empty value

LO removes empty properties while saving the doc. This is required in some
business scenarios.
bSkipEmpty is set to false by default to enable LibreOffice to save
even empty properties.

(cherry picked from commit 3ba58a22bdd51cd4221547e0a0e95b6d2b987358)
Signed-off-by: Michael Stahl 

Conflicts:
sfx2/source/doc/oleprops.hxx

Change-Id: I7aafe0c0be02a98fa6e72d73e9e4348a015da61f

diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index f61ce8a..bd49417 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -305,7 +305,7 @@ public:
 voidSetBoolValue( sal_Int32 nPropId, bool bValue );
 /** Inserts a string property with the passed value.
 @return  true = Property inserted; false = String was empty, property 
not inserted. */
-boolSetStringValue( sal_Int32 nPropId, const String& 
rValue, bool bSkipEmpty = true );
+boolSetStringValue( sal_Int32 nPropId, const String& 
rValue, bool bSkipEmpty = false );
 /** Inserts a time stamp property with the passed value. */
 voidSetFileTimeValue( sal_Int32 nPropId, const 
::com::sun::star::util::DateTime& rValue );
 /** Inserts a date property with the passed value. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits