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

[Tor Lillqvist]

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

New commits:
commit 14a6eab0cbd3b60937177863a23dae28b61c
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon May 13 09:18:23 2013 +0300

WaE: signed/unsigned mismatch

Change-Id: Id655a3f97107fd99bdf3c271fdc1938e22d6317d

diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 0c89359..b4679bf 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -335,7 +335,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size rSize, 
sal_uInt16 nBits, const
 // calculate bitmap size in Bytes
 const sal_uLong nAlignedWidth4Bytes = AlignedWidth4Bytes( nBits * 
rSize.Width() );
 const sal_uLong nImageSize = nAlignedWidth4Bytes * rSize.Height();
-bool bOverflow = (nImageSize / nAlignedWidth4Bytes) != rSize.Height();
+bool bOverflow = (nImageSize / nAlignedWidth4Bytes) != (sal_uLong) 
rSize.Height();
 if( bOverflow )
 return hDIB;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

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

New commits:
commit ba26c5e6330f5f1f38aab698b2b2c32cac7b5df3
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon May 13 08:24:49 2013 +0200

configure.ac: don't use python2 values for python3

unset more internal python-related variables, so that the test for 
runtime-python =3 does not reuse *any* value from test for build-python = 2.5

Change-Id: I508292713d582476db70fcd2b05ce0abb300f38a

diff --git a/configure.ac b/configure.ac
index efa1b77..dc578d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7462,7 +7462,7 @@ no|disable)
 else
 # Unset variables set by the above AM_PATH_PYTHON so that
 # we actually do check anew.
-unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON 
am_cv_python_version am_cv_python_platform am_cv_python_pythondir 
am_cv_python_pyexecdir
 AM_PATH_PYTHON([3.3],, [:])
 if test $PYTHON = :; then
 AC_MSG_RESULT([internal])
@@ -7515,7 +7515,7 @@ if test $enable_python = system; then
 elif test $cross_compiling != yes; then
 # Unset variables set by the above AM_PATH_PYTHON so that
 # we actually do check anew.
-unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON 
am_cv_python_version am_cv_python_platform am_cv_python_pythondir 
am_cv_python_pyexecdir
 # This causes an error if no python command is found
 AM_PATH_PYTHON([3.3])
 python_include=`$PYTHON -c import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('INCLUDEPY'));`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sw/source/ui/docvw/edtwin.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ee7f8cb10178fbc348210f6dea0e2ae64964ab6d
Author: Tor Lillqvist t...@iki.fi
Date:   Mon May 13 09:27:29 2013 +0300

WaE: declaration shadows a local variable

As far as I can see, the outer variable with the same name already has the
same value anyway, so it can be used.

Change-Id: Ia041aa1161015d441e99db6e1d4decea6c6fac99

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index ba6c20c..0cebc02 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5195,7 +5195,6 @@ void SwEditWin::Command( const CommandEvent rCEvt )
 break;
 case COMMAND_QUERYCHARPOSITION:
 {
-SwWrtShell rSh = m_rView.GetWrtShell();
 sal_Bool bVertical = rSh.IsInVerticalText();
 const SwPosition rPos = *rSh.GetCrsr()-GetPoint();
 SwDocShell* pDocSh = m_rView.GetDocShell();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: several reports of a problem with jpeg test in vcl

[Stephan Bergmann]

On 05/12/2013 10:05 AM, Markus Mohrhard wrote:

so after we got several complains about test failure in vcl with the
same file I looked at it with memcheck and can at least produce an
output there. The test does not fail for me or at the tinderbox but we
had now 3 independet people having problems with the same file on
different systems.

The memcheck output is:

file:///home/moggi/devel/libo4/vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-3.jpg,==13272==
Invalid read of size 8
==13272==at 0xF1FF117: ??? (in /usr/lib64/libjpeg.so.62.0.0)
==13272==  Address 0x15779db0 is 32 bytes inside a block of size 36 alloc'd
==13272==at 0x4C2ABED: malloc (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==13272==by 0x4E5D899: rtl_allocateMemory_SYSTEM(unsigned long)
(alloc_global.cxx:269)
==13272==by 0x4E5D9A0: rtl_allocateMemory (alloc_global.cxx:302)
==13272==by 0xC9F5D18: JPEGReader::CreateBitmap(void*) (JpegReader.cxx:282)
==13272==by 0xC9F527A: CreateBitmapFromJPEGReader (JpegReader.cxx:41)
==13272==by 0xC88C596: ReadJPEG (jpegc.c:151)


That should be https://bugzilla.redhat.com/show_bug.cgi?id=730364#c1 
(and thus should be harmless).


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

Re: [PATCH][REJECTED] fdo#60351: FILEOPEN particular .docx shows pictures with wrong contour instead of appropriate simple wrap

[David Tardon]

On Sat, May 04, 2013 at 03:13:58PM +0200, Joren wrote:
 Anderson Cordeiro schreef op 4/05/13 14:56:
 This is the patch to fix this easy hack. One of many I send!
 Is it possible you send this email without attaching your patch?

No patch - rejected.

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

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

[Arnaud Versini]

 sw/source/core/text/guess.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4e631a099bf354fe306e2035878ecb90f50ca5d2
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Sun May 12 17:01:01 2013 +0200

Fixes fdo#64237 by modifying the underlyning string

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

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 637372f..03628da 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -275,7 +275,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion rPor, 
SwTxtFormatInfo rInf,
 aDebugString = rInf.GetTxt();
 #endif
 
-OUString rOldTxt = rInf.GetTxt();
+OUString rOldTxt = const_castOUString (rInf.GetTxt());
 rOldTxt = rOldTxt.replaceAt( rInf.GetIdx() - 1, 1, aTxt );
 rInf.SetIdx( rInf.GetIdx() + nFieldDiff );
 }
@@ -487,9 +487,9 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion rPor, 
SwTxtFormatInfo rInf,
 I've got field trouble, part2! );
 nCutPos = nCutPos - nFieldDiff;
 
-XubString rOldTxt = (XubString)rInf.GetTxt();
-rOldTxt.Erase( nOldIdx - 1, nFieldDiff + 1 );
-rOldTxt.Insert( cFldChr, nOldIdx - 1 );
+OUString rOldTxt = const_castOUString (rInf.GetTxt());
+OUString aReplacement( cFldChr );
+rOldTxt = rOldTxt.replaceAt( nOldIdx - 1, nFieldDiff + 1, 
aReplacement);
 rInf.SetIdx( nOldIdx );
 
 #if OSL_DEBUG_LEVEL  0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cppcheck: throwing exception in destructor in SyncDbusSessionHelper.cxx (shell module)

[Stephan Bergmann]

On 05/12/2013 04:19 PM, julien2412 wrote:

Cppcheck reported exception thrown in destructor in
shell/source/sessioninstall/SyncDbusSessionHelper.cxx, line 39
  28 class GErrorWrapper
  29 {
  30 GError* m_pError;
  31 public:
  32 GErrorWrapper(GError* pError) : m_pError(pError) {}
  33 ~GErrorWrapper()
  34 {
  35 if(!m_pError)
  36 return;
  37 OUString sMsg =
OUString::createFromAscii(m_pError-message);
  38 g_error_free(m_pError);
  39 throw RuntimeException(sMsg, NULL);
  40 }
  41 GError** getRef() { return m_pError; }
  42 };

Should it be changed? If yes, how? (I suppose we shouldn't just remove it)


So this uses the RAII idiom to ensure one does not forget to call 
g_error_free, and consequently mis-uses the idiom to also throw from a 
dtor a RuntimeException synthesized from the GError.


In principle, this could be safe, if it can be proven that no stack 
unwinding out of the scope of a GErorrWrapper instance can happen. 
However, already the first use in lcl_GetPackageKitProxy shows that this 
is too error prone---the throw RuntimeException if !proxy is covered 
by the GErrorWrapper instance's scope, so this will likely lead to abort.


So the best is probably to replace RAII GErrorWrapper with something 
less clever that doesn't require throwing from a dtor.


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

[Libreoffice-commits] core.git: dbaccess/JunitTest_dbaccess_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk

[Stephan Bergmann]

 dbaccess/JunitTest_dbaccess_complex.mk |   10 +-
 dbaccess/JunitTest_dbaccess_unoapi.mk  |8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 24591677f476b6c937c4bb34bb8444c124b44d41
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 13 09:48:12 2013 +0200

Fix naming

Change-Id: Id167385e832b1cd78d0612fc2a7611aa76bf0601

diff --git a/dbaccess/JunitTest_dbaccess_complex.mk 
b/dbaccess/JunitTest_dbaccess_complex.mk
index bd8358e..5bd2f61 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_ju_complex))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
 
-$(eval $(call gb_JunitTest_use_jars,dbaccess_ju_complex,\
+$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
 ConnectivityTools \
 OOoRunner \
 jurt \
@@ -18,17 +18,17 @@ $(eval $(call gb_JunitTest_use_jars,dbaccess_ju_complex,\
 unoil \
 ))
 
-$(eval $(call gb_JunitTest_set_defs,dbaccess_ju_complex,\
+$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
 $$(DEFS) \
 -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,dbaccess_ju_complex,\
+$(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
 complex.dbaccess.Beamer \
 complex.dbaccess.PropertyBag \
 ))
 
-$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_ju_complex,\
+$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
 dbaccess/qa/complex/dbaccess/ApplicationController \
 dbaccess/qa/complex/dbaccess/Beamer \
 dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk 
b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 111496d..64af956 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -7,16 +7,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_ju_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,dbaccess_ju_unoapi,\
+$(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
 $$(DEFS) \
 -Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \
 -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl 
\
 -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,dbaccess_ju_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\
 OOoRunner \
 jurt \
 ridl \
@@ -24,7 +24,7 @@ $(eval $(call gb_JunitTest_use_jars,dbaccess_ju_unoapi,\
 unoil \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,dbaccess_ju_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
 org.openoffice.test.UnoApiTest \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Fixes fdo#64237 by modifying the underlyning string

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d387e40464b53a55524bf950b8d413cf8468376
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.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

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

[Björgvin Ragnarsson]

 scp2/source/ooo/common_brand.scp|5 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 6 files changed, 47 insertions(+)

New commits:
commit 2c99bbe1b7c94b90df73722667ea32c58824489f
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Sun May 12 12:16:53 2013 +0200

add Icelandic Hunspell dictionary and thesaurus

Change-Id: Ibf2cb81f57d123825990c7bde90586b894b9cdcc
Change-Id: I7ea382194476eeef7f83caa66c9115ed1da433b2
Reviewed-on: https://gerrit.libreoffice.org/3860
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7bf576c..d5d39e0 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -275,6 +275,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Hr
 DosName = dict-hr;
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Is
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = dict-is;
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_It
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = dict-it;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d3f596fe..11a0eb1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1078,6 +1078,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Is
+Dir = FILELIST_DIR;
+Name = Dictionary/dict-is.filelist;
+Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
Dir = FILELIST_DIR;
Name = Dictionary/dict-it.filelist;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 945c133..918e2ab 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -319,6 +319,17 @@ Module gid_Module_Root_Extension_Dictionary_Hr
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Is
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IS );
+Files = (gid_File_Extension_Dictionary_Is);
+InstallOrder = 2000;
+Sortkey = 617;
+Spellcheckerlanguage = is;
+PackageInfo = packinfo_office.txt;
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_It
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
 Files = (gid_File_Extension_Dictionary_It);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 7463ab6..3c00ad4 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -193,6 +193,12 @@ en-US = Croatian
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
 en-US = Croatian spelling dictionary, and hyphenation rules
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_IS]
+en-US = Icelandic
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_IS]
+en-US = Icelandic spelling dictionary and thesaurus
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
 en-US = Italian
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 9851174..067b0ba 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -794,6 +794,21 @@ packageversion = %PACKAGEVERSION
 End
 
 Start
+module = gid_Module_Root_Extension_Dictionary_Is
+solarispackagename = 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-is
+solarisrequires = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION
+packagename = %UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-is
+requires = 
%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION
+linuxpatchrequires = 
+copyright = 2013 The Document Foundation
+solariscopyright = solariscopyrightfile
+vendor = The hunspell-is project
+description = Is dictionary for %PRODUCTNAME 

[PUSHED] add Icelandic Hunspell dictionary and thesaurus

[David Tardon (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/3860

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ea382194476eeef7f83caa66c9115ed1da433b2
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björgvin Ragnarsson nifgr...@gmail.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

Re: Cppcheck: incorrectLogicOperator in svxrectctaccessiblecontext.cxx (in svx module)

[Stephan Bergmann]

On 05/12/2013 07:25 PM, julien2412 wrote:

cppcheck reported this:
error file=svx/source/accessibility/svxrectctaccessiblecontext.cxx
line=612 id=incorrectLogicOperator severity=style msg=Logical
disjunction always evaluates to true: nIndex gt;= 0 || nIndex lt; 0./

Indeed we have in this file that:
 610 void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex )
throw( lang::IndexOutOfBoundsException )
 611 {
 612 if( nIndex  0 || nIndex = getAccessibleChildCount() )
 613 throw lang::IndexOutOfBoundsException();
 614 }

and that!
 883 sal_Int32 SAL_CALL
SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw(
RuntimeException )
 884 {
 885 return 0;
 886 }

And this last one is like this since 2002!

What should be done here?


Unless Cppcheck does whole-program-analysis (does it?), this is a false 
positive.  SvxRectCtlAccessibleContext::getAccessibleChildCount is 
virtual, and from just looking at svxrectctaccessiblecontext.cxx one 
cannot determine that there cannot be any overrides of it.


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

[PATCH libreoffice-4-0] fdo#64311 - .desktop files: use %U for URLs only if we have ...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3880

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3880/1

fdo#64311 - .desktop files: use %U for URLs only if we have gvfs or gio.

(cherry picked from commit 363b82fdb4016bc42877fea2ebde9227b27579fe)

Signed-off-by: Fridrich Štrba fridrich.st...@bluewin.ch

Conflicts:
sysui/CustomTarget_share.mk

Change-Id: I52c75432eb30a46b2c6a597211df09fdbb08056c
---
M sysui/desktop/menus/base.desktop
M sysui/desktop/menus/calc.desktop
M sysui/desktop/menus/draw.desktop
M sysui/desktop/menus/impress.desktop
M sysui/desktop/menus/math.desktop
M sysui/desktop/menus/startcenter.desktop
M sysui/desktop/menus/writer.desktop
M sysui/desktop/menus/xsltfilter.desktop
M sysui/desktop/share/brand.pl
M sysui/desktop/share/makefile.mk
10 files changed, 38 insertions(+), 18 deletions(-)



diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index dcc43b9..9d47dbe 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -21,7 +21,7 @@
 Icon=base
 Type=Application
 
Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases;
-Exec=${UNIXBASISROOTNAME} --base %U
+Exec=${UNIXBASISROOTNAME} --base %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 Name=%PRODUCTNAME Base
 GenericName=Database Development
@@ -31,5 +31,5 @@
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Database
-Exec=libreoffice --base %U
+Exec=libreoffice --base %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 4c331c3..5a4ae2f 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -21,7 +21,7 @@
 Icon=calc
 Type=Application
 
Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
-Exec=${UNIXBASISROOTNAME} --calc %U
+Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv
 ;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
@@ -31,5 +31,5 @@
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Spreadsheet
-Exec=libreoffice --calc %U
+Exec=libreoffice --calc %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 2ffee61..4d32a2f 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -21,7 +21,7 @@
 Icon=draw
 Type=Application
 
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
-Exec=${UNIXBASISROOTNAME} --draw %U
+Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
@@ -31,5 +31,5 @@
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Drawing
-Exec=libreoffice --draw %U
+Exec=libreoffice --draw %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 3c0b151..e2a33aa 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -21,7 +21,7 @@
 Icon=impress
 Type=Application
 
Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
-Exec=${UNIXBASISROOTNAME} --impress %U
+Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
 

[PATCH libreoffice-4-0] fdo#64311 - don't encourage the fpicker to give us URLs we c...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3881

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3881/1

fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.

(cherry picked from commit 8659ca5c350b9b08fb5f343c68955cdd6d361c96)

Signed-off-by: Fridrich Štrba fridrich.st...@bluewin.ch

Conflicts:
config_host/config_vclplug.h.in

Change-Id: Ide7d833801e96a3375909238d036687082f34605
---
M configure.ac
M vcl/Library_vclplug_gtk.mk
M vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
M vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
4 files changed, 18 insertions(+), 0 deletions(-)



diff --git a/configure.ac b/configure.ac
index 9a89227..17f792d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9266,6 +9266,7 @@
 ENABLE_GNOMEVFS=TRUE
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 = 2.6.0 )
+AC_DEFINE(ENABLE_GNOME_VFS)
 else
 AC_MSG_RESULT([no])
 fi
@@ -9405,6 +9406,7 @@
 ENABLE_GIO=TRUE
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES( GIO, gio-2.0 )
+AC_DEFINE(ENABLE_GIO)
 else
 AC_MSG_RESULT([no])
 fi
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 153498c..86c1c6a 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -37,6 +37,18 @@
 ))
 endif
 
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
+   -DENABLE_GIO \
+))
+endif
+
+ifeq ($(ENABLE_GNOMEVFS),TRUE)
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
+   -DENABLE_GNOME_VFS \
+))
+endif
+
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index b4f1c6a..f2e1141 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -146,7 +146,9 @@
 
 gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), 
GTK_RESPONSE_ACCEPT );
 
+#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
 gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False 
);
+#endif
 gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), 
sal_False );
 
 m_pVBox = gtk_vbox_new( sal_False, 0 );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index d062cda..b80d6f5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -56,7 +56,9 @@
 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
 
 gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), 
GTK_RESPONSE_ACCEPT );
+#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
 gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False 
);
+#endif
 gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), 
sal_False );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide7d833801e96a3375909238d036687082f34605
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[PATCH libreoffice-4-0] fdo#64311 - fix pre-processor conditionals don't bail-out ...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3882

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3882/1

fdo#64311 - fix pre-processor conditionals  don't bail-out without gnome-vfs.

(cherry picked from commit fbc486a449808d1d9261f67ffaa4f0213e80787e)

Signed-off-by: Fridrich Štrba fridrich.st...@bluewin.ch

Conflicts:
desktop/Library_sofficeapp.mk
desktop/source/app/appinit.cxx

fdo#64311 - fix namespace issue / compile failure.

(cherry picked from commit 8627bf17d565e085bb204b91dfe596c4a0430d1d)

Change-Id: Ia7a805c95625b52fc99face000587692de21461e
7ce3837a1a451560f5867786bb20d8280e7bef23
---
M desktop/Library_sofficeapp.mk
M desktop/source/app/appinit.cxx
M vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
M vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
4 files changed, 28 insertions(+), 22 deletions(-)



diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 4a6fccf..8aa9d54 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -38,7 +38,7 @@
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
 -DDESKTOP_DLLIMPLEMENTATION \
-$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
+$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DENABLE_GNOME_VFS) \
 $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
 $(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \
 $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 7012243..d3823e9 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -80,26 +80,32 @@
 // createInstance w/o args directly to obtain an instance:
 UniversalContentBroker::create(comphelper::getProcessComponentContext());
 
-#ifdef GNOME_VFS_ENABLED
-// Instantiate GNOME-VFS UCP in the thread that initialized GNOME in order
-// to avoid a deadlock that may occure in case the UCP gets initialized 
from
-// a different thread (which may happen when calling remotely via UNO); 
this
-// is not a fix, just a workaround:
-Reference XCurrentContext  xCurrentContext(getCurrentContext());
-Any aValue(xCurrentContext-getValueByName(system.desktop-environment));
-OUString aDesktopEnvironment;
-if ((aValue = aDesktopEnvironment)  aDesktopEnvironment == GNOME)
-{
-UniversalContentBroker::create(
-comphelper::getProcessComponentContext())-
-registerContentProvider(
-ReferenceXContentProvider(
-comphelper::getProcessServiceFactory()-createInstance(
-com.sun.star.ucb.GnomeVFSContentProvider),
-UNO_QUERY_THROW),
-.*, false);
+#if ENABLE_GNOME_VFS
+try {
+// Instantiate GNOME-VFS UCP in the thread that initialized GNOME in 
order
+// to avoid a deadlock that may occure in case the UCP gets 
initialized from
+// a different thread (which may happen when calling remotely via 
UNO); this
+// is not a fix, just a workaround:
+Reference XCurrentContext  xCurrentContext(getCurrentContext());
+Any 
aValue(xCurrentContext-getValueByName(system.desktop-environment));
+OUString aDesktopEnvironment;
+if ((aValue = aDesktopEnvironment)  aDesktopEnvironment == GNOME)
+{
+Reference XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
+UniversalContentBroker::create(xContext)
+-registerContentProvider(
+ReferenceXContentProvider(
+
xContext-getServiceManager()-createInstanceWithContext(
+com.sun.star.ucb.GnomeVFSContentProvider, 
xContext),
+UNO_QUERY_THROW),
+.*, false);
+}
 }
-#endif // GNOME_VFS_ENABLED
+catch ( const Exception  )
+{
+OSL_FAIL( missing gnome-vfs component to initialize thread 
workaround );
+}
+#endif // ENABLE_GNOME_VFS
 }
 
 void Desktop::InitApplicationServiceManager()
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index f2e1141..a794aff 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -146,7 +146,7 @@
 
 gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), 
GTK_RESPONSE_ACCEPT );
 
-#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
+#if ENABLE_GNOME_VFS || ENABLE_GIO
 gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False 
);
 #endif
 gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), 
sal_False );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index b80d6f5..d4eb8e0 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 29/774b1dbc948d6d1755021e5f7806fc1f64c00a

[Caolán McNamara]

 29/774b1dbc948d6d1755021e5f7806fc1f64c00a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 06d6c6c5469a163466e25507b44b2ed66d1a1517
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:15:30 2013 +0100

Notes added by 'git notes add'

diff --git a/29/774b1dbc948d6d1755021e5f7806fc1f64c00a 
b/29/774b1dbc948d6d1755021e5f7806fc1f64c00a
new file mode 100644
index 000..f99df90
--- /dev/null
+++ b/29/774b1dbc948d6d1755021e5f7806fc1f64c00a
@@ -0,0 +1 @@
+prefer: af2b7fac27aa812229c6611fd35a77aa51b290f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/1627cd0217a62de83677e4c4a80aabf2f18b60

[Caolán McNamara]

 94/1627cd0217a62de83677e4c4a80aabf2f18b60 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit da781d29296dc4b37ceb7aca4e69fe091a87aa1e
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:16:17 2013 +0100

Notes added by 'git notes add'

diff --git a/94/1627cd0217a62de83677e4c4a80aabf2f18b60 
b/94/1627cd0217a62de83677e4c4a80aabf2f18b60
new file mode 100644
index 000..15739e4
--- /dev/null
+++ b/94/1627cd0217a62de83677e4c4a80aabf2f18b60
@@ -0,0 +1 @@
+prefer: 4634cbc237239da771e0f6a81f78171ecec726ba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1f/9d7c1b0248fb0c8d8fc2c3da21d881bffb579d

[Caolán McNamara]

 1f/9d7c1b0248fb0c8d8fc2c3da21d881bffb579d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4016e5d29ee0f199fea67ea963119598d56ba8f5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:17:10 2013 +0100

Notes added by 'git notes add'

diff --git a/1f/9d7c1b0248fb0c8d8fc2c3da21d881bffb579d 
b/1f/9d7c1b0248fb0c8d8fc2c3da21d881bffb579d
new file mode 100644
index 000..76fb84d
--- /dev/null
+++ b/1f/9d7c1b0248fb0c8d8fc2c3da21d881bffb579d
@@ -0,0 +1 @@
+prefer: a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 35/7e510eca19575a9e053d6d71f980da78436ee2

[Caolán McNamara]

 35/7e510eca19575a9e053d6d71f980da78436ee2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df9972ae140cc35191586c070fdc62475df8e625
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:17:57 2013 +0100

Notes added by 'git notes add'

diff --git a/35/7e510eca19575a9e053d6d71f980da78436ee2 
b/35/7e510eca19575a9e053d6d71f980da78436ee2
new file mode 100644
index 000..048c304
--- /dev/null
+++ b/35/7e510eca19575a9e053d6d71f980da78436ee2
@@ -0,0 +1 @@
+prefer: 966b75157fe2b17e2c8d46a7351f25dda0905366
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 57/192bfa697c8f86b8e7e0c35ffac28cd760e202

[Caolán McNamara]

 57/192bfa697c8f86b8e7e0c35ffac28cd760e202 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15f3ec8d6bf5ffdb35c95739d8e6e3a7aec0784d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:18:27 2013 +0100

Notes added by 'git notes add'

diff --git a/57/192bfa697c8f86b8e7e0c35ffac28cd760e202 
b/57/192bfa697c8f86b8e7e0c35ffac28cd760e202
new file mode 100644
index 000..38671be
--- /dev/null
+++ b/57/192bfa697c8f86b8e7e0c35ffac28cd760e202
@@ -0,0 +1 @@
+prefer: 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348

[Caolán McNamara]

 69/aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1a263532f7d82e65ea0dd06ab465f6e0b2d5d785
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:19:04 2013 +0100

Notes added by 'git notes add'

diff --git a/69/aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348 
b/69/aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348
new file mode 100644
index 000..38671be
--- /dev/null
+++ b/69/aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348
@@ -0,0 +1 @@
+prefer: 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/1de71fba53cbbef92fb50a63f5705aad22a08e

[Caolán McNamara]

 96/1de71fba53cbbef92fb50a63f5705aad22a08e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a8c1ef36a0fd5716cbb3811586cbed932aa8918
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:24:12 2013 +0100

Notes added by 'git notes add'

diff --git a/96/1de71fba53cbbef92fb50a63f5705aad22a08e 
b/96/1de71fba53cbbef92fb50a63f5705aad22a08e
new file mode 100644
index 000..a7b884b
--- /dev/null
+++ b/96/1de71fba53cbbef92fb50a63f5705aad22a08e
@@ -0,0 +1 @@
+prefer: 0c79562bde6645fb955ce0d79744ac306dcb82a4
___
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' - sysui/desktop

[Michael Meeks]

 sysui/desktop/menus/base.desktop|4 ++--
 sysui/desktop/menus/calc.desktop|4 ++--
 sysui/desktop/menus/draw.desktop|4 ++--
 sysui/desktop/menus/impress.desktop |4 ++--
 sysui/desktop/menus/math.desktop|4 ++--
 sysui/desktop/menus/startcenter.desktop |2 +-
 sysui/desktop/menus/writer.desktop  |4 ++--
 sysui/desktop/menus/xsltfilter.desktop  |2 +-
 sysui/desktop/share/brand.pl|   16 +---
 sysui/desktop/share/makefile.mk |   12 +++-
 10 files changed, 38 insertions(+), 18 deletions(-)

New commits:
commit 71f77792ed000e30a5cb090b0a21b8d1c577c23f
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:25:11 2013 +0100

fdo#64311 - .desktop files: use %U for URLs only if we have gvfs or gio.

(cherry picked from commit 363b82fdb4016bc42877fea2ebde9227b27579fe)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

Conflicts:
sysui/CustomTarget_share.mk

Change-Id: I52c75432eb30a46b2c6a597211df09fdbb08056c
Reviewed-on: https://gerrit.libreoffice.org/3880
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index dcc43b9..9d47dbe 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -21,7 +21,7 @@ Terminal=false
 Icon=base
 Type=Application
 
Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases;
-Exec=${UNIXBASISROOTNAME} --base %U
+Exec=${UNIXBASISROOTNAME} --base %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 Name=%PRODUCTNAME Base
 GenericName=Database Development
@@ -31,5 +31,5 @@ InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Database
-Exec=libreoffice --base %U
+Exec=libreoffice --base %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 4c331c3..5a4ae2f 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -21,7 +21,7 @@ Terminal=false
 Icon=calc
 Type=Application
 
Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
-Exec=${UNIXBASISROOTNAME} --calc %U
+Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv
 ;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
@@ -31,5 +31,5 @@ InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Spreadsheet
-Exec=libreoffice --calc %U
+Exec=libreoffice --calc %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 2ffee61..4d32a2f 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -21,7 +21,7 @@ Terminal=false
 Icon=draw
 Type=Application
 
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
-Exec=${UNIXBASISROOTNAME} --draw %U
+Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
 
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
@@ -31,5 +31,5 @@ InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
 UnityQuicklist=New Drawing
-Exec=libreoffice --draw %U
+Exec=libreoffice --draw %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 3c0b151..e2a33aa 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -21,7 +21,7 @@ Terminal=false
 Icon=impress
 Type=Application
 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac vcl/Library_vclplug_gtk.mk vcl/unx

[Michael Meeks]

 configure.ac   |2 ++
 vcl/Library_vclplug_gtk.mk |   12 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |2 ++
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |2 ++
 4 files changed, 18 insertions(+)

New commits:
commit bfdab9aeb1290f970d11c3704cbb11992c0d6304
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:35:04 2013 +0100

fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.

(cherry picked from commit 8659ca5c350b9b08fb5f343c68955cdd6d361c96)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

Conflicts:
config_host/config_vclplug.h.in

Change-Id: Ide7d833801e96a3375909238d036687082f34605
Reviewed-on: https://gerrit.libreoffice.org/3881
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/configure.ac b/configure.ac
index 9a89227..17f792d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9266,6 +9266,7 @@ if test $_os != WINNT -a $_os != Darwin -a 
$enable_gnome_vfs = yes -
 ENABLE_GNOMEVFS=TRUE
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 = 2.6.0 )
+AC_DEFINE(ENABLE_GNOME_VFS)
 else
 AC_MSG_RESULT([no])
 fi
@@ -9405,6 +9406,7 @@ if test  $test_gtk = yes; then
 ENABLE_GIO=TRUE
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES( GIO, gio-2.0 )
+AC_DEFINE(ENABLE_GIO)
 else
 AC_MSG_RESULT([no])
 fi
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 153498c..86c1c6a 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -37,6 +37,18 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
 ))
 endif
 
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
+   -DENABLE_GIO \
+))
+endif
+
+ifeq ($(ENABLE_GNOMEVFS),TRUE)
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
+   -DENABLE_GNOME_VFS \
+))
+endif
+
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index b4f1c6a..f2e1141 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -146,7 +146,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference 
uno::XComponentContext
 
 gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), 
GTK_RESPONSE_ACCEPT );
 
+#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
 gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False 
);
+#endif
 gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), 
sal_False );
 
 m_pVBox = gtk_vbox_new( sal_False, 0 );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index d062cda..b80d6f5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -56,7 +56,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference 
uno::XComponentCon
 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
 
 gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), 
GTK_RESPONSE_ACCEPT );
+#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
 gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False 
);
+#endif
 gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), 
sal_False );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#64311 - don't encourage the fpicker to give us URLs we c...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3881

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide7d833801e96a3375909238d036687082f34605
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[PUSHED libreoffice-4-0] fdo#64311 - .desktop files: use %U for URLs only if we have ...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3880

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52c75432eb30a46b2c6a597211df09fdbb08056c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

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

[Andre Fischer]

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

New commits:
commit e0dfd32be2e4c3ee389b180fd45348fb1b800e9d
Author: Andre Fischer a...@apache.org
Date:   Fri Jul 13 07:33:02 2012 +

Resolves: #i120172# Add missing undo action for changing PresObj index

Reported by: Shan Zhu
Fixed by: Andre Fischer
(cherry picked from commit 1289f5be48f50b38b16fb0ad34c7743317e8c79d)

Change-Id: I6c65dbe9bc87a64ebb2b46a9dc2fda855900c810

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index ff7f3c4..0d7839f 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -588,6 +588,13 @@ void DrawView::DeleteMarked()
 Rectangle aRect( pObj-GetLogicRect() );
 SdrObject* pNewObj = pPage-InsertAutoLayoutShape( 0, 
ePresObjKind, bVertical, aRect, true );
 
+// Move the new PresObj to the position before the
+// object it will replace.
+pUndoManager-AddUndoAction(
+mpDoc-GetSdrUndoFactory().CreateUndoObjectOrdNum(
+*pNewObj,
+pNewObj-GetOrdNum(),
+pObj-GetOrdNum()));
 pPage-SetObjectOrdNum( pNewObj-GetOrdNum(), 
pObj-GetOrdNum() );
 
 bResetLayout = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 12/89f5be48f50b38b16fb0ad34c7743317e8c79d

[Caolán McNamara]

 12/89f5be48f50b38b16fb0ad34c7743317e8c79d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 897fecaff207f10b58028c76a334799ea34811fa
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 09:32:55 2013 +0100

Notes added by 'git notes add'

diff --git a/12/89f5be48f50b38b16fb0ad34c7743317e8c79d 
b/12/89f5be48f50b38b16fb0ad34c7743317e8c79d
new file mode 100644
index 000..1ffe774
--- /dev/null
+++ b/12/89f5be48f50b38b16fb0ad34c7743317e8c79d
@@ -0,0 +1 @@
+merged as: e0dfd32be2e4c3ee389b180fd45348fb1b800e9d
___
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' - desktop/Library_sofficeapp.mk desktop/source

[Michael Meeks]

 desktop/Library_sofficeapp.mk  |2 -
 desktop/source/app/appinit.cxx |   42 +++--
 2 files changed, 25 insertions(+), 19 deletions(-)

New commits:
commit 0179aca82573724072b19fc1e8e669f133105dd4
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:52:26 2013 +0100

fdo#64311 - fix pre-processor conditionals  don't bail-out without 
gnome-vfs.

(cherry picked from commit fbc486a449808d1d9261f67ffaa4f0213e80787e)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

Conflicts:
desktop/Library_sofficeapp.mk
desktop/source/app/appinit.cxx

fdo#64311 - fix namespace issue / compile failure.

(cherry picked from commit 8627bf17d565e085bb204b91dfe596c4a0430d1d)

Change-Id: Ia7a805c95625b52fc99face000587692de21461e
7ce3837a1a451560f5867786bb20d8280e7bef23
Reviewed-on: https://gerrit.libreoffice.org/3882
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 4a6fccf..8aa9d54 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,sofficeapp))
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
 -DDESKTOP_DLLIMPLEMENTATION \
-$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
+$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DENABLE_GNOME_VFS) \
 $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
 $(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \
 $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 7012243..92ab2bc 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -80,26 +80,32 @@ static void configureUcb()
 // createInstance w/o args directly to obtain an instance:
 UniversalContentBroker::create(comphelper::getProcessComponentContext());
 
-#ifdef GNOME_VFS_ENABLED
-// Instantiate GNOME-VFS UCP in the thread that initialized GNOME in order
-// to avoid a deadlock that may occure in case the UCP gets initialized 
from
-// a different thread (which may happen when calling remotely via UNO); 
this
-// is not a fix, just a workaround:
-Reference XCurrentContext  xCurrentContext(getCurrentContext());
-Any aValue(xCurrentContext-getValueByName(system.desktop-environment));
-OUString aDesktopEnvironment;
-if ((aValue = aDesktopEnvironment)  aDesktopEnvironment == GNOME)
+#ifdef ENABLE_GNOME_VFS
+try {
+// Instantiate GNOME-VFS UCP in the thread that initialized GNOME in 
order
+// to avoid a deadlock that may occure in case the UCP gets 
initialized from
+// a different thread (which may happen when calling remotely via 
UNO); this
+// is not a fix, just a workaround:
+Reference XCurrentContext  xCurrentContext(getCurrentContext());
+Any 
aValue(xCurrentContext-getValueByName(system.desktop-environment));
+OUString aDesktopEnvironment;
+if ((aValue = aDesktopEnvironment)  aDesktopEnvironment == GNOME)
+{
+Reference XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
+UniversalContentBroker::create(xContext)
+-registerContentProvider(
+ReferenceXContentProvider(
+
xContext-getServiceManager()-createInstanceWithContext(
+com.sun.star.ucb.GnomeVFSContentProvider, 
xContext),
+UNO_QUERY_THROW),
+.*, false);
+}
+}
+catch ( const Exception  )
 {
-UniversalContentBroker::create(
-comphelper::getProcessComponentContext())-
-registerContentProvider(
-ReferenceXContentProvider(
-comphelper::getProcessServiceFactory()-createInstance(
-com.sun.star.ucb.GnomeVFSContentProvider),
-UNO_QUERY_THROW),
-.*, false);
+OSL_FAIL( missing gnome-vfs component to initialize thread 
workaround );
 }
-#endif // GNOME_VFS_ENABLED
+#endif // ENABLE_GNOME_VFS
 }
 
 void Desktop::InitApplicationServiceManager()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#64311 - fix pre-processor conditionals don't bail-out ...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3882

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7a805c95625b52fc99face000587692de21461e
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

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

[Noel Grandin]

 framework/inc/services/pathsettings.hxx |2 +-
 sc/source/ui/unoobj/appluno.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2fcf87e7f981ef4138054a59e10f87e925e1cae
Author: Noel Grandin n...@peralex.com
Date:   Mon May 13 10:49:08 2013 +0200

fix: left out SAL_CALL annotation

Change-Id: I0443ce15113945c4e4a97a0016a5c90e9b992c74

diff --git a/framework/inc/services/pathsettings.hxx 
b/framework/inc/services/pathsettings.hxx
index 799e2fa..0c7e2e2 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -183,7 +183,7 @@ class PathSettings : public  css::lang::XTypeProvider   
  ,
 { return getStringProperty(Addin); }
 virtual void SAL_CALL setAddin(const OUString p1) throw 
(css::uno::RuntimeException)
 { setStringProperty(Addin, p1); }
-virtual OUString getAutoCorrect() throw (css::uno::RuntimeException)
+virtual OUString SAL_CALL getAutoCorrect() throw 
(css::uno::RuntimeException)
 { return getStringProperty(AutoCorrect); }
 virtual void SAL_CALL setAutoCorrect(const OUString p1) throw 
(css::uno::RuntimeException)
 { setStringProperty(AutoCorrect, p1); }
commit 09c3e92fcb4cb18d7606c8d116936f9e0c5f3e2f
Author: Noel Grandin n...@peralex.com
Date:   Mon May 13 10:48:24 2013 +0200

fix uninitialised warnings

Change-Id: I20af2e294482657e2107b96381e400a609374032

diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 1862f9d..73b18a8 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -381,7 +381,7 @@ uno::SequenceOUString 
ScSpreadsheetSettings::getSupportedServiceNames_Static()
 sal_Bool ScSpreadsheetSettings::getPropertyBool(const OUString aPropertyName) 
throw (css::uno::RuntimeException)
 {
uno::Any any = getPropertyValue(aPropertyName);
-   sal_Bool b;
+   sal_Bool b = sal_False;
any = b;
return b;
 }
@@ -389,7 +389,7 @@ sal_Bool ScSpreadsheetSettings::getPropertyBool(const 
OUString aPropertyName) t
 sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString 
aPropertyName) throw (css::uno::RuntimeException)
 {
uno::Any any = getPropertyValue(aPropertyName);
-   sal_Int16 b;
+   sal_Int16 b = sal_False;
any = b;
return b;
 }
___
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' - distro-configs/LibreOfficeLinux.conf

[Michael Meeks]

 distro-configs/LibreOfficeLinux.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bd1022011bd9a46715134151ddde303d68e04c2
Author: Michael Meeks michael.me...@suse.com
Date:   Mon May 13 09:49:59 2013 +0100

fdo#64311 - re-enable gnome-vfs for linux.

Change-Id: I6e67c42e85748f7065b4d8bbfe2478f2af3a50c5
Signed-off-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 5246138..05734af 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -27,7 +27,7 @@
 --enable-kde
 --enable-gstreamer-0-10
 --enable-evolution2
---disable-gnome-vfs
+--enable-gnome-vfs
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - NOTICE sfx2/source svx/Library_svx.mk

[Oliver-Rainer Wittmann]

 NOTICE |   54 -
 sfx2/source/sidebar/AsynchronousCall.cxx   |2 
 sfx2/source/sidebar/IContextChangeReceiver.cxx |   34 +++
 sfx2/source/sidebar/ILayoutableWindow.cxx  |   34 +++
 svx/Library_svx.mk |1 
 5 files changed, 96 insertions(+), 29 deletions(-)

New commits:
commit 0e19eca42b149bc84f4aa3ead5c29bd64147bedc
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon May 13 08:18:22 2013 +

122047: adding missing pre-compiled header include

diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx 
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index 99f4d8c..c6520c3 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -19,6 +19,8 @@
  *
  */
 
+#include precompiled_sfx2.hxx
+
 #include sfx2/sidebar/IContextChangeReceiver.hxx
 
 
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx 
b/sfx2/source/sidebar/ILayoutableWindow.cxx
index a81b066..8f89cf3 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -19,6 +19,8 @@
  *
  */
 
+#include precompiled_sfx2.hxx
+
 #include sfx2/sidebar/ILayoutableWindow.hxx
 
 
commit ba6704b01ebc30b06485ef7f914b873201a08e85
Author: Andre Fischer a...@apache.org
Date:   Mon May 13 07:41:14 2013 +

122047: Remove last traces of unused toolbox controller.

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 9281d88..56fab42 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -213,7 +213,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/sidebar/tools/Popup \
 svx/source/sidebar/tools/ValueSetWithTextControl \
 svx/source/sidebar/insert/InsertPropertyPanel \
-svx/source/sidebar/insert/SimpleToolBoxController \
 svx/source/stbctrls/pszctrl \
 svx/source/stbctrls/insctrl \
 svx/source/stbctrls/selctrl \
commit 107eb08386046f1e78dc32b21f569c6aa7352cd1
Author: Andre Fischer a...@apache.org
Date:   Mon May 13 07:40:20 2013 +

122047: Added missing implementation of virtual destructors.

diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx 
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 9704d98..ad3231a 100755
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -72,7 +72,7 @@ void AsynchronousCall::CancelRequest (void)
 if (mnCallId != 0)
 {
 Application::RemoveUserEvent(mnCallId);
-mnCallId = -1;
+mnCallId = 0;
 }
 }
 
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx 
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
new file mode 100644
index 000..99f4d8c
--- /dev/null
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -0,0 +1,32 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include sfx2/sidebar/IContextChangeReceiver.hxx
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx 
b/sfx2/source/sidebar/ILayoutableWindow.cxx
new file mode 100644
index 000..a81b066
--- /dev/null
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -0,0 +1,32 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 5 commits - filter/inc filter/source sd/source

[Jan Holesovsky]

 filter/inc/filter/msfilter/svdfppt.hxx |3 -
 filter/source/msfilter/svdfppt.cxx |   11 --
 sd/source/filter/ppt/pptin.cxx |   57 ++---
 3 files changed, 20 insertions(+), 51 deletions(-)

New commits:
commit 4255f70fcf660900e9bcbadffec60015cb4c2502
Author: Jan Holesovsky ke...@suse.cz
Date:   Sun May 12 17:33:22 2013 +0200

bnc#758621: Set the attribs for the entire para if a placeholder.

Setting attributes for empty paragraphs does nothing, we have to apply it to
the style directly.

Change-Id: Id2a63c961e408906fa7c6457091405692262c6b7

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index f1e1a75..5185298 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2286,6 +2286,14 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( 
PPTTextObj* pTextObj, SdrTextObj*
 }
 pPortion-ApplyTo( aPortionAttribs, 
(SdrPowerPointImport)*this, nDestinationInstance, pTextObj );
 rOutliner.QuickSetAttribs( aPortionAttribs, aSelection );
+
+// set the attribs for the entire paragraph, if it is a 
placeholder
+if ( pTextObj-GetOEPlaceHolderAtom()  
aSelection.nStartPos == aSelection.nEndPos )
+{
+SfxItemSet rItemSet = rOutliner.GetStyleSheet( 
nParaIndex )-GetItemSet();
+pPortion-ApplyTo( rItemSet, 
(SdrPowerPointImport)*this, nDestinationInstance, pTextObj );
+}
+
 aSelection.nStartPos = aSelection.nEndPos;
 }
 boost::optional sal_Int16  oStartNumbering;
commit fc3fc4f1af182816a575751746564dae525f2e71
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 10 20:27:40 2013 +0200

bnc#758621: Set presentation object as non-empty only if not a placeholder.

Based on work of Felix Zhang fezh...@suse.com, thank you!

Change-Id: I26c7cef17b9a5f3d73107b5c974983e58c347d52

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 476eed8..1e15c3d 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2321,8 +2321,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 sal_BoolbVertical = sal_False;
 if ( ( pTextObj-GetShapeType() == mso_sptRectangle ) || ( 
pTextObj-GetShapeType() == mso_sptTextBox ) )
 {
-if ( pTextObj-Count() )
-bEmptyPresObj = sal_False;
 switch ( nPlaceholderId )
 {
 case PPT_PLACEHOLDER_NOTESBODY :
ePresObjKind = PRESOBJ_NOTES;   break;
@@ -2337,7 +2335,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 
 default :
 {
-if ( !pTextObj-Count() )
+if ( pTextObj-Count() == 0 )
 {
 switch ( nPlaceholderId )
 {
@@ -2349,6 +2347,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 case 
PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
 }
 }
+else
+bEmptyPresObj = sal_False;
 };
 }
 }
commit e3abe3f1c7e4bb7c788de71a9c01dffb1c088332
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 10 19:56:04 2013 +0200

bnc#758621: We don't need this index for anything.

Worse, it prevents us to enter part of the code that we need to execute in
some (valid) circumstances.

Change-Id: I15084b5efa10fbd5cd0d42856c2745c93d6765da

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 9d5b20e..476eed8 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2313,17 +2313,9 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 {
 sal_uInt32 nPlacementId = pPlaceHolder-nPlacementId;
 sal_Int16 nPlaceholderId = pPlaceHolder-nPlaceholderId;
-sal_uInt16 i = 0;
+
 if ( eAktPageKind == PPT_SLIDEPAGE )
 {
-for ( ; i  8; i++ )
-{
-if ( pSlideLayout-aPlaceholderId[ i ] == 
nPlaceholderId )
-break;
-}
-}
-if ( i  8 )
-{
 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 4 commits - filter/inc filter/source sd/source

[Jan Holesovsky]

 filter/inc/filter/msfilter/svdfppt.hxx |1 -
 filter/source/msfilter/svdfppt.cxx |   11 ---
 sd/source/filter/ppt/pptin.cxx |   21 +++--
 3 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 8378527a678f15b588550fcdfda84ac45613f84c
Author: Jan Holesovsky ke...@suse.cz
Date:   Sun May 12 17:33:22 2013 +0200

bnc#758621: Set the attribs for the entire para if a placeholder.

Setting attributes for empty paragraphs does nothing, we have to apply it to
the style directly.

Change-Id: Id2a63c961e408906fa7c6457091405692262c6b7

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 4870559..514dba3 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2296,6 +2296,14 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( 
PPTTextObj* pTextObj, SdrTextObj*
 }
 pPortion-ApplyTo( aPortionAttribs, 
(SdrPowerPointImport)*this, nDestinationInstance, pTextObj );
 rOutliner.QuickSetAttribs( aPortionAttribs, aSelection );
+
+// set the attribs for the entire paragraph, if it is a 
placeholder
+if ( pTextObj-GetOEPlaceHolderAtom()  
aSelection.nStartPos == aSelection.nEndPos )
+{
+SfxItemSet rItemSet = rOutliner.GetStyleSheet( 
nParaIndex )-GetItemSet();
+pPortion-ApplyTo( rItemSet, 
(SdrPowerPointImport)*this, nDestinationInstance, pTextObj );
+}
+
 aSelection.nStartPos = aSelection.nEndPos;
 }
 boost::optional sal_Int16  oStartNumbering;
commit c8f1d9140b898e1b63fe12f049738b8333202561
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 10 20:27:40 2013 +0200

bnc#758621: Set presentation object as non-empty only if not a placeholder.

Based on work of Felix Zhang fezh...@suse.com, thank you!

Change-Id: I26c7cef17b9a5f3d73107b5c974983e58c347d52

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5b88e50..c4ab6d2 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2340,8 +2340,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 sal_BoolbVertical = sal_False;
 if ( ( pTextObj-GetShapeType() == mso_sptRectangle ) || ( 
pTextObj-GetShapeType() == mso_sptTextBox ) )
 {
-if ( pTextObj-Count() )
-bEmptyPresObj = sal_False;
 switch ( nPlaceholderId )
 {
 case PPT_PLACEHOLDER_NOTESBODY :
ePresObjKind = PRESOBJ_NOTES;   break;
@@ -2356,7 +2354,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 
 default :
 {
-if ( !pTextObj-Count() )
+if ( pTextObj-Count() == 0 )
 {
 switch ( nPlaceholderId )
 {
@@ -2368,6 +2366,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 case 
PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
 }
 }
+else
+bEmptyPresObj = sal_False;
 };
 }
 }
commit 04bd0886d0208d08d96078539d491a7c2c3d2b20
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 10 19:56:04 2013 +0200

bnc#758621: We don't need this index for anything.

Worse, it prevents us to enter part of the code that we need to execute in
some (valid) circumstances.

Change-Id: I15084b5efa10fbd5cd0d42856c2745c93d6765da

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f587b06..5b88e50 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2332,17 +2332,9 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 {
 sal_uInt32 nPlacementId = pPlaceHolder-nPlacementId;
 sal_Int16 nPlaceholderId = pPlaceHolder-nPlaceholderId;
-sal_uInt16 i = 0;
+
 if ( eAktPageKind == PPT_SLIDEPAGE )
 {
-for ( ; i  8; i++ )
-{
-if ( pSlideLayout-aPlaceholderId[ i ] == 
nPlaceholderId )
-break;
-}
-}
-if ( i  8 )
-{
 PresObjKind 

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Depends on||62937

--- Comment #15 from Petr Mladek pmla...@suse.cz ---
Add bug 62937: It seems to be impossible to create new database

-- 
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: sd/source

[Caolán McNamara]

 sd/source/ui/view/drawview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 983beed96af004002fed6b71324c292b0fd9d1f4
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:32:09 2013 +0100

fix build

Change-Id: Ib29160cc3468bc4a06e269e5cd5121d5689cb1dc

diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 0d7839f..bd8424b 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -591,7 +591,7 @@ void DrawView::DeleteMarked()
 // Move the new PresObj to the position before the
 // object it will replace.
 pUndoManager-AddUndoAction(
-mpDoc-GetSdrUndoFactory().CreateUndoObjectOrdNum(
+mrDoc.GetSdrUndoFactory().CreateUndoObjectOrdNum(
 *pNewObj,
 pNewObj-GetOrdNum(),
 pObj-GetOrdNum()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/f65172af2cfc768e4f44507a02e1b17a9806ba

[Caolán McNamara]

 2a/f65172af2cfc768e4f44507a02e1b17a9806ba |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 48ea58f726d4db98057592d34b53e5461be5b5e9
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:39:46 2013 +0100

Notes added by 'git notes add'

diff --git a/2a/f65172af2cfc768e4f44507a02e1b17a9806ba 
b/2a/f65172af2cfc768e4f44507a02e1b17a9806ba
new file mode 100644
index 000..a7917e9
--- /dev/null
+++ b/2a/f65172af2cfc768e4f44507a02e1b17a9806ba
@@ -0,0 +1 @@
+prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f2/e09c9f5100836b9b08c6423e4845c127310637

[Caolán McNamara]

 f2/e09c9f5100836b9b08c6423e4845c127310637 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bb5b9aa2a331761858a9a0fa5f84642a1a4bdf97
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:43:31 2013 +0100

Notes added by 'git notes add'

diff --git a/f2/e09c9f5100836b9b08c6423e4845c127310637 
b/f2/e09c9f5100836b9b08c6423e4845c127310637
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/f2/e09c9f5100836b9b08c6423e4845c127310637
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/ww8par.hxx   |   58 +-
 sw/source/filter/ww8/ww8par2.cxx  |   58 --
 sw/source/filter/ww8/ww8par6.cxx  |   36 ++-
 sw/source/filter/ww8/ww8struc.hxx |1 
 4 files changed, 87 insertions(+), 66 deletions(-)

New commits:
commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 11:24:58 2013 +0200

Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame

Word supports floating tables, Writer does not. We can map floating
tables to fly frames, containing just a table, but then those can't span
over multiple pages. We could avoid creating frames in case the table is
of multiple pages, but that's hard to determine.

One easy case is when the table width is = the text area with, in that
case we can be sure that no wrapping would be performed anyway, so we
can avoid putting the table to a frame.

Two more related problems:

1) When we need to decide if a frame should be created or not, we
typically don't know yet the table width. That's why TestApo() has to
always succeed (in case the paragraphs are wrapped), and then we always
enter StartApo(), where we can avoid creating the frame, if necessary.

2) Even if we decide that we don't create a frame, floating and
non-floating table rows are different, so a separate table should be
created for such rows. By doing all the StartApo() / StopApo(), we are
safe here.

Change-Id: Ifc0e0e2f7320c3784698d0ff278031b46864e2e5

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a8ff78d..3927540 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2164,6 +2164,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
 const SwPosition rPos, bool bTableJoin)
 {
 SwTwips nRetWidth = 0;
+if (!pFlyFmt)
+return nRetWidth;
 // Alle Attribute schliessen, da sonst Attribute entstehen koennen,
 // die aus Flys rausragen
 WW8DupProperties aDup(rDoc,pCtrlStck);
@@ -2314,10 +2316,15 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults 
rApo,
 
 WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, false);
 
-pSFlyPara-pFlyFmt = rDoc.MakeFlySection( pSFlyPara-eAnchor,
-pPaM-GetPoint(), aFlySet );
-OSL_ENSURE(pSFlyPara-pFlyFmt-GetAnchor().GetAnchorId() ==
-pSFlyPara-eAnchor, Not the anchor type requested!);
+if (pTabPos  pTabPos-bNoFly)
+pSFlyPara-pFlyFmt = 0;
+else
+{
+pSFlyPara-pFlyFmt = rDoc.MakeFlySection( pSFlyPara-eAnchor,
+pPaM-GetPoint(), aFlySet );
+OSL_ENSURE(pSFlyPara-pFlyFmt-GetAnchor().GetAnchorId() ==
+pSFlyPara-eAnchor, Not the anchor type requested!);
+}
 
 if (pSFlyPara-pFlyFmt)
 {
@@ -2328,7 +2335,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults rApo,
 pWWZOrder-InsertTextLayerObject(pOurNewObject);
 }
 
-if (FLY_AS_CHAR != pSFlyPara-eAnchor)
+if (FLY_AS_CHAR != pSFlyPara-eAnchor  pSFlyPara-pFlyFmt)
 {
 pAnchorStck-AddAnchor(*pPaM-GetPoint(),pSFlyPara-pFlyFmt);
 }
@@ -2342,7 +2349,8 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults rApo,
 pSFlyPara-pOldAnchorStck = pAnchorStck;
 pAnchorStck = new SwWW8FltAnchorStack(rDoc, nFieldFlags);
 
-MoveInsideFly(pSFlyPara-pFlyFmt);
+if (pSFlyPara-pFlyFmt)
+MoveInsideFly(pSFlyPara-pFlyFmt);
 
 // 1) ReadText() wird nicht wie beim W4W-Reader rekursiv aufgerufen,
 //da die Laenge des Apo zu diesen Zeitpunkt noch nicht feststeht,
@@ -2445,7 +2453,8 @@ void SwWW8ImplReader::StopApo()
 pNd-JoinNext();
 }
 
-pSFlyPara-pFlyFmt-SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
+if (pSFlyPara-pFlyFmt)
+pSFlyPara-pFlyFmt-SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
 
 DeleteAnchorStk();
 pAnchorStck = pSFlyPara-pOldAnchorStck;
@@ -2469,7 +2478,7 @@ void SwWW8ImplReader::StopApo()
 #i27204# Added AutoWidth setting. Left the old CalculateFlySize in 
place
 so that if the user unselects autowidth, the width doesn't max out
 */
-else if( !pWFlyPara-nSp28 )
+else if( !pWFlyPara-nSp28  pSFlyPara-pFlyFmt)
 {
 using namespace sw::util;
 SfxItemSet aFlySet( pSFlyPara-pFlyFmt-GetAttrSet() );
@@ -4812,6 +4821,17 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, 
WW8PLCFx_Cp_FKP* pPap)
 pTabPos-nLoMgn = SVBT16ToShort(pRes);
 bRet = true;
 }
+if (0 != (pRes = pPap-HasSprm(NS_sprm::LN_TDefTable)))
+{
+WW8TabBandDesc aDesc;
+aDesc.ReadDef(false, pRes);
+int nTableWidth = 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 77/11bd5b33f87214ac6a0b0eac157b60e8bcd164

[Caolán McNamara]

 77/11bd5b33f87214ac6a0b0eac157b60e8bcd164 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 45f5d6dc3dec1a0db864096ba5b141e6cb8255fe
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:43:48 2013 +0100

Notes added by 'git notes add'

diff --git a/77/11bd5b33f87214ac6a0b0eac157b60e8bcd164 
b/77/11bd5b33f87214ac6a0b0eac157b60e8bcd164
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/77/11bd5b33f87214ac6a0b0eac157b60e8bcd164
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/71ebf6311b64f281d9059f6b108ff1163c4678

[Caolán McNamara]

 bc/71ebf6311b64f281d9059f6b108ff1163c4678 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d4da123dad54ce20aebb035ccbb3e92b6d706c6a
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:44:19 2013 +0100

Notes added by 'git notes add'

diff --git a/bc/71ebf6311b64f281d9059f6b108ff1163c4678 
b/bc/71ebf6311b64f281d9059f6b108ff1163c4678
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/bc/71ebf6311b64f281d9059f6b108ff1163c4678
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 4a/a27cc3b98d455379f7c97a215d557d646fa08e 8c/b45ee0b8d744c282b76be8b26b1196b9d91b44

[Caolán McNamara]

 4a/a27cc3b98d455379f7c97a215d557d646fa08e |1 +
 8c/b45ee0b8d744c282b76be8b26b1196b9d91b44 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit ee2f452270175087833d6d836cae2328150154ac
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:45:04 2013 +0100

Notes added by 'git notes add'

diff --git a/8c/b45ee0b8d744c282b76be8b26b1196b9d91b44 
b/8c/b45ee0b8d744c282b76be8b26b1196b9d91b44
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/8c/b45ee0b8d744c282b76be8b26b1196b9d91b44
@@ -0,0 +1 @@
+ignore: aoo
commit 67aa5a78ec47c2a2ed1a93caf4f2a268078204fa
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:44:52 2013 +0100

Notes added by 'git notes add'

diff --git a/4a/a27cc3b98d455379f7c97a215d557d646fa08e 
b/4a/a27cc3b98d455379f7c97a215d557d646fa08e
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/4a/a27cc3b98d455379f7c97a215d557d646fa08e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 unotools/source/misc/datetime.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef8a4af30a3261d92311c7c76af9cb9b123d7a54
Author: Tor Lillqvist t...@iki.fi
Date:   Mon May 13 12:47:00 2013 +0300

WaE: 'bFrac' may be used uninitialized in this function

Actually it isn't (I think), but let's silence the compiler.

Thanks to mjw for noticing and pointing out this warning on IRC.

Change-Id: I78885a6dac0c3e27867215d99f6e01d429d086ca

diff --git a/unotools/source/misc/datetime.cxx 
b/unotools/source/misc/datetime.cxx
index cbfb169..93f60a6 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -392,7 +392,7 @@ bool ISO8601parseTime(const OUString aTimeStr, 
starutil::Time rTime)
 sal_Int32 n = 0;
 OUString tokInt;
 OUString tokFrac;
-bool bFrac;
+bool bFrac = false;
 // hours
 if (bSuccess  (bSuccess = getISO8601TimeToken(aTimeStr, n, tokInt, 
bFrac, tokFrac)))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/5938b5cb01090f0cae5ffd57599a8dc030a357

[Caolán McNamara]

 2f/5938b5cb01090f0cae5ffd57599a8dc030a357 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 694beb0fd43132f0a2dc009e0473eff124f2d0c8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:51:12 2013 +0100

Notes added by 'git notes add'

diff --git a/2f/5938b5cb01090f0cae5ffd57599a8dc030a357 
b/2f/5938b5cb01090f0cae5ffd57599a8dc030a357
new file mode 100644
index 000..c1df25b
--- /dev/null
+++ b/2f/5938b5cb01090f0cae5ffd57599a8dc030a357
@@ -0,0 +1 @@
+prefer: 89d2733e16ae6233deea6bef3193bd45c89b854c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - af/96695d49ddd01501a127266915279ff0efdeb0

[Caolán McNamara]

 af/96695d49ddd01501a127266915279ff0efdeb0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd77166fbe3bd2cefd87d38c41f8398796bb4a9d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 10:53:05 2013 +0100

Notes added by 'git notes add'

diff --git a/af/96695d49ddd01501a127266915279ff0efdeb0 
b/af/96695d49ddd01501a127266915279ff0efdeb0
new file mode 100644
index 000..b89db36
--- /dev/null
+++ b/af/96695d49ddd01501a127266915279ff0efdeb0
@@ -0,0 +1 @@
+prefer: dee53a32a9feba2021782db5762b5a9a034efae4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[SOLVED] Re: Cppcheck: incorrectLogicOperator in svxrectctaccessiblecontext.cxx (in svx module)

[julien2412]

Indeed, I hadn't noticed it was a virtual function and had just read the
function in the same file svxrectctaccessiblecontext.cxx which returned 0.
I don't know if cppcheck could take this into account.

Anyway, thank you Stephan for your respond.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Cppcheck-incorrectLogicOperator-in-svxrectctaccessiblecontext-cxx-in-svx-module-tp4055534p4055660.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gengal' - 5 commits - config_host/config_vclplug.h.in configure.ac desktop/Library_sofficeapp.mk desktop/source extras/source include/svx solenv/bin svx

[Michael Meeks]

 config_host/config_vclplug.h.in|2 
 configure.ac   |2 
 desktop/Library_sofficeapp.mk  |1 
 desktop/source/app/appinit.cxx |   43 
 extras/source/gallery/galleries.ulf|2 
 include/svx/gallery1.hxx   |   33 +-
 solenv/bin/desktop-translate.pl|  155 +
 svx/source/gallery2/gallery1.cxx   |   32 -
 svx/source/gallery2/galtheme.cxx   |2 
 sysui/CustomTarget_share.mk|   29 +++--
 sysui/desktop/menus/base.desktop   |4 
 sysui/desktop/menus/calc.desktop   |4 
 sysui/desktop/menus/draw.desktop   |4 
 sysui/desktop/menus/impress.desktop|4 
 sysui/desktop/menus/math.desktop   |4 
 sysui/desktop/menus/startcenter.desktop|2 
 sysui/desktop/menus/writer.desktop |4 
 sysui/desktop/menus/xsltfilter.desktop |2 
 sysui/desktop/share/brand.pl   |   16 ++
 sysui/desktop/share/translate.pl   |  149 ---
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |4 
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |4 
 22 files changed, 251 insertions(+), 251 deletions(-)

New commits:
commit 5a6060d0d90a268a5febd15383c2b3f872810329
Author: Michael Meeks michael.me...@suse.com
Date:   Mon May 13 11:07:47 2013 +0100

gallery: remove obsolete GalleryImportThemeEntry

Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611

diff --git a/extras/source/gallery/galleries.ulf 
b/extras/source/gallery/galleries.ulf
new file mode 100644
index 000..7e1c915
--- /dev/null
+++ b/extras/source/gallery/galleries.ulf
@@ -0,0 +1,2 @@
+[sounds]
+en-US = Sounds
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 2be6b78..912e337 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -80,24 +80,6 @@ public:
 
 typedef ::std::vector GalleryThemeEntry*  GalleryThemeList;
 
-// ---
-// - GalleryImportThemeEntry -
-// ---
-
-struct GalleryImportThemeEntry
-{
-OUString aThemeName;
-OUString aUIName;
-INetURLObject aURL;
-};
-
-typedef ::std::vector GalleryImportThemeEntry*  GalleryImportThemeList;
-
-// 
-
-
-SvStream operator( SvStream rOut, const GalleryImportThemeEntry rEntry );
-SvStream operator( SvStream rIn, GalleryImportThemeEntry rEntry );
-
 // ---
 // - Gallery -
 // ---
@@ -110,14 +92,13 @@ class Gallery : public SfxBroadcaster
 {
 // only for gengal utility!
 friend Gallery* createGallery( const OUString );
-friend void disposeGallery( Gallery* );
+friend void disposeGallery( Gallery* );
 
 typedef std::vectorGalleryThemeCacheEntry* GalleryCacheThemeList;
 
 private:
 
 GalleryThemeListaThemeList;
-GalleryImportThemeList  aImportList;
 GalleryCacheThemeList   aThemeCache;
 INetURLObject   aRelURL;
 INetURLObject   aUserURL;
@@ -145,12 +126,12 @@ public:
 { return nPos  aThemeList.size() ? 
aThemeList[ nPos ] : NULL; }
 const GalleryThemeEntry*GetThemeInfo( const String rThemeName ) { 
return ImplGetThemeEntry( rThemeName ); }
 
-SVX_DLLPUBLIC sal_Bool  HasTheme( const String rThemeName );
-OUString   GetThemeName( sal_uIntPtr nThemeId ) const;
+SVX_DLLPUBLIC sal_Bool  HasTheme( const String rThemeName );
+OUStringGetThemeName( sal_uIntPtr nThemeId ) const;
 
-SVX_DLLPUBLIC sal_Bool  CreateTheme( const String rThemeName );
-sal_BoolRenameTheme( const String rOldName, const 
String rNewName );
-SVX_DLLPUBLIC sal_Bool  RemoveTheme( const String 
rThemeName );
+SVX_DLLPUBLIC sal_Bool  CreateTheme( const String rThemeName );
+sal_BoolRenameTheme( const String rOldName, const 
String rNewName );
+SVX_DLLPUBLIC sal_Bool  RemoveTheme( const String rThemeName );
 
 SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String rThemeName, 
SfxListener rListener );
 SVX_DLLPUBLIC void  ReleaseTheme( GalleryTheme* pTheme, 
SfxListener rListener );
@@ -160,7 +141,7 @@ public:
 const INetURLObjectGetUserURL() const { return aUserURL; }
 const INetURLObjectGetRelativeURL() const { return aRelURL; }
 
-sal_BoolIsMultiPath() const { return bMultiPath; }
+sal_BoolIsMultiPath() const { return bMultiPath; }
 };
 
 #endif // _SVX_GALLERY1_HXX_
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 9d005a1..8455318 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -116,33 +116,6 @@ void 

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

[Miklos Vajna]

 sw/qa/extras/inc/swmodeltestbase.hxx|   12 
 sw/qa/extras/rtfimport/rtfimport.cxx|   11 ---
 sw/qa/extras/ww8import/data/n816593.doc |binary
 sw/qa/extras/ww8import/data/n816603.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx|   23 ++-
 5 files changed, 34 insertions(+), 12 deletions(-)

New commits:
commit 26ce47baf1dc7ccc965d00142ef8fd6ee2367f22
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 12:07:54 2013 +0200

bnc#816593 WW8 import testcase

This always worked, but I almost broke it with
8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de.

Change-Id: I6b7817830da23afea758d1eb90395aeb01e32f67

diff --git a/sw/qa/extras/ww8import/data/n816593.doc 
b/sw/qa/extras/ww8import/data/n816593.doc
new file mode 100644
index 000..71cb9c4
Binary files /dev/null and b/sw/qa/extras/ww8import/data/n816593.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 157fa09..d924ef3 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -31,6 +31,7 @@ public:
 void testFdo59530();
 void testI120158();
 void testN816603();
+void testN816593();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -55,6 +56,7 @@ void Test::run()
 {fdo59530.doc, Test::testFdo59530},
 {i120158.doc, Test::testI120158},
 {n816603.doc, Test::testN816603},
+{n816593.doc, Test::testN816593},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -260,6 +262,15 @@ void Test::testN816603()
 CPPUNIT_ASSERT(getPages()  1);
 }
 
+void Test::testN816593()
+{
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// Make sure that even if we import the two tables as non-floating, we
+// still consider them different, and not merge them.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 95d8fa0bcd3996b22af3736f439971f419e41255
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 11:58:11 2013 +0200

bnc#816603 testcase

Make sure that at least full-page-width multi-page floating tables are
imported on multiple pages.

Change-Id: Ifb974d50c50b1495634ac2652a3ae46235bb5f52

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index fc8682d..3f0fab8 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -10,9 +10,11 @@
 #include com/sun/star/container/XContentEnumerationAccess.hpp
 #include com/sun/star/frame/Desktop.hpp
 #include com/sun/star/style/XStyleFamiliesSupplier.hpp
+#include com/sun/star/text/XPageCursor.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/text/XTextViewCursorSupplier.hpp
 #include com/sun/star/table/XCell.hpp
 
 #include test/bootstrapfixture.hxx
@@ -312,6 +314,16 @@ protected:
 }
 }
 
+/// Get page count.
+int getPages()
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+return xCursor-getPage();
+}
+
 uno::Referencelang::XComponent mxComponent;
 xmlBufferPtr mpXmlBuffer;
 
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8f3e113..f8c8a2f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -143,8 +143,6 @@ public:
 
 private:
 void run();
-/// Get page count.
-int getPages();
 /// Copypaste helper.
 void paste(OUString aFilename, uno::Referencetext::XTextRange xTextRange 
= uno::Referencetext::XTextRange())
 {
@@ -285,15 +283,6 @@ void Test::run()
 }
 }
 
-int Test::getPages()
-{
-uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
-uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
-uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
-xCursor-jumpToLastPage();
-return xCursor-getPage();
-}
-
 void Test::testFdo45553()
 {
 uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/qa/extras/ww8import/data/n816603.doc 
b/sw/qa/extras/ww8import/data/n816603.doc
new file mode 100644
index 000..9186f62
Binary files /dev/null and 

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - icu/icu4c.10129.wintz.patch icu/makefile.mk

[Isamu Mogi]

 icu/icu4c.10129.wintz.patch |   26 ++
 icu/makefile.mk |1 +
 2 files changed, 27 insertions(+)

New commits:
commit f2cc7e08263a0fcca8b6dfe95ea74f4e7938103b
Author: Isamu Mogi saturda...@gmail.com
Date:   Mon May 6 15:22:28 2013 +

fdo#59850: Resolves invalid date changing by ICU's timezone detection bug.

This is a backport of 263ab3f14bbb8cea9f5a1b8ea7496f6a23e6c547 .

Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
of which the outcome should be monitored.

u_strFromWCS() returns a wrong destination length for u_austrncpy() if
apiTZI.StandardName is multibyte string. Therefore apiStdName will be 
incomplete
string, and timezone detection (using apiStdName) returns invalid result. 
This
will fix destination length for u_austrncpy() enough to write multibyte 
string.

Change-Id: I859f322d952f4ceaf9f97c2bace71e3bb3dfb468
Reviewed-on: https://gerrit.libreoffice.org/3800
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/icu/icu4c.10129.wintz.patch b/icu/icu4c.10129.wintz.patch
new file mode 100644
index 000..d365f5e
--- /dev/null
+++ b/icu/icu4c.10129.wintz.patch
@@ -0,0 +1,26 @@
+
+# Fix for fdo#59850
+# Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
+# of which the outcome should be monitored.
+
+--- misc/icu/source/common/wintz.c 2012-04-05 20:46:14.0 +
 misc/build/icu/source/common/wintz.c   2013-05-03 13:00:47.188384300 
+
+@@ -255,7 +255,6 @@
+ char apiStdName[MAX_LENGTH_ID];
+   char regStdName[MAX_LENGTH_ID];
+ char tmpid[MAX_LENGTH_ID];
+-int32_t apiStdLength = 0;
+ int32_t len;
+ 
+ LONG result;
+@@ -278,8 +277,8 @@
+ 
+ /* Convert the wchar_t* standard name to char* */
+ uprv_memset(apiStdName, 0, sizeof(apiStdName));
+-u_strFromWCS(apiStd, MAX_LENGTH_ID, apiStdLength, apiTZI.StandardName, 
-1, status);
+-u_austrncpy(apiStdName, apiStd, apiStdLength);
++u_strFromWCS(apiStd, MAX_LENGTH_ID, NULL, apiTZI.StandardName, -1, 
status);
++u_austrncpy(apiStdName, apiStd, sizeof(apiStdName) - 1);
+ 
+ tmpid[0] = 0;
+ 
diff --git a/icu/makefile.mk b/icu/makefile.mk
index d6a73f9..8710b8b 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -43,6 +43,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif
 
 PATCH_FILES=\
+icu4c.10129.wintz.patch \
 icu4c-build.patch \
 icu4c.8320.freeserif.crash.patch \
 icu4c-aix.patch \
___
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' - vcl/generic

[Eike Rathke]

 vcl/generic/glyphs/gcach_layout.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 81db9e3abd84e13e1597b43680ec865e1e9f64e0
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/3756
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index ef03aa3..32f0887 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -200,6 +200,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;
@@ -220,7 +221,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);
@@ -229,8 +230,9 @@ 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 );
+rLength = static_castsize_t(nLength);
 #ifdef VERBOSE_DEBUG
 fprintf(stderr,IcuGetTable(\%s\) = %p\n, pTagName, pBuffer);
 int mnHeight = mrServerFont.GetFontSelData().mnHeight;
@@ -240,6 +242,12 @@ const void* IcuFontFromServerFont::getFontTable( LETag 
nICUTableTag ) const
 return (const void*)pBuffer;
 }
 
+const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const
+{
+size_t nLength = 0;
+return getFontTable( nICUTableTag, nLength);
+}
+
 // ---
 
 le_int32 IcuFontFromServerFont::getUnitsPerEM() const
@@ -475,7 +483,6 @@ bool IcuLayoutEngine::operator()( ServerFontLayout 
rLayout, ImplLayoutArgs rAr
 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-3-6' - sc/source

[Eike Rathke]

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

New commits:
commit 2c84287f151f14a4a6204fef30546414cf3d27f8
Author: Eike Rathke er...@redhat.com
Date:   Fri May 10 18:13:07 2013 +0200

resolved fdo#64384 check subtotal row filtered also for single reference

(cherry picked from commit 3c2d0acc871057573fe9ab45b8161fce70190e80)

Conflicts:
sc/source/core/tool/interpr1.cxx

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

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f645ec7..32f3a36 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3703,6 +3703,10 @@ double ScInterpreter::IterateParameters( ScIterFunc 
eFunc, bool bTextAsZero )
 ++nCount;
 break;
 }
+if (glSubTotal  pDok-RowFiltered( aAdr.Row(), aAdr.Tab()))
+{
+break;
+}
 ScBaseCell* pCell = GetCell( aAdr );
 if ( pCell )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-3-6] fdo#59850: Resolves invalid date changing by ICU's timezone ...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3800

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I859f322d952f4ceaf9f97c2bace71e3bb3dfb468
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

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

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3756

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic20b7e8dda4e84734eb6de0ccba82b0dea481d55
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-3-6] resolved fdo#64384 check subtotal row filtered also for sing...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3848

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] help.git: Branch 'libreoffice-4-0' - to-wiki/wikiconv2.py

[Andras Timar]

 to-wiki/wikiconv2.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8f46055f562917e857c4395601138f0515e71d0
Author: Andras Timar ati...@suse.com
Date:   Fri May 10 14:18:19 2013 +0200

fdo#64205 escape '' in help text with nowiki tag

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

diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 00d43d2..fb19eae 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -129,7 +129,8 @@ replace_text_list = \
 [[$[officename], {{ProductName}}],
  [%PRODUCTNAME, {{ProductName}}],
  [$PRODUCTNAME, {{ProductName}}],
- [font size, u\u200dfont size]
+ [font size, u\u200dfont size],
+ ['',nowiki''/nowiki]
 ]
 
 def get_link_filename(link, name):
___
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' - helpcontent2

[Andras Timar]

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

New commits:
commit 825ffc2068b67239277926794dddeb977d902fd3
Author: Andras Timar ati...@suse.com
Date:   Fri May 10 14:18:19 2013 +0200

Updated core
Project: help  d8f46055f562917e857c4395601138f0515e71d0

fdo#64205 escape '' in help text with nowiki tag

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

diff --git a/helpcontent2 b/helpcontent2
index ce4a330..d8f4605 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ce4a33033e5b5e9f58bb9cf2c522afedaa9b1b3e
+Subproject commit d8f46055f562917e857c4395601138f0515e71d0
___
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' - icu/icu4c.10129.wintz.patch icu/makefile.mk

[Isamu Mogi]

 icu/icu4c.10129.wintz.patch |   26 ++
 icu/makefile.mk |1 +
 2 files changed, 27 insertions(+)

New commits:
commit 2acdef7ee40179c7bc5e9510ad1ddc1266d053ab
Author: Isamu Mogi saturda...@gmail.com
Date:   Mon May 6 11:16:10 2013 +

fdo#59850: Resolves invalid date changing by ICU's timezone detection bug.

This is a backport of 263ab3f14bbb8cea9f5a1b8ea7496f6a23e6c547 .

Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
of which the outcome should be monitored.

u_strFromWCS() returns a wrong destination length for u_austrncpy() if
apiTZI.StandardName is multibyte string. Therefore apiStdName will be 
incomplete
string, and timezone detection (using apiStdName) returns invalid result. 
This
will fix destination length for u_austrncpy() enough to write multibyte 
string.

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

diff --git a/icu/icu4c.10129.wintz.patch b/icu/icu4c.10129.wintz.patch
new file mode 100644
index 000..d365f5e
--- /dev/null
+++ b/icu/icu4c.10129.wintz.patch
@@ -0,0 +1,26 @@
+
+# Fix for fdo#59850
+# Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
+# of which the outcome should be monitored.
+
+--- misc/icu/source/common/wintz.c 2012-04-05 20:46:14.0 +
 misc/build/icu/source/common/wintz.c   2013-05-03 13:00:47.188384300 
+
+@@ -255,7 +255,6 @@
+ char apiStdName[MAX_LENGTH_ID];
+   char regStdName[MAX_LENGTH_ID];
+ char tmpid[MAX_LENGTH_ID];
+-int32_t apiStdLength = 0;
+ int32_t len;
+ 
+ LONG result;
+@@ -278,8 +277,8 @@
+ 
+ /* Convert the wchar_t* standard name to char* */
+ uprv_memset(apiStdName, 0, sizeof(apiStdName));
+-u_strFromWCS(apiStd, MAX_LENGTH_ID, apiStdLength, apiTZI.StandardName, 
-1, status);
+-u_austrncpy(apiStdName, apiStd, apiStdLength);
++u_strFromWCS(apiStd, MAX_LENGTH_ID, NULL, apiTZI.StandardName, -1, 
status);
++u_austrncpy(apiStdName, apiStd, sizeof(apiStdName) - 1);
+ 
+ tmpid[0] = 0;
+ 
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 98708df..1f6e8e8 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31
 
 PATCH_FILES=\
+icu4c.10129.wintz.patch \
 icu4c.9948.mlym-crash.patch \
 icu4c-bsd.patch \
 icu4c-build.patch \
___
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' - basic/source

[Noel Power]

 basic/source/uno/namecont.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit c2816cf4b51fd84aa530653acaa48112bb55a4a6
Author: Noel Power noel.po...@suse.com
Date:   Wed May 8 20:48:22 2013 +0100

hopefully this fixed the strange autorecovery related dataloss fdo#42899

also this is a fix for bnc#817477
Disabling the optimisation of copying the library container storage
to target storage for the moment ( hopefully after some rework
it might make some sense to re-enable this code ) The problem here is
there is a tragic flaw in the api implementation. In the implementation
the library in-memory model state reflects that the library model
has been saved to storage but not the library container storage
as you ( or at least I ) would expect but actually any storage.
So to illustrate the problem, during autorecovery when the
basic library containers are stored to the autorecovery file the
library pImplLib-implIsModified() is set to false, any subsequent save
attempt will think the library is not modified and will attempt
to the librarycontainer storage to the target one. However, in this case the
source (library container) storage has never been updated with the changes
from memory.
Can't we simply only update the 'implIsModified' state only if the library
container's own storage and the storage to store to are the same ?
Sounds like a good idea, unfortunately this is not possible due to the way
that sfx spaghetti code uses temporary storages for even own copies and
also because it sets the new root storage for the library container
after the library copy happens. ( some stuff in dbaccess appears to
depend on this as well )
AFAICT for any document save/saveas etc. operation the librarycontainer's
own storage and the storage we save to are *always* different.
So for the moment it seems best to *always* write the storage from the
in-memory model.

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

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c9a67b6..1515b37 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1926,6 +1926,19 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference embed::XSto
 
 if( pImplLib-implIsModified() || bComplete )
 {
+// For the moment don't copy storage (as an optimisation )
+// but instead always write to storage from memory.
+// Testing pImplLib-implIsModified() is not reliable,
+// IMHO the value of pImplLib-implIsModified() should
+// reflect whether the library ( in-memory ) model
+// is in sync with the library container's own storage. Currently
+// whenever the library model is written to *any* storage
+// pImplLib-implSetModified( sal_False ) is called
+// The way the code works, especially the way that sfx uses
+// temp storage when saving ( and later sets the root storage of the
+// library container ) and similar madness in dbaccess means some surgery
+// is required to make it possible to successfully use this optimisation
+#if 0
 // Can we simply copy the storage?
 if( !mbOldInfoFormat  !pImplLib-implIsModified()  
!mbOasis2OOoFormat  xSourceLibrariesStor.is() )
 {
@@ -1940,6 +1953,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference embed::XSto
 }
 }
 else
+#endif
 {
 uno::Reference embed::XStorage  xLibraryStor;
 if( bStorage )
___
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' - sc/source

[Noel Power]

 sc/source/filter/excel/xlstyle.cxx |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 08cfff8437bf8ec13bd9c1ccfa99ad2a7bde6756
Author: Noel Power noel.po...@suse.com
Date:   Tue May 7 16:41:27 2013 +0100

fix for fdo#51300

Hopefully a better choice for defaults will minimise the chance of a bad 
colour
combination for notetext and notebackground colours when one colour ( more 
than
likely the notetext colour ) is gleaned from some default ( e.g. like a 
system
 tooltip colour ). We change the choice from system helptext ( fg  bg ) 
colours
and use Libreoffice default font and default note background colours 
instead.
The rationale here being that even in the normal scenario it seems with 
modern
excel documents the note background colour is a 'real' colour and not an 
index
( therefore the colour selection from some predefined colour doesn't happen 
)
But the note text colour is generally a colour index ( therefore a colour is
selected from defaults ). In say gnome3 the default tooltip colour is now 
white
 and a really bad contrast to the normal background colour for a note. I 
changed
the code here to use the colours from libreoffice given that the default 
colours
more or less match Excel default colours ( which will be by far the most
frequently ) used combination

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

diff --git a/sc/source/filter/excel/xlstyle.cxx 
b/sc/source/filter/excel/xlstyle.cxx
index a6a39ed..e2b3f18 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -27,11 +27,11 @@
 #include vcl/font.hxx
 #include sal/macros.h
 #include rtl/tencinfo.h
+#include svtools/colorcfg.hxx
 #include toolkit/unohlp.hxx
 #include editeng/svxfont.hxx
 #include global.hxx
 #include xlroot.hxx
-
 // Color data =
 
 /** Standard EGA colors, bright. */
@@ -94,8 +94,22 @@ XclDefaultPalette::XclDefaultPalette( const XclRoot rRoot ) 
:
 mnWindowText = rSett.GetWindowTextColor().GetColor();
 mnWindowBack = rSett.GetWindowColor().GetColor();
 mnFaceColor = rSett.GetFaceColor().GetColor();
-mnNoteText = rSett.GetHelpTextColor().GetColor();
-mnNoteBack = rSett.GetHelpColor().GetColor();
+// Don't use the system HelpBack and HelpText colours as it causes problems
+// with modern gnome. This is because mnNoteText and mnNoteBack are used
+// when colour indices ( instead of real colours ) are specified.
+// Note: That this it is not an unusual scenario that we get the Note
+// background specified as a real colour and the text specified as a
+// colour index. That means the text colour would be picked from
+// the system where the note background would be picked from a real colour.
+// Previously the the note text colour was picked from the system tooltip
+// text colour, on modern gnome(e.g. 3) that tends to be 'white' with the
+// default theme.
+// Using the the Libreoffice defaults ( instead of system specific colours
+// ) lessens the chance of the one colour being an unsuitable combination
+// because by default the note text is black and the note background is
+// a light yellow colour ( very similar to Excel's normal defaults )
+mnNoteText =  svtools::ColorConfig::GetDefaultColor( svtools::FONTCOLOR 
).GetColor();
+mnNoteBack =  svtools::ColorConfig::GetDefaultColor( 
svtools::CALCNOTESBACKGROUND ).GetColor();
 
 // default colors
 switch( rRoot.GetBiff() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#64205 escape '' in help text with nowiki tag

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3845

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9
Gerrit-PatchSet: 2
Gerrit-Project: help
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] fdo#59850: Resolves invalid date changing by ICU's timezone ...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3798

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0aa7da85aec41c61b04f76fb4cd5148f4d389991
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] hopefully this fixed the strange autorecovery related datalo...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3832

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia24e7a6119558497d901370dbc0986101bde4de9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] fix for fdo#51300

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3814

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ae38a44e0cbf201beb3b7d18a89f5ebdd644f8c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PATCH] fdo#64531 : Tab-stops exported to DOCX added too much indent...

[Adam CloudOn (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3883

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3883/1

fdo#64531 : Tab-stops exported to DOCX added too much indentation

Change-Id: I8ae5dec772fc56e75b3bec48edbf23a1258e47b4
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 95ce729..26ba5aa 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4163,7 +4163,9 @@
 break;
 }
 
-pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos() + nCurrentLeft ) );
+// Because GetTabHost is included Indent, we don't need to add CurrentLeft 
(CurrentLeft is Indent Information.)
+//pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos() + nCurrentLeft ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos()) );
 
 sal_Unicode cFillChar = rTab.GetFill();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae5dec772fc56e75b3bec48edbf23a1258e47b4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com

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

[PATCH] fdo#64531 : Tab-stops exported to DOCX added too much indent...

[Adam CloudOn (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3884

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3884/1

fdo#64531 : Tab-stops exported to DOCX added too much indentation

Change-Id: I12747006c8aac663f9529b495914f4a08301c66f
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 95ce729..795045f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4163,7 +4163,9 @@
 break;
 }
 
-pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos() + nCurrentLeft ) );
+// Because GetTabPos already includes indent, we don't need to add 
nCurrentLeft (CurrentLeft is indentation information)
+//pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos() + nCurrentLeft ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_pos ), OString::valueOf( 
rTab.GetTabPos()) );
 
 sal_Unicode cFillChar = rTab.GetFill();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12747006c8aac663f9529b495914f4a08301c66f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 3 commits - sw/source

[Miklos Vajna]

 sw/source/filter/ww8/ww8par.hxx   |   58 +-
 sw/source/filter/ww8/ww8par2.cxx  |   58 --
 sw/source/filter/ww8/ww8par6.cxx  |   37 +++-
 sw/source/filter/ww8/ww8struc.hxx |1 
 4 files changed, 88 insertions(+), 66 deletions(-)

New commits:
commit e9485fb5c5453618a39c8b64f607346c77aabad6
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 11:24:58 2013 +0200

bnc#816603, fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame

Word supports floating tables, Writer does not. We can map floating
tables to fly frames, containing just a table, but then those can't span
over multiple pages. We could avoid creating frames in case the table is
of multiple pages, but that's hard to determine.

One easy case is when the table width is = the text area with, in that
case we can be sure that no wrapping would be performed anyway, so we
can avoid putting the table to a frame.

Two more related problems:

1) When we need to decide if a frame should be created or not, we
typically don't know yet the table width. That's why TestApo() has to
always succeed (in case the paragraphs are wrapped), and then we always
enter StartApo(), where we can avoid creating the frame, if necessary.

2) Even if we decide that we don't create a frame, floating and
non-floating table rows are different, so a separate table should be
created for such rows. By doing all the StartApo() / StopApo(), we are
safe here.

(cherry picked from commit c2cf03e02b1c942645aea6988112028e13dd0c89)

Change-Id: Ifc0e0e2f7320c3784698d0ff278031b46864e2e5

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a74c4d0..220a7e5 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -75,6 +75,7 @@
 #include editeng/pgrditem.hxx
 #include editeng/frmdiritem.hxx
 #include editeng/charhiddenitem.hxx
+#include writerfilter/doctok/sprmids.hxx
 #include fmtpdsc.hxx
 #include node.hxx
 #include ndtxt.hxx // SwTxtNode, siehe unten: JoinNode()
@@ -2172,6 +2173,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
 const SwPosition rPos, bool bTableJoin)
 {
 SwTwips nRetWidth = 0;
+if (!pFlyFmt)
+return nRetWidth;
 // Alle Attribute schliessen, da sonst Attribute entstehen koennen,
 // die aus Flys rausragen
 WW8DupProperties aDup(rDoc,pCtrlStck);
@@ -2322,10 +2325,15 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults 
rApo,
 
 WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, false);
 
-pSFlyPara-pFlyFmt = rDoc.MakeFlySection( pSFlyPara-eAnchor,
-pPaM-GetPoint(), aFlySet );
-OSL_ENSURE(pSFlyPara-pFlyFmt-GetAnchor().GetAnchorId() ==
-pSFlyPara-eAnchor, Not the anchor type requested!);
+if (pTabPos  pTabPos-bNoFly)
+pSFlyPara-pFlyFmt = 0;
+else
+{
+pSFlyPara-pFlyFmt = rDoc.MakeFlySection( pSFlyPara-eAnchor,
+pPaM-GetPoint(), aFlySet );
+OSL_ENSURE(pSFlyPara-pFlyFmt-GetAnchor().GetAnchorId() ==
+pSFlyPara-eAnchor, Not the anchor type requested!);
+}
 
 if (pSFlyPara-pFlyFmt)
 {
@@ -2336,7 +2344,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults rApo,
 pWWZOrder-InsertTextLayerObject(pOurNewObject);
 }
 
-if (FLY_AS_CHAR != pSFlyPara-eAnchor)
+if (FLY_AS_CHAR != pSFlyPara-eAnchor  pSFlyPara-pFlyFmt)
 {
 pAnchorStck-AddAnchor(*pPaM-GetPoint(),pSFlyPara-pFlyFmt);
 }
@@ -2350,7 +2358,8 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults rApo,
 pSFlyPara-pOldAnchorStck = pAnchorStck;
 pAnchorStck = new SwWW8FltAnchorStack(rDoc, nFieldFlags);
 
-MoveInsideFly(pSFlyPara-pFlyFmt);
+if (pSFlyPara-pFlyFmt)
+MoveInsideFly(pSFlyPara-pFlyFmt);
 
 // 1) ReadText() wird nicht wie beim W4W-Reader rekursiv aufgerufen,
 //da die Laenge des Apo zu diesen Zeitpunkt noch nicht feststeht,
@@ -2453,7 +2462,8 @@ void SwWW8ImplReader::StopApo()
 pNd-JoinNext();
 }
 
-pSFlyPara-pFlyFmt-SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
+if (pSFlyPara-pFlyFmt)
+pSFlyPara-pFlyFmt-SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
 
 DeleteAnchorStk();
 pAnchorStck = pSFlyPara-pOldAnchorStck;
@@ -2477,7 +2487,7 @@ void SwWW8ImplReader::StopApo()
 #i27204# Added AutoWidth setting. Left the old CalculateFlySize in 
place
 so that if the user unselects autowidth, the width doesn't max out
 */
-else if( !pWFlyPara-nSp28 )
+else if( !pWFlyPara-nSp28  pSFlyPara-pFlyFmt)
 {
 using namespace sw::util;
 SfxItemSet aFlySet( pSFlyPara-pFlyFmt-GetAttrSet() );
@@ -4824,6 

[ABANDONED] fdo#64531 : Tab-stops exported to DOCX added too much indent...

[Adam CloudOn (via Code Review)]

Adam CloudOn has abandoned this change.

Change subject: fdo#64531 : Tab-stops exported to DOCX added too much 
indentation
..


Patch Set 1: Abandoned

recommitted this in 
https://gerrit.libreoffice.org/#/c/3884/

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I8ae5dec772fc56e75b3bec48edbf23a1258e47b4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com

___
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 50875, which changed state.

Bug 50875 Summary: SVG filter does not work under Windows 2000
https://bugs.freedesktop.org/show_bug.cgi?id=50875

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

-- 
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: solenv/gbuild

[Jan Holesovsky]

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

New commits:
commit 490780d1be75c746fec5c1e877bf2c8affbcf059
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon May 13 13:28:17 2013 +0200

Add missing \n.

Change-Id: I2fbfd9bc214eff1f224e257a0142b64cb5ffaeb2

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 07dacbf..ccde080 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -32,7 +32,7 @@
 # $(1): Cppunit or Python
 # $(2): the name of the unit test that failed
 define gb_UNIT_FAILED_MSG
-printf '\nError: a unit test failed, please do one of:\n\nexport 
DEBUGCPPUNIT=TRUE# for exception catching\nexport 
GDBCPPUNITTRACE=gdb --args # for interactive debugging\nexport 
VALGRIND=memcheck# for memory checking\n\nand retry using: make 
%sTest_%s' $(1) $(2)
+printf '\nError: a unit test failed, please do one of:\n\nexport 
DEBUGCPPUNIT=TRUE# for exception catching\nexport 
GDBCPPUNITTRACE=gdb --args # for interactive debugging\nexport 
VALGRIND=memcheck# for memory checking\n\nand retry using: make 
%sTest_%s\n\n' $(1) $(2)
 endef
 
 ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gengal' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/gengal'

[Michael Meeks]

New branch 'feature/gengal' available with the following commits:
commit b883d51412a9f267020f6b763d2c31e980824930
Author: Michael Meeks michael.me...@suse.com
Date:   Mon May 13 12:34:01 2013 +0100

gallery: add auxiliary .desktop style translation files.

Change-Id: I2f2f0d5d30fbcab83343f94fd16d9371baa380e5

commit 89d4e12303904a9b432ac8a89c28ec10d68ee43b
Author: Michael Meeks michael.me...@suse.com
Date:   Mon May 13 11:07:47 2013 +0100

gallery: remove obsolete GalleryImportThemeEntry

Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611

commit 5c37e2139d4981c5704f16eabe163cda1d2cdb9d
Author: Michael Meeks michael.me...@suse.com
Date:   Mon May 13 10:35:51 2013 +0100

move desktop translation tool to solenv.

Change-Id: I6e119f79a9293fa204904459c75ff97e5d3b5be6

commit af104b34066022551bf7c97a0a24d52b04ca1a28
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:52:26 2013 +0100

fdo#64311 - fix pre-processor conditionals  don't bail-out without 
gnome-vfs.

Change-Id: Ia7a805c95625b52fc99face000587692de21461e

commit 5b12cf71c627344f3785d25f6dd1f0d0bba4af29
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:35:04 2013 +0100

fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.

Change-Id: Ide7d833801e96a3375909238d036687082f34605

commit eee747b6d788ef74d4383c79a8e154b10a0f9037
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 17:25:11 2013 +0100

fdo#64311 - .desktop files: use %U for URLs only if we have gvfs or gio.

Change-Id: I52c75432eb30a46b2c6a597211df09fdbb08056c

commit 7b6832b9ff76ce63428dc8a95b7bbc2213513be5
Author: Michael Meeks michael.me...@suse.com
Date:   Sat May 11 10:40:33 2013 +0100

gengal: theme creation fix.

Change-Id: I72544e2bea45cf3f83e944aee9ca95676f1879c1

commit 345d033f08ff6309c1bd90ebe81f4130e54c9386
Author: Michael Meeks michael.me...@suse.com
Date:   Fri May 10 21:03:13 2013 +0100

gallery: fix hideous theme numbering / naming situation.

Change-Id: Ibe288e5b2e782da4dd5804a7e018d8ae85c156cc

commit 97eecbcf3e277ce735f579514bb2362b3e4b5b34
Author: Michael Meeks michael.me...@suse.com
Date:   Wed May 8 17:10:02 2013 +0100

galleries: implement first self-built sound gallery

Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15

commit 08f4efb11746736ddc176f6cbb12d12811635f57
Author: Michael Meeks michael.me...@suse.com
Date:   Wed May 8 17:08:55 2013 +0100

gengal: impl. relative URL pieces for internal galleries.

Change-Id: Ia44ad61e549e45ee2f4b8425023ed3e014fe2035

commit 55dc73f9d6499a0225dd850cb2c228e087d17127
Author: David Tardon dtar...@redhat.com
Date:   Tue May 7 20:41:41 2013 +0200

gbuild: make Gallery work

Change-Id: Ia2914e24f03cdb3f24df30bf203a09d18f4a8fd4

commit b583c04c5fb879cd5bece9021d7d87f76f541c5e
Author: David Tardon dtar...@redhat.com
Date:   Tue May 7 19:35:56 2013 +0200

add license header

commit d393b190a019e73fe037ef6c8ac88e3c90b7309e
Author: Michael Meeks michael.me...@suse.com
Date:   Tue May 7 16:05:48 2013 +0100

start of dynamic gallery building.

Change-Id: I488def80e855624ffd85a0b6c4cc19819c39ed01

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

[PATCH] datetime.cxx (ISO8601parseTime) ‘bFrac’ may be used uninitia...

[Mark Wielaard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3885

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3885/1

datetime.cxx (ISO8601parseTime) ‘bFrac’ may be used uninitialized.

gcc 4.4.7 warns about the above because getISO8601TimeToken calls
impl_getISO8601TimeToken, but if impl_getISO8601TimeToken fails, then
o_bFraction will never be set.

Change-Id: I3dd9460391c0dcdef37110110ad623c1016f0ddc
---
M unotools/source/misc/datetime.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/unotools/source/misc/datetime.cxx 
b/unotools/source/misc/datetime.cxx
index cbfb169..93f60a6 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -392,7 +392,7 @@
 sal_Int32 n = 0;
 OUString tokInt;
 OUString tokFrac;
-bool bFrac;
+bool bFrac = false;
 // hours
 if (bSuccess  (bSuccess = getISO8601TimeToken(aTimeStr, n, tokInt, 
bFrac, tokFrac)))
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dd9460391c0dcdef37110110ad623c1016f0ddc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

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

[Libreoffice-commits] core.git:

[Mark Wielaard]

 0 files changed

New commits:
commit 5338d80a98fb5f97e001c4f6c008ece03c7ae153
Author: Mark Wielaard m...@klomp.org
Date:   Mon May 13 13:57:14 2013 +0200

datetime.cxx (ISO8601parseTime) ‘bFrac’ may be used uninitialized.

gcc 4.4.7 warns about the above because getISO8601TimeToken calls
impl_getISO8601TimeToken, but if impl_getISO8601TimeToken fails, then
o_bFraction will never be set.

Change-Id: I3dd9460391c0dcdef37110110ad623c1016f0ddc
Reviewed-on: https://gerrit.libreoffice.org/3885
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] datetime.cxx (ISO8601parseTime) ‘bFrac’ may be used uninitia...

[Fridrich Strba (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3885

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dd9460391c0dcdef37110110ad623c1016f0ddc
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/SidebarController.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0763a83fb20825c66d8a3ecc50327753f7508bf9
Author: Andre Fischer a...@apache.org
Date:   Mon May 13 11:00:09 2013 +

122272: Select correct sidebar button after changing decks via menu.

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 6d6250d..3e5c05e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -488,6 +488,7 @@ void SidebarController::SwitchToDeck (
 
 msCurrentDeckId = rDeckDescriptor.msId;
 }
+mpTabBar-HighlightDeck(msCurrentDeckId);
 
 // Determine the panels to display in the deck.
 ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 oox/source/export/chartexport.cxx |4 ++--
 oox/source/export/drawingml.cxx   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ddb579666ce8b508ebb37f74f2d5d365047026f5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 13 14:17:14 2013 +0200

-Werror=maybe-uninitialized

Change-Id: I320e08d7d83727a93e0644db80943bc2bb896222

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 32edd25..0921156 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2637,7 +2637,7 @@ void ChartExport::exportErrorBar(Reference XPropertySet 
xErrorBarProps, bool b
 pFS-singleElement( FSNS( XML_c, XML_errDir ),
 XML_val, bYError ? y : x,
 FSEND );
-bool bPositive, bNegative;
+bool bPositive = false, bNegative = false;
 xErrorBarProps-getPropertyValue(ShowPositiveError) = bPositive;
 xErrorBarProps-getPropertyValue(ShowNegativeError) = bNegative;
 const char* pErrBarType;
@@ -2657,7 +2657,7 @@ void ChartExport::exportErrorBar(Reference XPropertySet 
xErrorBarProps, bool b
 XML_val, pErrBarType,
 FSEND );
 
-sal_Int32 nErrorBarStyle;
+sal_Int32 nErrorBarStyle = cssc::ErrorBarStyle::NONE;
 xErrorBarProps-getPropertyValue(ErrorBarStyle) = nErrorBarStyle;
 const char* pErrorBarStyle = getErrorBarStyle(nErrorBarStyle);
 pFS-singleElement( FSNS( XML_c, XML_errValType ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 3157eac..b083112 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1528,7 +1528,7 @@ void DrawingML::WriteFill( Reference XPropertySet  
xPropSet )
 if ( aFillStyle == FillStyle_SOLID  GetProperty( xPropSet, 
FillTransparence ) )
 {
 // map full transparent background to no fill
-sal_Int16 nVal;
+sal_Int16 nVal = 0;
 xPropSet-getPropertyValue( FillTransparence ) = nVal;
 if ( nVal == 100 )
 aFillStyle = FillStyle_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Get rid of GlobalEditData::GetStdRefDevice()

[Tor Lillqvist (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3886

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3886/1

Get rid of GlobalEditData::GetStdRefDevice()

This avoids a crash on exit in a dbgutil build on OS X.

The horrible bOwnerOfRefDev crack screams out for boost::shared_ptr, I think?

Change-Id: Icf3ae3c28da0583a44472f36312b07766734bf7b
---
M editeng/source/editeng/eerdll.cxx
M editeng/source/editeng/eerdll2.hxx
M editeng/source/editeng/impedit2.cxx
3 files changed, 11 insertions(+), 24 deletions(-)



diff --git a/editeng/source/editeng/eerdll.cxx 
b/editeng/source/editeng/eerdll.cxx
index c6a008d..704573a 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -79,7 +79,6 @@
 }
 
 GlobalEditData::GlobalEditData()
-: 
m_aStdRefDevice(::com::sun::star::uno::Referencecom::sun::star::lang::XComponent(::comphelper::getProcessComponentContext(),
 ::com::sun::star::uno::UNO_QUERY_THROW))
 {
 ppDefItems = NULL;
 }
@@ -186,16 +185,6 @@
 xLanguageGuesser = linguistic2::LanguageGuessing::create( 
comphelper::getProcessComponentContext() );
 }
 return xLanguageGuesser;
-}
-
-OutputDevice* GlobalEditData::GetStdRefDevice()
-{
-if ( !m_aStdRefDevice )
-{
-m_aStdRefDevice.reset(new VirtualDevice);
-m_aStdRefDevice-SetMapMode( MAP_TWIP );
-}
-return m_aStdRefDevice.get();
 }
 
 EditResId::EditResId( sal_uInt16 nId ):
diff --git a/editeng/source/editeng/eerdll2.hxx 
b/editeng/source/editeng/eerdll2.hxx
index ae592c3..2c53b96 100644
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -23,7 +23,6 @@
 #include com/sun/star/linguistic2/XLanguageGuessing.hpp
 #include editeng/forbiddencharacterstable.hxx
 #include rtl/ref.hxx
-#include comphelper/scoped_disposing_ptr.hxx
 
 class SfxPoolItem;
 
@@ -32,7 +31,6 @@
 private:
 ::com::sun::star::uno::Reference
 ::com::sun::star::linguistic2::XLanguageGuessing   xLanguageGuesser;
-comphelper::scoped_disposing_solar_mutex_reset_ptrOutputDevice 
m_aStdRefDevice;
 SfxPoolItem**   ppDefItems;
 
 rtl::ReferenceSvxForbiddenCharactersTable xForbiddenCharsTable;
@@ -42,13 +40,11 @@
 ~GlobalEditData();
 
 SfxPoolItem**   GetDefItems();
-OutputDevice*   GetStdRefDevice();
 
 rtl::ReferenceSvxForbiddenCharactersTable GetForbiddenCharsTable();
 voidSetForbiddenCharsTable( 
rtl::ReferenceSvxForbiddenCharactersTable xForbiddenChars ) { 
xForbiddenCharsTable = xForbiddenChars; }
 ::com::sun::star::uno::Reference 
::com::sun::star::linguistic2::XLanguageGuessing  GetLanguageGuesser();
 };
-
 
 #endif //_EERDLL2_HXX
 
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index b46b23c..8bd7306 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -150,10 +150,8 @@
 aOnlineSpellTimer.SetTimeout( 100 );
 aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl 
) );
 
-pRefDev = EE_DLL().GetGlobalData()-GetStdRefDevice();
-
 // Access data already from here on!
-SetRefDevice( pRefDev );
+SetRefDevice( NULL );
 InitDoc( sal_False );
 
 bCallParaInsertedOrDeleted = true;
@@ -190,11 +188,16 @@
 if ( bOwnerOfRefDev )
 delete pRefDev;
 
-pRefDev = pRef;
-bOwnerOfRefDev = false;
-
 if ( !pRef )
-pRefDev = EE_DLL().GetGlobalData()-GetStdRefDevice();
+{
+pRefDev = new VirtualDevice;
+pRefDev-SetMapMode( MAP_TWIP );
+bOwnerOfRefDev = true;
+} else
+{
+pRefDev = pRef;
+bOwnerOfRefDev = false;
+}
 
 nOnePixelInRef = (sal_uInt16)pRefDev-PixelToLogic( Size( 1, 0 ) ).Width();
 
@@ -210,8 +213,7 @@
 if ( GetRefDevice()-GetMapMode() == rMapMode )
 return;
 
-// When RefDev == GlobalRefDev = create own!
-if ( !bOwnerOfRefDev  ( pRefDev == 
EE_DLL().GetGlobalData()-GetStdRefDevice() ) )
+if ( !bOwnerOfRefDev )
 {
 pRefDev = new VirtualDevice;
 pRefDev-SetMapMode( MAP_TWIP );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf3ae3c28da0583a44472f36312b07766734bf7b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tor Lillqvist t...@iki.fi

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

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

[Lionel Elie Mamane]

 connectivity/source/drivers/macab/MacabDriver.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c46fa1299bc00bff5528895bcdffdf0e681572d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon May 13 14:33:47 2013 +0200

fdo#64528 macab URL is sdbc:address:macab, not sdbc:address:macab:*

Change-Id: I1e5721815c961e14484f78f449910908ed48aeb1

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx 
b/connectivity/source/drivers/macab/MacabDriver.cxx
index a8d736e..7b0ab7c 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -276,7 +276,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString 
url )
 return sal_False;
 
 // here we have to look whether we support this URL format
-return url.startsWith(sdbc:address:macab:);
+return url.equals(sdbc:address:macab);
 }
 // 

 Sequence DriverPropertyInfo  SAL_CALL MacabDriver::getPropertyInfo( const 
OUString, const Sequence PropertyValue  ) throw(SQLException, 
RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/dbui/mmlayoutpage.hxx |1 -
 sw/source/ui/inc/swuicnttab.hxx|1 -
 sw/source/ui/index/cnttab.cxx  |6 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 38504054d87e3fb8b29cd1172965fb5012983a75
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 13:36:16 2013 +0100

Resolves: fdo#64287 missing insert index/table preview

Change-Id: I90aab9339362565dd49b72dd057717f7bbf3d874

diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx 
b/sw/source/ui/dbui/mmlayoutpage.hxx
index 57e76e5..ca16b1a 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -54,7 +54,6 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
 PushButton  m_aDownPB;
 
 Window  m_aExampleContainerWIN;
-Window  m_aExampleWIN;
 
 FixedText   m_aZoomFT;
 ListBox m_aZoomLB;
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index b540a73..27a5a8f 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -62,7 +62,6 @@ struct SwIndexSections_Impl;
 class SwMultiTOXTabDialog : public SfxTabDialog
 {
 Window  aExampleContainerWIN;
-Window  aExampleWIN;
 CheckBoxaShowExampleCB;
 SwTOXMgr*   pMgr;
 SwWrtShell rSh;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 73089da..bf7965e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -224,7 +224,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, 
const SfxItemSet rSet
 sal_uInt16 nToxType, sal_Bool bGlobal) :
 SfxTabDialog(   pParent, SW_RES(DLG_MULTI_TOX), rSet),
 aExampleContainerWIN(this, SW_RES(WIN_EXAMPLE)),
-aExampleWIN( aExampleContainerWIN, 0 ),
 aShowExampleCB( this, SW_RES(CB_SHOWEXAMPLE)),
 pMgr( new SwTOXMgr( rShell ) ),
 rSh(rShell),
@@ -239,9 +238,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, 
const SfxItemSet rSet
 {
 FreeResource();
 
-aExampleWIN.SetPosSizePixel(aExampleContainerWIN.GetPosPixel(),
-aExampleContainerWIN.GetSizePixel());
-
 eCurrentTOXType.eType = TOX_CONTENT;
 eCurrentTOXType.nIndex = 0;
 
@@ -528,7 +524,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, 
pBox )
 {
 Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl));
 pExampleFrame = new SwOneExampleFrame(
-aExampleWIN, EX_SHOW_ONLINE_LAYOUT, aLink, 
sTemplate);
+aExampleContainerWIN, EX_SHOW_ONLINE_LAYOUT, aLink, 
sTemplate);
 
 if(!pExampleFrame-IsServiceAvailable())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_exporttest.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_importtest.mk char

[Stephan Bergmann]

 chart2/CppunitTest_chart2_export.mk |  119 
 chart2/CppunitTest_chart2_exporttest.mk |  119 
 chart2/CppunitTest_chart2_import.mk |  118 +++
 chart2/CppunitTest_chart2_importtest.mk |  118 ---
 chart2/Module_chart2.mk |2 
 chart2/qa/extras/chart2export.cxx   |   13 ++-
 6 files changed, 246 insertions(+), 243 deletions(-)

New commits:
commit 0ff2115b07c31663db45dcd71a7e6c554153dac2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 13 15:01:55 2013 +0200

Fix naming

Change-Id: Ib2f9577429a4b9b97540de1eb40837ddafdc05b5

diff --git a/chart2/CppunitTest_chart2_exporttest.mk 
b/chart2/CppunitTest_chart2_export.mk
similarity index 100%
rename from chart2/CppunitTest_chart2_exporttest.mk
rename to chart2/CppunitTest_chart2_export.mk
diff --git a/chart2/CppunitTest_chart2_importtest.mk 
b/chart2/CppunitTest_chart2_import.mk
similarity index 100%
rename from chart2/CppunitTest_chart2_importtest.mk
rename to chart2/CppunitTest_chart2_import.mk
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3dacc4c..1cfe2ad 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
-CppunitTest_chart2_exporttest \
+CppunitTest_chart2_export \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
commit 0c3a839f1e1ca16c1f41002cf00c8e21f05dd01c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 13 15:01:41 2013 +0200

-Werror=maybe-uninitialized

Change-Id: I4959f52510b814f4becb47105c7fd61188ab0e31

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index ca7105c..3e645ab 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -39,15 +39,18 @@ namespace {
 void testErrorBar( Reference XPropertySet  xErrorBar )
 {
 sal_Int32 nErrorBarStyle;
-xErrorBar-getPropertyValue(ErrorBarStyle) = nErrorBarStyle;
+CPPUNIT_ASSERT(
+xErrorBar-getPropertyValue(ErrorBarStyle) = nErrorBarStyle);
 CPPUNIT_ASSERT_EQUAL(nErrorBarStyle, chart::ErrorBarStyle::RELATIVE);
-bool bShowPositive, bShowNegative;
-xErrorBar-getPropertyValue(ShowPositiveError) = bShowPositive;
+bool bShowPositive = bool(), bShowNegative = bool();
+CPPUNIT_ASSERT(
+xErrorBar-getPropertyValue(ShowPositiveError) = bShowPositive);
 CPPUNIT_ASSERT(bShowPositive);
-xErrorBar-getPropertyValue(ShowNegativeError) = bShowNegative;
+CPPUNIT_ASSERT(
+xErrorBar-getPropertyValue(ShowNegativeError) = bShowNegative);
 CPPUNIT_ASSERT(bShowNegative);
 double nVal;
-xErrorBar-getPropertyValue(PositiveError) = nVal;
+CPPUNIT_ASSERT(xErrorBar-getPropertyValue(PositiveError) = nVal);
 CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 10.0, 1e-10);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - misc/test-doc-files.sh src/docstream.py

[Miklos Vajna]

 misc/test-doc-files.sh |   15 +
 src/docstream.py   |  147 +
 2 files changed, 151 insertions(+), 11 deletions(-)

New commits:
commit 0968e7558c98aad1ea67769b8e2a245a55aca2e4
Author: Maxime de Roucy mdero...@linagora.com
Date:   Mon May 13 13:47:26 2013 +0200

add fibRgFcLcb2000 2003 and 2007

diff --git a/src/docstream.py b/src/docstream.py
index 701c50b..f63a263 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -65,7 +65,14 @@ class WordDocumentStream(DOCDirStream):
 self.printAndSet(cbRgFcLcb, self.readuInt16())
 
 self.blobOffset = self.pos
-self.nFibNew = self.__getFibNew()
+cswNew = self.getuInt16(pos = self.__getCswNewOffset())
+
+if cswNew != 0:
+self.nFibNew = self.getuInt16(pos = self.__getCswNewOffset() + 2)
+self.nFib = self.nFibNew
+else:
+self.nFibNew = 0
+
 self.dumpFibRgFcLcb(fibRgFcLcbBlob)
 self.pos = self.__getCswNewOffset()
 
@@ -74,13 +81,6 @@ class WordDocumentStream(DOCDirStream):
 self.dumpFibRgCswNew(fibRgCswNew)
 print '/fib'
 
-def __getFibNew(self):
-cswNew = self.getuInt16(pos = self.__getCswNewOffset())
-if cswNew == 0:
-return 0
-else:
-return self.getuInt16(pos = self.__getCswNewOffset() + 2)
-
 def __getCswNewOffset(self):
 return self.blobOffset + (8 * self.cbRgFcLcb)
 
@@ -202,8 +202,14 @@ class WordDocumentStream(DOCDirStream):
 def dumpFibRgFcLcb(self, name):
 if self.nFib == 0x00c1:
 self.dumpFibRgFcLcb97(name)
+elif self.nFib == 0x00d9:
+self.dumpFibRgFcLcb2000(name)
 elif self.nFib == 0x0101:
 self.dumpFibRgFcLcb2002(name)
+elif self.nFib == 0x010c:
+self.dumpFibRgFcLcb2003(name)
+elif self.nFib == 0x0112:
+self.dumpFibRgFcLcb2007(name)
 else:
 print todo what=dumpFibRgFcLcb() doesn't know how to handle 
nFib = %s % hex(self.nFib)
 
@@ -562,6 +568,26 @@ class WordDocumentStream(DOCDirStream):
 self.__dumpFibRgFcLcb97()
 print '/%s' % name
 
+def dumpFibRgFcLcb2000(self, name):
+print '%s type=FibRgFcLcb2000 size=864 bytes' % name
+self.__dumpFibRgFcLcb2000()
+print '/%s' % name
+
+def dumpFibRgFcLcb2002(self, name):
+print '%s type=FibRgFcLcb2002 size=1088 bytes' % name
+self.__dumpFibRgFcLcb2002()
+print '/%s' % name
+
+def dumpFibRgFcLcb2003(self, name):
+print '%s type=FibRgFcLcb2003 size=1312 bytes' % name
+self.__dumpFibRgFcLcb2003()
+print '/%s' % name
+
+def dumpFibRgFcLcb2007(self, name):
+print '%s type=FibRgFcLcb2007 size=1464 bytes' % name
+self.__dumpFibRgFcLcb2007()
+print '/%s' % name
+
 def __dumpFibRgFcLcb2000(self):
 self.__dumpFibRgFcLcb97()
 fields = [
@@ -662,10 +688,109 @@ class WordDocumentStream(DOCDirStream):
 for i in fields:
 self.printAndSet(i, self.readuInt32())
 
-def dumpFibRgFcLcb2002(self, name):
-print '%s type=FibRgFcLcb2002 size=744 bytes' % name
+def __dumpFibRgFcLcb2003(self):
 self.__dumpFibRgFcLcb2002()
-print '/%s' % name
+fields = [
+fcHplxsdr,
+lcbHplxsdr,
+fcSttbfBkmkSdt,
+lcbSttbfBkmkSdt,
+fcPlcfBkfSdt,
+lcbPlcfBkfSdt,
+fcPlcfBklSdt,
+fcCustomXForm,
+lcbCustomXForm,
+fcSttbfBkmkProt,
+lcbSttbfBkmkProt,
+fcPlcfBkfProt,
+lcbPlcfBkfProt,
+fcPlcfBklProt,
+lcbPlcfBklProt,
+fcSttbProtUser,
+lcbSttbProtUser,
+fcUnused,
+lcbUnused,
+fcPlcfpmiOld,
+lcbPlcfpmiOld,
+fcPlcfpmiOldInline,
+lcbPlcfpmiOldInline,
+fcPlcfpmiNew,
+lcbPlcfpmiNew,
+fcPlcfpmiNewInline,
+lcbPlcfpmiNewInline,
+fcPlcflvcOld,
+lcbPlcflvcOld,
+lcbPlcflvcOldInline,
+fcPlcflvcNew,
+lcbPlcflvcNew,
+fcPlcflvcNewInline,
+lcbPlcflvcNewInline,
+fcPgdMother,
+lcbPgdMother,
+fcBkdMother,
+lcbBkdMother,
+fcAfdMother,
+lcbAfdMother,
+fcPgdFtn,
+lcbPgdFtn,
+fcBkdFtn,
+lcbBkdFtn,
+fcAfdFtn,
+lcbAfdFtn,
+fcPgdEdn,
+lcbPgdEdn,
+fcBkdEdn,
+lcbBkdEdn,
+fcAfdEdn,
+fcAfd,
+lcbAfd,
+]
+for i in fields:
+self.printAndSet(i, self.readuInt32())
+
+def __dumpFibRgFcLcb2007(self):
+self.__dumpFibRgFcLcb2003()
+fields = [
+

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

[Caolán McNamara]

 sw/source/ui/envelp/labelexp.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0e750859cd4a712a5d232ad12b52ed01b1b05109
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 14:19:32 2013 +0100

enable preview of business cards

Change-Id: I841f7599d8808bd747fb4fb6a1837dc7c2059231

diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index eb8384e..7104b88 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -45,6 +45,7 @@ using namespace ::comphelper;
 void SwVisitingCardPage::InitFrameControl()
 {
 Link aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl));
+aExampleWIN.Show();
 pExampleFrame = new SwOneExampleFrame( aExampleWIN,
 EX_SHOW_BUSINESS_CARDS, aLink );
 
___
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 - sw/source

[Jan Holesovsky]

 sw/source/filter/ww8/ww8par.cxx   |   13 +---
 sw/source/filter/ww8/ww8par.hxx   |   58 +-
 sw/source/filter/ww8/ww8par2.cxx  |   58 --
 sw/source/filter/ww8/ww8par6.cxx  |   37 +++-
 sw/source/filter/ww8/ww8struc.hxx |1 
 5 files changed, 96 insertions(+), 71 deletions(-)

New commits:
commit 0797b27ff5b18abd3bbdcba7b7a361d0097fd93e
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Apr 12 14:58:39 2013 +0200

bnc#816603, i#101884: Fix crash on load.

This was originally fixed in commit 792cbc03aef3873ba89c61db708898d96d6a52f8
due to fix of i#99564.

But later we reworked the handling of empty paragraphs in tables in commit
56b2cf0c10d9caa01ebae1d80465e342d046a85c, which caused the fix from i#99564
to regress.

Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1
(cherry picked from commit 9fb856ce844f2a4e794687c00ad6f0f75ef223c1)

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 26cfd3e..3cd43f9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4798,12 +4798,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary 
*pGloss, const SwPosition rPos)
 {
 SwFrmFmt *pFrmFmt = pHt-GetFlyCnt().GetFrmFmt();
 const SwNodeIndex *pNdIdx = 
pFrmFmt-GetCntnt().GetCntntIdx();
-const SwNodes nos = pNdIdx-GetNodes();
-const SwGrfNode *pGrf = dynamic_castconst 
SwGrfNode*(nos[pNdIdx-GetIndex() + 1]);
-if (pGrf)
+if (pNdIdx)
 {
-vecBulletGrf.push_back(pGrf);
-vecFrmFmt.push_back(pFrmFmt);
+const SwNodes nos = pNdIdx-GetNodes();
+const SwGrfNode *pGrf = dynamic_castconst 
SwGrfNode*(nos[pNdIdx-GetIndex() + 1]);
+if (pGrf)
+{
+vecBulletGrf.push_back(pGrf);
+vecFrmFmt.push_back(pFrmFmt);
+}
 }
 }
 }
commit 6e3f2fbc479f60756a5c939da877c6485916ae83
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 11:24:58 2013 +0200

bnc#816603, fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame

Word supports floating tables, Writer does not. We can map floating
tables to fly frames, containing just a table, but then those can't span
over multiple pages. We could avoid creating frames in case the table is
of multiple pages, but that's hard to determine.

One easy case is when the table width is = the text area with, in that
case we can be sure that no wrapping would be performed anyway, so we
can avoid putting the table to a frame.

Two more related problems:

1) When we need to decide if a frame should be created or not, we
typically don't know yet the table width. That's why TestApo() has to
always succeed (in case the paragraphs are wrapped), and then we always
enter StartApo(), where we can avoid creating the frame, if necessary.

2) Even if we decide that we don't create a frame, floating and
non-floating table rows are different, so a separate table should be
created for such rows. By doing all the StartApo() / StopApo(), we are
safe here.

(cherry picked from commit c2cf03e02b1c942645aea6988112028e13dd0c89)

Change-Id: Ifc0e0e2f7320c3784698d0ff278031b46864e2e5

Conflicts:
sw/source/filter/ww8/ww8par6.cxx

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 691b8f7..078db95 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -67,6 +67,7 @@
 #include editeng/frmdiritem.hxx
 #include editeng/charhiddenitem.hxx
 #include i18npool/mslangid.hxx
+#include writerfilter/doctok/sprmids.hxx
 #include fmtpdsc.hxx
 #include node.hxx
 #include ndtxt.hxx // SwTxtNode, siehe unten: JoinNode()
@@ -2168,6 +2169,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
 const SwPosition rPos, bool bTableJoin)
 {
 SwTwips nRetWidth = 0;
+if (!pFlyFmt)
+return nRetWidth;
 // Alle Attribute schliessen, da sonst Attribute entstehen koennen,
 // die aus Flys rausragen
 WW8DupProperties aDup(rDoc,pCtrlStck);
@@ -2318,10 +2321,15 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults 
rApo,
 
 WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, false);
 
-pSFlyPara-pFlyFmt = rDoc.MakeFlySection( pSFlyPara-eAnchor,
-pPaM-GetPoint(), aFlySet );
-OSL_ENSURE(pSFlyPara-pFlyFmt-GetAnchor().GetAnchorId() ==

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

[Isamu Mogi]

 solenv/gbuild/platform/filter-showIncludes.awk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 80cf1c22b629d524de18f20dcfd155d889ee5d2f
Author: Isamu Mogi saturda...@gmail.com
Date:   Sat May 11 08:31:51 2013 +

gbuild: Replace SHOWINCLUDES_PREFIX without regexp.

With MSVC Japanese, SHOWINCLUDES_PREFIX includes regexp special
charactor \x5b (left square bracket). In this case replacing
SHOWINCLUDES_PREFIX with regexp fails. To fix it, this commit
changes the script not to use regexp.

Example value of $SHOWINCLUDES_PREFIX from MSVC Japanese:
$ echo $SHOWINCLUDES_PREFIX | hexdump -C
83 81 83 82 3a 20 83 43 83 93 83 4e 83 8b 81 5b |:.C...N...[|
83 68 20 83 74 83 40 83 43 83 8b 3a 20 20 43 3a |.h.t.@.C..:  C:|
5c 54 65 6d 70 5c 73 74 64 69 6f 2e 68 0d 0a|\Temp\stdio.h..|

Change-Id: Ic7d85fc3a93807de11155488e9d0368427375c78
Reviewed-on: https://gerrit.libreoffice.org/3579
Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de
Tested-by: Kohei Yoshida kohei.yosh...@suse.de

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 9d94f3b..5d3fdcb 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -31,8 +31,6 @@ BEGIN {
 if (!showincludes_prefix) {
 showincludes_prefix = Note: including file:
 }
-regex = ^ * showincludes_prefix  *
-pattern = / regex /
 
 # to match especially drive letters in whitelist case insensitive
 IGNORECASE = 1
@@ -42,8 +40,10 @@ BEGIN {
 }
 
 {
-if ($0 ~ regex) {
-sub(regex, )
+sub(/^ */, )
+if (index($0, showincludes_prefix) == 1) {
+$0 = substr($0, 1, length(showincludes_prefix))
+sub(/^ */, )
 gsub(/\\/, /)
 gsub(/ /, \\ )
 if ($0 ~ whitelist) { # filter out system headers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: several reports of a problem with jpeg test in vcl

[Caolán McNamara]

On Sun, 2013-05-12 at 10:05 +0200, Markus Mohrhard wrote:
 Hey Caolan, *,
 
 so after we got several complains about test failure in vcl with the
 same file I looked at it with memcheck and can at least produce an
 output there. The test does not fail for me or at the tinderbox but we
 had now 3 independet people having problems with the same file on
 different systems.

Well, all we *really* care is that it doesn't crash, so one solution is
to move that test from pass to indeterminate.

I'm not mad about that idea really as that's super yucky, but it's a
short term workaround. Do we have any idea what the trigger is for
failure for some people ?, e.g. libjpeg version, distro version or what
not ? I'd prefer to force such busted jpegs to fail universally if
there's a version of libjpeg out there which has a legitimate reason to
barf on them.

C.

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

[PUSHED] gbuild: Replace SHOWINCLUDES_PREFIX without regexp.

[Kohei Yoshida (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/3579

Approvals:
  Kohei Yoshida: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d85fc3a93807de11155488e9d0368427375c78
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de

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

[Libreoffice-commits] .: doc-dump.py ppt-dump.py src/docdirstream.py src/docrecord.py src/docsprm.py src/docstream.py src/oletool.py src/xlsparser.py src/xmlpp.py test/doc xls-dump.py

[Miklos Vajna]

 doc-dump.py |2 +-
 ppt-dump.py |2 +-
 src/docdirstream.py |2 +-
 src/docrecord.py|2 +-
 src/docsprm.py  |2 +-
 src/docstream.py|2 +-
 src/oletool.py  |2 +-
 src/xlsparser.py|2 +-
 src/xmlpp.py|2 +-
 test/doc/test.py|2 +-
 xls-dump.py |2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit e804362274b5b631dc5e7a22c474c3d580d01b82
Author: Maxime de Roucy mdero...@linagora.com
Date:   Mon May 13 13:49:53 2013 +0200

env python → python2

diff --git a/doc-dump.py b/doc-dump.py
index 03760b2..17aec51 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # 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
diff --git a/ppt-dump.py b/ppt-dump.py
index 64039db..706b6f1 100755
--- a/ppt-dump.py
+++ b/ppt-dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 #
 #  Copyright (c) 2010 Kohei Yoshida, Thorsten Behrens
diff --git a/src/docdirstream.py b/src/docdirstream.py
index 497ccea..18c7453 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # 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
diff --git a/src/docrecord.py b/src/docrecord.py
index 59f1555..f79cd9b 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # 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
diff --git a/src/docsprm.py b/src/docsprm.py
index 5dbffc6..7924225 100644
--- a/src/docsprm.py
+++ b/src/docsprm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # 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
diff --git a/src/docstream.py b/src/docstream.py
index f63a263..0e939db 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # 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
diff --git a/src/oletool.py b/src/oletool.py
index 752c09d..f9464e6 100755
--- a/src/oletool.py
+++ b/src/oletool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 #
 #  Copyright (c) 2011 Noel Power
diff --git a/src/xlsparser.py b/src/xlsparser.py
index 322e9b2..d1a0f80 100644
--- a/src/xlsparser.py
+++ b/src/xlsparser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 #
 #  Copyright (c) 2011 Sergey Kishchenko
diff --git a/src/xmlpp.py b/src/xmlpp.py
index b318cf7..fd3ef62 100755
--- a/src/xmlpp.py
+++ b/src/xmlpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 Pretty print an XML document.
 
 LICENCE:
diff --git a/test/doc/test.py b/test/doc/test.py
index e50e447..2bf3f01 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- encoding: UTF-8 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/xls-dump.py b/xls-dump.py
index 0b7a7f6..c01d1e5 100755
--- a/xls-dump.py
+++ b/xls-dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 #
 #  Copyright (c) 2010 Kohei Yoshida
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/dbui/mmlayoutpage.cxx |   12 +++-
 sw/source/ui/dbui/mmlayoutpage.hxx |1 -
 sw/source/ui/dbui/mmlayoutpage.src |1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 3c607d39a45277b93f8fd8f3c67dbd3ba4bb874d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 14:46:27 2013 +0100

remove unnecessary intermediate window from frame preview

Change-Id: I5b9ce26b52ca2b10b87cfcfbf83ff1a0fc4c7659

diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx 
b/sw/source/ui/dbui/mmlayoutpage.cxx
index f9ccc48..44c7b9e 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -90,7 +90,6 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( 
SwMailMergeWizard* _pParent) :
 m_aDownFT( this, SW_RES(   FT_DOWN   )),
 m_aDownPB( this, SW_RES(   PB_DOWN   )),
 m_aExampleContainerWIN( this, SW_RES(  WIN_EXAMPLECONTAINER  )),
-m_aExampleWIN( this, 0 ),
 m_aZoomFT( this, SW_RES(   FT_ZOOM   )),
 m_aZoomLB( this, SW_RES(   LB_ZOOM   )),
 #ifdef _MSC_VER
@@ -103,9 +102,6 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( 
SwMailMergeWizard* _pParent) :
 m_pWizard(_pParent)
 {
 FreeResource();
-m_aExampleWIN.SetPosSizePixel(m_aExampleContainerWIN.GetPosPixel(),
-m_aExampleContainerWIN.GetSizePixel());
-
 
 const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
 OUString( FILTER_XML ),
@@ -130,11 +126,10 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( 
SwMailMergeWizard* _pParent) :
 xStore-storeToURL( m_sExampleURL, aValues   );
 
 Link aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl));
-m_pExampleFrame = new SwOneExampleFrame( m_aExampleWIN,
+m_pExampleFrame = new SwOneExampleFrame( m_aExampleContainerWIN,
 EX_SHOW_DEFAULT_PAGE, aLink, 
m_sExampleURL );
 
-m_aExampleWIN.Show( sal_False );
-m_aExampleContainerWIN.Show(sal_True);
+m_aExampleContainerWIN.Show(false);
 
 m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP);
 m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP);
@@ -662,8 +657,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell 
rShell, SwMailMergeConfig
 
 IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
 {
-m_aExampleWIN.Show( sal_True );
-m_aExampleContainerWIN.Show(sal_False);
+m_aExampleContainerWIN.Show(true);
 
 Reference XModel   xModel = m_pExampleFrame-GetModel();
 //now the ViewOptions should be set properly
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx 
b/sw/source/ui/dbui/mmlayoutpage.hxx
index 57e76e5..ca16b1a 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -54,7 +54,6 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
 PushButton  m_aDownPB;
 
 Window  m_aExampleContainerWIN;
-Window  m_aExampleWIN;
 
 FixedText   m_aZoomFT;
 ListBox m_aZoomLB;
diff --git a/sw/source/ui/dbui/mmlayoutpage.src 
b/sw/source/ui/dbui/mmlayoutpage.src
index bbb4da9..cc54bba 100644
--- a/sw/source/ui/dbui/mmlayoutpage.src
+++ b/sw/source/ui/dbui/mmlayoutpage.src
@@ -129,7 +129,6 @@ TabPage DLG_MM_LAYOUT_PAGE
 {
 Pos = MAP_APPFONT ( 130 , 20 ) ;
 Size = MAP_APPFONT ( 124 , 159 ) ;
-Border = TRUE;
 };
 FixedText   FT_ZOOM
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 solenv/bin/mkdocs.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 935d074e9fd4d4feab4dd393e5b4938bf32de1cb
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon May 13 16:00:07 2013 +0200

mkdocs.sh: adapt to global include dir

Change-Id: Ieacf702649fd9581213612454eba67ba38f8cc13

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 846e19e..6cd7df9 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -158,7 +158,7 @@ DOXYGEN_REF_TAGFILES=
 for PROJECT in $INPUT_PROJECTS;
 do
   # avoid processing of full project subdirs, only add source and inc
-  DOXYGEN_INPUT=`printf %s $PROJECT/source $PROJECT/inc `
+  DOXYGEN_INPUT=`printf %s $PROJECT/source $PROJECT/inc include/$PROJECT `
 
   DOXYGEN_OUTPUT=$BASE_OUTPUT/$PROJECT
   DOXYGEN_OUR_TAGFILE=$DOXYGEN_OUTPUT/$PROJECT.tags
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: several reports of a problem with jpeg test in vcl

[Michael Stahl]

On 12/05/13 11:42, Tomaž Vajngerl wrote:
 Hi,
 
 Probably one of my changes is the cause for this.
 
 One of the problems is that CVE-2004-0200-3.jpg is a semi corrupt file.
 Usually it can be read fine but doing any transform operations fails.
 For example jpegtrans fails for this file, GIMP does not open it,
 ImageMagick's convert does not work.
 From the memcheck I can see that libjpeg6 was used - maybe this is what
 triggers the problem as libjpeg8 is usually used today.

jpeg 6 is alive and well on Fedora - Fedora ships jpeg 6 and the
maintainer has publicly stated that packaging jpeg 8 will not happen:

http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/173253
http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/173299

... and it doesn't crash here apparently.


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

[Andre Fischer]

 sd/source/ui/view/drviews1.cxx |5 +
 sd/source/ui/view/drviewsa.cxx |5 -
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8
Author: Andre Fischer a...@apache.org
Date:   Mon May 13 13:34:46 2013 +

122275: Don't show the layout panel for master pages.

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 8f87947..615063f 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -516,6 +516,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 Invalidate( SID_TITLE_MASTERPAGE );
 Invalidate( SID_NOTES_MASTERPAGE );
 Invalidate( SID_HANDOUT_MASTERPAGE );
+
+if (meEditMode == EM_PAGE)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 }
 }
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 8420a23..211907c 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -156,7 +156,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, 
ViewShellBase rViewShellBas
 
 mpSelectionChangeHandler-Connect();
 
-
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Power]

 sc/qa/extras/macros-test.cxx |   26 +++---
 sc/qa/extras/testdocuments/Workbooks.xls |binary
 2 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit f34c31560bb29f90d579a795cd9f7707163c025f
Author: Noel Power noel.po...@suse.com
Date:   Mon May 13 15:22:30 2013 +0100

fix Workbooks.xls unit test ( was failing on windows )

Change-Id: Id1e3a761765c1e860f611f40a78a6c24fa17d055

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 65f7d01..347db65 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -175,23 +175,18 @@ void ScMacrosTest::testVba()
 OUString(MiscControlTests.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#if 0
 {
 OUString(Workbooks.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#endif
 };
 OUString sTempDir;
 OUString sTempDirURL;
 osl::FileBase:: getTempDirURL( sTempDirURL );
 osl::FileBase::getSystemPathFromFileURL( sTempDirURL, sTempDir );
+sTempDir += OUString( SAL_PATHDELIMITER );
+OUString sTestFileName(My Test WorkBook.xls);
 Sequence uno::Any  aParams;
-if ( !sTempDir.isEmpty() )
-{
-aParams.realloc(1);
-aParams[ 0 ] = sTempDir;
-}
 for ( sal_uInt32  i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
 {
 OUString aFileName;
@@ -204,6 +199,15 @@ void ScMacrosTest::testVba()
 Any aRet;
 Sequence sal_Int16  aOutParamIndex;
 Sequence Any  aOutParam;
+bool bWorkbooksHandling = OUString( testInfo[i].sFileBaseName 
).equalsAscii(Workbooks.)  !sTempDir.isEmpty() ;
+
+if ( bWorkbooksHandling )
+{
+aParams.realloc(2);
+aParams[ 0 ] = sTempDir;
+aParams[ 1 ] = sTestFileName;
+}
+
 SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
 
 CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
@@ -215,6 +219,14 @@ void ScMacrosTest::testVba()
 std::cout  value of Ret   OUStringToOString( aStringRes, 
RTL_TEXTENCODING_UTF8 ).getStr()  std::endl;
 CPPUNIT_ASSERT_MESSAGE( script reported failure,aStringRes == OK );
 pFoundShell-DoClose();
+if ( bWorkbooksHandling )
+{
+OUString sFileUrl;
+OUString sFilePath = sTempDir + sTestFileName;
+osl::FileBase::getFileURLFromSystemPath( sFilePath, sFileUrl );
+if ( !sFileUrl.isEmpty() )
+osl::File::remove( sFileUrl );
+}
 }
 }
 
diff --git a/sc/qa/extras/testdocuments/Workbooks.xls 
b/sc/qa/extras/testdocuments/Workbooks.xls
index a732167..2e8a7e7 100755
Binary files a/sc/qa/extras/testdocuments/Workbooks.xls and 
b/sc/qa/extras/testdocuments/Workbooks.xls differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sd/uiconfig/simpress/ui/photoalbum.ui |  474 --
 vcl/inc/svids.hrc |2 
 vcl/source/src/btntext.src|   10 
 vcl/source/window/builder.cxx |4 
 4 files changed, 247 insertions(+), 243 deletions(-)

New commits:
commit ba489418be7b67fd1e0e6a136ace9667a49a1013
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Sat May 11 11:54:21 2013 +0200

Related fdo#35546: Further improve Layout of Photo Album Dialog

With suggestions from 
http://nabble.documentfoundation.org/Streamlining-the-Photo-Album-Creator-td4054397.html

* Moved Album Layout to the right
* Changed buttons to GTK Stock buttons, added VCL equivalents
* Improved the wording of the Layout options

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

diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui 
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 352d4a2..13760d3 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -58,40 +58,101 @@
   /packing
 /child
 child
-  object class=GtkBox id=box1
+  object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=vexpandTrue/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
 child
-  object class=GtkFrame id=frame1
+  object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=margin_left12/property
+property name=margin_top6/property
 property name=vexpandTrue/property
-property name=label_xalign0/property
-property name=shadow_typenone/property
+property name=orientationvertical/property
 child
-  object class=GtkBox id=box2
+  object class=GtkButtonBox id=buttonbox2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=spacing6/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=file_btn
+property name=label translatable=yesInsert 
Images/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+property name=non_homogeneousTrue/property
+  /packing
+/child
+child
+  object class=GtkButton id=textbox_btn
+property name=label translatable=yesInsert Text 
Slide/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+property name=non_homogeneousTrue/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box4
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left12/property
 property name=margin_top6/property
 property 

[PUSHED] Related fdo#35546: Simplyfy Code in Photo Album Dialog

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie40a4f3bb4402b988071b315617404c802b7e92a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com
Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[PUSHED] Related fdo#35546: Further improve Layout of Photo Album Dia...

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfb24a8678d096bb596bcdeabbf539e9fe1835db
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com
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: sd/source sd/uiconfig

[Samuel Mehrbrodt]

 sd/source/ui/app/strings.src  |5 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx |   24 -
 sd/source/ui/dlg/PhotoAlbumDialog.hxx |3 
 sd/source/ui/inc/strings.hrc  |1 
 sd/uiconfig/simpress/ui/photoalbum.ui |  444 ++
 5 files changed, 196 insertions(+), 281 deletions(-)

New commits:
commit 3c480196dd66df48f8ab637a2ac26ffbca328063
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Sat May 11 20:16:30 2013 +0200

Related fdo#35546: Remove the Text box function from Photo Album Dialog

This has been discussed and approved in the Design Team IRC Chat on 
2013-05-11

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

diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index eb6b959..8b90e5f 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1273,9 +1273,4 @@ String STR_PHOTO_ALBUM_EMPTY_WARNING
  Text [ en-US ] = Please add Images to the Album. ;
 };
 
-String STR_PHOTO_ALBUM_TEXTBOX
-{
-Text [ en-US ] = Text Slide;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 351a9d8..ba11647 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -45,8 +45,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, 
SdDrawDocument* pActDoc)
 get(pCancelBtn, cancel_btn);
 get(pCreateBtn, create_btn);
 
-get(pFileBtn, file_btn);
-get(pTextBtn, textbox_btn);
+get(pAddBtn, add_btn);
 get(pUpBtn, up_btn);
 get(pDownBtn, down_btn);
 get(pRemoveBtn, rem_btn);
@@ -60,8 +59,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, 
SdDrawDocument* pActDoc)
 pCancelBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
 pCreateBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
 
-pFileBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
-pTextBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, TextHdl));
+pAddBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
 pUpBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, UpHdl));
 pUpBtn-Disable();
 pDownBtn-SetClickHdl(LINK(this, SdPhotoAlbumDialog, DownHdl));
@@ -72,7 +70,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, 
SdDrawDocument* pActDoc)
 
 mpGraphicFilter = new GraphicFilter;
 sDirUrl = ;
-pFileBtn-GrabFocus();
+pAddBtn-GrabFocus();
 pImagesLst-Clear();
 }
 
@@ -610,22 +608,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
 return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, TextHdl)
-{
-sal_Int16 nPos;
-sal_Int16 nInsertPos = pImagesLst-GetSelectEntryPos();
-if (nInsertPos  0)
-nPos = pImagesLst-InsertEntry( 
OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)));
-else
-nPos = pImagesLst-InsertEntry( 
OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)), nInsertPos);
-
-OUString sStr(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX));
-pImagesLst-SetEntryData(nPos, (void*)new OUString(sStr));
-
-EnableDisableButtons();
-return 0;
-}
-
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
 {
 if (pImagesLst-GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 3e75128..d49ec34 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -54,8 +54,7 @@ private:
 CancelButton*   pCancelBtn;
 PushButton* pCreateBtn;
 
-PushButton* pFileBtn;
-PushButton* pTextBtn;
+PushButton* pAddBtn;
 PushButton* pUpBtn;
 PushButton* pDownBtn;
 PushButton* pRemoveBtn;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 19816b9..e59dbeb 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -416,7 +416,6 @@
 #define STR_ACC_DIALOG_DESC (RID_APP_START+728)
 
 #define STR_PHOTO_ALBUM_EMPTY_WARNING   (RID_APP_START+729)
-#define STR_PHOTO_ALBUM_TEXTBOX   (RID_APP_START+730)
 
 /**
 * The ids in glob.hrc start at RID_APP_START+750!
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui 
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 13760d3..d1e7a6c 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -58,58 +58,156 @@
   /packing
 /child
 child
-  object class=GtkFrame id=frame1
+  object class=GtkBox id=box4
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=margin_top6/property
 property 

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

[Khaled Hosny]

 vcl/generic/glyphs/gcach_ftyp.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit dd5b15ebd868e21b4c948ccb7978136a91a7992c
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon May 13 16:32:20 2013 +0200

Handle fonts without hhea or OS/2 table e.g. Type1

Change-Id: Ib7245e9f8b7874087966cb1098e63d1f83acaa6a

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index bd1ef26..162ba11 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -945,8 +945,10 @@ void ServerFont::FetchFontMetric( ImplFontMetricData rTo, 
long rFactor ) const
 
 // Calculating ascender and descender:
 // FreeType = 2.4.6 does the right thing, so we just use what it gives us,
-// for earlier versions we emulate its behaviour; take them from 'hhea'
-// table, if zero take them from 'OS/2' table.
+// for earlier versions we emulate its behaviour;
+// take them from 'hhea' table,
+// if zero take them from 'OS/2' table,
+// if zero take them from FreeType's font metrics
 if (nFTVERSION = 2406)
 {
 const FT_Size_Metrics rMetrics = maFaceFT-size-metrics;
@@ -982,6 +984,14 @@ void ServerFont::FetchFontMetric( ImplFontMetricData rTo, 
long rFactor ) const
 }
 }
 }
+
+if (!(rTo.mnAscent || rTo.mnDescent))
+{
+const FT_Size_Metrics rMetrics = maFaceFT-size-metrics;
+rTo.mnAscent = (rMetrics.ascender + 32)  6;
+rTo.mnDescent = (-rMetrics.descender + 32)  6;
+rTo.mnExtLeading = ((rMetrics.height + 32)  6) - (rTo.mnAscent + 
rTo.mnDescent);
+}
 }
 
 if( pOS2  (pOS2-version != 0x) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Convert Calc page header/footer content to Widget UI

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26465f69a7fa50fa58643c00225376a82ba8a7fc
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Olivier Hallot olivier.hal...@edx.srv.br

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

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

[Caolán McNamara]

 sd/source/ui/app/strings.src |5 +
 sd/source/ui/inc/strings.hrc |1 +
 2 files changed, 6 insertions(+)

New commits:
commit 3986bd60487e1a6cf36b98a76f2eebd5afa397ae
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 13 15:50:10 2013 +0100

restore STR_PHOTO_ALBUM_TEXTBOX to fix build

Change-Id: I7b8924406735d687cf16123880942530a8b42c7a

diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 8b90e5f..eb6b959 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1273,4 +1273,9 @@ String STR_PHOTO_ALBUM_EMPTY_WARNING
  Text [ en-US ] = Please add Images to the Album. ;
 };
 
+String STR_PHOTO_ALBUM_TEXTBOX
+{
+Text [ en-US ] = Text Slide;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index e59dbeb..19816b9 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -416,6 +416,7 @@
 #define STR_ACC_DIALOG_DESC (RID_APP_START+728)
 
 #define STR_PHOTO_ALBUM_EMPTY_WARNING   (RID_APP_START+729)
+#define STR_PHOTO_ALBUM_TEXTBOX   (RID_APP_START+730)
 
 /**
 * The ids in glob.hrc start at RID_APP_START+750!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits