Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On 09/11/2013 04:53 PM, James Michael DuPont wrote: I have that, so I guess this is separate doxygen invocation. I will look into it. Do you happen to know where it is configured/invoked from? I would like to add in some additional doxygen flags and regenerate. The doxygen input files are odk/docs/cpp/Doxyfile and odk/docs/idl/Doxyfile, resp. Some % markers in there get replaced with actual values via sed in odk/CustomTarget_doxygen.mk. make odk.clean make odk triggers rebuilding the doxygen documentation. The HTML output can afterwards be found under workdir/*/CustomTarget/odk/docs/. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 14 --
1 file changed, 14 deletions(-)
New commits:
commit b8ddbddfd7ac7365196f0d2f875dbcc3e26dbff5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Sep 12 09:31:14 2013 +0200
RtfAttributeOutput::StartTableRow: clean this up
This was never enabled by default, nobody requested it, adds complexity,
so just don't do it at all.
Change-Id: Ieafb9777045e9cde3cdd2272c5190f88eb5eb576
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5151261..f318699 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -905,19 +905,6 @@ void RtfAttributeOutput::StartTableRow(
ww8::WW8TableNodeInfoInner::Pointer_t pT
TableDefinition(pTableTextNodeInfoInner);
-SvtMiscOptions aMiscOptions;
-if (aMiscOptions.IsExperimentalMode())
-{
-m_aTables.push_back(m_aRowDefs.toString());
-// Emit row properties at the start of the row as well for non-nested
-// tables, to support old readers.
-if ( nCurrentDepth = 1 )
-m_rExport.Strm() m_aRowDefs.makeStringAndClear().getStr();
-m_aRowDefs.setLength(0);
-return;
-}
-else
-{
if (!m_bLastTable)
m_aTables.push_back(m_aRowDefs.makeStringAndClear());
@@ -928,7 +915,6 @@ void RtfAttributeOutput::StartTableRow(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// necessary for subtables.
m_rExport.Strm() m_aAfterRuns.makeStringAndClear().getStr();
m_rExport.Strm() m_aRowDefs.makeStringAndClear().getStr();
-}
}
void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t
/*pTableTextNodeInfoInner*/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk
openssl/ExternalProject_openssl.mk | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) New commits: commit 9f8736411d454bfd711ef964288c50aae9f9e375 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 12 09:34:48 2013 +0200 Only build in ExternalProject_openssl what's needed in ExternalPackage_openssl ...i.e., for non-MSC always use non-shared (this also prevents a build error when using -fvisibility-hidden on Mac OS X and linking fips_premain_dso misses symbols) and just build lib_crypto lib_ssl. Also cleaned up the rest of the configure command line while trying not to change any of its meaning (and I have no idea about WNT-GCC lacking no-idea, likely just lots of cargo cult there awaiting further clean-up). Change-Id: I34ec43975cda7af800eeba5d4f6a0beaeca6f6bc diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index e50dee9..8df16bc 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -73,19 +73,18 @@ $(call gb_ExternalProject_get_state_target,openssl,build): else $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - unset MAKEFLAGS \ -$(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ - $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \ - $(OPENSSL_PLATFORM) \ - no-dso \ - $(if $(filter ANDROID,$(OS)),\ - shared no-idea,\ - $(if $(filter IOS,$(OS)),no-shared no-idea,\ - $(if $(filter WNT,$(OS)),shared,\ - shared no-idea \ - $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib \ + unset MAKEFLAGS \ + $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)), \ + ./Configure, \ + $(if $(filter WNT,$(OS)), \ + $(PERL) Configure, \ + ./config)) \ + $(OPENSSL_PLATFORM) no-dso no-shared \ + $(if $(filter-out WNT,$(OS)),no-idea) \ + $(if $(filter-out ANDROID IOS WNT,$(OS)), \ + $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ -$(MAKE) build_libs \ +$(MAKE) build_crypto build_ssl \ CC=$(CC) $(if $(filter-out WNT,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-15'
Tag 'suse-4.0-15' created by Andras Timar andras.ti...@collabora.com at 2013-09-11 20:58 -0700 suse-4.0-15 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-15'
Tag 'suse-4.0-15' created by Andras Timar andras.ti...@collabora.com at 2013-09-11 20:58 -0700 suse-4.0-15 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-15'
Tag 'suse-4.0-15' created by Andras Timar andras.ti...@collabora.com at 2013-09-11 20:58 -0700 suse-4.0-15 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-15'
Tag 'suse-4.0-15' created by Andras Timar andras.ti...@collabora.com at 2013-09-11 20:58 -0700 suse-4.0-15 Changes since suse-4.0-14-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk
openssl/ExternalProject_openssl.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18251a64d58e0a925c66c67ce9d0b1b83a442a19 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 12 10:14:35 2013 +0200 Looks like build_engines (incl. in build_libs) is needed afer all ...otherwise, building postgresql fails with missing _ENGINE_load_4758cca referenced from _ENGINE_load_builtin_engines in libcrypto.a(eng_all.o) etc. Change-Id: Ie3414164ee4f11a94cd59ec5ea072a40e99706fb diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 8df16bc..b825622 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -84,7 +84,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(filter-out ANDROID IOS WNT,$(OS)), \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ -$(MAKE) build_crypto build_ssl \ +$(MAKE) build_libs \ CC=$(CC) $(if $(filter-out WNT,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk
openssl/ExternalProject_openssl.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96e1446f3235cb06c8b9e0ac5bce09b37fbe36bd Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 12 10:17:24 2013 +0200 Unfortunately, openssl's no-shared apparently also implies no -fPIC ...so building dynamic libraries down the road that link in the openssl archives fails. Band-aid fix that by always passing in -fPIC (alternatives would be to patch the openssl Makefiles to only build archives and no dynamic libraries even under shared or to find another fix for the original Mac OS X hiden visibility program that triggered 9f8736411d454bfd711ef964288c50aae9f9e375 Only build in ExternalProject_openssl what's needed in ExternalPackage_openssl). Change-Id: I6b92ab55b0bbd340aacf325823b1f297e95f9197 diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index b825622..e41adb8 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -85,7 +85,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(MAKE) build_libs \ - CC=$(CC) $(if $(filter-out WNT,$(OS)),\ + CC=$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden)) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk ios/CustomTarget_LibreOffice_app.mk
instsetoo_native/CustomTarget_setup.mk |2 +- ios/CustomTarget_LibreOffice_app.mk|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5fd86fb2a3b91a4ab2c6610051db13a21119540a Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Sep 12 10:24:44 2013 +0200 make this work also if BUILDDIR != SRCDIR Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49 diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index a4c8893..8556ff5 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -130,7 +130,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ echo '[Version]' \ echo 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \ echo 'BuildVersion=$(BUILD_VER_STRING)' \ -echo 'buildid=$(shell git log -1 --format=%H)' \ +echo 'buildid=$(shell cd $(SRCDIR) git log -1 --format=%H)' \ echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \ echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index bd4dacb..fbc385d 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -44,7 +44,7 @@ ifeq ($(EXECUTABLE_NAME),LibreOffice) $(call gb_CustomTarget_get_target,ios/LibreOffice_app) : $(SCRIPT_OUTPUT_FILE_0) appdir=$(dir $(SCRIPT_OUTPUT_FILE_0)) -buildid=$(shell git log -1 --format=%H) +buildid=$(shell cd $(SRCDIR) git log -1 --format=%H) $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/mingw.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8a47e4a205594cd7aee8cc6bdd10b08c707c221a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Sep 12 10:30:08 2013 +0200 Unbreak mingw build of udkapi Change-Id: I8b88aec19d5aa95761f58b26b4290b7a468dcb8f diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index f2d5f84..5841ed8 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -17,6 +17,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +gb_INSTROOT := $(INSTDIR) +gb_DEVINSTALLROOT := $(gb_INSTROOT) + gb_RC := $(WINDRES) gb_COMPILERDEFS += \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Calc conditional formatting icon set: color smilies
Dear Markus, dear all, in reference to bug/enhancement 60107 https://bugs.freedesktop.org/show_bug.cgi?id=60107 and Markus' comment 17 https://bugs.freedesktop.org/show_bug.cgi?id=60107, I am sending the icon set 'color smilies' for Calc's conditional formatting feature to the dev list. The icon set can be found here: https://wiki.documentfoundation.org/images/2/21/Icon-set-color-smilies.svg The icons are based on Zorro's work at OpenClipart: http://openclipart.org/detail/100759/smiley-by-zorro. They are licensed as public domain: http://openclipart.org/share. I made several modifications to Zorro's work (selection of three smilies, bolder/wider smiles and in different colors). My modifications are also public domain/CC0. Regards, Gerry. ** https://bugs.freedesktop.org/show_bug.cgi?id=60107 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bugous bug fix
Hi Tomofumi and Cedric, I found that the next commit is bugous: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c2902ecbf135fae070ea032fa10a59bb76ec1b0 I have problem mostly with using the ApplyLineDashing method with scale parameter (borderlineprimitive2d.cxx). I know two reasons why this is wrong: - The value of aScale.getLength() increase when text zoom is decrease, while it should decrease too. So when the text (or content of the border) is the smallest the dashed border's snippets are the biggest, which is a bit weird. - The whole borderline primitive is transformed before drawing, so no need to change the size of snippets separately, because this happens during the mentioned transformation. Additionally this change causes the borderline changing all the time while zooming and not just the size, but the snippets are also moving, which is a bit disturbing. There is a small part of the patch, which make to draw hairline primitive, when the line is solid (before only the width was checked). Maybe this part fixed the original bug, because as I see the hairline primitive means a solid line. Best regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On 09/11/2013 07:28 PM, Lionel Elie Mamane wrote: On Wed, Sep 11, 2013 at 05:54:58PM +0200, bjoern wrote: On Wed, Sep 11, 2013 at 05:04:01PM +0200, Michael Stahl wrote: On 09/09/13 10:38, Lionel Elie Mamane wrote: Actually, it could make sense to document the API available in each version, that is, have something like: http://api.libreoffice.org/docs/3.3/idl/ http://api.libreoffice.org/docs/3.6/idl/ http://api.libreoffice.org/docs/4.0/idl/ http://api.libreoffice.org/docs/4.1/idl/ http://api.libreoffice.org/docs/4.2/idl/ http://api.libreoffice.org/docs/current/idl/ Well, properly packaged versions come with their own api-docs, so IMHO no need to keep docs for unsupported releases around. Packaged docs are much less practical for the user. I always love it how http://gcc.gnu.org/onlinedocs/ (linked as Documentation: Manual from the GCC homepage http://gcc.gnu.org/) unambiguously makes available the documentation for each released GCC major.minor version. Could serve as a model for us. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - xmloff/source
xmloff/source/transform/OOo2Oasis.cxx | 20 +++---
xmloff/source/transform/StyleOASISTContext.cxx| 30 +++---
xmloff/source/transform/StyleOASISTContext.hxx|2 -
xmloff/source/transform/StyleOOoTContext.cxx | 12
xmloff/source/xforms/SchemaContext.cxx|4 +-
xmloff/source/xforms/SchemaRestrictionContext.cxx |4 +-
xmloff/source/xforms/SchemaSimpleTypeContext.cxx |4 +-
xmloff/source/xforms/XFormsBindContext.cxx|2 -
xmloff/source/xforms/XFormsInstanceContext.cxx|2 -
xmloff/source/xforms/XFormsModelContext.cxx |4 +-
xmloff/source/xforms/XFormsSubmissionContext.cxx |2 -
xmloff/source/xforms/xformsapi.cxx|2 -
12 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit 3bba060388fde3272c93f96050a56f62d364256c
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Sep 12 17:57:44 2013 +0900
sal_Bool to bool
Change-Id: I826911bdf06b8047ca8e3bd256687e10fb51962d
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index 45f9323..20dcd99 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1134,8 +1134,8 @@ void XMLDocumentTransformerContext_Impl::StartElement(
m_aOldClass = GetTransformer().GetClass();
XMLMutableAttributeList *pMutableAttrList = 0;
-sal_Bool bOOo = sal_False, bOOoW = sal_False, bOOoC = sal_False,
- bDOM=sal_False, bDC = sal_False, bSVG = sal_False;
+bool bOOo = false, bOOoW = false, bOOoC = false,
+bDOM=false, bDC = false, bSVG = false;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList-getLength() : 0;
for( sal_Int16 i=0; i nAttrCount; i++ )
{
@@ -1163,17 +1163,17 @@ void XMLDocumentTransformerContext_Impl::StartElement(
{
const OUString rAttrValue = xAttrList-getValueByIndex( i );
if( IsXMLToken( rAttrValue, XML_N_OOO ) )
-bOOo = sal_True;
+bOOo = true;
else if( IsXMLToken( rAttrValue, XML_N_OOOW ) )
-bOOoW = sal_True;
+bOOoW = true;
else if( IsXMLToken( rAttrValue, XML_N_OOOC ) )
-bOOoC = sal_True;
+bOOoC = true;
else if( IsXMLToken( rAttrValue, XML_N_DOM ) )
-bDOM = sal_True;
+bDOM = true;
else if( IsXMLToken( rAttrValue, XML_N_DC ) )
-bDC = sal_True;
+bDC = true;
else if( IsXMLToken( rAttrValue, XML_N_SVG ) )
-bSVG = sal_True;
+bSVG = true;
}
}
if( !(bOOo bOOoW bOOoC bDOM bDC bSVG) )
@@ -1509,7 +1509,7 @@ void XMLTableOOoTransformerContext_Impl::StartElement(
GetTransformer().ProcessAttrList( xAttrList, OOO_STYLE_REF_ACTIONS,
sal_False );
if( rAttrList-getLength() IsXMLToken( GetTransformer().GetClass(),
XML_SPREADSHEET ) )
{
-sal_Bool bPrintRanges(sal_False);
+bool bPrintRanges(false);
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList-getLength() : 0;
for( sal_Int16 i=0; i nAttrCount; i++ )
@@ -1522,7 +1522,7 @@ void XMLTableOOoTransformerContext_Impl::StartElement(
if( XML_NAMESPACE_TABLE == nPrefix
IsXMLToken( aLocalName, XML_PRINT_RANGES ) )
{
-bPrintRanges = sal_True;
+bPrintRanges = true;
}
}
if (!bPrintRanges pMutableAttrList)
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx
b/xmloff/source/transform/StyleOASISTContext.cxx
index 9099d0b..f5ef3fe 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -65,7 +65,7 @@ class XMLPropertiesTContext_Impl : public
XMLPersElemContentTContext
::com::sun::star::xml::sax::XAttributeList m_xAttrList;
XMLPropType m_ePropType;
-sal_Boolm_bControlStyle;
+boolm_bControlStyle;
OUString m_aStyleFamily;
public:
@@ -83,7 +83,7 @@ public:
const OUString rQName,
XMLPropType eP,
const OUString rStyleFamily,
- sal_Bool _bControlStyle = sal_False );
+ bool _bControlStyle = false );
virtual ~XMLPropertiesTContext_Impl();
@@ -94,9 +94,9 @@ public:
static XMLPropType GetPropType( const OUString rLocalName );
static OUString MergeUnderline( XMLTokenEnum eUnderline,
- sal_Bool bBold, sal_Bool bDouble );
+ bool bBold, bool bDouble );
static OUString MergeLineThrough( XMLTokenEnum eLineThrough,
-sal_Bool bBold, sal_Bool bDouble,
+bool bBold, bool
Re: Gerrit migration
Hi, bjoern wrote on 2013-09-12 02:11: Yep, somehow mails dont exit that machine right now. Ill investigate with floeff tommorrow. it seems we've hit a bug in the current Salt modules, failing to edit two lines in amavisd's mail filter config. I fixed that manually now, mails should be working, and already created mails should be delivered now. Sorry for the noise :-) Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/merge.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e457724d5ef1aaac98b6ff84ce1b054adda72abe
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date: Thu Sep 12 11:04:21 2013 +0200
fdo#69208 take getenv() call out of the loop
Change-Id: Iade7917eb9ade7248392e04f4653bda3674464aa
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 63b212c..6752c7f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -280,6 +280,8 @@ MergeDataFile::MergeDataFile(
const OString rFileName, const OString rFile,
bool bCaseSensitive, bool bWithQtz )
{
+OString sEnableReleaseBuild(getenv(ENABLE_RELEASE_BUILD));
+
std::ifstream aInputStream( rFileName.getStr() );
if ( !aInputStream.is_open() )
{
@@ -371,7 +373,7 @@ MergeDataFile::MergeDataFile(
bFirstLang, bCaseSensitive );
if( bFirstLang bWithQtz
-( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE) ) )
+!sEnableReleaseBuild.equals(TRUE) )
{
aLanguageSet.insert(qtz);
InsertEntry(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: XRowLocate::findColumn API definition ambiguities
On Wed, 2013-09-11 at 11:20 +0200, Lionel Elie Mamane wrote: On Tue, Sep 10, 2013 at 09:56:50PM +0100, Andrzej Hunt wrote: The definition of XRowLocate::findColumn, and its implementations, all seem to be slightly confused. XRowLocate doesn't specify what should happen what happens if findColumn is called for an invalid column name. You mean XColumnLocate, not XRowLocate. Ooops ;) In the case of JDBC drivers: the JDBC specification states that an SQLException should be thrown in this case. (...) Is it OK if I rewrite the specification of findColumn to mirror that of the JDBC specification, Yes. SDB(C)(X) is (from my understanding) a C++-ized copy of (an older version of) JDBC anyway, so just align. perhaps with a note that some drivers may still return invalid values instead? Something like: Version of the specification before LibreOffice 4.2 left unspecified what happened when passed an invalid column name. As a result, some drivers written against older specification may return a special invalid numeric value, such as a negative value, zero or a number greater than the number of columns. (Of course I'd also upgrade all the drivers to reflect the new specification Done! Great, thanks. If you could also review what callers of findColumn within LibreOffice do, that would be even greater. Most of the callers reuse the value in other methods (mostly getXXX(...)) which will themselves have to throw an SQLException (column index out of range or similar) -- so essentially all that's happening is that the exception is now being thrown earlier. In one case the value is used to directly access members of an array (in connectivity/source/drivers/file/FStatement.cxx) so throwing an Exception will make that safer (especially since file/FResultSet returned number_of_columns+1 for findColumn). -- so this note would only apply to any external drivers -- are there any?) I don't know of any truly external; in some way, the MySQL one counts as external since people take binaries and try to use them with multiple OpenOffice.org, Apache OpenOffice and LibreOffice versions. Good to know. In any case the code in LO which deals with external drivers should be able to handle invalid values and/or exceptions so this doesn't seem worth worrying about. One thing I've not yet done is update ucbhelper/source/provider/propertyvalueset.cxx -- ucbhelper isn't linked against connectivity at the moment so can't make use of the same dbexception helper stuff -- I could make it throw the SQL Exception directly as in mysqlc, or link it against connectivity? No idea which is preferred. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/swruler.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit b73dec8a06ef762098e642b2c37e4baad780b11a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Sep 12 10:56:37 2013 +0100
Resolves: rhbz#1006850 crash in SwCommentRuler::GetCommentControlRegion
Change-Id: Ic846da3b22391d724da6f8df94dd771e89d2efb4
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index a41fc0b..76fb8be 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -247,6 +247,13 @@ void SwCommentRuler::UpdateCommentHelpText()
Rectangle SwCommentRuler::GetCommentControlRegion()
{
SwPostItMgr *pPostItMgr = mpViewShell-GetPostItMgr();
+
+//rhbz#1006850 When the SwPostItMgr ctor is called from SwView::SwView it
+//triggers an update of the uiview, but the result of the ctor hasn't been
+//set into the mpViewShell yet, so GetPostItMgr is temporarily still NULL
+if (!pPostItMgr)
+return Rectangle();
+
//FIXME When the page width is larger then screen, the ruler is misplaced
by one pixel
long nLeft = GetWinOffset() + GetPageOffset() +
mpSwWin-LogicToPixel(Size(GetPageWidth(), 0)).Width();
long nTop= 0 + 4; // Ruler::ImplDraw uses RULER_OFF (value: 3px) as
offset, and Ruler::ImplFormat adds one extra pixel
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News 2013-09-12
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#64491: Added functionality to export SmartArt diagrams in https://gerrit.libreoffice.org/5896 from Andres Gomez + Update mysqlc's ColumnLocate::findColumn to throw for invalid column. in https://gerrit.libreoffice.org/5923 from Andrzej J.R. Hunt + Update implementations of ColumnLocate::findColumn to throw on invalid co in https://gerrit.libreoffice.org/5922 from Andrzej J.R. Hunt + Update XColumnLocate to specify SQLException for invalid column. in https://gerrit.libreoffice.org/5921 from Andrzej J.R. Hunt + fdo#39881 change Find All behaviour in Calc in https://gerrit.libreoffice.org/5886 from Matúš Kukan + Automatic conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5898 from Lionel Elie Mamane + Convert connector tab page to widget UI in https://gerrit.libreoffice.org/5920 from Olivier Hallot + list types added to Expert Config page in https://gerrit.libreoffice.org/5917 from Efe Gürkan Yalaman + Using macro expansion function for the remaining config entries. in https://gerrit.libreoffice.org/5910 from Vishv Brahmbhatt + startcenter: Hide template toggle button if no templates in https://gerrit.libreoffice.org/5913 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Introduce ASCII case conversion and use more/rtl/character.hxx. in https://gerrit.libreoffice.org/5859 from Arnaud Versini + iOS experimental app support for selection marking via long press gesture in https://gerrit.libreoffice.org/5911 from Ptyl + String to OUString in https://gerrit.libreoffice.org/5895 from Thomas Arnhold * Merged changes on master for project core changed in the last 25 hours: + installer: search files in INSTDIR in https://gerrit.libreoffice.org/5918 from Michael Stahl + Easier conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5897 from Lionel Elie Mamane + add colored smilies to the icon sets, fdo#60107 in https://gerrit.libreoffice.org/5914 from Markus Mohrhard + fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5905 from Jelle van der Waa + sal: fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5906 from Jelle van der Waa + Related: fdo#38838 Remove String::SearchChar() in https://gerrit.libreoffice.org/5894 from Thomas Arnhold + String cleanup in https://gerrit.libreoffice.org/5907 from Ricardo Montania * Abandoned changes on master for project core changed in the last 25 hours: + test, wip, etc in https://gerrit.libreoffice.org/5915 from Thorsten Behrens + Switch sw style names to non-localized ones internally in https://gerrit.libreoffice.org/5747 from Bosdonnat Cedric + fdo#96111: Set edit window border to 4 again. in https://gerrit.libreoffice.org/5909 from Thomas Arnhold * Open changes needing tweaks, but being untouched for more than a week: + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
On Mon, Sep 9, 2013 at 10:18 PM, Michael Stahl mst...@redhat.com wrote: hello, good people, i've just pushed Matúš' feature/instdir branch to master, which makes the instdir an actually runnable office installation. dev-install is no longer executed as part of a make check, instead the subsequent tests run against the instdir. this has been tested on Windows and Linux but _not_ on Mac where it will I do not have instdir under Windows at all, and Tinderboxes also fail because of this (at odk/CustomTarget_check.mk). Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News 2013-09-12
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#64491: Added functionality to export SmartArt diagrams in https://gerrit.libreoffice.org/5896 from Andres Gomez + Update mysqlc's ColumnLocate::findColumn to throw for invalid column. in https://gerrit.libreoffice.org/5923 from Andrzej J.R. Hunt + Update implementations of ColumnLocate::findColumn to throw on invalid co in https://gerrit.libreoffice.org/5922 from Andrzej J.R. Hunt + Update XColumnLocate to specify SQLException for invalid column. in https://gerrit.libreoffice.org/5921 from Andrzej J.R. Hunt + fdo#39881 change Find All behaviour in Calc in https://gerrit.libreoffice.org/5886 from Matúš Kukan + Automatic conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5898 from Lionel Elie Mamane + Convert connector tab page to widget UI in https://gerrit.libreoffice.org/5920 from Olivier Hallot + list types added to Expert Config page in https://gerrit.libreoffice.org/5917 from Efe Gürkan Yalaman + Using macro expansion function for the remaining config entries. in https://gerrit.libreoffice.org/5910 from Vishv Brahmbhatt + startcenter: Hide template toggle button if no templates in https://gerrit.libreoffice.org/5913 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Introduce ASCII case conversion and use more/rtl/character.hxx. in https://gerrit.libreoffice.org/5859 from Arnaud Versini + iOS experimental app support for selection marking via long press gesture in https://gerrit.libreoffice.org/5911 from Ptyl * Merged changes on master for project core changed in the last 25 hours: + installer: search files in INSTDIR in https://gerrit.libreoffice.org/5918 from Michael Stahl + Easier conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5897 from Lionel Elie Mamane + add colored smilies to the icon sets, fdo#60107 in https://gerrit.libreoffice.org/5914 from Markus Mohrhard + fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5905 from Jelle van der Waa + sal: fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5906 from Jelle van der Waa + Related: fdo#38838 Remove String::SearchChar() in https://gerrit.libreoffice.org/5894 from Thomas Arnhold + String cleanup in https://gerrit.libreoffice.org/5907 from Ricardo Montania * Abandoned changes on master for project core changed in the last 25 hours: + test, wip, etc in https://gerrit.libreoffice.org/5915 from Thorsten Behrens + Switch sw style names to non-localized ones internally in https://gerrit.libreoffice.org/5747 from Bosdonnat Cedric + fdo#96111: Set edit window border to 4 again. in https://gerrit.libreoffice.org/5909 from Thomas Arnhold * Open changes needing tweaks, but being untouched for more than a week: + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[BUG] or [EVOL] about arrow enlargement in libreoffice draw ?
Hello, Can you look to the attached file? And tell me if the fact that we can't reduce the black lines the same as the yellow frame in libreoffice Draw, is a bug? Thank You very much, Matthieu GAY This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. cdr_1.cdr Description: cdr_1.cdr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News 2013-09-12
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#64491: Added functionality to export SmartArt diagrams in https://gerrit.libreoffice.org/5896 from Andres Gomez + Update mysqlc's ColumnLocate::findColumn to throw for invalid column. in https://gerrit.libreoffice.org/5923 from Andrzej J.R. Hunt + Update implementations of ColumnLocate::findColumn to throw on invalid co in https://gerrit.libreoffice.org/5922 from Andrzej J.R. Hunt + Update XColumnLocate to specify SQLException for invalid column. in https://gerrit.libreoffice.org/5921 from Andrzej J.R. Hunt + fdo#39881 change Find All behaviour in Calc in https://gerrit.libreoffice.org/5886 from Matúš Kukan + Automatic conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5898 from Lionel Elie Mamane + Convert connector tab page to widget UI in https://gerrit.libreoffice.org/5920 from Olivier Hallot + list types added to Expert Config page in https://gerrit.libreoffice.org/5917 from Efe Gürkan Yalaman + Using macro expansion function for the remaining config entries. in https://gerrit.libreoffice.org/5910 from Vishv Brahmbhatt + startcenter: Hide template toggle button if no templates in https://gerrit.libreoffice.org/5913 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Introduce ASCII case conversion and use more/rtl/character.hxx. in https://gerrit.libreoffice.org/5859 from Arnaud Versini + iOS experimental app support for selection marking via long press gesture in https://gerrit.libreoffice.org/5911 from Ptyl * Merged changes on master for project core changed in the last 25 hours: + installer: search files in INSTDIR in https://gerrit.libreoffice.org/5918 from Michael Stahl + Easier conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5897 from Lionel Elie Mamane + add colored smilies to the icon sets, fdo#60107 in https://gerrit.libreoffice.org/5914 from Markus Mohrhard + fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5905 from Jelle van der Waa + sal: fdo#39625 Make existing cppunittests work in https://gerrit.libreoffice.org/5906 from Jelle van der Waa + Related: fdo#38838 Remove String::SearchChar() in https://gerrit.libreoffice.org/5894 from Thomas Arnhold + String cleanup in https://gerrit.libreoffice.org/5907 from Ricardo Montania * Abandoned changes on master for project core changed in the last 25 hours: + test, wip, etc in https://gerrit.libreoffice.org/5915 from Thorsten Behrens + Switch sw style names to non-localized ones internally in https://gerrit.libreoffice.org/5747 from Bosdonnat Cedric + fdo#96111: Set edit window border to 4 again. in https://gerrit.libreoffice.org/5909 from Thomas Arnhold * Open changes needing tweaks, but being untouched for more than a week: + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: gerritbot/crontab.txt
gerritbot/crontab.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 144e2af389c58103d54f6b13eb128655c3102423 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Sep 12 12:24:56 2013 +0200 disable getmail for now, we are not using it currently Change-Id: I13ed0b1db4aa8e40b5b66d995b61a0ac49e2699a diff --git a/gerritbot/crontab.txt b/gerritbot/crontab.txt index 31c4d64..e269ba1 100644 --- a/gerritbot/crontab.txt +++ b/gerritbot/crontab.txt @@ -20,6 +20,6 @@ # For more information see the manual pages of crontab(5) and cron(8) # # m h dom mon dow command -*/5 * * * * getmail -q +#*/5 * * * * getmail -q #*/15 * * * * /home/gerritbot/dev-tools/gerritbot/syncgerrit 0 6 * * * /home/gerritbot/dev-tools/gerritbot/send-daily-digest -g logerrit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
new import crash testing run
Hey guys, so after my vacation I finally had some time to start a new import crash testing run. Attached you'll find the result minus the results for XLS and XLSX as these are too long. We are already looking into these issues. If you find some time it would be awesome if you could fix one of the issues. Regards, Markus Crash:/devel/files/doc/abi10075-3728.doc through disposed Crash:/devel/files/doc/fdo51430-63474.doc through disposed Crash:/devel/files/doc/fdo55196-67499.doc through disposed Crash:/devel/files/doc/fdo64893-79691.doc through disposed Crash:/devel/files/doc/kde239325-45142.doc through disposed Crash:/devel/files/doc/kde239597-46568.doc through disposed Crash:/devel/files/doc/novell618770-372933.doc through disposed Crash:/devel/files/doc/ooo100437-61086.doc through disposed Crash:/devel/files/doc/ooo121369-79923.doc through disposed Crash:/devel/files/doc/ooo32881-29402.doc through disposed Crash:/devel/files/doc/ooo34698-17965.doc through disposed Crash:/devel/files/doc/ooo34927-18100.doc through disposed Crash:/devel/files/doc/ooo39362-20700.doc through disposed Crash:/devel/files/doc/ooo42599-22500.doc through disposed Crash:/devel/files/doc/ooo60396-33129.doc through disposed Crash:/devel/files/doc/ooo62980-34711.doc through disposed Crash:/devel/files/doc/ooo64280-35861.doc through disposed Crash:/devel/files/doc/ooo67620-37925.doc through disposed Crash:/devel/files/doc/ooo72498-41365.doc through disposed Crash:/devel/files/doc/ooo76410-44508.doc through disposed Crash:/devel/files/doc/ooo87159-52175.doc through disposed Crash:/devel/files/doc/rhbz234817-151412.doc through disposed Crash:/devel/files/docx/fdo38054-47695.docx through disposed Crash:/devel/files/docx/fdo46547-57566.docx through disposed Crash:/devel/files/docx/fdo66496-81862.docx through disposed Crash:/devel/files/docx/novell478982-274899.docx through disposed Crash:/devel/files/docx/novell592911-351889.docx through disposed Crash:/devel/files/docx/novell647980-395935.docx through disposed Crash:/devel/files/docx/novell823049-542493.docx through disposed Crash:/devel/files/docx/ooo120595-80916.docx through disposed Crash:/devel/files/fodt/fdo45349-65650.fodt through disposed Crash:/devel/files/ods/fdo43338-55486.ods through disposed Crash:/devel/files/ods/fdo49903-61610.ods through disposed Crash:/devel/files/ods/fdo66241-81950.ods through disposed Crash:/devel/files/ods/fdo68615-84777.ods through disposed Crash:/devel/files/ods/ooo122801-81121.ods through disposed Crash:/devel/files/ods/ooo122889-81200.ods through disposed Crash:/devel/files/ods/ooo122889-81434.ods through disposed Crash:/devel/files/ods/ooo123056-81351.ods through disposed Crash:/devel/files/ods/ooo123061-81352.ods through disposed Crash:/devel/files/odt/fdo51921-64035.odt through disposed Crash:/devel/files/odt/ooo55043-29876.odt through disposed Crash:/devel/files/odt/rhbz908615-694367.odt through disposed Crash:/devel/files/ppt/ooo73933-42503.ppt through disposed Crash:/devel/files/ppt/ooo79264-46539.ppt through disposed Crash:/devel/files/ppt/ooo81454-48121.ppt through disposed Crash:/devel/files/pptx/novell653343-44.pptx through disposed Crash:/devel/files/pptx/ooo118640-77046.pptx through disposed Crash:/devel/files/pptx/rhbz988104-777893.pptx through disposed Crash:/devel/files/rtf/fdo49666-63853.rtf through disposed Crash:/devel/files/rtf/ooo70537-39983.rtf through disposed Crash:/devel/files/rtf/ooo70741-39988.rtf through disposed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/numitem.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3bd07839d6b114b5cea0ca22fd66af8ca8fd6d4e
Author: Tor Lillqvist t...@collabora.com
Date: Thu Sep 12 13:41:01 2013 +0300
WaE: C4701: potentially uninitialized local variable 'pGraphic' used
Change-Id: If726ed1d8b7db0c4bbf27fc9456e5eedd9e28924
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 3dd4e04..c72a2fe 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -910,7 +910,7 @@ sal_Bool SvxNumRule::UnLinkGraphics()
{
SvxNumberFormat aFmt(GetLevel(i));
const SvxBrushItem* pBrush = aFmt.GetBrush();
-const Graphic* pGraphic;
+const Graphic* pGraphic = NULL;
if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
{
if(pBrush
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/GeneratedPackage.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 901afe3a5934229725a27f3c33b13d32c163c22a Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Sep 12 12:34:57 2013 +0200 use ';' instead of ':' to separate two parts of a string ':' is used in a path to files on Windows Change-Id: I3ca283a575bb753cbcd4dfd350947710efad3a62 diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 704a508..e3c54a9 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -19,8 +19,8 @@ # If you know the filenames in advance, use Package. Laziness is not an # excuse. -gb_GeneratedPackage__get_srcdir = $(lastword $(subst :, ,$(1))) -gb_GeneratedPackage__get_destdir = $(firstword $(subst :, ,$(1))) +gb_GeneratedPackage__get_srcdir = $(lastword $(subst ;, ,$(1))) +gb_GeneratedPackage__get_destdir = $(firstword $(subst ;, ,$(1))) define gb_GeneratedPackage__command_cp mkdir -p $(dir $(2)) \ @@ -111,7 +111,7 @@ endef # # gb_GeneratedPackage_add_dir package destdir srcdir define gb_GeneratedPackage_add_dir -$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2)):$(strip $(3)) +$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2));$(strip $(3)) $(call gb_GeneratedPackage_get_clean_target,$(1)) : PACKAGE_DIRS += $(2) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/typemanager.cxx |6 +++---
cppuhelper/source/typemanager.hxx |7 ---
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 905e862c80d1496485cd744bd63f27103d979fa1
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 12 13:15:08 2013 +0200
Pass by const ref
Change-Id: Iacbb07d6478901be77feb253f526614800564c0f
diff --git a/cppuhelper/source/typemanager.cxx
b/cppuhelper/source/typemanager.cxx
index 05d39cc..724b171 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -2245,7 +2245,7 @@ css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
}
css::uno::Any cppuhelper::TypeManager::getNamed(
-rtl::OUString const name, rtl::Reference unoidl::Entity entity)
+rtl::OUString const name, rtl::Reference unoidl::Entity const
entity)
{
assert(entity.is());
switch (entity-getSort()) {
@@ -2337,7 +2337,7 @@ css::uno::Any cppuhelper::TypeManager::getNamed(
}
css::uno::Any cppuhelper::TypeManager::getEnumMember(
-rtl::Reference unoidl::EnumTypeEntity entity,
+rtl::Reference unoidl::EnumTypeEntity const entity,
rtl::OUString const member)
{
for (std::vector unoidl::EnumTypeEntity::Member ::const_iterator i(
@@ -2353,7 +2353,7 @@ css::uno::Any cppuhelper::TypeManager::getEnumMember(
css::uno::Any cppuhelper::TypeManager::getConstant(
rtl::OUString const constantGroupName,
-rtl::Reference unoidl::ConstantGroupEntity entity,
+rtl::Reference unoidl::ConstantGroupEntity const entity,
rtl::OUString const member)
{
for (std::vector unoidl::ConstantGroupEntity::Member ::const_iterator i(
diff --git a/cppuhelper/source/typemanager.hxx
b/cppuhelper/source/typemanager.hxx
index a1a2108..3cd6a75 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -131,15 +131,16 @@ private:
rtl::OUString const name, sal_Int32 separator);
css::uno::Any getNamed(
-rtl::OUString const name, rtl::Reference unoidl::Entity entity);
+rtl::OUString const name,
+rtl::Reference unoidl::Entity const entity);
css::uno::Any getEnumMember(
-rtl::Reference unoidl::EnumTypeEntity entity,
+rtl::Reference unoidl::EnumTypeEntity const entity,
rtl::OUString const member);
css::uno::Any getConstant(
rtl::OUString const constantGroupName,
-rtl::Reference unoidl::ConstantGroupEntity entity,
+rtl::Reference unoidl::ConstantGroupEntity const entity,
rtl::OUString const member);
rtl::Reference unoidl::Entity findEntity(rtl::OUString const name);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/typemanager.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d1dad0cf5382244dfe940d21a9af4df980c8ecc7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 12 13:18:19 2013 +0200
Use OUString::startsWith where possible
Change-Id: I3f3b7b3600aa097187b05e21c375d087a2fa92bb
diff --git a/cppuhelper/source/typemanager.cxx
b/cppuhelper/source/typemanager.cxx
index 724b171..5a50967 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1905,7 +1905,7 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString
const name) {
new SimpleTypeDescription(simple[i].typeClass, name));
}
}
-if (name.match([])) {
+if (name.startsWith([])) {
return getSequenceType(name);
}
sal_Int32 i = name.indexOf('');
@@ -2163,7 +2163,7 @@ void cppuhelper::TypeManager::readRdbFile(
css::uno::Any cppuhelper::TypeManager::getSequenceType(
rtl::OUString const name)
{
-assert(name.match([]));
+assert(name.startsWith([]));
return css::uno::makeAny
css::uno::Reference css::reflection::XTypeDescription (
new SequenceTypeDescription(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
Le 11/09/13 17:56, Stephan Bergmann a écrit : FWIW, I currently see my Mac build failing when attempting [Build LNK] libAppleRemotelo.dylib gnutar copyfile unpack (Projects/mac/.DS_Store) failed : file exists gnutar copyfile unpack (Projects/mac/LittleCMS/.DS_Store) failed : file exists Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/CustomTarget_LibreOffice_app.mk
ios/CustomTarget_LibreOffice_app.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 854c302ed254f2b439cd90c60ff6635111f449f1 Author: Tor Lillqvist t...@collabora.com Date: Thu Sep 12 14:21:39 2013 +0300 Adapt to OUTDIR-INSTDIR changes Change-Id: I21c44470fa49152ebff79bf5138b32f07da53328 diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index fbc385d..b8a55be 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -56,8 +56,8 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) cp $(OUTDIR)/bin/offapi.rdb $(appdir) cp $(OUTDIR)/bin/udkapi.rdb $(appdir) cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir) - cp $(OUTDIR)/xml/services.rdb $(appdir) - cp $(OUTDIR)/xml/ure/services.rdb $(appdir)/ure + cp $(INSTDIR)/program/services/services.rdb $(appdir) + cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure # # Copy registry files # @@ -72,12 +72,12 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # we could set STAR_RESOURCE_PATH instead. sigh... # mkdir -p $(appdir)/program/resource - cp $(OUTDIR)/bin/*en-US.res $(appdir)/program/resource + cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res $(appdir)/program/resource # # Artwork # mkdir -p $(appdir)/share/config - cp -R $(OUTDIR)/bin/images_tango.zip $(appdir)/share/config/images.zip + cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip $(appdir)/share/config/images.zip # # soffice.cfg # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - 2 commits - sc/Library_scopencl.mk sc/source
sc/Library_scopencl.mk | 29 ++---
sc/source/core/data/colorscale.cxx |4 ++--
2 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 7c94346a60ddf44f7ce82a11d0d374831afc7e9b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Sep 12 07:36:34 2013 -0400
Additional build fix for Windows.
Change-Id: Ie1d6eec25c442e8dba31936e502249ee04c13177
diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index 0eab89eb..2942e47 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -10,31 +10,38 @@
$(eval $(call gb_Library_Library,scopencl))
$(eval $(call gb_Library_set_include,scopencl,\
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
+-I$(SRCDIR)/sc/source/core/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
))
$(eval $(call
gb_Library_set_precompiled_header,scopencl,$(SRCDIR)/sc/inc/pch/precompiled_scopencl))
$(eval $(call gb_Library_use_sdk_api,scopencl))
+$(eval $(call gb_Library_use_externals,scopencl,\
+boost_headers \
+))
+
$(eval $(call gb_Library_use_libraries,scopencl,\
- for \
- sal \
- sc \
- $(gb_UWINAPI) \
+cppu \
+cppuhelper \
+for \
+sal \
+sc \
+tl \
+$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,scopencl,\
- sc/source/core/opencl/formulagroupcl \
- sc/source/core/opencl/openclwrapper \
- sc/source/core/opencl/clcc/clew \
+sc/source/core/opencl/formulagroupcl \
+sc/source/core/opencl/openclwrapper \
+sc/source/core/opencl/clcc/clew \
))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,scopencl,\
- -ldl \
+-ldl \
))
endif
commit 058416fa31c8fae861691ad8d060b46ca08321ae
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Sep 11 22:12:57 2013 -0400
Don't forget assignment operators.
Change-Id: If9ee3f140a09b1977afaad8ad00406c67bbe224f
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 8a1d0df..5481d99 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1204,11 +1204,11 @@ const sal_Int32 a3Flags[] = {
BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
};
-const sal_Int32 a3Smilies[] {
+const sal_Int32 a3Smilies[] = {
BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
};
-const sal_Int32 a3ColorSmilies[] {
+const sal_Int32 a3ColorSmilies[] = {
BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_RED_SMILIE
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/ios vcl/source
vcl/ios/iosinst.cxx | 19 +--
vcl/source/window/window.cxx |1 +
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 16a53253e5991de8d44679157c29d58bb431eb2c
Author: tsahi glik tsahi.g...@cloudon.com
Date: Fri Aug 30 11:10:40 2013 -0700
Sync IOS screen invalidate to end of paint
Change-Id: If179c5280366a377ace710e4acf7df737544b224
Reviewed-on: https://gerrit.libreoffice.org/5706
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index b316d34..8b654a5 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -146,6 +146,9 @@ SalSystem *IosSalInstance::CreateSalSystem()
class IosSalFrame : public SvpSalFrame
{
+private:
+basegfx::B2IBox m_DamagedRect;
+
public:
IosSalFrame( IosSalInstance *pInstance,
SalFrame *pParent,
@@ -176,7 +179,7 @@ public:
if (rDamageRect.isEmpty())
return;
-IosSalInstance::getInstance()-damaged( this, rDamageRect );
+m_DamagedRect.expand(rDamageRect);
}
virtual void UpdateSettings( AllSettings rSettings )
@@ -199,6 +202,16 @@ public:
rSettings.SetStyleSettings( aStyleSet );
}
+
+virtual void Flush()
+{
+IosSalInstance::getInstance()-damaged( this, m_DamagedRect );
+}
+
+void resetDamaged()
+{
+m_DamagedRect.reset();
+}
};
SalFrame *IosSalInstance::CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle )
@@ -322,7 +335,7 @@ IMPL_LINK( IosSalInstance, RenderWindows,
RenderWindowsArg*, arg )
for( std::list SalFrame* ::const_iterator it = getFrames().begin();
it != getFrames().end();
it++ ) {
-SvpSalFrame *pFrame = static_castSvpSalFrame *(*it);
+IosSalFrame *pFrame = static_castIosSalFrame *(*it);
SalFrameGeometry aGeom = pFrame-GetGeometry();
CGRect bbox = CGRectMake( aGeom.nX, aGeom.nY, aGeom.nWidth,
aGeom.nHeight );
if ( pFrame-IsVisible()
@@ -344,6 +357,8 @@ IMPL_LINK( IosSalInstance, RenderWindows,
RenderWindowsArg*, arg )
false,
kCGRenderingIntentDefault );
CGContextDrawImage( arg-context, bbox, image );
+
+pFrame-resetDamaged();
}
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 669e0eb..d027eaa 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -7568,6 +7568,7 @@ void Window::Update()
}
pUpdateWindow-ImplCallPaint( NULL,
pUpdateWindow-mpWindowImpl-mnPaintFlags );
+bFlush = sal_True;
}
if ( bFlush )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Calc conditional formatting icon set: smilies
Dear Markus, dear all, additionally to my previous email regarding a coloured smilies icon set for bug/enhancement 60107 https://bugs.freedesktop.org/show_bug.cgi?id=60107, there is also the icon set 'smilies' (just yellow) to be included in the Calc conditional formatting feature. The icon set can be found here: https://wiki.documentfoundation.org/images/9/9f/Smilies-with-thicker-smiles.svg These icons are also based on Zorro's work at OpenClipart: http://openclipart.org/detail/100759/smiley-by-zorro. They are licensed as public domain: http://openclipart.org/share. I made a few modifications to Zorro's work (selection of three smilies bolder/wider smiles). My modifications are also public domain/CC0. Regards, Gerry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - solenv/gbuild
solenv/gbuild/CustomTarget.mk |2 +- solenv/gbuild/GeneratedPackage.mk |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit a2979511ce81fb848f5696836066a8243ec14209 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Sep 12 14:18:42 2013 +0200 ';' as a delimiter sometimes does not work for unknown reason Or rather it does work only sometimes. Change-Id: I97efd718dc6fcf370ca6456432b275e563f62f62 diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index e3c54a9..751e329 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -19,8 +19,8 @@ # If you know the filenames in advance, use Package. Laziness is not an # excuse. -gb_GeneratedPackage__get_srcdir = $(lastword $(subst ;, ,$(1))) -gb_GeneratedPackage__get_destdir = $(firstword $(subst ;, ,$(1))) +gb_GeneratedPackage__get_srcdir = $(lastword $(subst , ,$(1))) +gb_GeneratedPackage__get_destdir = $(firstword $(subst , ,$(1))) define gb_GeneratedPackage__command_cp mkdir -p $(dir $(2)) \ @@ -111,7 +111,7 @@ endef # # gb_GeneratedPackage_add_dir package destdir srcdir define gb_GeneratedPackage_add_dir -$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2));$(strip $(3)) +$(call gb_GeneratedPackage_get_target,$(1)) : PACKAGE_DIRS += $(strip $(2))$(strip $(3)) $(call gb_GeneratedPackage_get_clean_target,$(1)) : PACKAGE_DIRS += $(2) endef commit 66589fae35ebed03e8f2859ae4b666b5143f2173 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Sep 12 13:50:35 2013 +0200 gb_CustomTarget_ulfex_rule: add dependency on directory Change-Id: Ibe00404978cc5b7efc31fe84cb5d0a79a0e13ce3 diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 3f6357e..e2dc2fd 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -72,7 +72,7 @@ endif # $(call gb_CustomTarget_ulfex_rule,ulftargetpattern,ulfsource,pofiles) define gb_CustomTarget_ulfex_rule -$(1) : $(2) $(if $(WITH_LANG),$(call gb_Executable_get_runtime_dependencies,ulfex)) +$(1) : $(2) $(if $(WITH_LANG),$(call gb_Executable_get_runtime_dependencies,ulfex)) | $(dir $(1)).dir $$(call gb_CustomTarget_ulfex__command,$$@,$(subst %,$$*,$(strip $(2))),$(strip $(3))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/ios
vcl/ios/iosinst.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 015a0a652f89c05ccef2b23af3d81604b990ba33
Author: tsahi glik tsahi.g...@cloudon.com
Date: Fri Aug 30 13:18:23 2013 -0700
in iOS avoid copying covered windows to screen
Change-Id: Iebf53e5c2e3909e068739351ccce497ca91b67a5
Reviewed-on: https://gerrit.libreoffice.org/5710
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 8b654a5..dd92c6e 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -332,14 +332,16 @@ IMPL_LINK( IosSalInstance, RenderWindows,
RenderWindowsArg*, arg )
rc = pthread_mutex_lock( m_aRenderMutex );
SAL_WARN_IF( rc != 0, vcl.ios, pthread_mutex_lock failed:
strerror( rc ) );
-for( std::list SalFrame* ::const_iterator it = getFrames().begin();
- it != getFrames().end();
+CGRect invalidRect = arg-rect;
+
+for( std::list SalFrame* ::const_reverse_iterator it =
getFrames().rbegin();
+ it != getFrames().rend();
it++ ) {
IosSalFrame *pFrame = static_castIosSalFrame *(*it);
SalFrameGeometry aGeom = pFrame-GetGeometry();
CGRect bbox = CGRectMake( aGeom.nX, aGeom.nY, aGeom.nWidth,
aGeom.nHeight );
if ( pFrame-IsVisible()
- CGRectIntersectsRect( arg-rect, bbox ) ) {
+ CGRectIntersectsRect( invalidRect, bbox ) ) {
const basebmp::BitmapDeviceSharedPtr aDevice = pFrame-getDevice();
CGDataProviderRef provider =
@@ -358,6 +360,12 @@ IMPL_LINK( IosSalInstance, RenderWindows,
RenderWindowsArg*, arg )
kCGRenderingIntentDefault );
CGContextDrawImage( arg-context, bbox, image );
+// if current frame covers the whole invalidRect then break
+if (CGRectEqualToRect(CGRectIntersection(invalidRect, bbox),
invalidRect))
+{
+break;
+}
+
pFrame-resetDamaged();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b32ca041cd88467d3862eab4460dfe4bb693b8b8
Author: Tor Lillqvist t...@collabora.com
Date: Thu Sep 12 15:08:02 2013 +0300
WaE: C4701: potentially uninitialized local variables
Change-Id: I323fa5f1c9b94166d32b0457905ccb1ec06ecd5c
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6076d77..9a0a10c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -551,7 +551,7 @@ void Test::testSmartart()
xGroupPropertySet-getPropertyValue(OUString::createFromAscii(InteropGrabBag))
= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
-sal_Bool bData, bLayout, bQStyle, bColor, bDrawing = sal_False;
+sal_Bool bData = sal_False, bLayout = sal_False, bQStyle = sal_False,
bColor = sal_False, bDrawing = sal_False;
for(int i = 0; i aGrabBag.getLength(); ++i)
{
if (aGrabBag[i].Name == OUString::createFromAscii(OOXData))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basic/CppunitTest_basic_scanner.mk connectivity/Rdb_postgresql-sdbc.mk postprocess/Rdb_services.mk pyuno/Rdb_pyuno.mk scripting/Rdb_scriptproviderforbeanshe
basic/CppunitTest_basic_scanner.mk |2 + connectivity/Rdb_postgresql-sdbc.mk |4 --- postprocess/Rdb_services.mk |4 --- pyuno/Rdb_pyuno.mk |4 --- scripting/Rdb_scriptproviderforbeanshell.mk |4 --- scripting/Rdb_scriptproviderforjavascript.mk |4 --- solenv/gbuild/Helper.mk |6 + solenv/gbuild/Pagein.mk | 11 ++ solenv/gbuild/Rdb.mk | 29 --- ure/Rdb_ure.mk |4 --- 10 files changed, 35 insertions(+), 37 deletions(-) New commits: commit 6667caef24557d66177c1f7e9b72d2f609233d87 Author: Michael Stahl mst...@redhat.com Date: Thu Sep 12 13:10:32 2013 +0200 gbuild: remove gb_Rdb__get_final_target ... by replacing gb_Rdb_install with a separate constructor so the right target can be registered at the module. There is still an ugly special case for the ure/services. Change-Id: I81c004143f201aaf38daca99819888313ee24f49 diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index ec0c928..83c040a 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -8,6 +8,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_scanner)) +$(eval $(call gb_CppunitTest_use_ure,basic_scanner)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \ basic/qa/cppunit/test_scanner \ )) diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk index 7f58482..6162b30 100644 --- a/connectivity/Rdb_postgresql-sdbc.mk +++ b/connectivity/Rdb_postgresql-sdbc.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb,postgresql-sdbc)) - -$(eval $(call gb_Rdb_install,postgresql-sdbc)) +$(eval $(call gb_Rdb_Rdb_install,postgresql-sdbc)) $(eval $(call gb_Rdb_add_components,postgresql-sdbc,\ connectivity/source/drivers/postgresql/postgresql-sdbc \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 00be524..964f1fc 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb,services)) - -$(eval $(call gb_Rdb_install,services)) +$(eval $(call gb_Rdb_Rdb_install,services)) $(eval $(call gb_Rdb_add_components,services,\ animations/source/animcore/animcore \ diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk index 71050ec..c141857 100644 --- a/pyuno/Rdb_pyuno.mk +++ b/pyuno/Rdb_pyuno.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb,pyuno)) - -$(eval $(call gb_Rdb_install,pyuno)) +$(eval $(call gb_Rdb_Rdb_install,pyuno)) $(eval $(call gb_Rdb_add_components,pyuno, \ pyuno/source/loader/pythonloader \ diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk b/scripting/Rdb_scriptproviderforbeanshell.mk index 0a08694..5781610 100644 --- a/scripting/Rdb_scriptproviderforbeanshell.mk +++ b/scripting/Rdb_scriptproviderforbeanshell.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell)) - -$(eval $(call gb_Rdb_install,scriptproviderforbeanshell)) +$(eval $(call gb_Rdb_Rdb_install,scriptproviderforbeanshell)) $(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\ scripting/java/ScriptProviderForBeanShell \ diff --git a/scripting/Rdb_scriptproviderforjavascript.mk b/scripting/Rdb_scriptproviderforjavascript.mk index 1ac23ab..5d7f56d 100644 --- a/scripting/Rdb_scriptproviderforjavascript.mk +++ b/scripting/Rdb_scriptproviderforjavascript.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript)) - -$(eval $(call gb_Rdb_install,scriptproviderforjavascript)) +$(eval $(call gb_Rdb_Rdb_install,scriptproviderforjavascript)) $(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\ scripting/java/ScriptProviderForJavaScript \ diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 980f2c8..b3dcaff 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -8,7 +8,6 @@ # gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb -gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ @@ -30,26 +29,34 @@ $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsl $(call gb_Rdb_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RDB,1) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*)) - -$(call gb_Rdb__get_final_target,%) : - touch $@ + rm -f $(call
Re: docx locale
Hi Faisal, On Thu, Sep 12, 2013 at 11:24:01AM +, Faisal M. Alotaibi fmalota...@kacst.edu.sa wrote: is there a way to know if the docx file was written in MS by RTL locale or LTR locale? Hmm, you mean if the UI was LTR/RTL, which is independent from the locale of the text of the document? I don't really know, if you can share a sample, which was created by an RTL UI, I may be able to check it. In general, I doubt it, though, at least AFAIK ODF doesn't store it. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/cppumaker/cppumaker.cxx | 20 +---
codemaker/source/cppumaker/cppuoptions.cxx | 11 +++
codemaker/source/cppumaker/cpputype.cxx| 15 +--
3 files changed, 33 insertions(+), 13 deletions(-)
New commits:
commit 54dd4ae0ddc92b3fbc02e104e9844b587e694a99
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 12 15:28:11 2013 +0200
Add cppumaker -nD no dependent types are generated
...just like javamaker.
Change-Id: I7634a65a948ca7abdb7ad75d0aeca8becb38ab87
diff --git a/codemaker/source/cppumaker/cppumaker.cxx
b/codemaker/source/cppumaker/cppumaker.cxx
index 3f0c665..2a698f4 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -78,13 +78,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
} else {
produce(, typeMgr, generated, options);
}
-// C++ header files generated for the following UNO types are included
-// in header files in cppu/inc/com/sun/star/uno (Any.hxx,
Reference.hxx,
-// Type.h), so it seems best to always generate those C++ header files:
-produce(
-com.sun.star.uno.RuntimeException, typeMgr, generated, options);
-produce(com.sun.star.uno.TypeClass, typeMgr, generated, options);
-produce(com.sun.star.uno.XInterface, typeMgr, generated, options);
+if (!options.isValid(-nD)) {
+// C++ header files generated for the following UNO types are
+// included in header files in cppu/inc/com/sun/star/uno (Any.hxx,
+// Reference.hxx, Type.h), so it seems best to always generate
those
+// C++ header files:
+produce(
+com.sun.star.uno.RuntimeException, typeMgr, generated,
+options);
+produce(
+com.sun.star.uno.TypeClass, typeMgr, generated, options);
+produce(
+com.sun.star.uno.XInterface, typeMgr, generated, options);
+}
} catch (CannotDumpException e) {
std::cerr ERROR: e.getMessage() '\n';
return EXIT_FAILURE;
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx
b/codemaker/source/cppumaker/cppuoptions.cxx
index 3446134..3e70b68 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -94,6 +94,16 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
m_options[-O] = OString(s);
break;
+case 'n':
+if (av[i][2] != 'D' || av[i][3] != '\0')
+{
+OString tmp('-nD', please check);
+tmp += your input ' + OString(av[i]) + ';
+throw IllegalArgument(tmp);
+}
+
+m_options[-nD] = OString();
+break;
case 'T':
if (av[i][2] == '\0')
{
@@ -321,6 +331,7 @@ OString CppuOptions::prepareHelp()
help += '-L' should be the default for external
components.\n;
help += -C = UNO type functions are generated comprehensive
that means all\n;
help += necessary information is available for bridging
the type in UNO.\n;
+help += -nD= no dependent types are generated.\n;
help += -G = generate only target files which does not
exists.\n;
help += -Gc= generate only target files which content will be
changed.\n;
help += -Xfile = extra types which will not be taken into account
for generation.\n\n;
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index b03e472..8f8cdf3 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -409,12 +409,15 @@ void CppuType::dumpFile(
void CppuType::dumpDependedTypes(
codemaker::GeneratedTypeSet generated, CppuOptions const options)
{
-codemaker::cppumaker::Dependencies::Map const map
-= m_dependencies.getMap();
-for (codemaker::cppumaker::Dependencies::Map::const_iterator
i(map.begin());
- i != map.end(); ++i)
-{
-produce(i-first, m_typeMgr, generated, options);
+if (!options.isValid(-nD)) {
+codemaker::cppumaker::Dependencies::Map const map
+= m_dependencies.getMap();
+for (codemaker::cppumaker::Dependencies::Map::const_iterator i(
+ map.begin());
+ i != map.end(); ++i)
+{
+produce(i-first, m_typeMgr, generated, options);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 13
++
1 file changed, 13 insertions(+)
New commits:
commit b6807fd38373c98adc276697c24dcfcdf9471ac0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Sep 12 14:21:32 2013 +0100
Resolves: fdo#61754 allow midletters in field name tokens
Change-Id: I77cea3c1d2210435109ca0b6f762b6aea478e91b
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 3f3de5b..488b62e 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -666,6 +666,19 @@ UPT_FLAG_TYPE cclass_Unicode::getFlagsExtended( const
sal_Unicode* aStr, sal_Int
case U_SPACE_SEPARATOR :
return ((nTypes KParseTokens::IGNORE_LEADING_WS) ?
TOKEN_CHAR_DONTCARE : (bStart ? TOKEN_CHAR_WORD :
(TOKEN_CHAR_DONTCARE | TOKEN_WORD_SEP | TOKEN_VALUE_SEP) ));
+case U_OTHER_PUNCTUATION:
+// fdo#61754 Lets see (if we not at the start) if this is midletter
+// punctuation and allow it in a word if it is similarly to
+// U_NON_SPACING_MARK
+if (bStart || U_WB_MIDLETTER != u_getIntPropertyValue(c,
UCHAR_WORD_BREAK))
+return TOKEN_ILLEGAL;
+else
+{
+//allowing it to continue the word
+return (nTypes KParseTokens::UNI_OTHER_LETTER) ?
+TOKEN_WORD : TOKEN_ILLEGAL;
+}
+break;
}
return TOKEN_ILLEGAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - 3 commits - sw/inc sw/source
Rebased ref, commits from common ancestor:
commit b3781d43adbc0c9701af80d393c302c9c2252ba2
Author: Alex Ivan alexni...@yahoo.com
Date: Thu Sep 12 16:19:51 2013 +0300
Remove obsolete UpdateTo/FromSet methods
These should have been removed some time ago, since they
were not used any more. Seems they somehow escaped.
Change-Id: I958de698f96a6c48e4cb41dc5226f96134d2886b
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index a4a330a..05de618 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -127,12 +127,6 @@ public:
void SetName( const String rNew ) { m_pTableStyle-SetName( rNew );
nStrResId = USHRT_MAX; }
const String GetName() const { return m_pTableStyle-GetName(); }
-enum UpdateFlags { UPDATE_CHAR = 1, UPDATE_BOX = 2, UPDATE_ALL = 3 };
-void UpdateFromSet( sal_uInt8 nPos, const SfxItemSet rSet,
-UpdateFlags eFlags, SvNumberFormatter* );
-void UpdateToSet( sal_uInt8 nPos, SfxItemSet rSet, UpdateFlags eFlags,
-SvNumberFormatter* ) const ;
-
void RestoreTableProperties(SwTable table) const;
void StoreTableProperties(const SwTable table);
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 426f0e6..2ff9b38 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -584,158 +584,6 @@ SwTableBoxFmt* SwTableAutoFmt::GetBoxFmt( sal_uInt8 nPos
) const
return m_pTableStyle-GetBoxFmt( nPos );
}
-
-void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
-const SfxItemSet rSet,
-UpdateFlags eFlags,
-SvNumberFormatter* pNFmtr)
-{
-OSL_ENSURE( nPos 16, wrong area );
-
-SwTableBoxFmt* pFmt = GetBoxFmt( nPos );
-
-if( UPDATE_CHAR eFlags )
-{
-pFmt-SetFont( (SvxFontItem)rSet.Get( RES_CHRATR_FONT ) );
-pFmt-SetHeight( (SvxFontHeightItem)rSet.Get( RES_CHRATR_FONTSIZE ) );
-pFmt-SetWeight( (SvxWeightItem)rSet.Get( RES_CHRATR_WEIGHT ) );
-pFmt-SetPosture( (SvxPostureItem)rSet.Get( RES_CHRATR_POSTURE ) );
-pFmt-SetCJKFont( (SvxFontItem)rSet.Get( RES_CHRATR_CJK_FONT ) );
-pFmt-SetCJKHeight( (SvxFontHeightItem)rSet.Get(
RES_CHRATR_CJK_FONTSIZE ) );
-pFmt-SetCJKWeight( (SvxWeightItem)rSet.Get( RES_CHRATR_CJK_WEIGHT )
);
-pFmt-SetCJKPosture( (SvxPostureItem)rSet.Get( RES_CHRATR_CJK_POSTURE
) );
-pFmt-SetCTLFont( (SvxFontItem)rSet.Get( RES_CHRATR_CTL_FONT ) );
-pFmt-SetCTLHeight( (SvxFontHeightItem)rSet.Get(
RES_CHRATR_CTL_FONTSIZE ) );
-pFmt-SetCTLWeight( (SvxWeightItem)rSet.Get( RES_CHRATR_CTL_WEIGHT )
);
-pFmt-SetCTLPosture( (SvxPostureItem)rSet.Get( RES_CHRATR_CTL_POSTURE
) );
-pFmt-SetUnderline( (SvxUnderlineItem)rSet.Get( RES_CHRATR_UNDERLINE
) );
-pFmt-SetOverline( (SvxOverlineItem)rSet.Get( RES_CHRATR_OVERLINE ) );
-pFmt-SetCrossedOut( (SvxCrossedOutItem)rSet.Get(
RES_CHRATR_CROSSEDOUT ) );
-pFmt-SetContour( (SvxContourItem)rSet.Get( RES_CHRATR_CONTOUR ) );
-pFmt-SetShadowed( (SvxShadowedItem)rSet.Get( RES_CHRATR_SHADOWED ) );
-pFmt-SetColor( (SvxColorItem)rSet.Get( RES_CHRATR_COLOR ) );
-pFmt-SetAdjust( (SvxAdjustItem)rSet.Get( RES_PARATR_ADJUST ) );
-}
-if( UPDATE_BOX eFlags )
-{
-pFmt-SetBox( (SvxBoxItem)rSet.Get( RES_BOX ) );
-// FIXME - add attribute IDs for the diagonal line items
-//pFmt-SetTLBR( (SvxLineItem)rSet.Get( RES_... ) );
-//pFmt-SetBLTR( (SvxLineItem)rSet.Get( RES_... ) );
-pFmt-SetBackground( (SvxBrushItem)rSet.Get( RES_BACKGROUND ) );
-pFmt-SetTextOrientation(static_castconst
SvxFrameDirectionItem(rSet.Get(RES_FRAMEDIR)));
-pFmt-SetVerticalAlignment(static_castconst
SwFmtVertOrient(rSet.Get(RES_VERT_ORIENT)));
-
-const SwTblBoxNumFormat* pNumFmtItem;
-const SvNumberformat* pNumFormat = 0;
-if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, sal_True,
-(const SfxPoolItem**)pNumFmtItem ) pNFmtr
-0 != (pNumFormat = pNFmtr-GetEntry( pNumFmtItem-GetValue() )) )
-pFmt-SetValueFormat(
((SvNumberformat*)pNumFormat)-GetFormatstring(),
-pNumFormat-GetLanguage(),
-::GetAppLanguage());
-else
-{
-// default
-pFmt-SetValueFormat( aEmptyStr, LANGUAGE_SYSTEM,
- ::GetAppLanguage() );
-}
-}
-
-// we cannot handle the rest, that's specific to StarCalc
-}
-
-
-void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet rSet,
- UpdateFlags eFlags, SvNumberFormatter*
pNFmtr) const
-{
-const SwTableBoxFmt rChg = *GetBoxFmt( nPos );
-
-if( UPDATE_CHAR eFlags )
-{
-if( IsFont() )
-{
-rSet.Put(
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx| 36 --
i18nlangtag/source/languagetag/languagetag.cxx | 50 -
2 files changed, 74 insertions(+), 12 deletions(-)
New commits:
commit bc3759f2dba31b958219f02b8bbb043d8bdb729f
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 15:34:33 2013 +0200
include legacy tags in fallback strings
Change-Id: Ice3f4f061b1ae84d2d486e908399550770d5170a
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 72297cc..5f5f4b5 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -141,6 +141,36 @@ void TestLanguageTag::testAllTags()
}
{
+OUString s_sr_Latn_CS( sr-Latn-CS );
+LanguageTag sr_Latn_CS( s_sr_Latn_CS, true );
+lang::Locale aLocale = sr_Latn_CS.getLocale();
+CPPUNIT_ASSERT( sr_Latn_CS.getBcp47() == s_sr_Latn_CS );
+CPPUNIT_ASSERT( aLocale.Language == qlt );
+CPPUNIT_ASSERT( aLocale.Country == CS );
+CPPUNIT_ASSERT( aLocale.Variant == s_sr_Latn_CS );
+CPPUNIT_ASSERT( sr_Latn_CS.getLanguageType() == LANGUAGE_SERBIAN_LATIN
);
+CPPUNIT_ASSERT( sr_Latn_CS.isValidBcp47() == true );
+CPPUNIT_ASSERT( sr_Latn_CS.isIsoLocale() == false );
+CPPUNIT_ASSERT( sr_Latn_CS.isIsoODF() == true );
+CPPUNIT_ASSERT( sr_Latn_CS.getLanguage() == sr );
+CPPUNIT_ASSERT( sr_Latn_CS.getCountry() == CS );
+CPPUNIT_ASSERT( sr_Latn_CS.getScript() == Latn );
+CPPUNIT_ASSERT( sr_Latn_CS.getLanguageAndScript() == sr-Latn );
+::std::vector OUString sr_Latn_CS_Fallbacks(
sr_Latn_CS.getFallbackStrings( true));
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks.size() == 9);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[0] == sr-Latn-CS);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[1] == sr-Latn-YU);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[2] == sh-CS);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[3] == sh-YU);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[4] == sr-Latn);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[5] == sh);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[6] == sr-CS);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[7] == sr-YU);
+CPPUNIT_ASSERT( sr_Latn_CS_Fallbacks[8] == sr);
+CPPUNIT_ASSERT( sr_Latn_CS.makeFallback().getBcp47() == sr-Latn-CS);
+}
+
+{
OUString s_sh_RS( sh-RS );
LanguageTag sh_RS( s_sh_RS, true );
lang::Locale aLocale = sh_RS.getLocale();
@@ -161,9 +191,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( sh_RS_Fallbacks[0] == sh-RS);
CPPUNIT_ASSERT( sh_RS_Fallbacks[1] == sr-Latn-RS);
CPPUNIT_ASSERT( sh_RS_Fallbacks[2] == sr-Latn);
-CPPUNIT_ASSERT( sh_RS_Fallbacks[3] == sr-RS);
-CPPUNIT_ASSERT( sh_RS_Fallbacks[4] == sr);
-CPPUNIT_ASSERT( sh_RS_Fallbacks[5] == sh);
+CPPUNIT_ASSERT( sh_RS_Fallbacks[3] == sh);
+CPPUNIT_ASSERT( sh_RS_Fallbacks[4] == sr-RS);
+CPPUNIT_ASSERT( sh_RS_Fallbacks[5] == sr);
CPPUNIT_ASSERT( sh_RS.makeFallback().getBcp47() == sr-Latn-RS);
CPPUNIT_ASSERT( sh_RS.getBcp47() == sr-Latn-RS);
CPPUNIT_ASSERT( sh_RS.getLanguageType() ==
LANGUAGE_USER_SERBIAN_LATIN_SERBIA );
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 46579e2..504d90a 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1241,9 +1241,14 @@ LanguageTag LanguageTag::makeFallback()
}
else if (aLanguage == sh)
{
-::std::vector OUString aRep( LanguageTag( sr-Latn- +
aCountry).getFallbackStrings( true));
-aVec.insert( aVec.end(), aRep.begin(), aRep.end());
-aVec.push_back( aLanguage); // 'sh' after all 'sr...'?
+// Manual list instead of calling
+// LanguageTag( sr-Latn- + aCountry).getFallbackStrings(
true)
+// that would also include sh-* again.
+aVec.push_back( sr-Latn- + aCountry);
+aVec.push_back( sr-Latn);
+aVec.push_back( sh); // legacy with script, before default
script with country
+aVec.push_back( sr- + aCountry);
+aVec.push_back( sr);
}
else if (aLanguage == ca aCountry == XV)
{
@@ -1260,8 +1265,8 @@ LanguageTag LanguageTag::makeFallback()
aVec.push_back( aLanguage);
if (aLanguage == sh)
{
-::std::vector OUString aRep( LanguageTag(
sr-Latn).getFallbackStrings( true));
-aVec.insert( aVec.end(), aRep.begin(), aRep.end());
+aVec.push_back( sr-Latn);
+aVec.push_back( sr);
}
}
return aVec;
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/forms/propertyexport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 08fb2bfeb18b6d5329bae8490bd02043d101bb06
Author: Michael Stahl mst...@redhat.com
Date: Thu Sep 12 16:00:46 2013 +0200
xmloff: fix Apple g++ 4.2.1 warning
Change-Id: I7ded25661e7d3343afc783e804ab5f3cf0207641
diff --git a/xmloff/source/forms/propertyexport.cxx
b/xmloff/source/forms/propertyexport.cxx
index c5727fa..299acf5 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -674,7 +674,8 @@ namespace xmloff
// the property must exist
if (!m_xPropertyInfo-hasPropertyByName(_rPropertyName))
{
-OSL_FAIL(OPropertyExport::dbg_implCheckProperty: no property
with the name + OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)
+ !);
+SAL_WARN(xmloff.forms, OPropertyExport:
+no property with the name + _rPropertyName + !);
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/workbookhelper.cxx | 39 ++--
1 file changed, 18 insertions(+), 21 deletions(-)
New commits:
commit bc1fced1aedbaca367fc653c5806f1f8d9efeebe
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Sep 12 00:05:31 2013 -0400
No need to delay initialization of ScDocument member.
Change-Id: Icf3ae78158e4a3844aa4ff393f1527c0c72e5131
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index dbdf45d..7a9a58f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -77,6 +77,8 @@
#include editutil.hxx
#include editeng/editstat.hxx
+#include boost/noncopyable.hpp
+
namespace oox {
namespace xls {
@@ -107,7 +109,7 @@ bool IgnoreCaseCompare::operator()( const OUString rName1,
const OUString rNam
//
-class WorkbookGlobals
+class WorkbookGlobals : boost::noncopyable
{
public:
explicitWorkbookGlobals( ExcelFilter rFilter );
@@ -143,24 +145,7 @@ public:
return *mxEditEngine.get();
}
-inline ScDocument getScDocument() const
-{
-if ( !mpDoc )
-{
-if ( mxDoc.get() )
-{
-ScModelObj* pModel = dynamic_cast ScModelObj* ( mxDoc.get()
);
-ScDocShell* pDocShell = NULL;
-if ( pModel )
-pDocShell = (ScDocShell*)pModel-GetEmbeddedObject();
-if ( pDocShell )
-mpDoc = pDocShell-GetDocument();
-}
-}
-if ( !mpDoc )
-throw RuntimeException( OUString(
Workbookhelper::getScDocument(): Failed to access ScDocument from model ),
Reference XInterface () );
-return *mpDoc;
-}
+ScDocument getScDocument() const { return *mpDoc; }
/** Returns a reference to the source/target spreadsheet document model. */
inline Reference XSpreadsheetDocument getDocument() const { return
mxDoc; }
@@ -314,7 +299,7 @@ private:
BiffTypemeBiff; /// BIFF version for BIFF
import/export.
rtl_TextEncodingmeTextEnc; /// BIFF byte string text
encoding.
boolmbHasCodePage; /// True = CODEPAGE record
exists in imported stream.
-mutable ScDocument* mpDoc;
+ScDocument* mpDoc;
};
//
@@ -338,7 +323,6 @@ WorkbookGlobals::~WorkbookGlobals()
mrExcelFilter.unregisterWorkbookGlobals();
}
-// document model -
Reference XNameContainer WorkbookGlobals::getStyleFamily( bool bPageStyles
) const
{
@@ -535,6 +519,19 @@ void WorkbookGlobals::initialize( bool bWorkbookFile )
mxDoc.set( mrBaseFilter.getModel(), UNO_QUERY );
OSL_ENSURE( mxDoc.is(), WorkbookGlobals::initialize - no spreadsheet
document );
+if (mxDoc.get())
+{
+ScModelObj* pModel = dynamic_castScModelObj*(mxDoc.get());
+ScDocShell* pDocShell = NULL;
+if (pModel)
+pDocShell = static_castScDocShell*(pModel-GetEmbeddedObject());
+if (pDocShell)
+mpDoc = pDocShell-GetDocument();
+}
+
+if (!mpDoc)
+throw RuntimeException(Workbookhelper::getScDocument(): Failed to
access ScDocument from model, ReferenceXInterface());
+
mxFormulaBuffer.reset( new FormulaBuffer( *this ) );
mxWorkbookSettings.reset( new WorkbookSettings( *this ) );
mxViewSettings.reset( new ViewSettings( *this ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/calc-pluggable-opencl'
New branch 'feature/calc-pluggable-opencl' available with the following commits: commit 27d9f6334fb1fe3e204759b57b75cf01061ccfcf Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Thu Sep 12 07:36:34 2013 -0400 Additional build fix for Windows. Change-Id: Ie1d6eec25c442e8dba31936e502249ee04c13177 commit 017303c13b1855ebdb71aae32174c73e7b6180b9 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 19:21:35 2013 -0400 OpenCL code shouldn't be needing any UI code. Change-Id: I789ac7b9c1404b2f7b35178d9c43c59182a20cea commit baf2ce459ef2170b3491cfd169cf463005002296 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 19:20:54 2013 -0400 Move the clewInit to where the Windows DLL is manually loaded. Change-Id: I58c8bcbd76c28c458fb28c21d65887159fa0ea34 commit 037712cd8e134b3bd9ac830dabb7b56c1cfbe1e1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 17:46:35 2013 -0400 Allow enable / disable opencl at build time. Change-Id: I65e2a71aae8317930d1575e7d82c11c3fd2b74de commit d0a829159a998a378461226916d9f45849e00a6e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 14:45:36 2013 -0400 Remove opencl-sdk configure option, and build time opencl conditionals. We now load OpenCL library dynmically at run-time as needed. So there is no build time dependency on any OpenCL implementations. Change-Id: I214399060398a7c5e37b9a254147ccc2834e7866 commit 784ea18e9804098acff48c1f689f000e9885b19b Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 14:22:48 2013 -0400 Use clew from clcc to allow run-time loading of opencl drivers. Change-Id: I9f6ce113d637dbec069caa86b32459e2001ec0a0 commit 4a6d88aac62936657fff5fb3193d2e711506c24a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 12:33:02 2013 -0400 Dynamically load the opencl group interpreter code at run time. Change-Id: I0e2b393ecf068b57bfe653663be0a788caa22a36 commit 91fc96dd8be9d64c723498aec8ab0cd58181f7ab Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Sep 10 21:09:24 2013 -0400 First step toward splitting the opencl code into own shared library. Change-Id: I44fa3ded8d48b2972af17b78ab6c0af03e024f36 commit 2d4c25d10ca8d262436712b4252c58c60960f942 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Sep 10 17:10:15 2013 -0400 Disable dummy and groundwater interpreters from the default build. They are of no use in the default build. Change-Id: Ie3b874a5c78123436736318357fa48baafd991f3 commit 1cbbb7f03a926c2d3f0f2fc831b43dcded05e710 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Sep 10 17:01:15 2013 -0400 Put all opencl related code inside sc::opencl namespace. Change-Id: Ia6c1fd88ed08022347c60af33a8620b9cf278c12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmaddressblockpage.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e955030c0748b793fb5ff658dff713db4e621c41 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 12 15:43:35 2013 +0100 fix crash after overwriting content with tab and using move buttons Change-Id: Ica52384f05ea1e74c489b38d953e27dd37bcde89 diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 804d769..e2dc89f 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1581,9 +1581,9 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove) InsertNewEntryAtPosition( sCurrentItem, nPara, nIndex ); // select the new entry [#i40817] -const TextCharAttrib *pAttrib; -pAttrib = pTextEngine-FindCharAttrib(TextPaM(nPara, nIndex),TEXTATTR_PROTECTED); -aEntrySel = TextSelection(TextPaM(nPara, nIndex), TextPaM(nPara, pAttrib-GetEnd())); +const TextCharAttrib *pAttrib = pTextEngine-FindCharAttrib(TextPaM(nPara, nIndex),TEXTATTR_PROTECTED); +if (pAttrib) +aEntrySel = TextSelection(TextPaM(nPara, nIndex), TextPaM(nPara, pAttrib-GetEnd())); pTextView-SetSelection(aEntrySel); Invalidate(); Modify(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||68771 --- Comment #82 from tommy27 ba...@quipo.it --- I add Bug 68771 Crash on launch on OS X 4.1.1 doesn't work with some Mac users forcing them to revert to 4.0.5 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|68771 | -- 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: vcl/coretext
vcl/coretext/salgdi2.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit 3ea6e49f581ef9d28cc2c3374426b5fac8627802
Author: tsahi glik tsahi.g...@cloudon.com
Date: Fri Aug 30 13:27:32 2013 -0700
iOS fix clip area in coretext context
Change-Id: Ibaef9701ad4ba1bda1068c0dfa34f83c09a4e409
Reviewed-on: https://gerrit.libreoffice.org/5711
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 819d9f9..cf7e7e1 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -873,6 +873,35 @@ bool SvpSalGraphics::CheckContext()
CGContextScaleCTM( mrContext, 1, -1 );
}
+
+if (mrContext)
+{
+RectangleVector aRectangles;
+m_aClipRegion.GetRegionRectangles(aRectangles);
+
+CGContextBeginPath( mrContext );
+
+for(RectangleVector::const_iterator aRectIter(aRectangles.begin());
aRectIter != aRectangles.end(); aRectIter++)
+{
+const long nW(aRectIter-Right() - aRectIter-Left() + 1); // uses
+1 logic in original
+
+if(nW)
+{
+const long nH(aRectIter-Bottom() - aRectIter-Top() + 1); //
uses +1 logic in original
+
+if(nH)
+{
+CGRect aRect = {{ (CGFloat) aRectIter-Left(), (CGFloat)
aRectIter-Top() }, { (CGFloat) nW, (CGFloat) nH }};
+CGContextAddRect( mrContext, aRect );
+}
+}
+}
+
+CGContextClip(mrContext);
+
+}
+
+
SAL_INFO( vcl.ios, CheckContext: context= mrContext );
return ( mrContext != NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 6056965245915d3aeb84e8ccd065133bdf21d806
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 17:29:37 2013 +0200
added known unhandled to IsoLanguageScriptCountryEntry
Change-Id: Ica66ae2c7ced84c7d41537197447ebfebf02ddd7
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index da29abf..1abf020 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -277,7 +277,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_CROATIAN,hr, HR, false }, // Croatian
in Croatia
{ LANGUAGE_CROATIAN_BOSNIA_HERZEGOVINA, hr, BA, false },
{ LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA,bs, BA, false },
-// { LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_AND_HERZEGOVINA, bs, BA, false },
// script codes not supported yet
{ LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA,sr, RS, false }, //
Serbian Cyrillic in Serbia
{ LANGUAGE_SERBIAN_CYRILLIC,sr, CS, false }, //
Serbian Cyrillic in Serbia and Montenegro
{ LANGUAGE_SERBIAN_CYRILLIC,sr, YU, true }, //
legacy Serbian Cyrillic in Serbia and Montenegro (former Yugoslavia); kludge,
sr_CS not supported by ICU 2.6 (3.4 does)
@@ -290,10 +289,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[]
=
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA,sh, BA, true }, //
legacy kludge, is sr-Latn-BA now
{ LANGUAGE_SERBIAN_LATIN_NEUTRAL, sh, , true }, //
legacy kludge, is sr-Latn now
{ LANGUAGE_ARMENIAN,hy, AM, false },
-{ LANGUAGE_AZERI_LATIN, az, AZ, false },
-// { LANGUAGE_AZERI_CYRILLIC, az, AZ, false }, // script
codes not supported yet
-{ LANGUAGE_UZBEK_LATIN, uz, UZ, false },
-// { LANGUAGE_UZBEK_CYRILLIC, uz, UZ, false }, // script
codes not supported yet
+{ LANGUAGE_AZERI_LATIN, az, AZ, false },//
macrolanguage code
+{ LANGUAGE_UZBEK_LATIN, uz, UZ, false },//
macrolanguage code
{ LANGUAGE_BENGALI_BANGLADESH, bn, BD, false },
{ LANGUAGE_BENGALI, bn, IN, false },
{ LANGUAGE_BURMESE, my, MM, false },
@@ -582,6 +579,9 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO, sr-Latn, ME },
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA,sr-Latn, BA },
{ LANGUAGE_SERBIAN_LATIN_NEUTRAL, sr-Latn,},
+{ LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, bs-Cyrl, BA },
+{ LANGUAGE_AZERI_CYRILLIC, az-Cyrl, AZ }, //
macrolanguage code
+{ LANGUAGE_UZBEK_CYRILLIC, uz-Cyrl, UZ }, //
macrolanguage code
{ LANGUAGE_DONTKNOW,, } // marks
end of table
};
commit 4fe5c3b5cd3425375d7212797dc3d5f7ed14ee2e
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 16:38:52 2013 +0200
set some mbOverrideExists flags
Change-Id: Iec408fcdc21357fcbb00cdf08215f0db92a48d3c
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 0de5d5a..da29abf 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -214,7 +214,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_BASQUE, eu, , false },
{ LANGUAGE_BULGARIAN, bg, BG, false },
{ LANGUAGE_CZECH, cs, CZ, false },
-{ LANGUAGE_CZECH, cz, , false },
+{ LANGUAGE_CZECH, cz, , true },
{ LANGUAGE_ENGLISH_JAMAICA, en, JM, false },
{ LANGUAGE_ENGLISH_CARRIBEAN, en, BS, false }, // not
100%, because AG is Bahamas
{ LANGUAGE_ENGLISH_BELIZE, en, BZ, false },
@@ -229,11 +229,11 @@ static IsoLanguageCountryEntry const
aImplIsoLangEntries[] =
{ LANGUAGE_GERMAN_LUXEMBOURG, de, LU, false },
{ LANGUAGE_GERMAN_LIECHTENSTEIN,de, LI, false },
{ LANGUAGE_HEBREW, he, IL, false }, // new: old
was iw
-{ LANGUAGE_HEBREW, iw, IL, false }, // old: new
is he
+{ LANGUAGE_HEBREW, iw, IL, true }, // old: new
is he
{ LANGUAGE_HUNGARIAN, hu, HU, false },
{ LANGUAGE_ICELANDIC, is, IS, false },
{ LANGUAGE_INDONESIAN, id, ID, false }, // new: old
was in
-{ LANGUAGE_INDONESIAN, in, ID, false }, // old: new
is id
+{ LANGUAGE_INDONESIAN, in, ID, true }, // old: new
is id
{
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/inc/helpid.hrc |1 - cui/uiconfig/ui/connectortabpage.ui |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit f4226034189d65b0a90f4e40969bfe6f80b63869 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 12 17:08:13 2013 +0100 drop unused hid Change-Id: I70c9e272d52809ba0c166085f24fec672a18ab1b diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 4aa58c6..073fa2e 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -218,7 +218,6 @@ #define HID_TPCOLOR_CMYK_3 CUI_HID_TPCOLOR_CMYK_3 #define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS -#define HID_PAGE_CONNECTION_CTL_PREVIEW CUI_HID_PAGE_CONNECTION_CTL_PREVIEW #define HID_PAGE_DISTRIBUTE CUI_HID_PAGE_DISTRIBUTE #define HID_SVXPAGE_GRFCROP CUI_HID_SVXPAGE_GRFCROP #define HID_CAPTION CUI_HID_CAPTION commit 08275e40dcd4d7dc052a20f633def55e6092ab73 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 12 16:57:54 2013 +0100 oops, forgot about my debugging 'a' Change-Id: I339a490cfeda0de170772a396241b939a1dd1a59 diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui index fc3f139..6bc51b1 100644 --- a/cui/uiconfig/ui/connectortabpage.ui +++ b/cui/uiconfig/ui/connectortabpage.ui @@ -178,7 +178,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesLine skewa/property +property name=label translatable=yesLine skew/property attributes attribute name=weight value=bold/ /attributes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7071bebc00ef86e8ce10b66766882cf96214998b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 12 17:54:54 2013 +0200
Fix C++11'ism
Change-Id: Ia2ecbbc9262b4e2b794914030f88e1c9d792cb5e
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index 6029151..7d5f108 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -1654,7 +1654,7 @@ attributeAccessDecl:
assert(!pad-attributes.empty());
pad-attributes.back().getExceptions = *$2;
delete $2;
- $$ = unoidl::detail::SourceProviderAccessDecls::ACCESS_DECL_GET;
+ $$ = unoidl::detail::ACCESS_DECL_GET;
}
| TOK_SET exceptionSpec ';'
{
@@ -1673,7 +1673,7 @@ attributeAccessDecl:
+ cannot have set access declaration));
YYERROR;
}
- $$ = unoidl::detail::SourceProviderAccessDecls::ACCESS_DECL_SET;
+ $$ = unoidl::detail::ACCESS_DECL_SET;
}
;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 10 -- source/text/simpress/01/0517.xhp | 35 +-- 2 files changed, 17 insertions(+), 28 deletions(-) New commits: commit 0c13515aab91aed4e53560362de4ad8be9d36551 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 12 17:10:22 2013 +0100 update help ids for connectortabpage .ui conversion Change-Id: I980e8fcaee58b43ea08af0438c5a682d48e66b2e diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 341b91e..280b814 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2597,8 +2597,6 @@ HID_OPTSENDERDEFINE,41136, HID_OPTSENDERPLACEHOLDER,41135, HID_OUTLINE_FORM,54851, HID_PAGEPREVIEW,52835, -HID_PAGE_CONNECTION,33857, -HID_PAGE_CONNECTION_CTL_PREVIEW,33858, HID_PAGE_DBWIZARD_ADO_ET_ADOURL,39117, HID_PAGE_DBWIZARD_ADO_PB_ADOURL,39118, HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION,39119, @@ -6897,7 +6895,6 @@ svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ_REL,703172099, svx_ListBox_RID_SVXPAGE_CAPTION_LB_WINKEL,703172097, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538, -svx_ListBox_RID_SVXPAGE_CONNECTION_LB_TYPE,703843841, svx_ListBox_RID_SVXPAGE_DOCRECOVERY_SAVE_LB_SAVE_FILELIST,700845574, svx_ListBox_RID_SVXPAGE_EVENTASSIGN_LB_SCRIPTTYPE,705678856, svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN,705547787, @@ -6958,13 +6955,6 @@ svx_MetricField_RID_SVXPAGE_COLOR_MTR_FLD_1,701700609, svx_MetricField_RID_SVXPAGE_COLOR_MTR_FLD_2,701700610, svx_MetricField_RID_SVXPAGE_COLOR_MTR_FLD_3,701700611, svx_MetricField_RID_SVXPAGE_COLOR_MTR_FLD_4,701700612, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_HORZ_1,703846916, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_HORZ_2,703846917, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_LINE_1,703846913, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_LINE_2,703846914, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_LINE_3,703846915, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_VERT_1,703846918, -svx_MetricField_RID_SVXPAGE_CONNECTION_MTR_FLD_VERT_2,703846919, svx_MetricField_RID_SVXPAGE_FOOTER_ED_DIST,701143564, svx_MetricField_RID_SVXPAGE_FOOTER_ED_HEIGHT,701143566, svx_MetricField_RID_SVXPAGE_FOOTER_ED_LMARGIN,701143569, diff --git a/source/text/simpress/01/0517.xhp b/source/text/simpress/01/0517.xhp index 91219e5..9a7c5db 100644 --- a/source/text/simpress/01/0517.xhp +++ b/source/text/simpress/01/0517.xhp @@ -34,39 +34,38 @@ bookmark xml-lang=en-US branch=index id=bm_id3150297bookmark_valueconnectors; properties of/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:ConnectorAttributes id=bm_id7044568 localize=false/!-- HID added by script -- -bookmark xml-lang=en-US branch=hid/.uno:ConnectorAttributes id=bm_id3150343 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/connectortabpage/ConnectorTabPage id=bm_id3150343 localize=false/ paragraph role=heading id=hd_id3150297 xml-lang=en-US level=1 l10n=U oldref=1link href=text/simpress/01/0517.xhp name=ConnectorsConnectors/link/paragraph paragraph role=paragraph id=par_id3149209 xml-lang=en-US l10n=U oldref=2variable id=verbindertextahelp hid=.uno:ConnectorAttributesSets the properties of a connector./ahelp /variable/paragraph -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE id=bm_id3149405 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/connectortabpage/LB_TYPE id=bm_id3149405 localize=false/ paragraph role=heading id=hd_id3145384 xml-lang=en-US level=2 l10n=U oldref=21Type/paragraph -paragraph role=paragraph id=par_id3152899 xml-lang=en-US l10n=U oldref=22ahelp hid=SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPELists the types of connectors that are available./ahelp There are four types of connectors: emphstandard, line, straight, and curved/emph./paragraph +paragraph role=paragraph id=par_id3152899 xml-lang=en-US l10n=U oldref=22ahelp hid=cui/ui/connectortabpage/LB_TYPELists the types of connectors that are available./ahelp There are four types of connectors: emphstandard, line, straight, and curved/emph./paragraph paragraph role=heading id=hd_id3148866 xml-lang=en-US level=2 l10n=U oldref=3Line skew/paragraph paragraph role=paragraph id=par_id3148605 xml-lang=en-US l10n=U oldref=4Defines the skew of a connector line. The preview window displays the result./paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 id=bm_id3159206 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/connectortabpage/MTR_FLD_LINE_1 id=bm_id3159206 localize=false/ paragraph role=heading id=hd_id3157982 xml-lang=en-US level=3 l10n=U oldref=5Line 1/paragraph -paragraph role=paragraph id=par_id3150215 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1Enter a skew value for Line 1./ahelp/paragraph -bookmark xml-lang=en-US
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a244243c76001627b6594fcc2edeb3940ee42450 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 12 17:10:22 2013 +0100 Updated core Project: help 0c13515aab91aed4e53560362de4ad8be9d36551 diff --git a/helpcontent2 b/helpcontent2 index 29aa4cb..0c13515 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 29aa4cb0cf80b9733dc1feff3e61479c189d85ec +Subproject commit 0c13515aab91aed4e53560362de4ad8be9d36551 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - 2 commits - sc/Library_vbaobj.mk sc/qa sc/source
sc/Library_vbaobj.mk|5 -
sc/qa/unit/filters-test.cxx |2 +-
sc/qa/unit/ucalc.cxx| 40 +++-
sc/source/ui/navipi/content.cxx | 19 ---
4 files changed, 28 insertions(+), 38 deletions(-)
New commits:
commit 1132ea0a7c5a5b97a155b1bb65468242fc484da8
Author: Laurent Godard lgodard.li...@laposte.net
Date: Thu Sep 12 18:30:35 2013 +0200
GetNotes removal - last initial changes
Change-Id: I419dd8671f40fdfce5f181cda35415526c72844f
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 9146a11..00f31ad 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -21,7 +21,10 @@ $(eval $(call
gb_Library_set_precompiled_header,vbaobj,$(SRCDIR)/sc/inc/pch/prec
$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
-$(eval $(call gb_Library_use_external,vbaobj,boost_headers))
+$(eval $(call gb_Library_use_externals,vbaobj,\
+ boost_headers \
+ mdds_headers \
+))
$(eval $(call gb_Library_use_api,vbaobj,\
offapi \
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 23e8675..07c4d90 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3747,8 +3747,10 @@ void Test::testSort()
ASSERT_DOUBLES_EQUAL(nVal, 1.0);
// check that note is also moved
+/* TODO GetNotes
pNote = m_pDoc-GetNote(1, 0, 0);
CPPUNIT_ASSERT(pNote);
+*/
clearRange(m_pDoc, ScRange(0, 0, 0, 1, 9, 0)); // Clear A1:B10.
{
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 17e92ad..c09baeb 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -968,25 +968,6 @@ sal_Bool ScContentTree::NoteStringsChanged()
}
}
-
-/*
-ScNotes* pNotes = pDoc-GetNotes(nTab);
-for (ScNotes::const_iterator itr = pNotes-begin(); itr !=
pNotes-end(); ++itr)
-{
-if( const ScPostIt* pNote = itr-second )
-{
-if ( !pEntry )
-bEqual = false;
-else
-{
-if ( lcl_NoteString( *pNote ) != GetEntryText(pEntry) )
-bEqual = false;
-
-pEntry = NextSibling( pEntry );
-}
-}
-}
-*/
}
if ( pEntry )
commit 0b3822c0efb544d77539eaca097a19f03a04a957
Author: Laurent Godard lgodard.li...@laposte.net
Date: Thu Sep 12 18:01:37 2013 +0200
remove GetNotes use - unit tests
Change-Id: I6f466b3d5424f8f39c56827e3a70ab205e6ac4cb
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index f6b9b0b..45cd1b2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -275,7 +275,7 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat )
//same code for ods,
//check notes import
ScAddress aAddress(7, 2, 0);
-ScPostIt* pNote =
pDoc-GetNotes(aAddress.Tab())-findByAddress(aAddress);
+ScPostIt* pNote = pDoc-GetNote(aAddress);
CPPUNIT_ASSERT_MESSAGE(note not imported, pNote);
CPPUNIT_ASSERT_EQUAL_MESSAGE(note text not imported correctly,
pNote-GetText(), OUString(Test));
}
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 11b7c0e..23e8675 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2573,58 +2573,58 @@ void Test::testPostIts()
m_pDoc-InsertTab(0, aTabName);
ScAddress rAddr(2, 2, 0); // cell C3
-ScPostIt *pNote = m_pDoc-GetNotes(rAddr.Tab())-GetOrCreateNote(rAddr);
+ScPostIt *pNote = m_pDoc-GetOrCreateNote(rAddr);
pNote-SetText(rAddr, aHello);
pNote-SetAuthor(aJimBob);
-ScPostIt *pGetNote = m_pDoc-GetNotes(rAddr.Tab())-findByAddress(rAddr);
+ScPostIt *pGetNote = m_pDoc-GetNote(rAddr);
CPPUNIT_ASSERT_MESSAGE(note should be itself, pGetNote == pNote );
// Insert one row at row 1.
bool bInsertRow = m_pDoc-InsertRow(0, 0, MAXCOL, 0, 1, 1);
CPPUNIT_ASSERT_MESSAGE(failed to insert row, bInsertRow );
-CPPUNIT_ASSERT_MESSAGE(note hasn't moved,
m_pDoc-GetNotes(rAddr.Tab())-findByAddress(rAddr) == NULL);
+CPPUNIT_ASSERT_MESSAGE(note hasn't moved, m_pDoc-GetNote(rAddr) ==
NULL);
rAddr.IncRow(); // cell C4
-CPPUNIT_ASSERT_MESSAGE(note not there,
m_pDoc-GetNotes(rAddr.Tab())-findByAddress(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE(note not there, m_pDoc-GetNote(rAddr) == pNote);
// Insert column at column A.
bool bInsertCol = m_pDoc-InsertCol(0, 0, MAXROW, 0, 1, 1);
CPPUNIT_ASSERT_MESSAGE(failed to insert column, bInsertCol );
-CPPUNIT_ASSERT_MESSAGE(note hasn't moved,
m_pDoc-GetNotes(rAddr.Tab())-findByAddress(rAddr) == NULL);
+CPPUNIT_ASSERT_MESSAGE(note hasn't moved, m_pDoc-GetNote(rAddr) ==
NULL);
rAddr.IncCol(); // cell D4
-CPPUNIT_ASSERT_MESSAGE(note not there,
m_pDoc-GetNotes(rAddr.Tab())-findByAddress(rAddr) == pNote);
+
Re: cuitabarea.hxx
On Wed, 2013-09-11 at 23:39 -0300, Olivier Hallot wrote: Hi Converting a page setup dialog to widgets UI in sd/, I stumbled on the need to have cui/source/inc/cuitabarea.hxx visible to sd/ But moving it to include/cui/ will affect many files that looks for it in cui/source/inc/ Any objections for the move? Well, we don't currently have an include/cui so you'd have to create that. What are the circumstances that require its exposure due to a .ui conversion ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68771, which changed state. Bug 68771 Summary: Crash on launch on OS X https://bugs.freedesktop.org/show_bug.cgi?id=68771 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |NOTABUG -- 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: 2 commits - i18nlangtag/source lingucomponent/source
i18nlangtag/source/isolang/isolang.cxx |4 ++--
i18nlangtag/source/languagetag/languagetag.cxx |8
lingucomponent/source/lingutil/lingutil.cxx|4 +---
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 08e4d51f04734b952f42e3c334920dfd859bba02
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 18:38:12 2013 +0200
if valid accept whatever the dictionary's name might comprise
Change-Id: Ia6ea53f1a9e1c575606901e173bc952449135522
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index b6db0b9..590206c 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -152,9 +152,7 @@ std::vector SvtLinguConfigDictionaryEntry
GetOldStyleDics( const char *pDicTy
// ctor as that triggers use of liblangtag and initializes its
// database which we do not want during startup. Convert
// instead.
-sal_Int32 nPos;
-if (sChunk.indexOf('-') 0 ((nPos = sChunk.indexOf('_'))
0))
-sChunk = sChunk.replaceAt( nPos, 1, OUString('-'));
+sChunk = sChunk.replace( '_', '-');
LanguageTag aLangTag(sChunk, true);
if (!aLangTag.isValidBcp47())
continue;
commit fa031ec8eb216978b1646ab2459cf5900891d98c
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 18:33:48 2013 +0200
special case for Pali 'pi-Latn' vs 'pli', fdo#41599 related
Change-Id: I924c87dd7c58d9e1aca440c6f2aea7bbbcf9
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 1abf020..fc412e4 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -522,8 +522,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_MANX, gv, GB, false },
{ LANGUAGE_USER_ARAGONESE, an, ES, false },
{ LANGUAGE_USER_KEYID, qtz, , false }, // key id
pseudolanguage used for UI testing
-{ LANGUAGE_USER_PALI_LATIN, pi, , false }, // Pali
with Latin script, ISO 639-1
-{ LANGUAGE_USER_PALI_LATIN,pli, , true }, // Pali
with Latin script, ISO 639-3 (sigh..) back-compat
+{ LANGUAGE_USER_PALI_LATIN,pli, , true }, // Pali
with Latin script, ISO 639-3 (sigh..) back-compat, Latin is not a default
script though..
{ LANGUAGE_USER_KYRGYZ_CHINA, ky, CN, false },
{ LANGUAGE_USER_KOMI_ZYRIAN, kpv, RU, false },
{ LANGUAGE_USER_KOMI_PERMYAK, koi, RU, false },
@@ -582,6 +581,7 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, bs-Cyrl, BA },
{ LANGUAGE_AZERI_CYRILLIC, az-Cyrl, AZ }, //
macrolanguage code
{ LANGUAGE_UZBEK_CYRILLIC, uz-Cyrl, UZ }, //
macrolanguage code
+{ LANGUAGE_USER_PALI_LATIN, pi-Latn,},
{ LANGUAGE_DONTKNOW,, } // marks
end of table
};
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 504d90a..e2f714c 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1268,6 +1268,12 @@ LanguageTag LanguageTag::makeFallback()
aVec.push_back( sr-Latn);
aVec.push_back( sr);
}
+else if (aLanguage == pli)
+{
+// a special case for Pali dictionary, see fdo#41599
+aVec.push_back( pi-Latn);
+aVec.push_back( pi);
+}
}
return aVec;
}
@@ -1311,6 +1317,8 @@ LanguageTag LanguageTag::makeFallback()
else
aVec.push_back( sh- + aCountry);
}
+else if (aLanguage == pi aScript == Latn)
+aVec.push_back( pli); // a special case for Pali
dictionary, see fdo#41599
}
if (!aVariants.isEmpty() !bHaveLanguageScriptVariant)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc conditional formatting icon set: smilies
Hey Gerry, 2013/9/12 Gerry T. gerry.trep...@googlemail.com Dear Markus, dear all, additionally to my previous email regarding a coloured smilies icon set for bug/enhancement 60107https://bugs.freedesktop.org/show_bug.cgi?id=60107, there is also the icon set 'smilies' (just yellow) to be included in the Calc conditional formatting feature. The icon set can be found here: https://wiki.documentfoundation.org/images/9/9f/Smilies-with-thicker-smiles.svg These icons are also based on Zorro's work at OpenClipart: http://openclipart.org/detail/100759/smiley-by-zorro. They are licensed as public domain: http://openclipart.org/share. I made a few modifications to Zorro's work (selection of three smilies bolder/wider smiles). My modifications are also public domain/CC0. Thanks a lot for your work. I've used these icons already for the new icon sets. I'll add it to the 4.2 features page soon. If you want you can add your name as one of the persons who developed this feature. I hope to see more of your great work soon. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/test-bugzilla-files.py
test-bugzilla-files/test-bugzilla-files.py | 962 ++---
1 file changed, 482 insertions(+), 480 deletions(-)
New commits:
commit 293b82d938f7f4492813299cbb39e7389165
Author: Tor Lillqvist t...@collabora.com
Date: Fri Sep 6 13:59:04 2013 +0300
Use Unix newlines, drop some noise output, improve usage message
diff --git a/test-bugzilla-files/test-bugzilla-files.py
b/test-bugzilla-files/test-bugzilla-files.py
index 54343f6..84e282b 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -1,480 +1,482 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., Michael Stahl mst...@redhat.com
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the GPLv3+), or
-# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-import getopt
-import os
-import subprocess
-import sys
-import time
-import uuid
-import datetime
-
-import signal
-import threading
-try:
-from urllib.parse import quote
-except ImportError:
-from urllib import quote
-
-try:
-import pyuno
-import uno
-import unohelper
-except ImportError:
-print(pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables)
-print(PYTHONPATH=/installation/opt/program)
-print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
-raise
-
-try:
-from com.sun.star.document import XDocumentEventListener
-except ImportError:
-print(UNO API class not found: try to set URE_BOOTSTRAP variable)
-print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
-raise
-
-### utilities ###
-
-def partition(list, pred):
-left = []
-right = []
-for e in list:
-if pred(e):
-left.append(e)
-else:
-right.append(e)
-return (left, right)
-
-def filelist(dir, suffix):
-if len(dir) == 0:
-raise Exception(filelist: empty directory)
-if not(dir[-1] == /):
-dir += /
-files = [dir + f for f in os.listdir(dir)]
-#print(files)
-return [f for f in files
-if os.path.isfile(f) and os.path.splitext(f)[1] == suffix]
-
-def getFiles(dirs, suffix):
-print( dirs )
-files = []
-for dir in dirs:
-files += filelist(dir, suffix)
-return files
-
-### UNO utilities ###
-
-class OfficeConnection:
-def __init__(self, args):
-self.args = args
-self.soffice = None
-self.socket = None
-self.xContext = None
-self.pro = None
-def setUp(self):
-(method, sep, rest) = self.args[--soffice].partition(:)
-if sep != ::
-raise Exception(soffice parameter does not specify method)
-if method == path:
-socket = pipe,name=pytest + str(uuid.uuid1())
-try:
-userdir = self.args[--userdir]
-except KeyError:
-raise Exception('path' method requires --userdir)
-if not(userdir.startswith(file://)):
-raise Exception(--userdir must be file URL)
-self.soffice = self.bootstrap(rest, userdir, socket)
-elif method == connect:
-socket = rest
-else:
-raise Exception(unsupported connection method: + method)
-self.xContext = self.connect(socket)
-
-def bootstrap(self, soffice, userdir, socket):
-argv = [ soffice, --accept= + socket + ;urp,
--env:UserInstallation= + userdir,
---quickstart=no, --nofirststartwizard,
---norestore, --nologo, --headless ]
-if --valgrind in self.args:
-argv.append(--valgrind)
-self.pro = subprocess.Popen(argv)
-print(self.pro.pid)
-
-def connect(self, socket):
-xLocalContext = uno.getComponentContext()
-xUnoResolver = xLocalContext.ServiceManager.createInstanceWithContext(
-com.sun.star.bridge.UnoUrlResolver, xLocalContext)
-url = uno: + socket + ;urp;StarOffice.ComponentContext
-
[Libreoffice-commits] core.git: 4 commits - include/linguistic lingucomponent/source linguistic/source
include/linguistic/misc.hxx |4
lingucomponent/source/lingutil/lingutil.cxx | 16 +---
linguistic/source/misc.cxx | 13 +
3 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit b291852c2f907e5d181b1de43af216f7d03db96a
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 19:31:04 2013 +0200
get rid of unnecessary conversion, use LinguIsUnspecified(OUString)
Change-Id: Ib1074e3025680306c0a8bf7dcff651cefdcb90ba
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 3d6321e..da5c4dc 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -111,6 +111,10 @@ LNG_DLLPUBLIC ::com::sun::star::lang::Locale
LinguLanguageToLocale( LanguageType
*/
LNG_DLLPUBLIC bool LinguIsUnspecified( LanguageType nLanguage );
+/** The same as LinguIsUnspecified(LanguageType) but taking a BCP 47 language
+tag string instead. */
+LNG_DLLPUBLIC bool LinguIsUnspecified( const OUString rBcp47 );
+
::com::sun::star::uno::Sequence sal_Int16
LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence
::com::sun::star::lang::Locale rLocaleSeq );
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index 48fe7c5..5543a66 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -208,11 +208,7 @@ void MergeNewStyleDicsAndOldStyleDics(
DBG_ASSERT( nOldStyleDics, old style dictionary with more then one
language found!);
if (nOldStyleDics 0)
{
-/* TODO: this conversion exists only to check with
- * LinguIsUnspecified(), add another check that takes the tag
- * string instead. */
-LanguageType nLang =
LanguageTag::convertToLanguageTypeWithFallback( aIt2-aLocaleNames[0] );
-if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified(
nLang))
+if (linguistic::LinguIsUnspecified( aIt2-aLocaleNames[0]))
{
OSL_FAIL( old style dictionary with invalid language found!
);
continue;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 867dccf..fe24438 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -106,6 +106,19 @@ bool LinguIsUnspecified( LanguageType nLanguage )
return false;
}
+// When adding anything keep both LinguIsUnspecified() methods in sync!
+// For mappings between language code string and LanguageType see
+// i18nlangtag/source/isolang/isolang.cxx
+
+bool LinguIsUnspecified( const OUString rBcp47 )
+{
+if (rBcp47.getLength() != 3)
+return false;
+if (rBcp47 == zxx || rBcp47 == und || rBcp47 == mul)
+return true;
+return false;
+}
+
static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 )
{
sal_Int32 nMin = n1 n2 ? n1 : n2;
commit 2f6551b0167c2651f900b9c727bd74240b493754
Author: Eike Rathke er...@redhat.com
Date: Thu Sep 12 19:13:53 2013 +0200
a set of LanguageType fallback converted to is utter nonsense here
Change-Id: I02881a2a7ab3178521388b76e2413b7e1cd6c443
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index 6afd28c..48fe7c5 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -185,7 +185,7 @@ void MergeNewStyleDicsAndOldStyleDics(
const std::vector SvtLinguConfigDictionaryEntry rOldStyleDics )
{
// get list of languages supported by new style dictionaries
-std::set LanguageType aNewStyleLanguages;
+std::set OUString aNewStyleLanguages;
std::list SvtLinguConfigDictionaryEntry ::const_iterator aIt;
for (aIt = rNewStyleDics.begin() ; aIt != rNewStyleDics.end(); ++aIt)
{
@@ -193,8 +193,7 @@ void MergeNewStyleDicsAndOldStyleDics(
sal_Int32 nLocaleNames = aLocaleNames.getLength();
for (sal_Int32 k = 0; k nLocaleNames; ++k)
{
-LanguageType nLang =
LanguageTag::convertToLanguageTypeWithFallback( aLocaleNames[k] );
-aNewStyleLanguages.insert( nLang );
+aNewStyleLanguages.insert( aLocaleNames[k] );
}
}
@@ -209,8 +208,10 @@ void MergeNewStyleDicsAndOldStyleDics(
DBG_ASSERT( nOldStyleDics, old style dictionary with more then one
language found!);
if (nOldStyleDics 0)
{
+/* TODO: this conversion exists only to check with
+ * LinguIsUnspecified(), add another check that takes the tag
+ * string instead. */
LanguageType nLang =
LanguageTag::convertToLanguageTypeWithFallback( aIt2-aLocaleNames[0] );
-
if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified(
nLang))
{
OSL_FAIL( old style dictionary with invalid language found!
);
@@ -218,7 +219,7
[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source include/connectivity mysqlc/source
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 10
+--
connectivity/source/commontools/dbexception.cxx |9
++
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 10
+--
connectivity/source/drivers/ado/AResultSet.cxx | 10
+--
connectivity/source/drivers/evoab2/NResultSet.cxx | 10
+--
connectivity/source/drivers/file/FResultSet.cxx | 12
+---
connectivity/source/drivers/firebird/ResultSet.cxx | 12
++--
connectivity/source/drivers/kab/KResultSet.cxx | 13
++---
connectivity/source/drivers/macab/MacabResultSet.cxx| 14
+++---
connectivity/source/drivers/mork/MResultSet.cxx |9
--
connectivity/source/drivers/mozab/MResultSet.cxx|9
--
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 10
+--
connectivity/source/drivers/odbcbase/OResultSet.cxx | 10
+--
connectivity/source/drivers/postgresql/pq_resultset.cxx |7
+
connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx | 10
+++
connectivity/source/sdbcx/VCollection.cxx |8
+
dbaccess/source/ui/browser/formadapter.cxx |6 +++-
include/connectivity/dbexception.hxx| 13
+
mysqlc/source/mysqlc_resultset.cxx |8
+
19 files changed, 120 insertions(+), 70 deletions(-)
New commits:
commit 3f31bdd67a82056b87b8b93e54a953983ba048bc
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 12 10:37:31 2013 +0100
Update mysqlc's ColumnLocate::findColumn to throw for invalid column.
(This is to comply with the updated API specification.)
Change-Id: I4542fecc78a6e64011276dafc72c31d5533af1ab
Reviewed-on: https://gerrit.libreoffice.org/5923
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/mysqlc/source/mysqlc_resultset.cxx
b/mysqlc/source/mysqlc_resultset.cxx
index b2793ad..d9160ff 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -179,7 +179,13 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString
columnName)
} catch (const sql::SQLException e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
}
-return 0;
+throw SQLException(
+The column name ' + columnName + ' is not valid.,
+*this,
+OUString(42S22),
+0,
+Any()
+);
}
/* }}} */
commit 42165189826367937737861116e969a22e9db787
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Wed Sep 11 21:40:41 2013 +0100
Update implementations of ColumnLocate::findColumn to throw on invalid
column.
Change-Id: I7a9354ecd35a70a005c6c50e38d27de9b2bd
Reviewed-on: https://gerrit.libreoffice.org/5922
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 6217626..9373481 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -37,6 +37,7 @@
#include cppuhelper/factory.hxx
#include cppuhelper/implementationentry.hxx
#include connectivity/dbexception.hxx
+#include resource/common_res.hrc
#include TConnection.hxx
using namespace connectivity;
@@ -168,13 +169,16 @@ sal_Int32 SAL_CALL
ODatabaseMetaDataResultSet::findColumn( const OUString colum
sal_Int32 nLen = xMeta-getColumnCount();
sal_Int32 i = 1;
for(;i=nLen;++i)
+{
if(xMeta-isCaseSensitive(i) ? columnName == xMeta-getColumnName(i) :
columnName.equalsIgnoreAsciiCase(xMeta-getColumnName(i))
)
-break;
-/* FIXME: should throw in case of not found ? */
+return i;
+}
-return i;
+::dbtools::throwInvalidColumnException( columnName, *this );
+assert(false);
+return 0; // Never reached
}
//
-
void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException)
diff --git a/connectivity/source/commontools/dbexception.cxx
b/connectivity/source/commontools/dbexception.cxx
index 5dcac1b..c33c1e0 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -446,6 +446,15 @@ void throwFeatureNotImplementedException( const sal_Char*
_pAsciiFeatureName, co
);
}
+void throwInvalidColumnException( const
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/sdbc/XColumnLocate.idl | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit a042cdd7eff15ed5f6cbd613588b3fca9509a85e
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 12 09:05:50 2013 +0100
Update XColumnLocate to specify SQLException for invalid column.
This is to reflect the JDBC specification where invalid column names
result in an SQLException.
(The drivers within LibreOffice are being updated to reflect this new
specification.)
Change-Id: I76cdf9d5d15d55b534b28219b541ff9190365f9d
Reviewed-on: https://gerrit.libreoffice.org/5921
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/offapi/com/sun/star/sdbc/XColumnLocate.idl
b/offapi/com/sun/star/sdbc/XColumnLocate.idl
index 0943898..a7c8d52 100644
--- a/offapi/com/sun/star/sdbc/XColumnLocate.idl
+++ b/offapi/com/sun/star/sdbc/XColumnLocate.idl
@@ -45,12 +45,22 @@ published interface XColumnLocate:
com::sun::star::uno::XInterface
{
/** maps the given ResultSet column name to its ResultSet column index.
+
+p
+The specification before LibreOffice 4.2 left unspecified what should
+happen for an invalid column name. As a result some drivers written
+against the older speification may return a special invalid value, such
+as a negative number, zero, or a number greater than the number of
+columns.
+/p
+
@param columnName
the name of the column
@returns
the position of the column
@throws SQLException
-if a database access error occurs.
+if the column named codecolumnName/code does not exist,
+or a database access error occurs.
*/
long findColumn([in]string columnName) raises (SQLException);
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
Yes, the existing links could point to the current version and we could host also all the older revisions as well. mike On Thu, Sep 12, 2013 at 3:56 AM, Stephan Bergmann sberg...@redhat.comwrote: On 09/11/2013 07:28 PM, Lionel Elie Mamane wrote: On Wed, Sep 11, 2013 at 05:54:58PM +0200, bjoern wrote: On Wed, Sep 11, 2013 at 05:04:01PM +0200, Michael Stahl wrote: On 09/09/13 10:38, Lionel Elie Mamane wrote: Actually, it could make sense to document the API available in each version, that is, have something like: http://api.libreoffice.org/**docs/3.3/idl/http://api.libreoffice.org/docs/3.3/idl/ http://api.libreoffice.org/**docs/3.6/idl/http://api.libreoffice.org/docs/3.6/idl/ http://api.libreoffice.org/**docs/4.0/idl/http://api.libreoffice.org/docs/4.0/idl/ http://api.libreoffice.org/**docs/4.1/idl/http://api.libreoffice.org/docs/4.1/idl/ http://api.libreoffice.org/**docs/4.2/idl/http://api.libreoffice.org/docs/4.2/idl/ http://api.libreoffice.org/**docs/current/idl/http://api.libreoffice.org/docs/current/idl/ Well, properly packaged versions come with their own api-docs, so IMHO no need to keep docs for unsupported releases around. Packaged docs are much less practical for the user. I always love it how http://gcc.gnu.org/**onlinedocs/http://gcc.gnu.org/onlinedocs/ (linked as Documentation: Manual from the GCC homepage http://gcc.gnu.org/) unambiguously makes available the documentation for each released GCC major.minor version. Could serve as a model for us. Stephan __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new import crash testing run
Markus Mohrhard wrote: Crash:/devel/files/pptx/novell653343-44.pptx through disposed Crash:/devel/files/pptx/ooo118640-77046.pptx through disposed Crash:/devel/files/pptx/rhbz988104-777893.pptx through disposed Looking into those now. -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/connectivity
connectivity/source/commontools/dbexception.cxx | 111 ++-
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |2
include/connectivity/dbexception.hxx | 54 +
3 files changed, 49 insertions(+), 118 deletions(-)
New commits:
commit 7a6fd503b1c69e99eb1bcfb55a453a1afad3e4eb
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Mon Sep 9 09:28:57 2013 +0100
Remove sal_char* from dbexception and some cleanup.
Change-Id: I81909e4542bd5e8d1f8ae182c3c17f9bbea9745d
Reviewed-on: https://gerrit.libreoffice.org/5881
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/commontools/dbexception.cxx
b/connectivity/source/commontools/dbexception.cxx
index c33c1e0..87e8d50 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -198,12 +198,12 @@ SQLExceptionInfo::operator const
::com::sun::star::sdb::SQLContext*() const
}
//--
-void SQLExceptionInfo::prepend( const OUString _rErrorMessage, const
sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
+void SQLExceptionInfo::prepend( const OUString _rErrorMessage, const
OUString _rSQLState, const sal_Int32 _nErrorCode )
{
SQLException aException;
aException.Message = _rErrorMessage;
aException.ErrorCode = _nErrorCode;
-aException.SQLState = _pAsciiSQLState ? OUString::createFromAscii(
_pAsciiSQLState ) : OUString(S1000 );
+aException.SQLState = !_rSQLState.isEmpty() ? _rSQLState : S1000;
aException.NextException = m_aContent;
m_aContent = aException;
@@ -211,7 +211,7 @@ void SQLExceptionInfo::prepend( const OUString
_rErrorMessage, const sal_Char*
}
//--
-void SQLExceptionInfo::append( TYPE _eType, const OUString _rErrorMessage,
const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
+void SQLExceptionInfo::append( TYPE _eType, const OUString _rErrorMessage,
const OUString _rSQLState, const sal_Int32 _nErrorCode )
{
// create the to-be-appended exception
Any aAppend;
@@ -227,7 +227,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString
_rErrorMessage, cons
SQLException* pAppendException( static_cast SQLException* ( const_cast
void* ( aAppend.getValue() ) ) );
pAppendException-Message = _rErrorMessage;
-pAppendException-SQLState = OUString::createFromAscii( _pAsciiSQLState );
+pAppendException-SQLState = _rSQLState;
pAppendException-ErrorCode = _nErrorCode;
// find the end of the current chain
@@ -386,31 +386,18 @@ void throwInvalidIndexException(const
::com::sun::star::uno::Reference ::com::s
);
}
//
-
-void throwFunctionNotSupportedException(const OUString _rMsg,
-const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface _Context,
-const ::com::sun::star::uno::Any _Next) throw (
::com::sun::star::sdbc::SQLException )
-{
-throw SQLException(
-_rMsg,
-_Context,
-getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ),
-0,
-_Next
-);
-}
-//
-
-void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName,
const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
_rxContext,
-const ::com::sun::star::uno::Any* _pNextException ) throw (
::com::sun::star::sdbc::SQLException )
+void throwFunctionNotSupportedException( const OUString _rFunctionName, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
_rxContext,
+const ::com::sun::star::uno::Any _rNextException ) throw (
::com::sun::star::sdbc::SQLException )
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
STR_UNSUPPORTED_FUNCTION,
-$functionname$, OUString::createFromAscii( _pAsciiFunctionName )
+$functionname$, _rFunctionName
) );
throwFunctionNotSupportedException(
sError,
_rxContext,
-_pNextException ? *_pNextException : Any()
+_rNextException
);
}
//
-
@@ -428,13 +415,13 @@ void throwGenericSQLException(const OUString _rMsg,
const Reference XInterface
}
//
-
-void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName,
const Reference XInterface _rxContext, const Any* _pNextException )
+void throwFeatureNotImplementedException( const OUString _rFeatureName, const
Reference
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer.pm |4 ++--
solenv/bin/modules/installer/scriptitems.pm |9 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 1f3f3c94458aef5df3d30e32b497885cccf32a52
Author: Michael Stahl mst...@redhat.com
Date: Thu Sep 12 19:04:26 2013 +0200
installer: find files in INSTDIR also on WNT
... where everything is inside some artificial LibreOffice 4
directory that is set as WINDOWSBASISROOTNAME in openoffice.lst.in
Change-Id: Ib04f84a8064739e0ea9d11b3b79cc1fa167a06e5
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 7093e64..a26196a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -588,7 +588,7 @@ sub run {
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref,
$dirsinproductarrayref);
-
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, Files);
+
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, Files,
$allvariableshashref);
$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_Files_Without_Sourcedirectory($filesinproductlanguageresolvedarrayref);
@@ -672,7 +672,7 @@ sub run {
installer::scriptitems::changing_name_of_language_dependent_keys($scpactionsinproductlanguageresolvedarrayref);
-
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref,
ScpActions);
+
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref,
ScpActions, $allvariableshashref);
# Editing scpactions with flag SCPZIP_REPLACE.
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index e0ed89f..749ada9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1014,10 +1014,11 @@ sub get_sourcepath_from_filename_and_includepath
sub get_Source_Directory_For_Files_From_Includepathlist
{
-my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
+my ($filesarrayref, $includepatharrayref, $dirsref, $item, $allvariables)
= @_;
installer::logger::include_header_into_logfile($item:);
+my $extrarootdir = $allvariables-{'WINDOWSBASISROOTNAME'};
my $infoline = ;
for ( my $i = 0; $i = $#{$filesarrayref}; $i++ )
@@ -1044,7 +1045,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $instdirdestination;
if ($destination)
{
-$instdirdestination = $ENV{'INSTDIR'} .
$installer::globals::separator . $onefile-{'destination'};
+if ($extrarootdir)
+{
+$destination =~ s,$extrarootdir/,,; # remove it from path
+}
+$instdirdestination = $ENV{'INSTDIR'} .
$installer::globals::separator . $destination;
}
if ($instdirdestination -f $instdirdestination)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-scanner.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b302e856f3cf8c0dcea745a94a9823f3cb01cac1
Author: Tor Lillqvist t...@collabora.com
Date: Thu Sep 12 21:27:58 2013 +0300
WaE: C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool' in
operation
Change-Id: I3fd7508a3b9c362661ad1bfa66901be9f938b8e6
diff --git a/unoidl/source/sourceprovider-scanner.hxx
b/unoidl/source/sourceprovider-scanner.hxx
index 4509361..152b9cf 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -59,7 +59,7 @@ public:
rtl::Referenceunoidl::PlainStructTypeEntity const theBaseEntity):
SourceProviderEntityPad(published), baseName(theBaseName),
baseEntity(theBaseEntity)
-{ assert(theBaseName.isEmpty() != theBaseEntity.is()); }
+{ assert(theBaseName.isEmpty() != (bool) theBaseEntity.is()); }
OUString const baseName;
rtl::Referenceunoidl::PlainStructTypeEntity const baseEntity;
@@ -91,7 +91,7 @@ public:
rtl::Referenceunoidl::ExceptionTypeEntity const theBaseEntity):
SourceProviderEntityPad(published), baseName(theBaseName),
baseEntity(theBaseEntity)
-{ assert(theBaseName.isEmpty() != theBaseEntity.is()); }
+{ assert(theBaseName.isEmpty() != (bool) theBaseEntity.is()); }
OUString const baseName;
rtl::Referenceunoidl::ExceptionTypeEntity const baseEntity;
@@ -122,7 +122,7 @@ public:
SourceProviderEntityPad(published),
singleBase(!singleBaseName.isEmpty())
{
-assert(singleBaseName.isEmpty() != singleBaseEntity.is());
+assert(singleBaseName.isEmpty() != (bool) singleBaseEntity.is());
if (singleBase) {
mandatoryBases.push_back(
Base(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/oustring/rtl_OUString2.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0992fbe72b8bf5e228d236f42ae64a27fe493f6c
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 12 20:09:47 2013 +0100
WaE: unused variable suToken, aEmpty, aEmpty2.
Change-Id: I2eaa32e0ec09b239e03d3efa776f5b47c2fb5c6d
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index fb86b08..4878540 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -859,7 +859,7 @@ public:
sal_Int32 nIndex = 0;
do
{
-rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+suTokenStr.getToken( 0, ';', nIndex );
}
while ( nIndex = 0 );
printf(Index % SAL_PRIdINT32 \n, nIndex);
@@ -1000,8 +1000,8 @@ public:
void intern()
{
// The empty string is 'static' a special case ...
-rtl::OUString aEmpty = rtl::OUString().intern();
-rtl::OUString aEmpty2 = rtl::OUString::intern(
,strlen(),RTL_TEXTENCODING_ASCII_US );
+rtl::OUString().intern();
+rtl::OUString::intern( ,strlen(),RTL_TEXTENCODING_ASCII_US );
::rtl::OUString aFoo( foo );
::rtl::OUString aFooIntern = aFoo.intern();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/dbexception.cxx | 42
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 9f46834fbfa73a53536a336fa8f1fb6fff3bfbf9
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 12 19:55:37 2013 +0100
Explicitly wrap char as OUString.
Currently this causes some (all?) gcc to break.
Change-Id: If6d802f5a763904d06107fa99731dd4512f18052
diff --git a/connectivity/source/commontools/dbexception.cxx
b/connectivity/source/commontools/dbexception.cxx
index 87e8d50..6b774ad 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -468,27 +468,27 @@ OUString getStandardSQLState( StandardSQLState _eState )
{
switch ( _eState )
{
-case SQL_WRONG_PARAMETER_NUMBER:return 07001;
-case SQL_INVALID_DESCRIPTOR_INDEX: return 07009;
-case SQL_UNABLE_TO_CONNECT: return 08001;
-case SQL_NUMERIC_OUT_OF_RANGE: return 22003;
-case SQL_INVALID_DATE_TIME: return 22007;
-case SQL_INVALID_CURSOR_STATE: return 24000;
-case SQL_TABLE_OR_VIEW_EXISTS: return 42S01;
-case SQL_TABLE_OR_VIEW_NOT_FOUND: return 42S02;
-case SQL_INDEX_ESISTS: return 42S11;
-case SQL_INDEX_NOT_FOUND: return 42S12;
-case SQL_COLUMN_EXISTS: return 42S21;
-case SQL_COLUMN_NOT_FOUND: return 42S22;
-case SQL_GENERAL_ERROR: return HY000;
-case SQL_INVALID_SQL_DATA_TYPE: return HY004;
-case SQL_OPERATION_CANCELED:return HY008;
-case SQL_FUNCTION_SEQUENCE_ERROR: return HY010;
-case SQL_INVALID_CURSOR_POSITION: return HY109;
-case SQL_INVALID_BOOKMARK_VALUE:return HY111;
-case SQL_FEATURE_NOT_IMPLEMENTED: return HYC00;
-case SQL_FUNCTION_NOT_SUPPORTED:return IM001;
-case SQL_CONNECTION_DOES_NOT_EXIST: return 08003;
+case SQL_WRONG_PARAMETER_NUMBER:return OUString(07001);
+case SQL_INVALID_DESCRIPTOR_INDEX: return OUString(07009);
+case SQL_UNABLE_TO_CONNECT: return OUString(08001);
+case SQL_NUMERIC_OUT_OF_RANGE: return OUString(22003);
+case SQL_INVALID_DATE_TIME: return OUString(22007);
+case SQL_INVALID_CURSOR_STATE: return OUString(24000);
+case SQL_TABLE_OR_VIEW_EXISTS: return OUString(42S01);
+case SQL_TABLE_OR_VIEW_NOT_FOUND: return OUString(42S02);
+case SQL_INDEX_ESISTS: return OUString(42S11);
+case SQL_INDEX_NOT_FOUND: return OUString(42S12);
+case SQL_COLUMN_EXISTS: return OUString(42S21);
+case SQL_COLUMN_NOT_FOUND: return OUString(42S22);
+case SQL_GENERAL_ERROR: return OUString(HY000);
+case SQL_INVALID_SQL_DATA_TYPE: return OUString(HY004);
+case SQL_OPERATION_CANCELED:return OUString(HY008);
+case SQL_FUNCTION_SEQUENCE_ERROR: return OUString(HY010);
+case SQL_INVALID_CURSOR_POSITION: return OUString(HY109);
+case SQL_INVALID_BOOKMARK_VALUE:return OUString(HY111);
+case SQL_FEATURE_NOT_IMPLEMENTED: return OUString(HYC00);
+case SQL_FUNCTION_NOT_SUPPORTED:return OUString(IM001);
+case SQL_CONNECTION_DOES_NOT_EXIST: return OUString(08003);
default:
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/dbexception.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7b12446f34d1d9e575c7202bedd0763cfbb871dc Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Sep 12 20:00:18 2013 +0100 Fix throwFunctionNotSupportedException. Would have caused eternal recursion, probably was intended to use throwGenericSQLException or similar, but throwing the correct exception is probably cleaner anyway. Change-Id: Ic4afa623bfcd57eb68ef6cfbf737862fd40eaaa2 diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 6b774ad..b05044f 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -394,9 +394,11 @@ void throwFunctionNotSupportedException( const OUString _rFunctionName, const : STR_UNSUPPORTED_FUNCTION, $functionname$, _rFunctionName ) ); -throwFunctionNotSupportedException( +throw SQLException( sError, _rxContext, +getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ), +0, _rNextException ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On Thu, Sep 12, 2013 at 10:56:08AM +0200, Stephan Bergmann wrote: On 09/11/2013 07:28 PM, Lionel Elie Mamane wrote: Packaged docs are much less practical for the user. I always love it how http://gcc.gnu.org/onlinedocs/ (linked as Documentation: Manual from the GCC homepage http://gcc.gnu.org/) unambiguously makes available the documentation for each released GCC major.minor version. Could serve as a model for us. PostgreSQL also makes it nicely, with links from one version to another on each page. See e.g. http://www.postgresql.org/docs/current/interactive/index.html -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cuitabarea.hxx
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Em 12-09-2013 13:19, Caolán McNamara escreveu: On Wed, 2013-09-11 at 23:39 -0300, Olivier Hallot wrote: Hi Converting a page setup dialog to widgets UI in sd/, I stumbled on the need to have cui/source/inc/cuitabarea.hxx visible to sd/ But moving it to include/cui/ will affect many files that looks for it in cui/source/inc/ Any objections for the move? Well, we don't currently have an include/cui so you'd have to create that. What are the circumstances that require its exposure due to a .ui conversion ? C. Hi Caolán While converting the format page dialog in sdraw I stumbled into sd/source/ui/dlg/dlgpage.cxx - -AddTabPage( RID_SVXPAGE_PAGE); - -AddTabPage( RID_SVXPAGE_AREA); +nPage= AddTabPage( RID_SVXPAGE_PAGE, SvxPageDescPage::Create(),0 ); +nBackground = AddTabPage( RID_SVXPAGE_AREA, SvxAreaTabPage::Create(),0); where SvxPageDescPage::Create() and SvxAreaTabPage::Create() are in cui/ If there is a way to build the Page and Area tabs pages of cui/ inside sd/ I'll be happy to learn how. Thank you - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJSMhjwAAoJEJp3R7nH3vLxQsIH+wY1UqZXO5NW3YDkUTAmiN9J 6AsKP08oJVlgOGvjbP7JTrgnDSZotoH127+zV+olpgst8Lj/P459qc4Dtx1FN0R6 sq6bmHp01Y/D5CZXsvZrlgjkkRXphOEwg74elQzCbmHPHEFHAvXReezpOye2Btg2 xTfNM7YPlUlXBS70y3X5VVQ/dGd7uDXO+U5IK8tYlZuYMZfUgpRNN81ebPEOWyKa TqzRpZ+n3nlo+fZ5PcqLTSzGBqx2p16cbVSa4/A195JbAAJfez/ICiq3eDhBjaeU CBZMAsbX/BSykDP/pJThscz0LPsjp6LVxNgsrWAKtULNgBhDttcGJHeccT91woU= =5HCF -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||68771 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/workben
sc/workben/opencl/platform_detect.cxx | 71 ++
1 file changed, 71 insertions(+)
New commits:
commit 798cf059bd5ee25fbc8b0d26a69ed8d1ea24b32b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Sep 12 16:13:19 2013 -0400
Add a quick test code to detect available OpenCL platforms.
Compile this with clew files from source/core/opencl/clcc.
Change-Id: I9a0be046ec996a6bccdcc8555aa8119fcf9afde3
diff --git a/sc/workben/opencl/platform_detect.cxx
b/sc/workben/opencl/platform_detect.cxx
new file mode 100755
index 000..81c19e6
--- /dev/null
+++ b/sc/workben/opencl/platform_detect.cxx
@@ -0,0 +1,71 @@
+#include cstdlib
+#include iostream
+#include vector
+#include string
+
+#include clew.h
+
+using namespace std;
+
+int main()
+{
+const char* dllname = OpenCL.dll; // from GPU driver.
+// const char* dllname = amdocl.dll; // from AMD SDK
+// const char* dllname = intelocl.dll; // from Intel SDK
+int status = clewInit(dllname);
+if (status 0)
+{
+cout failed to load endl;
+return EXIT_FAILURE;
+}
+
+cout OpenCL.dll loaded successfully. endl;
+
+cl_uint platformCount = 0;
+clGetPlatformIDs(0, NULL, platformCount);
+
+cout number of platforms: platformCount endl;
+vectorcl_platform_id platformIDs(platformCount);
+if (clGetPlatformIDs(platformCount, platformIDs[0], NULL) != CL_SUCCESS)
+{
+cout failed to get platform IDs endl;
+return EXIT_FAILURE;
+}
+
+for (size_t i = 0, n = platformIDs.size(); i n; ++i)
+{
+cout * platform (ID= platformIDs[i] ) endl;
+string param(100, '\0');
+if (clGetPlatformInfo(platformIDs[i], CL_PLATFORM_PROFILE,
param.size(), param[0], NULL) == CL_SUCCESS)
+coutprofile: param.c_str() endl;
+if (clGetPlatformInfo(platformIDs[i], CL_PLATFORM_VERSION,
param.size(), param[0], NULL) == CL_SUCCESS)
+coutversion: param.c_str() endl;
+if (clGetPlatformInfo(platformIDs[i], CL_PLATFORM_NAME, param.size(),
param[0], NULL) == CL_SUCCESS)
+coutname: param.c_str() endl;
+if (clGetPlatformInfo(platformIDs[i], CL_PLATFORM_VENDOR,
param.size(), param[0], NULL) == CL_SUCCESS)
+coutvendor: param.c_str() endl;
+if (clGetPlatformInfo(platformIDs[i], CL_PLATFORM_EXTENSIONS,
param.size(), param[0], NULL) == CL_SUCCESS)
+coutextensions: param.c_str() endl;
+
+cl_uint deviceCount = 0;
+clGetDeviceIDs(platformIDs[i], CL_DEVICE_TYPE_ALL, 0, NULL,
deviceCount);
+coutnumber of devices: deviceCount endl;
+
+vectorcl_device_id deviceIDs(deviceCount);
+if (clGetDeviceIDs(platformIDs[i], CL_DEVICE_TYPE_ALL, deviceCount,
deviceIDs[0], NULL) != CL_SUCCESS)
+continue;
+
+for (size_t j = 0; j deviceIDs.size(); ++j)
+{
+cout* device (ID= deviceIDs[j] ) endl;
+if (clGetDeviceInfo(deviceIDs[j], CL_DEVICE_VENDOR, param.size(),
param[0], NULL) == CL_SUCCESS)
+cout vendor: param.c_str() endl;
+if (clGetDeviceInfo(deviceIDs[j], CL_DEVICE_VERSION, param.size(),
param[0], NULL) == CL_SUCCESS)
+cout version: param.c_str() endl;
+if (clGetDeviceInfo(deviceIDs[j], CL_DRIVER_VERSION, param.size(),
param[0], NULL) == CL_SUCCESS)
+cout driver version: param.c_str() endl;
+}
+}
+
+return EXIT_SUCCESS;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/misc/swruler.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 20d50a8c87c87f33c57397ca2c6f25d49e51f7cd
Author: Caolán McNamara caol...@redhat.com
Date: Thu Sep 12 10:56:37 2013 +0100
Resolves: rhbz#1006850 crash in SwCommentRuler::GetCommentControlRegion
Change-Id: Ic846da3b22391d724da6f8df94dd771e89d2efb4
(cherry picked from commit b73dec8a06ef762098e642b2c37e4baad780b11a)
Reviewed-on: https://gerrit.libreoffice.org/5924
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index a41fc0b..76fb8be 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -247,6 +247,13 @@ void SwCommentRuler::UpdateCommentHelpText()
Rectangle SwCommentRuler::GetCommentControlRegion()
{
SwPostItMgr *pPostItMgr = mpViewShell-GetPostItMgr();
+
+//rhbz#1006850 When the SwPostItMgr ctor is called from SwView::SwView it
+//triggers an update of the uiview, but the result of the ctor hasn't been
+//set into the mpViewShell yet, so GetPostItMgr is temporarily still NULL
+if (!pPostItMgr)
+return Rectangle();
+
//FIXME When the page width is larger then screen, the ruler is misplaced
by one pixel
long nLeft = GetWinOffset() + GetPageOffset() +
mpSwWin-LogicToPixel(Size(GetPageWidth(), 0)).Width();
long nTop= 0 + 4; // Ruler::ImplDraw uses RULER_OFF (value: 3px) as
offset, and Ruler::ImplFormat adds one extra pixel
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit migration
Hi Bjoern, Please update your addressbook :-) - ke...@collabora.com now. bjoern píše v St 11. 09. 2013 v 20:31 +0200: To developers: You will get a 'host identification changed' warning when pushing/pulling to gerrit. This is expected. - gitweb is missing (not mission critical) documentation missing, *NOT* fixed http://gerrit.googlecode.com/svn/documentation/2.1.2/config-gitweb.html might be helpful, hopefully? @Kendy: Wasnt this your baby? Nope, it was not. If it was up to me, I'd prefer cgit over gitweb; it is trival to set up, and is more user friendly :-) But whatever will be easier for the admins setting this up of course, gitweb is not that bad these days either. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source vcl/coretext
svtools/source/control/ruler.cxx |2 +-
vcl/coretext/salgdi2.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c0e93c4f69faaf7ef566791f1f62fb3b64dc3bfa
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Sep 12 20:50:15 2013 +0200
cppcheck: fix Prefer prefix ++/-- operators for non-primitive types
Change-Id: I7495f86cb35b6f712cfb7d603f022f6f6c407266
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 6aa2c6c..b409b03 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2849,7 +2849,7 @@ void Ruler::SetTabs( sal_uInt32 aTabArraySize, const
RulerTab* pTabArray )
{
break;
}
-aTabIterator++;
+++aTabIterator;
pInputArray++;
i--;
}
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index cf7e7e1..5db35d4 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -881,7 +881,7 @@ bool SvpSalGraphics::CheckContext()
CGContextBeginPath( mrContext );
-for(RectangleVector::const_iterator aRectIter(aRectangles.begin());
aRectIter != aRectangles.end(); aRectIter++)
+for(RectangleVector::const_iterator aRectIter(aRectangles.begin());
aRectIter != aRectangles.end(); ++aRectIter)
{
const long nW(aRectIter-Right() - aRectIter-Left() + 1); // uses
+1 logic in original
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [BUG] or [EVOL] about arrow enlargement in libreoffice draw ?
Hi Matthieu, Gay, Matthieu schrieb: Hello, Can you look to the attached file? And tell me if the fact that we can't reduce the black lines the same as the yellow frame in libreoffice Draw, is a bug? What do you mean by reduce? The yellow object has fill: yellow and outline: none in CorelDraw. Therefore the import generates a polygon, lines do not have the property fill. The black object has fill: none and outline: black in CorelDraw. They are imported as line. What import do you expect? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [BUG] or [EVOL] about arrow enlargement in libreoffice draw ?
Hi Matthieu, Regina Henschel píše v Čt 12. 09. 2013 v 18:43 +0200: And tell me if the fact that we can't reduce the black lines the same as the yellow frame in libreoffice Draw, is a bug? What do you mean by reduce? The yellow object has fill: yellow and outline: none in CorelDraw. Therefore the import generates a polygon, lines do not have the property fill. The black object has fill: none and outline: black in CorelDraw. They are imported as line. What import do you expect? In other words - even thought all the objects in this file look similarly when opened in LibreOffice, they are not the same. The yellow rectangle is a real rectangle, and the black ones are thick lines. LibreOffice is missing a feature to scale attributes like line thickness, font size, etc. when scaling objects, because the more common use case is _not_ to scale these (imagine a rectangle with a text that you'd want to reshape a bit - for sure you don't want the text to change its font size in most cases). But of course would be useful to have a modifier to allow this. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpstyl.cxx | 45 ++--
1 file changed, 43 insertions(+), 2 deletions(-)
New commits:
commit 14e7a290dab7fead66ef6ff7f94c6a425d80ceb6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 9 16:54:30 2013 +0100
Resolves: fdo#34987 skip autoheight reset if it will be set to the same
value
Triggered by aa9af08b389a106fcfb53842ac7669b208a27205 which explicitly sets
rSet.Put( SdrTextAutoGrowHeightItem(FALSE) ); so there is something set on
the
style which is being overwritten.
The code here resets the style to the default of true before going on to
set
it to the explicit false again. In that window of time the master shapes
listen to the property change, on being set to autoheight they resize and on
being unset, they remain stuck on their autoheight calculated size.
Change-Id: I567a791b2bbbcb3a1a111633fabf509142984645
Reviewed-on: https://gerrit.libreoffice.org/5887
Reviewed-by: mhofmann bor...@web.de
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e092e37..ea0fc4a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1261,6 +1261,43 @@ void SdXMLStylesContext::ImpSetCellStyles() const
}
}
+//Resolves: fdo#34987 if the style's auto height before and after is the same
+//then don't reset it back to the underlying default of true for the small
+//period before its going to be reset to false again. Doing this avoids the
+//master page shapes from resizing themselves due to autoheight becoming
+//enabled before having autoheight turned off again and getting stuck on that
+//autosized height
+static bool canSkipReset(const OUString rName, const XMLPropStyleContext*
pPropStyle,
+const uno::Reference beans::XPropertySet rPropSet, const UniReference
XMLPropertySetMapper rPrMap)
+{
+bool bCanSkipReset = false;
+if (pPropStyle rName == TextAutoGrowHeight)
+{
+sal_Bool bOldStyleTextAutoGrowHeight(sal_False);
+rPropSet-getPropertyValue(TextAutoGrowHeight) =
bOldStyleTextAutoGrowHeight;
+
+sal_Int32 nIndexStyle = rPrMap-GetEntryIndex(XML_NAMESPACE_DRAW,
auto-grow-height, 0);
+if (nIndexStyle != -1)
+{
+const ::std::vector XMLPropertyState rProperties =
pPropStyle-GetProperties();
+::std::vector XMLPropertyState ::const_iterator property =
rProperties.begin();
+for(; property != rProperties.end(); ++property)
+{
+sal_Int32 nIdx = property-mnIndex;
+if (nIdx == nIndexStyle)
+{
+sal_Bool bNewStyleTextAutoGrowHeight(sal_False);
+property-maValue = bNewStyleTextAutoGrowHeight;
+if (bNewStyleTextAutoGrowHeight ==
bOldStyleTextAutoGrowHeight)
+bCanSkipReset = true;;
+break;
+}
+}
+}
+}
+return bCanSkipReset;
+}
+
// help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles()
//
void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference
container::XNameAccess xPageStyles, sal_uInt16 nFamily, const OUString
rPrefix) const
@@ -1289,6 +1326,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles(
uno::Reference container::XNameAc
if(nFamily == pStyle-GetFamily() !pStyle-IsDefaultStyle())
{
OUString aStyleName(pStyle-GetDisplayName());
+
if( nPrefLen )
{
sal_Int32 nStylePrefLen = aStyleName.lastIndexOf(
sal_Unicode('-') ) + 1;
@@ -1298,6 +1336,8 @@ void SdXMLStylesContext::ImpSetGraphicStyles(
uno::Reference container::XNameAc
aStyleName = aStyleName.copy( nPrefLen );
}
+XMLPropStyleContext* pPropStyle = dynamic_cast
XMLPropStyleContext* (const_cast SvXMLStyleContext* ( pStyle ) );
+
uno::Reference style::XStyle xStyle;
if(xPageStyles-hasByName(aStyleName))
{
@@ -1326,6 +1366,9 @@ void SdXMLStylesContext::ImpSetGraphicStyles(
uno::Reference container::XNameAc
const OUString rName =
xPrMap-GetEntryAPIName( i );
if( xPropSetInfo-hasPropertyByName( rName )
beans::PropertyState_DIRECT_VALUE == xPropState-getPropertyState( rName ) )
{
+bool bCanSkipReset = canSkipReset(rName,
pPropStyle, xPropSet, xPrMap);
+if (bCanSkipReset)
+continue;
xPropState-setPropertyToDefault( rName );
}
Re: Gerrit migration
On Thu, Sep 12, 2013 at 3:31 PM, Jan Holesovsky ke...@collabora.com wrote: Nope, it was not. If it was up to me, I'd prefer cgit over gitweb; it is trival to set up, and is more user friendly :-) But whatever will be easier for the admins setting this up of course, gitweb is not that bad these days either. I did re-install gitweb. apt-get + 2 lines edit of /etc/gitweb.conf... gerrit seems to like it by default... But I do not mind cgit if you figure out how to get gerrit to play nice with it... it is supposed to be 'suppoerted' by gerrit... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/splitwin.cxx | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 16ea2dc1f572d698923c770a2a58f7ab402d1298
Author: Prashant Pandey prashant3.yi...@gmail.com
Date: Sat Sep 7 23:53:02 2013 +0530
Sidebar: Correcting anomalous mouse behaviour while resizing
Currently, when the sidebar is showing, and we hold the handle to make
it wider/narrower, if we move the mouse much to the left (so that it
can't become any wider), and now move mouse pointer to the right (while
still holding the handle), it immediately begins to shrink.
Ideally how it should behave when we move the mouse much to the left is
that- the sidebar should begin shrinking once we have the mouse pointer
over the handle again and not immediately.
Change-Id: Id17dc19e6e1ad02fb7879ace9a2e092ac0128693
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 2322189..e9286bd 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2542,21 +2542,30 @@ void SplitWindow::Tracking( const TrackingEvent rTEvt )
{
sal_BoolbPropSmaller = (mnMouseModifier KEY_SHIFT) ?
sal_True : sal_False;
sal_BoolbPropGreater = (mnMouseModifier KEY_MOD1) ? sal_True
: sal_False;
-longnDelta = mnMSplitPos-mnMStartPos;
if ( (mnSplitTest SPLIT_WINDOW) !mpMainSet-mpItems )
{
+// nDelta corresponds to the direction to which user drags the
mouse.
+// If nDelta 0, means user has dragged the handle towards
the right and vice-versa
+long nDelta = mnMSplitPos-mnMStartPos;
+
if ( (mpSplitSet == mpMainSet) mbBottomRight )
nDelta *= -1;
ImplSetWindowSize( nDelta );
}
else
{
-long nNewSize = mpSplitSet-mpItems[mnSplitPos].mnPixSize;
+long nNewSize( 0 );
+
+// where is the sidebar is attached?
if ( (mpSplitSet == mpMainSet) mbBottomRight )
-nNewSize -= nDelta;
+nNewSize = mnMaxSize - mnMStartPos; // right hand side of
the screen
else
-nNewSize += nDelta;
+nNewSize = mnMStartPos; // left hand side of the screen
+
+// do not make the sidebar wider than mnMaxSize
+nNewSize = std::min(nNewSize,
mpSplitSet-mpItems[mnSplitPos].mnMaxSize);
+
SplitItem( mpSplitSet-mpItems[mnSplitPos].mnId, nNewSize,
bPropSmaller, bPropGreater );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit migration
On Thu, Sep 12, 2013 at 05:37:20PM -0500, Norbert Thiebaud wrote: But I do not mind cgit if you figure out how to get gerrit to play nice with it... it is supposed to be 'suppoerted' by gerrit... AFAIK the argument against cgit was that it is not packaged on Ubuntu/Debian because it does some nasty 'we take the git tarball and then patch that and statically glue that into our binary' which makes it essentially unsupportable for a distro (and as this is facing the wild web -- meh). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/workben
sc/workben/opencl/platform_detect.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a0f1577167e17ef7af54b45c4b96f7a06410041f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Sep 12 18:03:34 2013 -0400
On linux, the entry library name is 'libOpenCL.so'.
And it should be installed in the system library path, so no need to
specify full path to load it.
Change-Id: I0a77bd6911e69f8453b7c95c7cdcb77fe2e6e5e0
diff --git a/sc/workben/opencl/platform_detect.cxx
b/sc/workben/opencl/platform_detect.cxx
index 81c19e6..b0a9c61 100755
--- a/sc/workben/opencl/platform_detect.cxx
+++ b/sc/workben/opencl/platform_detect.cxx
@@ -9,7 +9,8 @@ using namespace std;
int main()
{
-const char* dllname = OpenCL.dll; // from GPU driver.
+const char* dllname = libOpenCL.so; // on Linux
+// const char* dllname = OpenCL.dll; // from GPU driver.
// const char* dllname = amdocl.dll; // from AMD SDK
// const char* dllname = intelocl.dll; // from Intel SDK
int status = clewInit(dllname);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit migration
Hi Bjoern, Norbert, bjoern píše v Pá 13. 09. 2013 v 00:53 +0200: But I do not mind cgit if you figure out how to get gerrit to play nice with it... it is supposed to be 'suppoerted' by gerrit... AFAIK the argument against cgit was that it is not packaged on Ubuntu/Debian because it does some nasty 'we take the git tarball and then patch that and statically glue that into our binary' which makes it essentially unsupportable for a distro (and as this is facing the wild web -- meh). OK - not worth the trouble then :-) - let's stick to gitweb then. Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - android/sdremote
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
|4
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java
| 41 +-
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
|2
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 198 +++---
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
|2
android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java
|6
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java
| 46 +-
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
| 44 +-
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
|2
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
|2
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
|2
android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
| 16
12 files changed, 174 insertions(+), 191 deletions(-)
New commits:
commit 14a25b343d98d7a4ebf9b6c03b09d1882c71d0b1
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Fri Sep 13 02:32:24 2013 +0300
Fix minor style issues.
Change-Id: I6c7cfd8c1e0d88ad99f5e2ca15758eab033ec50c
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index 605e0a9..2dbb6e6 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -96,7 +96,7 @@ class BluetoothServersFinder extends BroadcastReceiver
implements ServersFinder,
private void startDiscoveryDelayed() {
// Start discovery again after a small delay.
// Check whether device is on in case the user manually
-// disabled bluetooth
+// disabled Bluetooth.
if (!BluetoothOperator.getAdapter().isEnabled()) {
return;
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index ea03e52..95b54b3 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -69,7 +69,7 @@ public class CommunicationService extends Service implements
Runnable, MessagesL
}
@Override
-public IBinder onBind(Intent intent) {
+public IBinder onBind(Intent aIntent) {
return mBinder;
}
@@ -96,7 +96,8 @@ public class CommunicationService extends Service implements
Runnable, MessagesL
public void connectServer(Server aServer) {
mServer = aServer;
-new Thread(this).start();
+Thread aConnectionThread = new Thread(this);
+aConnectionThread.start();
}
@Override
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
index 4e94b6c..9f1a16b 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
@@ -22,7 +22,7 @@ public class Server implements Parcelable {
private final String mAddress;
private final String mName;
-public Server(Protocol aProtocol, String aAddress, String aName) {
+private Server(Protocol aProtocol, String aAddress, String aName) {
this.mProtocol = aProtocol;
this.mAddress = aAddress;
this.mName = aName;
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
index d63fdd4..0a2141b 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
@@ -77,26 +77,26 @@ public final class Preferences {
return mPreferences.getAll();
}
-public String getString(String aKey) {
-return mPreferences.getString(aKey, Defaults.STRING);
+public boolean getBoolean(String aKey) {
+return mPreferences.getBoolean(aKey, Defaults.BOOLEAN);
}
public int getInt(String aKey) {
return mPreferences.getInt(aKey, Defaults.INT);
}
-public void
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/cellvalue.hxx|3 ---
sc/inc/dociter.hxx |4 ++--
sc/inc/mtvelements.hxx |3 +++
sc/qa/unit/helper/qahelper.cxx |1 +
sc/source/core/data/cellvalue.cxx | 29 -
sc/source/core/data/dociter.cxx | 18 --
sc/source/core/data/mtvelements.cxx | 25 +
7 files changed, 39 insertions(+), 44 deletions(-)
New commits:
commit c86b1a5c352df806166fc674fb3b85d334e4cb55
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Sep 12 21:15:10 2013 -0400
Change so that we won't have to include mtvelements.hxx in cellvalue.hxx.
Because mtvelements.hxx is very slow to parse by the compiler, and
cellvalue.hxx is included everywhere. Hopefully this will speed up the
compilation time of sc...
Change-Id: Ic9a9b8483c8325e4a91021f071f2391db8b57806
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 0e2987c..fd112a6 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -11,7 +11,6 @@
#define SC_CELLVALUE_HXX
#include global.hxx
-#include mtvelements.hxx
class ScDocument;
class ScFormulaCell;
@@ -119,8 +118,6 @@ struct SC_DLLPUBLIC ScRefCellValue
*/
void assign( ScDocument rDoc, const ScAddress rPos );
-void assign( const sc::CellStoreType::const_iterator itPos, size_t
nOffset );
-
/**
* Set cell value at specified position in specified document.
*/
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 8a57ef3..3a83f0a 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -49,7 +49,7 @@ class ScFormulaCell;
class ScValueIterator// walk through all values in an area
{
-typedef std::pairsc::CellStoreType::const_iterator, size_t PositionType;
+typedef sc::CellStoreType::const_position_type PositionType;
ScDocument* pDoc;
const ScAttrArray* pAttrArray;
@@ -253,7 +253,7 @@ class ScQueryCellIterator // walk through all
non-empty cells in an ar
nTestEqualConditionFulfilled = nTestEqualConditionEnabled |
nTestEqualConditionMatched
};
-typedef std::pairsc::CellStoreType::const_iterator, size_t PositionType;
+typedef sc::CellStoreType::const_position_type PositionType;
PositionType maCurPos;
boost::scoped_ptrScQueryParam mpParam;
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 46a5d40..f0e5fff 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -31,6 +31,7 @@
#include boost/unordered_map.hpp
class ScDocument;
+struct ScRefCellValue;
namespace sc {
@@ -133,6 +134,8 @@ public:
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
};
+ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator itPos,
size_t nOffset );
+
}
#endif
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 7c409ef..33c8f04 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -11,6 +11,7 @@
#include csv_handler.hxx
#include drwlayer.hxx
#include compiler.hxx
+#include formulacell.hxx
#include svx/svdpage.hxx
#include svx/svdoole2.hxx
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index 2c40418..ba71d1e 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -496,35 +496,6 @@ void ScRefCellValue::assign( ScDocument rDoc, const
ScAddress rPos )
*this = rDoc.GetRefCellValue(rPos);
}
-void ScRefCellValue::assign( const sc::CellStoreType::const_iterator itPos,
size_t nOffset )
-{
-switch (itPos-type)
-{
-case sc::element_type_numeric:
-// Numeric cell
-mfValue = sc::numeric_block::at(*itPos-data, nOffset);
-meType = CELLTYPE_VALUE;
-break;
-case sc::element_type_string:
-// String cell
-mpString = sc::string_block::at(*itPos-data, nOffset);
-meType = CELLTYPE_STRING;
-break;
-case sc::element_type_edittext:
-// Edit cell
-mpEditText = sc::edittext_block::at(*itPos-data, nOffset);
-meType = CELLTYPE_EDIT;
-break;
-case sc::element_type_formula:
-// Formula cell
-mpFormula = sc::formula_block::at(*itPos-data, nOffset);
-meType = CELLTYPE_FORMULA;
-break;
-default:
-clear();
-}
-}
-
void ScRefCellValue::commit( ScDocument rDoc, const ScAddress rPos ) const
{
switch (meType)
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f951ea3..6f4d4a7 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -400,8 +400,7 @@ bool
ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value rValue)
continue;
}
-ScRefCellValue aCell;
-aCell.assign(maCurPos.first, maCurPos.second);
+
Smartphone S4 Android Apenas R$349,00 em ate 12x
Seu cliente de e-mail não pode ler este e-mail. Para visualizá-lo on-line, por favor, clique aqui: http://midiaon.net/display.php?M=1980489C=d8d4bc4a2ec54c32e1de8073fdb034d8S=26L=4N=4 Para parar de receber nossos Emails:http://midiaon.net/unsubscribe.php?M=1980489C=d8d4bc4a2ec54c32e1de8073fdb034d8L=4N=26 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 48 ++--
sc/source/core/opencl/openclwrapper.hxx |6
2 files changed, 4 insertions(+), 50 deletions(-)
New commits:
commit 19983dfa038b0a6766cf3d5bdaade6004a45ceaf
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Sep 12 23:44:53 2013 -0400
Remove these Windows specific DLL loading in favor of clew.
Change-Id: Ia2ca3c512e033e80a55eb2d33fdd34d07297f29b
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 0cad340..c1791f9 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -20,10 +20,6 @@
#ifdef WIN32
#include Windows.h
-#define OPENCL_DLL_NAME opencllo.dll
-#define OCLERR -1
-#define OCLSUCCESS 1
-
#define TRUE 1
#define FALSE 0
@@ -43,48 +39,14 @@ namespace sc { namespace opencl {
GPUEnv OpenclDevice::gpuEnv;
int OpenclDevice::isInited =0;
-#ifdef WIN32
-
-HINSTANCE HOpenclDll = NULL;
-void * OpenclDll = NULL;
-
-int OpenclDevice::loadOpencl()
-{
-//fprintf(stderr, loadOpenclDllxx... \n);
-OpenclDll = static_castHINSTANCE( HOpenclDll );
-OpenclDll = LoadLibrary( OPENCL_DLL_NAME );
-if ( !static_castHINSTANCE( OpenclDll ) )
-{
-fprintf(stderr, Load opencllo.dll failed! \n);
-FreeLibrary( static_castHINSTANCE( OpenclDll ) );
-return OCLERR;
-}
-fprintf(stderr, Load opencllo.dll successfully!\n);
-return OCLSUCCESS;
-}
-
-void OpenclDevice::freeOpenclDll()
-{
-fprintf(stderr, Free opencllo.dll ... \n);
-if ( !static_castHINSTANCE( OpenclDll ) )
-FreeLibrary( static_castHINSTANCE( OpenclDll ) );
-}
-#endif
-
int OpenclDevice::initEnv()
{
-// TODO: Make the path configurable.
-int status = clewInit(/opt/AMDAPP/lib/x86_64/libOpenCL.so);
+// TODO: This part needs more platform specific handling. On Windows,
+// the GPU Driver itself installs OpenCL.dll in the system folder.
+int status = clewInit(OpenCL.dll);
if (status 0)
return 1;
-#ifdef WIN32
-while( 1 )
-{
-if( 1 == loadOpencl() )
-break;
-}
-#endif
initOpenclRunEnv( 0 );
return 1;
}
@@ -92,9 +54,7 @@ int OpenclDevice::initEnv()
int OpenclDevice::releaseOpenclRunEnv()
{
releaseOpenclEnv( gpuEnv );
-#ifdef WIN32
-freeOpenclDll();
-#endif
+
return 1;
}
///
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 685c281..431a771 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -205,12 +205,6 @@ public:
int runKernelWrapper( cl_kernel_function function, const char *
kernelName, void **usrdata );
int getKernelEnvAndFunc( const char *kernelName, KernelEnv *env,
cl_kernel_function *function );
-
-#ifdef WIN32
-static int loadOpencl();
-static void freeOpenclDll();
-#endif
-
int getOpenclState();
void setOpenclState( int state );
static int addKernelConfig( int kCount, const char *kName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on|37606 | --- Comment #171 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- (In reply to comment #162) Adding bug 37606 - Edit Select All doesn't work on a document beginning with a table. It's more than 2 years old. Is it that hard to fix? Bug inherited from OOo, no regression, existing workaround. So not a MAB as proposed by several comments. And, as fixing it require large changes, it will not be fixed in 4.0 branch which is almost at its end-of-life. -- 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: dbaccess/qa
dbaccess/qa/unit/firebird.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24f277a4ad53a8655902d5fb3aab05643d90f57e Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Sep 12 17:26:38 2013 -0500 Do not use int64 litteral without the proper wrapping Change-Id: I879a47720f337b57038ac3207cb466aa42d0beeb diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx index 183d83d..78b7e66 100644 --- a/dbaccess/qa/unit/firebird.cxx +++ b/dbaccess/qa/unit/firebird.cxx @@ -75,7 +75,7 @@ void FirebirdTest::testIntegerDatabase() xRow-getShort(xColumnLocate-findColumn(_SMALLINT))); CPPUNIT_ASSERT(sal_Int32(-21) == xRow-getInt(xColumnLocate-findColumn(_INT))); -CPPUNIT_ASSERT(sal_Int64(-900) == +CPPUNIT_ASSERT(SAL_CONST_INT64(-900) == xRow-getLong(xColumnLocate-findColumn(_BIGINT))); CPPUNIT_ASSERT(OUString(5) == xRow-getString(xColumnLocate-findColumn(_CHAR))); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/ui/optdlg/calcoptionsdlg.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b7160172cdf26b90e2bc4ae7b5172b02f172ceba
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Sep 13 07:05:53 2013 +0200
use the correct description for the opencl option
Change-Id: Ie4b8e2f99bb8a32dae3161c86a448201f792
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 6639f35..dd6003c 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -250,9 +250,15 @@ void ScCalcOptionsDialog::SelectionChanged()
bool bValue = false;
if ( nSelectedPos == CALC_OPTION_EMPTY_AS_ZERO )
+{
bValue = maConfig.mbEmptyStringAsZero;
+mpFtAnnotation-SetText(maDescEmptyStringAsZero);
+}
else
+{
bValue = maConfig.mbOpenCLEnabled;
+mpFtAnnotation-SetText(maDescOpenCLEnabled);
+}
if ( bValue )
{
@@ -264,7 +270,6 @@ void ScCalcOptionsDialog::SelectionChanged()
mpBtnTrue-Check(false);
mpBtnFalse-Check(true);
}
-mpFtAnnotation-SetText(maDescEmptyStringAsZero);
}
break;
default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Why no daily master builds
Hi ape I believe it must be related to the fact that many of the tinderboxes (e.g. Tinderbox #6, the only one producing binaries for all Windows versions) were run by Suse staff and Suse has dropped LO development (https://people.gnome.org/~michael/blog/2013-09-03-collabora.html) See list of tinderboxes and people running them here https://wiki.documentfoundation.org/Development/Tinderbox Just my 2 cents ;) -- View this message in context: http://nabble.documentfoundation.org/Why-no-daily-master-builds-tp4073881p4073896.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Why no daily master builds
Hi Pedro, On Thu, Sep 12, 2013 at 11:52 AM, Pedro pedl...@gmail.com wrote: I believe it must be related to the fact that many of the tinderboxes (e.g. Tinderbox #6, the only one producing binaries for all Windows versions) were run by Suse staff and Suse has dropped LO development (https://people.gnome.org/~michael/blog/2013-09-03-collabora.html) No, that's not the case. Tinderboxes are up and running and it was never the responsibility of the SUSE staff to fix regressions reported by Tinderboxes. Now we have a big change in the build system again, the feature/instdir branch was merged, I think that it causes the build break that we see now. Hopefully it will be fixed soon. Regards, Andras ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Why no daily master builds
Hi Andras Andras Timar-3 wrote No, that's not the case. Tinderboxes are up and running and it was never the responsibility of the SUSE staff to fix regressions reported by Tinderboxes. I never said (or implied) it was their responsibility to fix those regressions :) I assumed that the Tinderboxes were a property of Suse and with this change in Suse's position they would no longer be available for compiling LO binaries (only some say tdf-owned hardware so the owner of e.g. #6 could be Suse). Tinderbox #39 manages to produce Windows binaries most days (even if they do not work in Windows XP) so it must be doing something right :) Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Why-no-daily-master-builds-tp4073881p4073919.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Why no daily master builds
On Thu, Sep 12, 2013 at 1:34 PM, Pedro pedl...@gmail.com wrote: Tinderbox #39 manages to produce Windows binaries most days (even if they do not work in Windows XP) so it must be doing something right :) Yes, because it builds with --disable-odk. Regards, Andras ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 69162] Other: Cmd-arrow and Opt-arrow in query design view crashes LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=69162 --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- On Mac 10.7.5 and LO 4.1.1.2, I don't reproduce this. What LO version do you use? Could you give a try the last one? If you still reproduce this, could you rename your LO directory profile (see https://wiki.documentfoundation.org/UserProfile#Mac_OS_X) and try again? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
