[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit eeab70fd53ee88b44afc5278ae81db53403f4a0e
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 19 08:03:09 2013 +0200
-Werror,-Wformat
Change-Id: I10eb204e63dee480a54494f5869f1f1b2e4bfc92
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index a9be424..478fb63 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -140,7 +140,7 @@ OUString time2String( const com::sun::star::util::Time x )
// TODO FIXME: replace by DBTypeConversion::toTimeString
const size_t buflen = 19;
char buffer[buflen];
-snprintf( buffer, buflen, %02d:%02d:%02d.%09d, x.Hours, x.Minutes,
x.Seconds, x.NanoSeconds );
+snprintf( buffer, buflen, %02d:%02d:%02d.%09 SAL_PRIuUINT32, x.Hours,
x.Minutes, x.Seconds, x.NanoSeconds );
return OUString::createFromAscii( buffer );
}
@@ -180,7 +180,7 @@ OUString dateTime2String( const
com::sun::star::util::DateTime x )
{
// TODO FIXME: replace by DBTypeConversion::toDateTimeString
char buffer[128];
-sprintf( buffer, %d-%02d-%02d %02d:%02d:%02d.%09d,
+sprintf( buffer, %d-%02d-%02d %02d:%02d:%02d.%09 SAL_PRIuUINT32,
x.Year, x.Month, x.Day,
x.Hours, x.Minutes, x.Seconds, x.NanoSeconds );
return OUString::createFromAscii( buffer );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/Executable_LibreOffice.mk Makefile.in RepositoryModule_host.mk
Makefile.in |3 +++ RepositoryModule_host.mk |1 - ios/Executable_LibreOffice.mk |6 +- 3 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 685a12ac0e4867a5082d08d5cbf500b3a081c14d Author: Tor Lillqvist t...@iki.fi Date: Fri Apr 19 09:27:44 2013 +0300 Prefer simple and working solution to obscure and non-working Change-Id: I5c7d02daced54c2cb3881fafd2d58fe7f14d diff --git a/Makefile.in b/Makefile.in index 68b5024..6dea2a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -224,6 +224,9 @@ bootstrap: compilerplugins # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild +ifeq ($(OS),IOS) + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios +endif build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 3b425d0..9c74108 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,idlc) \ instsetoo_native \ io \ - ios \ javaunohelper \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JPEG,jpeg) \ diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk index 0104744..69745ad 100644 --- a/ios/Executable_LibreOffice.mk +++ b/ios/Executable_LibreOffice.mk @@ -34,14 +34,10 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\ $(call gb_Executable_use_package,LibreOffice,touch_inc) -# Mark the executable as dependingf on AllModulesButInstsetNative so -# that it is built only after all libraries that it links to (which -# might be any of them) have been built. - # Mark the executable as depending on all libraries so that it gets # rebuilt if any library has been rebuilt. Avoids need for make # ios.clean. -$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(wildcard $(OUTDIR)/lib/lib*.a) +$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(wildcard $(OUTDIR)/lib/lib*.a) # vim: set ts=4 sw=4 et: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] clean up PythonTests
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3478
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3478/1
clean up PythonTests
Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
---
M sw/Module_sw.mk
R sw/PythonTest_sw_python.mk
M sw/qa/python/get_expression.py
M sw/qa/python/set_expression.py
M unotest/source/python/org/libreoffice/unotest.py
5 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index fedb44a..651ac52 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -72,7 +72,7 @@
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
- PythonTest_sw_unoapi \
+ PythonTest_sw_python \
))
endif
diff --git a/sw/PythonTest_sw_unoapi.mk b/sw/PythonTest_sw_python.mk
similarity index 81%
rename from sw/PythonTest_sw_unoapi.mk
rename to sw/PythonTest_sw_python.mk
index 20c6549..2b4132c 100644
--- a/sw/PythonTest_sw_unoapi.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_PythonTest_PythonTest,sw_unoapi))
+$(eval $(call gb_PythonTest_PythonTest,sw_python))
-$(eval $(call gb_PythonTest_use_configuration,sw_unoapi))
+$(eval $(call gb_PythonTest_use_configuration,sw_python))
-$(eval $(call gb_PythonTest_use_api,sw_unoapi,offapi))
+$(eval $(call gb_PythonTest_use_api,sw_python,offapi))
-# FAIL: this brings in GconfBackend $(eval $(call
gb_PythonTest_use_rdb,sw_unoapi,services))
+# FAIL: this brings in GconfBackend $(eval $(call
gb_PythonTest_use_rdb,sw_python,services))
-$(eval $(call gb_PythonTest_use_components,sw_unoapi,\
+$(eval $(call gb_PythonTest_use_components,sw_python,\
basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
@@ -48,7 +48,7 @@
unoxml/source/service/unoxml \
))
-$(eval $(call gb_PythonTest_add_classes,sw_unoapi,\
+$(eval $(call gb_PythonTest_add_classes,sw_python,\
$(SRCDIR)/sw/qa/python/set_expression.py \
$(SRCDIR)/sw/qa/python/get_expression.py \
))
diff --git a/sw/qa/python/get_expression.py b/sw/qa/python/get_expression.py
index 5ac49f8..089aa2d 100644
--- a/sw/qa/python/get_expression.py
+++ b/sw/qa/python/get_expression.py
@@ -1,22 +1,22 @@
import unittest
-from org.libreoffice.unotest import UnoNotConnection as UnoConnection
+from org.libreoffice.unotest import UnoInProcess
class TestGetExpression(unittest.TestCase):
-_unoCon = None
+_uno = None
_xDoc = None
@classmethod
def setUpClass(cls):
-cls._unoCon = UnoConnection({})
-cls._unoCon.setUp()
-cls._xDoc = cls._unoCon.openEmptyWriterDoc()
+cls._uno = UnoInProcess()
+cls._uno.setUp()
+cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod
def tearDownClass(cls):
-cls._unoCon.tearDown()
+cls._uno.tearDown()
def test_get_expression(self):
-self.__class__._unoCon.checkProperties(
+self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance(com.sun.star.text.textfield.GetExpression),
{Content: foo,
CurrentPresentation: bar,
@@ -32,21 +32,11 @@
# property 'Value' is read only?
@unittest.expectedFailure
def test_get_expression_veto_read_only(self):
-self.__class__._unoCon.checkProperties(
+self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance(com.sun.star.text.textfield.GetExpression),
{Value: 0.0},
self
)
-
-# property 'NumberingType' is unknown?
-@unittest.expectedFailure
-def test_get_expression_unknown_property(self):
-self.__class__._unoCon.checkProperties(
-
self.__class__._xDoc.createInstance(com.sun.star.text.textfield.GetExpression),
-{NumberingType: 0},
-self
-)
-
if __name__ == '__main__':
unittest.main()
diff --git a/sw/qa/python/set_expression.py b/sw/qa/python/set_expression.py
index d88d2f3..6a24ff7 100644
--- a/sw/qa/python/set_expression.py
+++ b/sw/qa/python/set_expression.py
@@ -1,23 +1,23 @@
import unittest
-from org.libreoffice.unotest import UnoNotConnection as UnoConnection
+from org.libreoffice.unotest import UnoInProcess
#@unittest.skip(that seems to work)
class TestSetExpresion(unittest.TestCase):
-_unoCon = None
+_uno = None
_xDoc = None
@classmethod
def setUpClass(cls):
-cls._unoCon = UnoConnection({})
-cls._unoCon.setUp()
-cls._xDoc = cls._unoCon.openEmptyWriterDoc()
+cls._uno = UnoInProcess()
+cls._uno.setUp()
+cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod
def tearDownClass(cls):
-cls._unoCon.tearDown()
+cls._uno.tearDown()
def test_set_expression(self):
-self.__class__._unoCon.checkProperties(
+
[Libreoffice-commits] core.git: odk/settings
odk/settings/std.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 391477d40ea718c46089e16484726dba085a6ad8 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 19 09:26:53 2013 +0200 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version outputs OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 1b260b3..d8c5f51 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -54,9 +54,11 @@ JAVA_OPTIONS= ifneq $(OO_SDK_JAVA_HOME) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail -1 | cut -d -f3) ifeq $(JAVA_BITS) 64-Bit +ifneq $(PROCTYPE) x86_64 JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/inc oox/source
oox/inc/oox/ole/axbinaryreader.hxx | 20 --
oox/inc/oox/ole/axcontrol.hxx | 50 ++--
oox/source/ole/axbinaryreader.cxx | 11 +++
oox/source/ole/axcontrol.cxx | 115 +
oox/source/ole/vbacontrol.cxx | 63 ++--
5 files changed, 242 insertions(+), 17 deletions(-)
New commits:
commit b565b63ac2df2c9383c7031946e170acc92c6558
Author: Noel Power noel.po...@suse.com
Date: Wed Apr 17 17:08:59 2013 +0100
implement MultiPage, Page TabStrip import for oox
Change-Id: I1912c9550c12a971fcc7fdbc8bd623f18ccc40b8
(cherry picked from commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf)
Change-Id: I9d31017ab149ed8a4c80feefc891dc6c911bad20
(cherry picked from commit 474362028e13f98e73ea9420834a1aaa3490fd83)
Reviewed-on: https://gerrit.libreoffice.org/3456
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx
b/oox/inc/oox/ole/axbinaryreader.hxx
index d63ccb1..4a03f8a 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
typedef ::std::pair sal_Int32, sal_Int32 AxPairData;
/** An array of string values as a property. */
-typedef ::std::vector ::rtl::OUString AxStringArray;
+typedef ::std::vector ::rtl::OUString AxArrayString;
//
@@ -111,7 +111,10 @@ public:
voidreadPairProperty( AxPairData orPairData );
/** Reads the next string property from the stream, if the respective flag
in the property mask is set. */
-voidreadStringProperty( ::rtl::OUString orValue );
+voidreadStringProperty( OUString orValue );
+/** Reads ArrayString, an array of fmString ( compressed or uncompressed )
+is read from the stream and inserted into rStrings */
+voidreadArrayStringProperty( std::vector OUString
rStrings );
/** Reads the next GUID property from the stream, if the respective flag
in the property mask is set. The GUID will be enclosed in braces. */
voidreadGuidProperty( ::rtl::OUString orGuid );
@@ -135,6 +138,9 @@ public:
/** Skips the next string property in the stream, if the respective flag in
the property mask is set. */
inline void skipStringProperty() { readStringProperty(
maDummyString ); }
+/** Skips the next ArrayString property in the stream, if the respective
flag in
+the property mask is set. */
+inline void skipArrayStringProperty() { readArrayStringProperty(
maDummyArrayString ); }
/** Skips the next GUID property in the stream, if the respective flag in
the property mask is set. */
inline void skipGuidProperty() { readGuidProperty( maDummyString
); }
@@ -185,11 +191,11 @@ private:
};
/** Complex property for an array of strings. */
-struct StringArrayProperty : public ComplexProperty
+struct ArrayStringProperty : public ComplexProperty
{
-AxStringArray mrArray;
+AxArrayString mrArray;
sal_uInt32 mnSize;
-inline explicit StringArrayProperty( AxStringArray rArray,
sal_uInt32 nSize ) :
+inline explicit ArrayStringProperty( AxArrayString rArray,
sal_uInt32 nSize ) :
mrArray( rArray ), mnSize( nSize ) {}
virtual boolreadProperty( AxAlignedInputStream rInStrm );
};
@@ -233,8 +239,8 @@ private:
AxPairData maDummyPairData;/// Dummy pair for unsupported
properties.
AxFontData maDummyFontData;/// Dummy font for unsupported
properties.
StreamDataSequence maDummyPicData; /// Dummy picture for unsupported
properties.
-::rtl::OUString maDummyString; /// Dummy string for unsupported
properties.
-AxStringArray maDummyStringArray; /// Dummy string array for
unsupported properties.
+OUString maDummyString; /// Dummy string for unsupported
properties.
+AxArrayString maDummyArrayString; /// Dummy strings for unsupported
ArrayString properties.
sal_Int64 mnPropFlags;/// Flags specifying existing
properties.
sal_Int64 mnNextProp; /// Next property to read.
sal_Int64 mnPropsEnd; /// End position of simple/large
properties.
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 9e00278..1f4b640 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -157,13 +157,13 @@ enum ApiControlType
API_CONTROL_COMBOBOX,
API_CONTROL_SPINBUTTON,
API_CONTROL_SCROLLBAR,
-API_CONTROL_TABSTRIP,
+API_CONTROL_TABSTRIP, //11
API_CONTROL_PROGRESSBAR,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source
oox/source/ole/axcontrol.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e450f964e3790903c447afb7bba482aa6de2a224 Author: Noel Power noel.po...@suse.com Date: Thu Apr 18 12:32:24 2013 +0100 fix Frame import for oox filter Change-Id: Ie165b509ea7668a3064e16b537bf2e51345324ba (cherry picked from commit dbd84f33def04f555fb7b61c0f78f9d312bba633) Reviewed-on: https://gerrit.libreoffice.org/3457 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 04373b2..3f7b11c 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -624,6 +624,7 @@ OUString ControlModelBase::getServiceName() const case API_CONTROL_SCROLLBAR: return CREATE_OUSTRING( com.sun.star.form.component.ScrollBar ); case API_CONTROL_PROGRESSBAR: return CREATE_OUSTRING( com.sun.star.awt.UnoControlProgressBarModel ); case API_CONTROL_GROUPBOX: return CREATE_OUSTRING( com.sun.star.form.component.GroupBox ); +case API_CONTROL_FRAME: return CREATE_OUSTRING( com.sun.star.awt.UnoFrameModel ); case API_CONTROL_PAGE: return CREATE_OUSTRING( com.sun.star.awt.UnoPageModel ); case API_CONTROL_MULTIPAGE: return CREATE_OUSTRING( com.sun.star.awt.UnoMultiPageModel ); case API_CONTROL_DIALOG:return CREATE_OUSTRING( com.sun.star.awt.UnoControlDialogModel ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/zoomitem.cxx | 124 +--
1 file changed, 84 insertions(+), 40 deletions(-)
New commits:
commit b2a84e61e25679e63b5620e818c4532b64b2a4fc
Author: Noel Power noel.po...@suse.com
Date: Thu Apr 18 11:54:42 2013 +0100
fix fdo#63659 restore handling of ZOOM MID, MID_VALUESET MID_TYPE sub
parmas
Change-Id: I01eff3bb8b194e1437a263e527cb8e6d2defa4de
Reviewed-on: https://gerrit.libreoffice.org/3458
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 888272a..09b2ae7 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -23,7 +23,7 @@
#include sfx2/zoomitem.hxx
#include com/sun/star/uno/Sequence.hxx
#include com/sun/star/beans/PropertyValue.hpp
-
+#include sfx.hrc
// ---
TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
@@ -107,19 +107,28 @@ int SvxZoomItem::operator==( const SfxPoolItem rAttr )
const
bool SvxZoomItem::QueryValue( com::sun::star::uno::Any rVal, sal_uInt8
nMemberId ) const
{
-// sal_Bool bConvert = 0!=(nMemberIdCONVERT_TWIPS);
nMemberId = ~CONVERT_TWIPS;
+switch( nMemberId )
+{
+case 0:
+{
+::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue aSeq( ZOOM_PARAMS );
+aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM(
ZOOM_PARAM_VALUE ));
+aSeq[0].Value = sal_Int32( GetValue() );
+aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM(
ZOOM_PARAM_VALUESET ));
+aSeq[1].Value = sal_Int16( nValueSet );
+aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM(
ZOOM_PARAM_TYPE ));
+aSeq[2].Value = sal_Int16( eType );
+rVal = aSeq;
+}
-assert(nMemberId == 0);
-
-::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
aSeq( ZOOM_PARAMS );
-aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ZOOM_PARAM_VALUE ));
-aSeq[0].Value = sal_Int32( GetValue() );
-aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ZOOM_PARAM_VALUESET ));
-aSeq[1].Value = sal_Int16( nValueSet );
-aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE
));
-aSeq[2].Value = sal_Int16( eType );
-rVal = aSeq;
+case MID_VALUE: rVal = (sal_Int32) GetValue(); break;
+case MID_VALUESET: rVal = (sal_Int16) nValueSet; break;
+case MID_TYPE: rVal = (sal_Int16) eType; break;
+default:
+OSL_FAIL(sfx2::SvxZoomItem::QueryValue(), Wrong MemberId!);
+return false;
+}
return true;
}
@@ -127,45 +136,80 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any
rVal, sal_uInt8 nMemberI
bool SvxZoomItem::PutValue( const com::sun::star::uno::Any rVal, sal_uInt8
nMemberId )
{
nMemberId = ~CONVERT_TWIPS;
-assert(nMemberId == 0);
-
-::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
aSeq;
-if (( rVal = aSeq ) ( aSeq.getLength() == ZOOM_PARAMS ))
+switch( nMemberId )
{
-sal_Int32 nValueTmp( 0 );
-sal_Int16 nValueSetTmp( 0 );
-sal_Int16 nTypeTmp( 0 );
-sal_Bool bAllConverted( sal_True );
-sal_Int16 nConvertedCount( 0 );
-for ( sal_Int32 i = 0; i aSeq.getLength(); i++ )
+case 0:
{
-if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE ))
-{
-bAllConverted = ( aSeq[i].Value = nValueTmp );
-++nConvertedCount;
-}
-else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET ))
+::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue aSeq;
+if (( rVal = aSeq ) ( aSeq.getLength() == ZOOM_PARAMS ))
{
-bAllConverted = ( aSeq[i].Value = nValueSetTmp );
-++nConvertedCount;
+sal_Int32 nValueTmp( 0 );
+sal_Int16 nValueSetTmp( 0 );
+sal_Int16 nTypeTmp( 0 );
+sal_Bool bAllConverted( sal_True );
+sal_Int16 nConvertedCount( 0 );
+for ( sal_Int32 i = 0; i aSeq.getLength(); i++ )
+{
+if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE ))
+{
+bAllConverted = ( aSeq[i].Value = nValueTmp );
+++nConvertedCount;
+}
+else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET ))
+{
+bAllConverted = ( aSeq[i].Value = nValueSetTmp );
+++nConvertedCount;
+}
+else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_TYPE ))
+
[PUSHED libreoffice-4-0] implement MultiPage, Page TabStrip import for oox
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3456 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3456 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d31017ab149ed8a4c80feefc891dc6c911bad20 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fix Frame import for oox filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3457 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3457 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie165b509ea7668a3064e16b537bf2e51345324ba Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fix fdo#63659 restore handling of ZOOM MID, MID_VALUESET M...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3458 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3458 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01eff3bb8b194e1437a263e527cb8e6d2defa4de Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java |2
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 62
+++-
swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java|2
swext/mediawiki/src/com/sun/star/wiki/Settings.java| 75
--
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 36
++--
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 45
++
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 35
++--
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 72
+++--
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 18
--
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 11 -
10 files changed, 167 insertions(+), 191 deletions(-)
New commits:
commit a79d43dcd7989ee927de1b8c69ebc2981cc7166e
Author: Noel Grandin n...@peralex.com
Date: Wed Apr 17 13:51:15 2013 +0200
Java cleanup in mediawiki extension
- remove unnecessary casts
- convert Hashtable-Map and Vector-ArrayList
- remove dead fields
Change-Id: Id85abee74857325a113133bf61474b962256489c
Reviewed-on: https://gerrit.libreoffice.org/3430
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index 3967710..7500be6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -29,7 +29,6 @@ public class EditPageParser extends
HTMLEditorKit.ParserCallback
protected String m_sLoginToken = ;
protected String m_sMainURL = ;
-private int m_nWikiArticleHash = 0;
private boolean m_bHTMLStartFound = false;
private boolean m_bInHead = false;
@@ -138,7 +137,6 @@ public class EditPageParser extends
HTMLEditorKit.ParserCallback
{
if ( sName.equalsIgnoreCase( wpTextbox1 ) )
{
-m_nWikiArticleHash = t.hashCode();
m_nWikiArticleStart = pos;
}
}
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 9601579..345be2c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -55,8 +55,6 @@ import com.sun.star.uno.XComponentContext;
import com.sun.star.util.XChangesBatch;
import java.net.*;
import java.io.*;
-import java.util.Hashtable;
-import java.util.Random;
import javax.net.ssl.SSLException;
import javax.swing.text.html.HTMLEditorKit;
@@ -149,11 +147,9 @@ public class Helper
private static final String sHTMLHeader = HTMLHEADmeta
http-equiv=\Content-Type\ content=\text/html; charset=utf-8\
/TITLE/TITLE/HEADBODY;
private static final String sHTMLFooter = /BODY/HTML;
-private static Random m_aRandom;
private static MultiThreadedHttpConnectionManager m_aConnectionManager;
private static HttpClient m_aClient;
private static boolean m_bAllowConnection = true;
-private static Hashtable m_aAcceptedUnknownCerts;
private static Boolean m_bShowInBrowser = null;
@@ -245,7 +241,7 @@ public class Helper
XPropertySet xProps = Helper.GetConfigProps( xContext,
org.openoffice.Office.Custom.WikiExtension/Settings );
xProps.setPropertyValue( PreselectShowBrowser, new Boolean(
bValue ) );
-XChangesBatch xBatch = ( XChangesBatch )
UnoRuntime.queryInterface( XChangesBatch.class, xProps );
+XChangesBatch xBatch = UnoRuntime.queryInterface(
XChangesBatch.class, xProps );
if ( xBatch != null )
xBatch.commitChanges();
}
@@ -262,7 +258,7 @@ public class Helper
{
XMultiComponentFactory xFactory = xContext.getServiceManager();
if ( xFactory != null )
-m_xPasswordContainer =
(XPasswordContainer)UnoRuntime.queryInterface(
+m_xPasswordContainer = UnoRuntime.queryInterface(
XPasswordContainer.class,
xFactory.createInstanceWithContext(
com.sun.star.task.PasswordContainer, xContext ) );
}
@@ -280,7 +276,7 @@ public class Helper
{
XMultiComponentFactory xFactory = xContext.getServiceManager();
if ( xFactory != null )
-m_xInteractionHandler = ( XInteractionHandler
)UnoRuntime.queryInterface(
+m_xInteractionHandler = UnoRuntime.queryInterface(
XInteractionHandler.class,
xFactory.createInstanceWithContext(
[Libreoffice-commits] core.git: forms/qa odk/examples
forms/qa/integration/forms/DocumentHelper.java |4 ++--
forms/qa/integration/forms/DocumentViewHelper.java | 10
+-
forms/qa/integration/forms/FormComponent.java |2 +-
forms/qa/integration/forms/ListSelection.java |6
+++---
forms/qa/integration/forms/MasterDetailForms.java |2 +-
forms/qa/integration/forms/TestCase.java |4 ++--
odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java |4 ++--
odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java |8
8 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 0d8719b0ff9aacb7cdd8a238b8060540d4d00eff
Author: Noel Grandin n...@peralex.com
Date: Wed Apr 17 15:10:06 2013 +0200
Java cleanup, use generics in calls to UnoRuntime#queryInterface
A handful of places wrap the call to queryInterface. With a little
generics love, we can reduce the casting required.
Change-Id: I9efca2afb1b23fad2359af24e1c273aea96e45fe
Reviewed-on: https://gerrit.libreoffice.org/3433
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/forms/qa/integration/forms/DocumentHelper.java
b/forms/qa/integration/forms/DocumentHelper.java
index a26434b..a5a44be 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -133,12 +133,12 @@ public class DocumentHelper
/* -- */
public boolean isModified()
{
-XModifiable modify = (XModifiable)query( XModifiable.class );
+XModifiable modify = query( XModifiable.class );
return modify.isModified();
}
/* -- */
-public Object query( Class aInterfaceClass )
+public T T query( ClassT aInterfaceClass )
{
return UnoRuntime.queryInterface( aInterfaceClass, m_documentComponent
);
}
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java
b/forms/qa/integration/forms/DocumentViewHelper.java
index 66d8f0b..76a03d0 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -73,7 +73,7 @@ public class DocumentViewHelper
@param aInterfaceClass
the class of the interface which shall be returned
*/
-public Object query( Class aInterfaceClass )
+public T T query( ClassT aInterfaceClass )
{
return UnoRuntime.queryInterface( aInterfaceClass, m_controller );
}
@@ -92,7 +92,7 @@ public class DocumentViewHelper
XDispatch xReturn = null;
// go get the current view
-XController xController = (XController)query( XController.class );
+XController xController = query( XController.class );
// go get the dispatch provider of it's frame
XDispatchProvider xProvider = UnoRuntime.queryInterface(
XDispatchProvider.class, xController.getFrame() );
@@ -147,7 +147,7 @@ public class DocumentViewHelper
public XControl getControl( XControlModel xModel ) throws
com.sun.star.uno.Exception
{
// the current view of the document
-XControlAccess xCtrlAcc = (XControlAccess)query( XControlAccess.class
);
+XControlAccess xCtrlAcc = query( XControlAccess.class );
// delegate the task of looking for the control
return xCtrlAcc.getControl( xModel );
}
@@ -160,7 +160,7 @@ public class DocumentViewHelper
}
/* -- */
-public Object getControl( Object aModel, Class aInterfaceClass ) throws
com.sun.star.uno.Exception
+public T T getControl( Object aModel, ClassT aInterfaceClass ) throws
com.sun.star.uno.Exception
{
XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class,
aModel );
return UnoRuntime.queryInterface( aInterfaceClass, getControl( xModel
) );
@@ -171,7 +171,7 @@ public class DocumentViewHelper
*/
public XFormController getFormController( XForm _form )
{
-XFormLayerAccess formLayerAccess = (XFormLayerAccess)query(
XFormLayerAccess.class );
+XFormLayerAccess formLayerAccess = query( XFormLayerAccess.class );
return formLayerAccess.getFormController( _form );
}
diff --git a/forms/qa/integration/forms/FormComponent.java
b/forms/qa/integration/forms/FormComponent.java
index f19ceea..d6ea10d 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -79,7 +79,7 @@ public class FormComponent
@param aInterfaceClass
the class of the interface which shall be returned
*/
-public Object query( Class
[PUSHED] Java cleanup in mediawiki extension
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3430 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3430 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id85abee74857325a113133bf61474b962256489c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Java cleanup, remove unnecessary casts
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3431 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3431 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id12089bc7df16631737e6acaee0973fb91dd953f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Java cleanup, remove the rest of the unnecessary casts
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3432 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3432 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia61d250f6b3711abc29569c5ece38a6f87e38daa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Java cleanup, use generics in calls to UnoRuntime#queryInter...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3433 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3433 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9efca2afb1b23fad2359af24e1c273aea96e45fe Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 26 +++---
1 file changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 41d6003e87b580dc435a423863f92b7c0c20647e
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 17:25:06 2013 +0300
Make the use of SAL_LOG=+WARN+INFO optional
Change-Id: I6af17a7745f4de88b4933e93b77eda1050760794
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 02845d3..59e5994 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -68,7 +68,12 @@ public class Desktop
Bootstrap.setup(this);
-Bootstrap.putenv(SAL_LOG=+WARN+INFO);
+// To enable the putenv below, which turns on all SAL_INFO
+// logging, do: adb shell setprop log.tag.LODesktopLogging
+// VERBOSE.
+
+if (Log.isLoggable(LODesktopLogging, Log.VERBOSE))
+Bootstrap.putenv(SAL_LOG=+WARN+INFO);
}
// This sucks, we need to experiment and think, can an app process
commit 9e7c73d54cc6a33689cb7bf65bcc6274acc748ad
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 15:51:05 2013 +0300
Minor comment change
Change-Id: I14e9b86c23ff000df2339a37ba78a11cc319f27c
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 5e3f15b..02845d3 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -312,11 +312,14 @@ public class Desktop
// Just temporary hack. We should not show the keyboard
// unconditionally on a ACTION_UP event here. The LO level
// should callback to us requesting showing the keyboard
-// if the user taps in a text area. Also, if the device
-// has a hardware keyboard, we probably should not show
-// the soft one unconditionally? But what if the user
-// wants to input in another script than what the hardware
-// keyboard covers?
+// if the user taps in a text area. Unfortunately it seems
+// less than obvious where the correct place to insert
+// such a request is.
+
+// Also, if the device has a hardware keyboard, we
+// probably should not show the soft one unconditionally?
+// But what if the user wants to input in another script
+// than what the hardware keyboard covers?
if (!scrollJustEnded
event.getPointerCount() == 1
event.getActionMasked() == MotionEvent.ACTION_UP) {
commit bf2a1812a4e4233c08f9432ce765f87d1b57727e
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 15:49:48 2013 +0300
Attempt to avoid popping up keyboard after panning
Change-Id: Ie5639ea5a2c50e54ab880ac850287de07ff69959
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 5fb59f2..5e3f15b 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -282,6 +282,7 @@ public class Desktop
@Override public boolean onTouchEvent(MotionEvent event)
{
+boolean scrollJustEnded = false;
if (event.getPointerCount() == 1
gestureDetector.onTouchEvent(event)) {
return true;
@@ -298,6 +299,7 @@ public class Desktop
Desktop.scroll((int) translateX, (int) translateY);
translateX = translateY = 0;
scrollInProgress = false;
+scrollJustEnded = true;
invalidate();
} else if (event.getPointerCount() == 2
scaleDetector.onTouchEvent(event)
@@ -315,7 +317,9 @@ public class Desktop
// the soft one unconditionally? But what if the user
// wants to input in another script than what the hardware
// keyboard covers?
-if (event.getActionMasked() == MotionEvent.ACTION_UP) {
+if (!scrollJustEnded
+event.getPointerCount() == 1
+event.getActionMasked() == MotionEvent.ACTION_UP) {
// show the keyboard so we can enter text
InputMethodManager imm = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
[Libreoffice-commits] core.git: tools/inc
tools/inc/tools/time.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e7cec47f037ee7fd1fc8effb83d0c3654b299e5 Author: Tor Lillqvist t...@iki.fi Date: Fri Apr 19 09:02:32 2013 +0300 Presumably call clock should be wall clock Change-Id: I7bcdfccc17de7057cc47720bd6ce78345f2d6d7c diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx index ce6eb42..1c3dc61 100644 --- a/tools/inc/tools/time.hxx +++ b/tools/inc/tools/time.hxx @@ -25,7 +25,7 @@ class ResId; /** - @WARNING: This class can serve both as call clock time and time duration, and + @WARNING: This class can serve both as wall clock time and time duration, and the mixing of these concepts leads to problems such as there being 25 hours or 10 minus 20 seconds being (non-negative) 10 seconds. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframe.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8d351c59d4393aa37ab38139b3a741f15a49dbfe Author: jorendc joren.libreoff...@telenet.be Date: Sun Apr 14 00:33:19 2013 +0200 fdo#31082 cursor visible during impress presentation Change-Id: I8983676244d0b996c237cbfc487ed68a535803d1 Reviewed-on: https://gerrit.libreoffice.org/3376 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 608e9d8..cb31f56 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -931,6 +931,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const case POINTER_WINDOW_WSIZE: pCursor = [NSCursor resizeLeftRightCursor]; break; case POINTER_REFHAND: pCursor = [NSCursor pointingHandCursor];break; +case POINTER_NULL: [NSCursor hide];break; default: pCursor = GetSalData()-getCursor( mePointerStyle ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#31082 cursor visible during impress presentation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3376 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3376 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8983676244d0b996c237cbfc487ed68a535803d1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source svx/inc svx/Package_inc.mk svx/source
filter/source/msfilter/svdfppt.cxx |2 +- svx/Package_inc.mk |1 - svx/inc/svx/svditext.hxx | 30 -- svx/source/svdraw/svdattr.cxx |2 +- svx/source/svdraw/svdedtv1.cxx |2 +- svx/source/svdraw/svdedxv.cxx |2 +- svx/source/svdraw/svdetc.cxx |2 +- svx/source/svdraw/svdfmtf.cxx |2 +- svx/source/svdraw/svdibrow.cxx |1 - svx/source/svdraw/svdmodel.cxx |2 +- svx/source/svdraw/svdmrkv.cxx |3 ++- svx/source/svdraw/svdoattr.cxx |3 +-- svx/source/svdraw/svdomeas.cxx |2 +- svx/source/svdraw/svdotext.cxx |2 +- svx/source/svdraw/svdotxat.cxx |2 +- svx/source/svdraw/svdotxed.cxx |2 +- svx/source/svdraw/svdotxln.cxx |1 - svx/source/svdraw/svdotxtr.cxx |2 +- svx/source/svdraw/svdundo.cxx |2 +- svx/source/svdraw/svdxcgv.cxx |2 +- 20 files changed, 17 insertions(+), 50 deletions(-) New commits: commit 6f30f805bd87b940fd0693fb9f8c90e6ca779eff Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Thu Apr 18 19:59:45 2013 -0300 fdo#62699: Drop wrapper header Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 Reviewed-on: https://gerrit.libreoffice.org/3473 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index b8b680b..fca74f7 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -22,6 +22,7 @@ #include unotools/tempfile.hxx #include math.h #include editeng/eeitem.hxx +#include editeng/editdata.hxx #include sot/storage.hxx #include sot/storinfo.hxx #include sot/stg.hxx @@ -51,7 +52,6 @@ #include editeng/numdef.hxx #include svx/svdattr.hxx #include svx/xattr.hxx -#include svx/svditext.hxx #include svx/svdetc.hxx #include editeng/bulletitem.hxx #include svx/polysc3d.hxx diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index cb54894..5b25ac3 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -388,7 +388,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx)) diff --git a/svx/inc/svx/svditext.hxx b/svx/inc/svx/svditext.hxx deleted file mode 100644 index 586d51d..000 --- a/svx/inc/svx/svditext.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _SVDITEXT_HXX -#define _SVDITEXT_HXX - -// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen - -#include editeng/editdata.hxx - - -#endif // _SVDITEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d160b73..25e0710 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -39,10 +39,10 @@ #include svl/solar.hrc #include editeng/xmlcnitm.hxx +#include editeng/editdata.hxx #include svx/svxids.hrc #include svx/xtable.hxx// for RGB_Color() -#include svx/svditext.hxx #include svx/svdmodel.hxx // for DEGREE_CHAR #include svx/svdtrans.hxx #include svx/svdglob.hxx // string cache diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 50397b4..9a0528c 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -27,7 +27,6
[PUSHED] fdo#62699: Drop wrapper header
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3473 Approvals: LibreOffice gerrit bot: Verified Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3473 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/window.h |2
vcl/source/window/window.cxx | 321 +--
2 files changed, 158 insertions(+), 165 deletions(-)
New commits:
commit 3ce89a2149d3495ff63827b39c33a79cb9abacab
Author: Herbert Dürr h...@apache.org
Date: Mon Jun 18 12:05:35 2012 +
Resolves: coverity#708649# start to fix mis-pimpl-ification of Window class
(cherry picked from commit b0a0253e4fea1d79bc255d45f8472498a3206fd5)
Conflicts:
vcl/source/window/window.cxx
Change-Id: I8330b7361dfdd9f291babb2e49d59ddeb91f5e35
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 97401f2..725f5ad 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -226,7 +226,7 @@ enum AlwaysInputMode { AlwaysInputNone = 0,
AlwaysInputEnabled = 1, AlwaysInputD
class WindowImpl
{
public:
-WindowImpl();
+WindowImpl( WindowType );
~WindowImpl();
ImplWinData*mpWinData;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7deb67c..53b349f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -148,12 +148,161 @@ ImplAccessibleInfos::~ImplAccessibleInfos()
// ---
-WindowImpl::WindowImpl()
-{
+WindowImpl::WindowImpl( WindowType nType )
+{
+maZoom = Fraction( 1, 1 );
+maWinRegion = Region( REGION_NULL );
+maWinClipRegion = Region( REGION_NULL );
+mpWinData = NULL; // Extra Window Data, that we dont
need for all windows
+mpOverlapData = NULL; // Overlap Data
+mpFrameData = NULL; // Frame Data
+mpFrame = NULL; // Pointer to frame window
+mpSysObj= NULL;
+mpFrameWindow = NULL; // window to top level parent (same as
frame window)
+mpOverlapWindow = NULL; // first overlap parent
+mpBorderWindow = NULL; // Border-Window
+mpClientWindow = NULL; // Client-Window of a FrameWindow
+mpParent= NULL; // parent (inkl. BorderWindow)
+mpRealParent= NULL; // real parent (exkl. BorderWindow)
+mpFirstChild= NULL; // first child window
+mpLastChild = NULL; // last child window
+mpFirstOverlap = NULL; // first overlap window (only set in
overlap windows)
+mpLastOverlap = NULL; // last overlap window (only set in
overlap windows)
+mpPrev = NULL; // prev window
+mpNext = NULL; // next window
+mpNextOverlap = NULL; // next overlap window of frame
+mpLastFocusWindow = NULL; // window for focus restore
+mpDlgCtrlDownWindow = NULL; // window for dialog control
+mpFirstDel = NULL; // Dtor notification list
+mpUserData = NULL; // user data
+mpCursor= NULL; // cursor
+mpControlFont = NULL; // font propertie
+mpVCLXWindow= NULL;
+mpAccessibleInfos = NULL;
+maControlForeground = Color( COL_TRANSPARENT ); // no foreground set
+maControlBackground = Color( COL_TRANSPARENT ); // no background set
+mnLeftBorder= 0;// left border
+mnTopBorder = 0;// top border
+mnRightBorder = 0;// right border
+mnBottomBorder = 0;// bottom border
+mnWidthRequest = -1; // width request
+mnHeightRequest = -1; // height request
+mnX = 0;// X-Position to Parent
+mnY = 0;// Y-Position to Parent
+mnAbsScreenX= 0;// absolute X-position on screen, used
for RTL window positioning
+mpChildClipRegion = NULL; // Child-Clip-Region when ClipChildren
+mpPaintRegion = NULL; // Paint-ClipRegion
+mnStyle = 0;// style (init in ImplInitWindow)
+mnPrevStyle = 0;// prevstyle (set in SetStyle)
+mnExtendedStyle = 0;// extended style (init in
ImplInitWindow)
+mnPrevExtendedStyle = 0;// prevstyle (set in SetExtendedStyle)
+mnType = nType;// type
+mnGetFocusFlags = 0;// Flags fuer GetFocus()-Aufruf
+mnWaitCount = 0;// Wait-Count (1 ==
Warte-MousePointer)
+mnPaintFlags= 0;// Flags for ImplCallPaint
+mnParentClipMode= 0;// Flags for Parent-ClipChildren-Mode
+mnActivateMode = 0;// Will be converted in
System/Overlap-Windows
+mnDlgCtrlFlags = 0;// DialogControl-Flags
+mnLockCount = 0;// LockCount
+meAlwaysInputMode = AlwaysInputNone; // neither
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b0/a0253e4fea1d79bc255d45f8472498a3206fd5
b0/a0253e4fea1d79bc255d45f8472498a3206fd5 |1 + 1 file changed, 1 insertion(+) New commits: commit e9a556521199274dbbd37e9a24e1076305d74389 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:30:17 2013 +0100 Notes added by 'git notes add' diff --git a/b0/a0253e4fea1d79bc255d45f8472498a3206fd5 b/b0/a0253e4fea1d79bc255d45f8472498a3206fd5 new file mode 100644 index 000..cac7578 --- /dev/null +++ b/b0/a0253e4fea1d79bc255d45f8472498a3206fd5 @@ -0,0 +1 @@ +merged as: 3ce89a2149d3495ff63827b39c33a79cb9abacab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b7/ff116e58df419aa40ccc93a3e785810afba5ae
b7/ff116e58df419aa40ccc93a3e785810afba5ae |1 + 1 file changed, 1 insertion(+) New commits: commit 6cab9d27c68726ce436f42ddb65cd64c80c405e1 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:32:12 2013 +0100 Notes added by 'git notes add' diff --git a/b7/ff116e58df419aa40ccc93a3e785810afba5ae b/b7/ff116e58df419aa40ccc93a3e785810afba5ae new file mode 100644 index 000..9a416ab --- /dev/null +++ b/b7/ff116e58df419aa40ccc93a3e785810afba5ae @@ -0,0 +1 @@ +prefer: 83079e1fdd729492a6829f005f9ba937493770b1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/df44038976177f0145da65eff0d6fae44ad722
db/df44038976177f0145da65eff0d6fae44ad722 |1 + 1 file changed, 1 insertion(+) New commits: commit a46c8d9784e6200e808018ee171b9924987e35ff Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:38:19 2013 +0100 Notes added by 'git notes add' diff --git a/db/df44038976177f0145da65eff0d6fae44ad722 b/db/df44038976177f0145da65eff0d6fae44ad722 new file mode 100644 index 000..55b156b --- /dev/null +++ b/db/df44038976177f0145da65eff0d6fae44ad722 @@ -0,0 +1 @@ +prefer: 955ae0c3792e65844935c765144c1bed051a7c49 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/1c83c696bd850066d425427c10374b6587b45d
58/1c83c696bd850066d425427c10374b6587b45d |1 + 1 file changed, 1 insertion(+) New commits: commit bf08c085d729f20f25cf437b4b41c248e1d832ee Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:40:29 2013 +0100 Notes added by 'git notes add' diff --git a/58/1c83c696bd850066d425427c10374b6587b45d b/58/1c83c696bd850066d425427c10374b6587b45d new file mode 100644 index 000..90c9ef7 --- /dev/null +++ b/58/1c83c696bd850066d425427c10374b6587b45d @@ -0,0 +1 @@ +prefer: 176a22eb1df77a31e8d116750ca0cb3a10149fe0 ___ 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/core/data/dpresfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 06d86e36a3a192484deee8da08e28509827a2272
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Apr 19 10:39:49 2013 +0200
remove needless explicit type for swap()
MSVC gives:
C:/PROGRA~2/MICROS~2.0/VC/include\vector(1544) : error C2825: '_Alloc':
must be a class or namespace when followed by '::'
C:/PROGRA~2/MICROS~2.0/VC/include\vector(1589) : see reference to
class template instantiation 'std::_Vb_iter_base_Alloc' being compiled
with
[
_Alloc=ScDPResultFilterSet::MemberNode *
]
C:/cygwin/home/tinderbox/master-build/sc/source/core/data/dpresfilter.cxx(147)
: see reference to class template instantiation 'std::_Vb_reference_Alloc'
being compiled
with
[
_Alloc=ScDPResultFilterSet::MemberNode *
]
Change-Id: I394f861aa29a8b6e43ea92447215a786895a
diff --git a/sc/source/core/data/dpresfilter.cxx
b/sc/source/core/data/dpresfilter.cxx
index 9a23233..81eb3d1 100644
--- a/sc/source/core/data/dpresfilter.cxx
+++ b/sc/source/core/data/dpresfilter.cxx
@@ -144,7 +144,7 @@ void ScDPResultFilterSet::add(
void ScDPResultFilterSet::swap(ScDPResultFilterSet rOther)
{
std::swap(maPrimaryDimName, rOther.maPrimaryDimName);
-std::swapMemberNode*(mpRoot, rOther.mpRoot);
+std::swap(mpRoot, rOther.mpRoot);
}
bool ScDPResultFilterSet::empty() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 52/363a3ad822868e417c665def18d5302670403b
52/363a3ad822868e417c665def18d5302670403b |1 + 1 file changed, 1 insertion(+) New commits: commit 378fe15a5d260e45dd077a681a7b8da5fa84e509 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:42:48 2013 +0100 Notes added by 'git notes add' diff --git a/52/363a3ad822868e417c665def18d5302670403b b/52/363a3ad822868e417c665def18d5302670403b new file mode 100644 index 000..05695f0 --- /dev/null +++ b/52/363a3ad822868e417c665def18d5302670403b @@ -0,0 +1 @@ +prefer: 3db7c67ddda3f6f9f0e6aa70c83ea43db65b325a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/a5505c0ec568577ab62c086de0675738098761
d5/a5505c0ec568577ab62c086de0675738098761 |1 + 1 file changed, 1 insertion(+) New commits: commit 355dad525c464e3227806edbd1fc744253644c7a Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:47:43 2013 +0100 Notes added by 'git notes add' diff --git a/d5/a5505c0ec568577ab62c086de0675738098761 b/d5/a5505c0ec568577ab62c086de0675738098761 new file mode 100644 index 000..be08f3b --- /dev/null +++ b/d5/a5505c0ec568577ab62c086de0675738098761 @@ -0,0 +1 @@ +prefer: 0fdbb5b0eabbaa571f3747fda12a56c938cba474 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b9/02cae0a2f7d1546e5746bf81842122f60897e2
b9/02cae0a2f7d1546e5746bf81842122f60897e2 |1 + 1 file changed, 1 insertion(+) New commits: commit bcbebd1ddbe5f46703edabe95b9b5caa8d115c4f Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:50:42 2013 +0100 Notes added by 'git notes add' diff --git a/b9/02cae0a2f7d1546e5746bf81842122f60897e2 b/b9/02cae0a2f7d1546e5746bf81842122f60897e2 new file mode 100644 index 000..6b5156b --- /dev/null +++ b/b9/02cae0a2f7d1546e5746bf81842122f60897e2 @@ -0,0 +1 @@ +prefer: b8329bde87089c4d44a48632dd205e157cc0b204 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 55/c850cfeb2d136554d611d3ac1f4195eff28bd0
55/c850cfeb2d136554d611d3ac1f4195eff28bd0 |1 + 1 file changed, 1 insertion(+) New commits: commit 7b47bf35d788f3cb672e6c30c29ca9e57040d058 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:55:05 2013 +0100 Notes added by 'git notes add' diff --git a/55/c850cfeb2d136554d611d3ac1f4195eff28bd0 b/55/c850cfeb2d136554d611d3ac1f4195eff28bd0 new file mode 100644 index 000..a30b8c3 --- /dev/null +++ b/55/c850cfeb2d136554d611d3ac1f4195eff28bd0 @@ -0,0 +1 @@ +reject: clang define __GNUC__ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/84b27a141da728614ddc484049be1573cec157
ef/84b27a141da728614ddc484049be1573cec157 |1 + 1 file changed, 1 insertion(+) New commits: commit d8ec673b513b7dd3ba1ccd33f51a92390ebf7c85 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 09:59:19 2013 +0100 Notes added by 'git notes add' diff --git a/ef/84b27a141da728614ddc484049be1573cec157 b/ef/84b27a141da728614ddc484049be1573cec157 new file mode 100644 index 000..e88cc56 --- /dev/null +++ b/ef/84b27a141da728614ddc484049be1573cec157 @@ -0,0 +1 @@ +prefer: 1f26095e9c4f72f7bd6e78416c409f68ceae3027 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/style/NumberingType.idl | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 4a4589e5bc2d8c159d1fbf7fb1ca218faae401d8 Author: Ariel Constenla-Haile arie...@apache.org Date: Wed Oct 10 21:23:33 2012 + Resolves: #i121197# Escape non-ASCII chars from css.style.NumberingType Patch by: Tsutomu Uchino Review by: arielch (cherry picked from commit 6970569ca1e0adf78ac34a5fbab434f5026d3a89) Conflicts: offapi/com/sun/star/style/NumberingType.idl Change-Id: I9375377c4fb15f871beb46ae96b107bb1296b6b6 diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl index 2058733..c5f7516 100644 --- a/offapi/com/sun/star/style/NumberingType.idl +++ b/offapi/com/sun/star/style/NumberingType.idl @@ -95,7 +95,7 @@ published constants NumberingType const short CIRCLE_NUMBER = 14; /** Numbering for Chinese lower case number -as ä¸,äº,ä¸... +as #19968;,#20108;,#19977;... */ const short NUMBER_LOWER_ZH = 15; @@ -108,12 +108,12 @@ published constants NumberingType const short NUMBER_UPPER_ZH_TW = 17; /** Bullet for Chinese Tian Gan -as ç²,ä¹,ä¸... +as #30002;,#20057;,#19993;... */ const short TIAN_GAN_ZH = 18; /** Bullet for Chinese Di Zi -as å,ä¸,å¯ ... +as #23376;,#19985;,#23493;... */ const short DI_ZI_ZH = 19; @@ -138,37 +138,37 @@ published constants NumberingType const short IROHA_HALFWIDTH_JA = 24; /** Numbering for Korean upper case number -as 壹,è²³,å... +as #22777;,#36019;,#21443;... */ const short NUMBER_UPPER_KO = 25; /** Numbering for Korean Hangul number -as ì¼,ì´,ì¼... +as #51068;,#51060;,#49340;... */ const short NUMBER_HANGUL_KO = 26; /** Bullet for Korean Hangul Jamo -as ã±,ã´,ã·... +as #12593;,#12596;,#12599;... */ const short HANGUL_JAMO_KO = 27; /** Bullet for Korean Hangul Syllable -as ê°,ë,ë¤... +as #44032;,#45208;,#45796;... */ const short HANGUL_SYLLABLE_KO = 28; /** Bullet for Korean Hangul Circled Jamo -as ã ,ã¡,ã¢... +as #12896;,#12897;,#12898;... */ const short HANGUL_CIRCLED_JAMO_KO = 29; /** Bullet for Korean Hangul Circled Syllable -as ã®,ã¯,ã°... +as #12910;,#12911;,#12912;... */ const short HANGUL_CIRCLED_SYLLABLE_KO = 30; /** Numbering in Arabic alphabet letters -as Ø£,ب,ت... +as #1571;,#1576;,#1578;... @since OOo 1.1.2 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/70569ca1e0adf78ac34a5fbab434f5026d3a89
69/70569ca1e0adf78ac34a5fbab434f5026d3a89 |1 + 1 file changed, 1 insertion(+) New commits: commit da29f2b91a6386af5e7aae6c9ec96ffba4d79148 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 19 10:12:05 2013 +0100 Notes added by 'git notes add' diff --git a/69/70569ca1e0adf78ac34a5fbab434f5026d3a89 b/69/70569ca1e0adf78ac34a5fbab434f5026d3a89 new file mode 100644 index 000..d95c490 --- /dev/null +++ b/69/70569ca1e0adf78ac34a5fbab434f5026d3a89 @@ -0,0 +1 @@ +merged as: 4a4589e5bc2d8c159d1fbf7fb1ca218faae401d8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/inc vcl/inc vcl/unx
sal/inc/rtl/logfile.hxx |2 +-
vcl/inc/unx/gtk/gtksalmenu.hxx|3 ++-
vcl/unx/gtk/window/gloactiongroup.cxx |7 ---
vcl/unx/gtk/window/gtksalmenu.cxx | 32 +---
4 files changed, 24 insertions(+), 20 deletions(-)
New commits:
commit 26d092b3635680248f8b176564409e6c0c24bfbf
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Apr 19 11:13:05 2013 +0200
lp#1085169: we overactivate here, as it does not seem to hurt
Change-Id: I4f6e76347c5c9b5c67a09b8c3dcd1b1708e8e703
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 35915d8..d161c61 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -52,6 +52,7 @@ private:
GtkSalMenu* GetMenuForItemCommand( gchar* aCommand,
gboolean bGetSubmenu );
voidImplUpdate( gboolean bRecurse );
+voidActivateAllSubmenus(MenuBar* pMenuBar);
public:
GtkSalMenu( sal_Bool bMenuBar );
@@ -97,7 +98,7 @@ public:
voidNativeSetAccelerator( unsigned nSection,
unsigned nItemPos, const KeyCode rKeyCode, const OUString rKeyName );
voidDispatchCommand( gint itemId, const gchar*
aCommand );
-voidActivate( const gchar* aMenuCommand );
+voidActivate();
voidDeactivate( const gchar* aMenuCommand );
voidDisplay( sal_Bool bVisible );
boolPrepUpdate();
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx
b/vcl/unx/gtk/window/gloactiongroup.cxx
index 810ac3d..78fecf0 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -167,20 +167,22 @@ g_lo_action_group_perform_submenu_action (GLOActionGroup
*group,
const gchar*action_name,
GVariant *state)
{
-SAL_INFO(vcl.unity, g_lo_action_group_perform_submenu_action on
group);
GtkSalFrame* pFrame = group-priv-frame;
+SAL_INFO(vcl.unity, g_lo_action_group_perform_submenu_action on
group for frame pFrame);
if (pFrame == NULL)
return;
GtkSalMenu* pSalMenu = static_castGtkSalMenu* (pFrame-GetMenu());
+SAL_INFO(vcl.unity, g_lo_action_group_perform_submenu_action on
group for menu pSalMenu);
if (pSalMenu != NULL) {
gboolean bState = g_variant_get_boolean (state);
+SAL_INFO(vcl.unity, g_lo_action_group_perform_submenu_action on
group to bState);
if (bState)
-pSalMenu-Activate (action_name);
+pSalMenu-Activate();
else
pSalMenu-Deactivate (action_name);
}
@@ -191,7 +193,6 @@ g_lo_action_group_change_state (GActionGroup *group,
const gchar *action_name,
GVariant *value)
{
-SAL_INFO(vcl.unity, g_lo_action_group_perform_submenu_action on
group);
g_return_if_fail (value != NULL);
g_variant_ref_sink (value);
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx
b/vcl/unx/gtk/window/gtksalmenu.cxx
index c79aee2..c601af1 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -353,10 +353,6 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
SAL_INFO(vcl.unity, preparing submenupSubMenuModel
to menu model G_MENU_MODEL(pSubMenuModel) and action group
G_ACTION_GROUP(pActionGroup));
pSubmenu-SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
pSubmenu-SetActionGroup( G_ACTION_GROUP( pActionGroup ) );
-
-pSubmenu-GetMenu()-Activate();
-pSubmenu-GetMenu()-Deactivate();
-
pSubmenu-ImplUpdate( bRecurse );
}
}
@@ -658,7 +654,6 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar*
aCommand, gboolean bGetSub
{
SolarMutexGuard aGuard;
GtkSalMenu* pMenu = NULL;
-
for ( sal_uInt16 nPos = 0; nPos maItems.size(); nPos++ )
{
GtkSalMenuItem *pSalItem = maItems[ nPos ];
@@ -695,24 +690,31 @@ void GtkSalMenu::DispatchCommand( gint itemId, const
gchar *aCommand )
Menu* pSubMenu = ( pSalSubMenu != NULL ) ? pSalSubMenu-GetMenu() : NULL;
MenuBar* pMenuBar = static_cast MenuBar* ( mpVCLMenu );
-
pMenuBar-HandleMenuCommandEvent( pSubMenu, itemId );
}
-void GtkSalMenu::Activate( const gchar* aMenuCommand )
+void GtkSalMenu::ActivateAllSubmenus(MenuBar* pMenuBar)
+{
+pMenuBar-HandleMenuActivateEvent(mpVCLMenu);
+for ( sal_uInt16 nPos = 0; nPos maItems.size(); nPos++ )
+{
+GtkSalMenuItem *pSalItem = maItems[ nPos ];
+if ( pSalItem-mpSubMenu != NULL )
+{
+pSalItem-mpSubMenu-ActivateAllSubmenus(pMenuBar);
+
[PATCH] Removed unused method from core listed in unusedcode.easy
Regards, Sameer Deshmukh 0001-PATCH-Removed-useless-method.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/inc editeng/source
editeng/inc/editeng/numitem.hxx |9 +--
editeng/source/items/frmitems.cxx |5 -
editeng/source/items/numitem.cxx | 103 +-
3 files changed, 10 insertions(+), 107 deletions(-)
New commits:
commit 98d594abd42c5aa33d6981f4dd19582c2d345705
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 19 11:15:52 2013 +0200
Revert fix fdo#47018 Impress paste destroy bullet
This reverts commit a95cce27295f9cd255fa72eaded00972e3efb69b, it lead to
live-
lock in JunitTest_sc_unoapi, where SvxBoxItem::Create
(editeng/source/items/frmitems.cxx) failed to break out of the while(true)
loop,
apparently because it kept reading past the end of rStrm, so cLine wouldn't
be
updated. (That code would need to be made more robust, but I do not know
how
best to flag errors from SvxBoxItem::Create?)
What looks suspicious about the changes of
a95cce27295f9cd255fa72eaded00972e3efb69b at least to
editeng/source/items/frmitems.cxx is that it changes the stream's format,
now
reading/writing a 16 bit value where it previously read/wrote an 8 bit value
(SvStream /does/ support sal_Int8, btw).
Change-Id: I1a46746559dcf8e1ea8be63a9a0cf2d32ccc69a1
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index f17e9cf..86f4aef 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -157,12 +157,10 @@ public:
explicit SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode =
LABEL_WIDTH_AND_POSITION );
SvxNumberFormat(const SvxNumberFormat rFormat);
-SvxNumberFormat( SvStream rStream );
virtual ~SvxNumberFormat();
SvStream Store(SvStream rStream, FontToSubsFontConverter
pConverter);
-SvxNumberFormat* Create(SvStream rStream );
SvxNumberFormat operator=( const SvxNumberFormat );
sal_Booloperator==( const SvxNumberFormat ) const;
@@ -254,7 +252,6 @@ public:
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule rCopy);
-SvxNumRule(SvStream rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule ) const;
@@ -263,7 +260,7 @@ public:
SvxNumRule operator=( const SvxNumRule );
SvStream Store(SvStream rStream);
-SvxNumRule* Create(SvStream rStream);
+
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat GetLevel(sal_uInt16 nLevel)const;
voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat
rFmt, sal_Bool bIsValid = sal_True);
@@ -297,9 +294,9 @@ public:
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-virtual SfxPoolItem* Create(SvStream rStream, sal_uInt16
nItemVersion) const;
+virtual SfxPoolItem* Create(SvStream , sal_uInt16) const;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-virtual SvStreamStore(SvStream rStream, sal_uInt16 nItemVersion
) const;
+virtual SvStreamStore(SvStream , sal_uInt16 nItemVersion ) const;
virtual int operator==( const SfxPoolItem ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index b8ec78a..8741e69 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3475,7 +3475,7 @@ SvxBrushItem::SvxBrushItem( SvStream rStream, sal_uInt16
nVersion,
if ( nVersion = BRUSH_GRAPHIC_VERSION )
{
sal_uInt16 nDoLoad = 0;
-sal_uInt16 nPos;
+sal_Int8 nPos;
rStream nDoLoad;
@@ -3892,8 +3892,7 @@ SvStream SvxBrushItem::Store( SvStream rStream ,
sal_uInt16 /*nItemVersion*/ )
// UNICODE: rStream *pStrFilter;
rStream.WriteUniOrByteString(*pStrFilter, rStream.GetStreamCharSet());
}
-// SvStream doesn't support sal_Int8
-rStream (sal_uInt16)eGraphicPos;
+rStream (sal_Int8)eGraphicPos;
return rStream;
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7ef42e0..7c3ec9c 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -28,7 +28,6 @@
#include editeng/editids.hrc
#include editeng/editrids.hrc
#include editeng/numdef.hxx
-#include editeng/eeitem.hxx
#include vcl/graph.hxx
#include vcl/window.hxx
#include vcl/svapp.hxx
@@ -178,59 +177,6 @@ SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat
rFormat) :
*this = rFormat;
}
-SvxNumberFormat::SvxNumberFormat( SvStream rStream )
-{
-sal_uInt16 nTmp16;
-sal_Int32 nTmp32;
-rStream nTmp16; // Version number
-
-rStream nTmp16; SetNumberingType( nTmp16 );
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit3.cxx | 49
1 file changed, 28 insertions(+), 21 deletions(-)
New commits:
commit f1f7dfebb3d147471ed2aa6a5b50326688cb4007
Author: László Németh nem...@numbertext.org
Date: Fri Apr 19 11:45:57 2013 +0200
fdo#63711 Calc: fix Catalan and Hungarian hyphenation
Change-Id: I08962578e5d41637e78c91f5df45e518893c82e5
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 92bb45a..da52915 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1748,6 +1748,9 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
sal_Bool bHangingPunctuation = sal_False;
sal_Unicode cAlternateReplChar = 0;
sal_Unicode cAlternateExtraChar = 0;
+sal_Bool bAltFullLeft = sal_False;
+sal_Bool bAltFullRight = sal_False;
+sal_uInt32 nAltDelChar = 0;
if ( ( nMaxBreakPos ( nMax + pLine-GetStart() ) ) ( pNode-GetChar(
nMaxBreakPos ) == ' ' ) )
{
@@ -1852,29 +1855,38 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
}
else
{
-String aAlt( xHyphWord-getHyphenatedWord() );
-
-// We expect the two cases, which might exist now:
+// TODO: handle all alternative hyphenations (see
hyphen-1.2.8/tests/unicode.*)
+OUString aAlt( xHyphWord-getHyphenatedWord() );
+OUString aWord2(aWord);
+OUString aAltLeft(aAlt.copy(0, _nWordLen));
+OUString aAltRight(aAlt.copy(_nWordLen));
+bAltFullLeft = aWord2.startsWith(aAltLeft);
+bAltFullRight = aWord2.endsWith(aAltRight);
+nAltDelChar = aWord2.getLength() -
aAlt.getLength() + (1 - bAltFullLeft) + (1 - bAltFullRight);
+
+// NOTE: improved for other cases, see fdo#63711
+
+// We expect[ed] the two cases:
// 1) packen becomes pak-ken
// 2) Schiffahrt becomes Schiff-fahrt
// In case 1, a character has to be replaced
// in case 2 a character is added.
// The identification is complicated by long
// compound words because the Hyphenator separates
-// all position of the word.
+// all position of the word. [This is not true for
libhyphen.]
// Schiffahrtsbrennesseln -
Schifffahrtsbrennnesseln
// We can thus actually not directly connect the index of the
// AlternativeWord to aWord. The whole issue will
be simplified
// by a function in the Hyphenator as soon as AMA
builds this in...
sal_uInt16 nAltStart = _nWordLen - 1;
-sal_uInt16 nTxtStart = nAltStart - (aAlt.Len() -
aWord.Len());
+sal_uInt16 nTxtStart = nAltStart -
(aAlt.getLength() - aWord.Len());
sal_uInt16 nTxtEnd = nTxtStart;
sal_uInt16 nAltEnd = nAltStart;
// The regions between the nStart and nEnd is the
// difference between alternative and original
string.
-while( nTxtEnd aWord.Len() nAltEnd
aAlt.Len()
- aWord.GetChar(nTxtEnd) !=
aAlt.GetChar(nAltEnd) )
+while( nTxtEnd aWord.Len() nAltEnd
aAlt.getLength()
+ aWord.GetChar(nTxtEnd) != aAlt[nAltEnd] )
{
++nTxtEnd;
++nAltEnd;
@@ -1882,7 +1894,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
// If a character is added, then we notice it now:
if( nAltEnd nTxtEnd nAltStart == nAltEnd
-aWord.GetChar( nTxtEnd ) ==
aAlt.GetChar(nAltEnd) )
+aWord.GetChar( nTxtEnd ) == aAlt[nAltEnd] )
{
++nAltEnd;
++nTxtStart;
@@ -1892,13 +1904,13 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
DBG_ASSERT( ( nAltEnd - nAltStart ) == 1,
Alternate: Wrong assumption! );
if ( nTxtEnd nTxtStart )
-cAlternateReplChar =
Re: [PATCH] Removed unused method from core listed in unusedcode.easy
What does unused mean? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst libwps/ExternalPackage_libwps.mk libwps/ExternalProject_libwps.mk libwps/libwps.gcc.warnings.patch libwps/libwps.msvc.warnings.patch libwps/Module_libwps.m
RepositoryExternal.mk | 10 +++-- download.lst |2 - libwps/ExternalPackage_libwps.mk | 12 +- libwps/ExternalProject_libwps.mk | 40 + libwps/Module_libwps.mk |2 - libwps/StaticLibrary_wps.mk | 47 - libwps/UnpackedTarball_wps.mk |7 --- libwps/libwps.gcc.warnings.patch | 15 libwps/libwps.msvc.warnings.patch | 71 -- 9 files changed, 58 insertions(+), 148 deletions(-) New commits: commit 8c07bd39a8615bb165380a009f73d6dcbc1ad500 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 19 12:06:58 2013 +0200 Uploading libwps 0.2.8 release Change-Id: I53413843694bd090d5eaa714b141761e8ad7db60 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1e7e0ea..df44d2d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1471,18 +1471,20 @@ gb_ExternalProject__use_wps := else # !SYSTEM_WPS $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - wpslib \ + wps-0.2 \ )) define gb_LinkTarget__use_wps +$(call gb_LinkTarget_use_package,$(1),\ + libwps \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ - wpslib \ + wps-0.2 \ ) endef define gb_ExternalProject__use_wps -$(call gb_ExternalProject_use_package,$(1),libwps_inc) -$(call gb_ExternalProject_use_static_libraries,$(1),wpslib) +$(call gb_ExternalProject_use_package,$(1),libwps) endef diff --git a/download.lst b/download.lst index 5e8d904..a119ffa 100644 --- a/download.lst +++ b/download.lst @@ -83,7 +83,7 @@ export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz export WPD_TARBALL := b39ca1071918f1687f19202e9cd9eb46-libwpd-0.9.7.tar.bz2 export WPG_TARBALL := b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 -export WPS_TARBALL := d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 +export WPS_TARBALL := 78196c097db366fac66841d032b1ddac-libwps-0.2.8.tar.bz2 export XPDF_TARBALL := 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2 diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk index 0eb66fd..2390a8f 100644 --- a/libwps/ExternalPackage_libwps.mk +++ b/libwps/ExternalPackage_libwps.mk @@ -7,11 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,wps)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\ src/lib/libwps.h \ src/lib/WPSDocument.h \ )) +$(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_ExternalPackage_add_file,libwps,lib/wps-0.2.lib,src/lib/.libs/libwps-0.2.lib)) +else +$(eval $(call gb_ExternalPackage_add_file,libwps,lib/libwps-0.2.a,src/lib/.libs/libwps-0.2.a)) +endif + # vim: set noet sw=4 ts=4: diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk new file mode 100644 index 000..ca0728d --- /dev/null +++ b/libwps/ExternalProject_libwps.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,libwps)) + +$(eval $(call gb_ExternalProject_use_unpacked,libwps,wps)) + +$(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) + +$(eval $(call gb_ExternalProject_register_targets,libwps,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libwps,\ + boost_headers \ + wpd \ +)) + +$(call gb_ExternalProject_get_state_target,libwps,build) : + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG= \ +./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ +(cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ + ) + +# vim: set noet sw=4 ts=4: diff --git
Re: symbols and no optimization for external libs in dgbutil builds?
On 19/04/13 02:00, Markus Mohrhard wrote: Hey, is there anything speaking against building external libraries in the dbgutil case with symbols and without optimization? Ideally IMHO we should even build c++ libraries with GLIBCXX_DEBUG. we should definitely build everything with debug symbols in a dbgutil build. i don't really have an opinion on optimizations. we already build the 2 externals where it matters (cppunit/liborcus) with _GLIBCXX_DEBUG; i'd say it's probably a good idea to use it for all externals but in case a library has never been build with it we should be prepared to patch some issues in it, i.e. it needs testing. there are also more debug modes in some externals, similar to our own --enable-dbgutil with additional assertions; there may be some among them that make sense to enable but there are probably others that don't make sense, e.g. iirc there was some XML library that dumps out every element it parses on stderr which is a bit too much verbosity. for example python has --with-pydebug, which we actually use currently when building against MSVC debug runtimes but not on other platforms. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Possilbe UNO Accessibility API - Java Access Bridge issue in current build of Master while using NVDA for AT
On Windows 7 SP1 64-bit
JRE 1.6.45
JAB 2.0.2
Bumped into a an issue with Java Access Bridge and LibreOffice today's Master
daily build.
When running the NVDA 2012.3.1 AT screen reader, a long stable test document is
crashing LibreOffice 4.1 alpha from Master when accessed with NVDA AT in use.
Without NVDA AT active, the document opens fully in todays daily build.
Without NVDA AT activated, the JavaFerret and JavaMonkey utilities both show
the document opening correctly with today's LibreOffice build of Master. And
on the same system, earlier builds of Master, 4.0.3.1 and 4.0.2.2 opened and
continue to open while NVDA is in use.
Have opened an issue with NVAccess against NVDA 2012.3.1 (
http://community.nvda-project.org/ticket/3170 ) but suspect it could be recent
Java work in LibreOffice--Java Ferret/Java Monkey less sensitive to whatever
the issue is.
Test document opens with these builds of LibreOffice while NVDA is active
LibreOffice_4.0.2_Win_x86.msi
LibreOffice_4.0.3.1_Win_x86.msi (administrative install)
master~2013-03-22_21.36.46_LibreOfficeDev_4.1.0.0.alpha0_Win_x86.msi
(administrative install)
Does not ope With NVDA AT active with an administrative install of todays:
master~2013-04-18_04.00.51_LibreOfficeDev_4.1.0.0.alpha0_Win_x86.msi
NVDA logging shows error:
gainFocus on NVDAObjects.Dynamic_EditableTextWithoutAutoSelectDetectionJAB
object at 0x06028C90 with extra args of {}
Suggests there may be a recent change in what LibreOffice is exposing via UAA
and the JAB.
Holding off on a FDO bug for now to allow NV Access devs a chance to look at
what is faulting on the JAB events.
Stuart
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Wiki page
Hello Gergõ, Great tutorial. It's things like this that will make new LO developers (like me) life a lot easier. Eric On Thursday 18 April 2013 11:47:51 Gergő Mocsi wrote: Dear developers, I've created a wiki page on request wit title Create new dialog in Impress. It is a so- called tutorial on how to integrat new dialog windows into Impress UI. The URL is here: https://wiki.documentfoundation.org/Development/Create_new_dialog_in_Impres s[1] Please, someone could check it out? thx, Gergő Mocsi [1] https://wiki.documentfoundation.org/Development/Create_new_dialog_in_Impress ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix fdo#47018 Impress pasting destroy bullet
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3479
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3479/1
fix fdo#47018 Impress pasting destroy bullet
Implements the attributes loading from SvStream in pasting.
This is a modification of commit a95cce27295f9cd255fa72eaded00972e3efb69b
which has been reverted in commit 98d594abd42c5aa33d6981f4dd19582c2d345705
due to unnecessary change in editeng/source/items/frmitems.cxx
Change-Id: I11ba65f8a4972ab1a6d4f30337a0a779f22cdd35
---
M editeng/inc/editeng/numitem.hxx
M editeng/source/items/numitem.cxx
2 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 86f4aef..546f82d 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -157,10 +157,12 @@
explicit SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode =
LABEL_WIDTH_AND_POSITION );
SvxNumberFormat(const SvxNumberFormat rFormat);
+SvxNumberFormat( SvStream rStream );
virtual ~SvxNumberFormat();
-SvStream Store(SvStream rStream, FontToSubsFontConverter
pConverter);
+SvStream Store(SvStream rStream);
+SvxNumberFormat* Create(SvStream rStream );
SvxNumberFormat operator=( const SvxNumberFormat );
sal_Booloperator==( const SvxNumberFormat ) const;
@@ -252,6 +254,7 @@
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule rCopy);
+SvxNumRule(SvStream rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule ) const;
@@ -260,7 +263,7 @@
SvxNumRule operator=( const SvxNumRule );
SvStream Store(SvStream rStream);
-
+SvxNumRule* Create(SvStream rStream);
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat GetLevel(sal_uInt16 nLevel)const;
voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat
rFmt, sal_Bool bIsValid = sal_True);
@@ -294,9 +297,9 @@
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-virtual SfxPoolItem* Create(SvStream , sal_uInt16) const;
+virtual SfxPoolItem* Create(SvStream rStream, sal_uInt16
nItemVersion) const;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-virtual SvStreamStore(SvStream , sal_uInt16 nItemVersion ) const;
+virtual SvStreamStore(SvStream rStream, sal_uInt16 nItemVersion
) const;
virtual int operator==( const SfxPoolItem ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7c3ec9c..32b0d96 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -28,6 +28,7 @@
#include editeng/editids.hrc
#include editeng/editrids.hrc
#include editeng/numdef.hxx
+#include editeng/eeitem.hxx
#include vcl/graph.hxx
#include vcl/window.hxx
#include vcl/svapp.hxx
@@ -177,21 +178,67 @@
*this = rFormat;
}
+SvxNumberFormat::SvxNumberFormat( SvStream rStream )
+{
+sal_uInt16 nTmp16;
+sal_Int32 nTmp32;
+rStream nTmp16; // Version number
+
+rStream nTmp16; SetNumberingType( nTmp16 );
+rStream nTmp16; eNumAdjust = ( SvxAdjust )nTmp16;
+rStream nTmp16; nInclUpperLevels = nTmp16;
+rStream nStart;
+rStream nTmp16; cBullet = (sal_Unicode)nTmp16;
+
+rStream nFirstLineOffset;
+rStream nAbsLSpace;
+rStream nLSpace;
+
+rStream nCharTextDistance;
+
+sPrefix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+sSuffix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+sCharStyleName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+
+sal_uInt16 hasGraphicBrush = 0;
+rStream hasGraphicBrush;
+if ( hasGraphicBrush )
+{
+pGraphicBrush = new SvxBrushItem( SID_ATTR_BRUSH );
+pGraphicBrush = (SvxBrushItem*)(pGraphicBrush-Create( rStream,
BRUSH_GRAPHIC_VERSION ));
+}
+else pGraphicBrush = 0;
+rStream nTmp16; eVertOrient = nTmp16;
+
+sal_uInt16 hasBulletFont = 0;
+rStream hasBulletFont;
+if ( hasBulletFont )
+{
+pBulletFont = new Font( );
+rStream *pBulletFont;
+}
+else pBulletFont = NULL;
+rStream aGraphicSize;
+
+rStream nBulletColor;
+rStream nBulletRelSize;
+rStream nTmp16; SetShowSymbol( nTmp16 );
+
+rStream nTmp16; mePositionAndSpaceMode = ( SvxNumPositionAndSpaceMode
)nTmp16;
+rStream nTmp16; meLabelFollowedBy = ( LabelFollowedBy )nTmp16;
+rStream nTmp32; mnListtabPos = nTmp32;
+rStream nTmp32;
[ABANDONED] Some clean up related to copypaste function
Cao Cuong Ngo has abandoned this change. Change subject: Some clean up related to copypaste function .. Patch Set 2: Abandoned Intergrated in https://gerrit.libreoffice.org/#/c/3479/ -- To view, visit https://gerrit.libreoffice.org/3464 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I3d781468b1878d7c6589ef4a313c66bf00e4d75b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Built-in Python Create Table Sample script fails on LO master OSX
Hi all, Master build on OSX : Version: 4.1.0.0.alpha0+ Build ID: f182521948f0d31b0f6ad7b98eb5fc32562ba3d When trying to run the included python script via Tools Macros Organize Python PythonSamplesTableSample createTable : com.sun.star.uno.RuntimeExceptionError during invoking function createTable in module file:///Applications/LibreOfficeDev.app/Contents/share/Scripts/python/pythonSamples/TableSample.py (class 'AttributeError': 'NoneType' object has no attribute 'Text' /Applications/LibreOfficeDev.app/Contents/share/Scripts/python/pythonSamples/TableSample.py:44 in function createTable() [text = doc.Text] /Applications/LibreOfficeDev.app/Contents/program/pythonscript.py:830 in function invoke() [ret = self.func( *args )] ) The Experimental features option is enabled. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Multiple Java version messages on LibreOfficeDev startup on OSX from master
Hi all, With my master build : Version: 4.1.0.0.alpha0+ Build ID: f182521948f0d31b0f6ad7b98eb5fc32562ba3d on OSX 10.8.3 I see multiple Java version select messages on startup, basically it appears to be one error message for each module that gets loaded on startup (between 10 to 15), despite a previously existing LibreOfficeDev configuration in which the Java version had already been defined. Doesn't seem normal to me. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Zotero extension hosed with master build on OSX 10.8.3
More extension woes with my master build
Version: 4.1.0.0.alpha0+
Build ID: f182521948f0d31b0f6ad7b98eb5fc32562ba3d
on OSX, this time with Zotero :
The extension appears as disable in the Extensions Manager. If I try to
enable it, I get the following error :
javaloader error - no mapping from java to C++
(com.sun.star.uno.RuntimeException) { { Message = javaloader error - no
mapping from java to C++ , Context = (com.sun.star.uno.XInterface) @0 } }
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: curl/ExternalProject_curl.mk
curl/ExternalProject_curl.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 14cdaf7f7279573e2aae6859d9e5a4cd03371557 Author: Michael Stahl mst...@redhat.com Date: Fri Apr 19 12:41:49 2013 +0200 curl: add missing dependency on NSS external (zlib too) Thanks again to Alex Thurgood, who doesn't have much luck this week :) Change-Id: I0e902f6994b07fb277b3561fa5bfc8662e954202 diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index b41a5d5..c56d9ee 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -11,6 +11,11 @@ $(eval $(call gb_ExternalProject_ExternalProject,curl)) $(eval $(call gb_ExternalProject_use_unpacked,curl,curl)) +$(eval $(call gb_ExternalProject_use_externals,curl,\ + nss3 \ + zlib \ +)) + $(eval $(call gb_ExternalProject_register_targets,curl,\ build \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build failure on master in libcurl on Linux 32bit (Mint Nadia)
On 19/04/13 05:51, Alex Thurgood wrote: Le 18/04/2013 15:42, Michael Stahl a écrit : Hi Michael, should be fixed with 075023b473b064e2cad84c3212602e1bb2bc9d1c. Fresh pull this morning, cleared ccache, fresh make, the error is still there : /home/Development/libo/core/workdir/unxlngi6.pro/UnpackedTarball/nss/mozilla/dist/public/nss -I/home/Development/libo/core/workdir/unxlngi6.pro/UnpackedTarball/nss/mozilla/dist/out/include -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-base64.lo -MD -MP -MF .deps/libcurl_la-base64.Tpo -c base64.c -fPIC -DPIC -o .libs/libcurl_la-base64.o In file included from base64.c:30:0: urldata.h:119:18: fatal error: nspr.h: No such file or directory compilation terminated. make[3]: *** [libcurl_la-base64.lo] Erreur 1 hmm... clearly i have this file there... ls -l workdir/*/UnpackedTarball/nss/mozilla/dist/out/include/nspr.h aha, there is a dependency missing, so apparently your libcurl started to build before nss was done, which of course doesn't work; that should be fixed in 14cdaf7f7279573e2aae6859d9e5a4cd03371557. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LO project Extensions and master build on OSX 10.8.3
It seems like something has gone wrong with registration/activation of the extensions in my latest build of LO from master, the following no longer work : Zotero - disabled, can not enable, causes error message (see other related post) SmartDiagram - inactive, status unknown MediaWiki - when clicking on Options, I get a blank main UI screen with left hand pane containing 2 entries - someone been working on UI changes there recently ?) Watchwindow - inactive, status unknown Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failure on master in libcurl on Linux 32bit (Mint Nadia)
Le 19/04/13 12:55, Michael Stahl a écrit : Hi Michael, hmm... clearly i have this file there... ls -l workdir/*/UnpackedTarball/nss/mozilla/dist/out/include/nspr.h aha, there is a dependency missing, so apparently your libcurl started to build before nss was done, which of course doesn't work; that should be fixed in 14cdaf7f7279573e2aae6859d9e5a4cd03371557. thanks. :-) will repull and restart build. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/svapp.hxx|4
vcl/source/app/svapp.cxx |4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7a75505d6a4b0f1c02603fcc7559819f7d65
Author: Tor Lillqvist t...@iki.fi
Date: Fri Apr 19 14:04:55 2013 +0300
Make Application::PostZoomEvent() and PostScrollEvent() non-DESKTOP only
That is where they are used anyway. Avoids misleading entries in
unusedcode.easy.
Change-Id: I2ce06ebca55998dc1df7df1f40b08b496adfbc64
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 3198a3d..b4acc57 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -20,6 +20,8 @@
#ifndef _SV_SVAPP_HXX
#define _SV_SVAPP_HXX
+#include config_features.h
+
#include sal/config.h
#include stdexcept
@@ -211,8 +213,10 @@ public:
static sal_uLongPostKeyEvent( sal_uLong nEvent, Window
*pWin, KeyEvent* pKeyEvent );
static sal_uLongPostMouseEvent( sal_uLong nEvent, Window
*pWin, MouseEvent* pMouseEvent );
+#if !HAVE_FEATURE_DESKTOP
static sal_uLongPostZoomEvent( sal_uLong nEvent, Window *pWin,
ZoomEvent* pZoomEvent );
static sal_uLongPostScrollEvent( sal_uLong nEvent, Window
*pWin, ScrollEvent* pScrollEvent );
+#endif
static void RemoveMouseAndKeyEvents( Window *pWin );
static sal_uLongPostUserEvent( const Link rLink, void*
pCaller = NULL );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b3ebdf5..9792f14 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -880,6 +880,8 @@ sal_uLong Application::PostMouseEvent( sal_uLong nEvent,
Window *pWin, MouseEven
return nEventId;
}
+#if !HAVE_FEATURE_DESKTOP
+
sal_uLong Application::PostZoomEvent( sal_uLong nEvent, Window *pWin,
ZoomEvent* pZoomEvent )
{
const SolarMutexGuard aGuard;
@@ -937,7 +939,7 @@ sal_uLong Application::PostScrollEvent( sal_uLong nEvent,
Window *pWin, ScrollEv
return nEventId;
}
-//
-
+#endif // !HAVE_FEATURE_DESKTOP
IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sfx2/inc sfx2/Package_inc.mk svtools/inc svtools/Package_inc.mk svx/inc svx/source sw/inc sw/source xmloff/inc xmloff/Package_inc.mk
sc/inc/pch/precompiled_sc.hxx |2 +- sc/source/filter/xml/xmlexprt.cxx |2 +- sfx2/Package_inc.mk |1 - sfx2/inc/sfx2/imgdef.hxx| 26 -- sfx2/inc/sfx2/module.hxx|2 +- svtools/Package_inc.mk |1 - svtools/inc/svtools/txtcmp.hxx | 26 -- svx/inc/pch/precompiled_svx.hxx |2 +- svx/inc/svx/ctredlin.hxx|2 +- svx/source/dialog/ctredlin.cxx |2 +- sw/inc/pch/precompiled_sw.hxx |4 ++-- sw/source/core/edit/edtox.cxx |2 +- sw/source/core/inc/pamtyp.hxx |2 +- sw/source/core/unocore/unoframe.cxx |2 +- sw/source/ui/index/idxmrk.cxx |2 +- sw/source/ui/index/swuiidxmrk.cxx |2 +- sw/source/ui/uiview/srcview.cxx |2 +- sw/source/ui/uiview/view2.cxx |2 +- sw/source/ui/uiview/viewsrch.cxx|2 +- sw/source/ui/uno/unotxdoc.cxx |2 +- xmloff/Package_inc.mk |1 - xmloff/inc/xmloff/xmlcnitm.hxx | 28 22 files changed, 17 insertions(+), 100 deletions(-) New commits: commit 01af5efbbb8a27c627bb061b8399fb18b6519247 Author: Michael Dunphy michael.w.dun...@gmail.com Date: Thu Apr 18 22:30:07 2013 -0400 Remove pass-through header svtools/inc/svtools/txtcmp.hxx Change-Id: I605ae778e57a12588dca274a4ee34a018004034e Remove pass-through header sfx2/inc/sfx2/imgdef.hxx Change-Id: I9a5ebabefccdd63b55d64aec26488542d0d362e3 Remove pass-through header xmloff/inc/xmloff/xmlcnitm.hxx Change-Id: If880679499daee2f77d1f6e148dba963d09bbb9c Reviewed-on: https://gerrit.libreoffice.org/3477 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index deefbe6..442f3d8 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -965,7 +965,7 @@ #include xmloff/txtparae.hxx #include xmloff/txtprmap.hxx #include xmloff/xmlaustp.hxx -#include xmloff/xmlcnitm.hxx +#include editeng/xmlcnitm.hxx #include xmloff/xmlerror.hxx #include xmloff/xmlictxt.hxx #include xmloff/xmlimppr.hxx diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index ec3a741..2248f90 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -67,7 +67,7 @@ #include xmloff/families.hxx #include xmloff/numehelp.hxx #include xmloff/txtparae.hxx -#include xmloff/xmlcnitm.hxx +#include editeng/xmlcnitm.hxx #include xmloff/xmlerror.hxx #include xmloff/XMLEventExport.hxx diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 0b49d4b..0e22e48 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/infobar.hxx,sfx2/infobar.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx deleted file mode 100644 index b529974..000 --- a/sfx2/inc/sfx2/imgdef.hxx +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _SFX_IMGDEF_HXX -#define _SFX_IMGDEF_HXX - -#include svtools/imgdef.hxx - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx index 635139b..3b285fa 100644 --- a/sfx2/inc/sfx2/module.hxx +++ b/sfx2/inc/sfx2/module.hxx @@ -23,7 +23,7 @@ #include
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk | 34 - 1 file changed, 34 deletions(-) New commits: commit 8dd4db783ffe5a11b5bf427014a2f8524cc87cad Author: Petr Kraus petr_kr...@email.cz Date: Thu Apr 4 03:42:23 2013 +0200 fdo#42781 Do not unnecessarily ignore MSVC warnings Removed some ignored warnings for MSVC compiler that should not occur. MSVC 2010 can, but do not issue these for me. Some of them are disabled by default and should not occur unless -Wall C warnings: C4180, C4250, C4255, C4275, C4290, C4503, C4511, C4611, C4640 CXX warnings: C4180, C4242, C4265, C4503, C4511, C4626, C4640, C4996 Change-Id: I61b692a9c02a8900f80b019e11ad4acdea3e4dfc Reviewed-on: https://gerrit.libreoffice.org/3203 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 439afa5..e33f22e 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -80,8 +80,6 @@ gb_AFLAGS := $(AFLAGS) # C4127: conditional expression is constant -# C4180: qualifier applied to function type has no meaning; ignored - # C4189: 'identifier' : local variable is initialized but not referenced # C4242: 'identifier' : conversion from 'type1' to 'type2', possible @@ -98,12 +96,6 @@ gb_AFLAGS := $(AFLAGS) # C4251: 'identifier' : class 'type' needs to have dll-interface to be # used by clients of class 'type2' -# C4255: 'function' : no function prototype given: converting '()' to -# '(void)' - -# C4265: 'class' : class has virtual functions, but destructor is not -# virtual - # C4275: non-DLL-interface classkey 'identifier' used as base for # DLL-interface classkey 'identifier' @@ -119,13 +111,8 @@ gb_AFLAGS := $(AFLAGS) # of the compiler did not override when parameters only differed by # const/volatile qualifiers. -# C4503: 'identifier' : decorated name length exceeded, name was -# truncated - # C4505: 'function' : unreferenced local function has been removed -# C4511: 'class' : copy constructor could not be generated - # C4512: 'class' : assignment operator could not be generated # C4611: interaction between 'function' and C++ object destruction is @@ -134,15 +121,11 @@ gb_AFLAGS := $(AFLAGS) # C4626: 'derived class' : assignment operator could not be generated # because a base class assignment operator is inaccessible -# C4640: 'instance' : construction of local static object is not thread-safe - # C4706: assignment within conditional expression # C4800: 'type' : forcing value to bool 'true' or 'false' (performance # warning) -# C4996: 'function': was declared deprecated - gb_CFLAGS := \ -Gd \ -GR \ @@ -152,24 +135,15 @@ gb_CFLAGS := \ -nologo \ -W4 \ -wd4127 \ - -wd4180 \ -wd4189 \ -wd4242 \ -wd4244 \ -wd4245 \ - -wd4250 \ -wd4251 \ - -wd4255 \ - -wd4275 \ - -wd4290 \ -wd4355 \ - -wd4503 \ -wd4505 \ - -wd4511 \ -wd4512 \ - -wd4611 \ -wd4626 \ - -wd4640 \ -wd4706 \ -wd4800 \ -Zc:forScope,wchar_t- \ @@ -185,29 +159,21 @@ gb_CXXFLAGS := \ -nologo \ -W4 \ -wd4127 \ - -wd4180 \ -wd4189 \ - -wd4242 \ -wd4244 \ -wd4245 \ -wd4250 \ -wd4251 \ - -wd4265 \ -wd4275 \ -wd4290 \ -wd4351 \ -wd4355 \ -wd4373 \ - -wd4503 \ -wd4505 \ - -wd4511 \ -wd4512 \ -wd4611 \ - -wd4626 \ - -wd4640 \ -wd4706 \ -wd4800 \ - -wd4996 \ -Zc:forScope,wchar_t- \ -Zm500 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 7c0c20076d95e911fb44fd2c5b4a028d87b7023e
Author: Tor Lillqvist t...@iki.fi
Date: Fri Apr 19 14:13:10 2013 +0300
Do build libwps for iOS
Change-Id: Icd3120496e5548349ca58423ea537f392f6d5c6b
diff --git a/configure.ac b/configure.ac
index 8451b74..639a1f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7215,9 +7215,7 @@ AC_SUBST(FREETYPE_LIBS)
dnl ===
dnl Check for system libwps
dnl ===
-if test $_os != iOS; then
-
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],[-I${OUTDIR}/inc/external],[-L${OUTDIR}/lib
-lwpslib])
-fi
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],[-I${OUTDIR}/inc/external],[-L${OUTDIR}/lib
-lwpslib])
dnl ===
dnl Check for system libwpg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove pass-through header svtools/inc/svtools/txtcmp.hxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3477 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3477 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If880679499daee2f77d1f6e148dba963d09bbb9c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Dunphy michael.w.dun...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#42781 Do not unnecessarily ignore MSVC warnings
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3203 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3203 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61b692a9c02a8900f80b019e11ad4acdea3e4dfc Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Petr Kraus petr_kr...@email.cz Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/core/txtnode/ndtxt.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 414940e7fbcbcbabd793f053a7849995fe52b8e8 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Apr 19 13:16:43 2013 +0200 there seems to be no ssize_t on windows Change-Id: Ib234a53b50929d1f977ff2d7f83afed86514520e diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 9e88202..364deed 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1723,8 +1723,8 @@ void SwTxtNode::InsertText( const XubString rStr, const SwIndex rIdx, xub_StrLen aPos = rIdx.GetIndex(); xub_StrLen nLen = m_Text.Len() - aPos; -ssize_t const nOverflow(static_castssize_t(m_Text.Len()) -+ static_castssize_t(rStr.Len()) - TXTNODE_MAX); +long const nOverflow(static_castlong(m_Text.Len()) ++ static_castlong(rStr.Len()) - TXTNODE_MAX); m_Text.Insert((nOverflow 0) ? rStr.Copy(0, rStr.Len() - nOverflow) : rStr, aPos); assert(m_Text.Len() = TXTNODE_MAX); ___ 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/JunitTest.mk |2 +-
solenv/gbuild/platform/macosx.mk | 21 -
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 8a4e5e55100d396af2ab4a95f70e0fe0b1b8b079
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 19 13:18:08 2013 +0200
Interactive JuniTest debugging on Mac OS X, too
Change-Id: If1faab6b5903e287d800899f243b8b568b27c312
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 1224087..3c1ca48 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -57,7 +57,7 @@ $(call gb_JunitTest_get_target,%) :
echo to rerun just this failed test without all others,
run: \
echo echo make JunitTest_$* echo \
echo cd into the module dir to run the tests faster \
-echo Or to do interactive debugging, run two shells with
(Linux only): \
+echo Or to do interactive debugging (non-Windows), run two
shells with: \
echo \
echo make debugrun \
echo make gb_JunitTest_DEBUGRUN=T JunitTest_$* \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 011aaae..5ce425c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -313,15 +313,34 @@ endef
# JunitTest class
+ifneq ($(OOO_TEST_SOFFICE),)
+gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
+else
+ifneq ($(gb_JunitTest_DEBUGRUN),)
+gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
+else
+gb_JunitTest_SOFFICEARG:=path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
+endif
+endif
+
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice}
\
+ -Dorg.openoffice.test.arg.soffice=$(gb_JunitTest_SOFFICEARG) \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH{DYLD_LIBRARY_PATH+=DYLD_LIBRARY_PATH}
\
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
endef
+# Module class
+
+define gb_Module_DEBUGRUNCOMMAND
+OFFICESCRIPT=$$($(gb_MKTEMP)) \
+printf '%s\n' set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)
$${OFFICESCRIPT} \
+gdb -x $${OFFICESCRIPT}
$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice \
+rm $${OFFICESCRIPT}
+endef
+
# InstallModuleTarget class
define gb_InstallModuleTarget_InstallModuleTarget_platform
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Zotero extension hosed with master build on OSX 10.8.3
Le 19/04/13 12:52, Alexander Thurgood a écrit :
Add Reports in a ODB document to that list. I have one here which
refuses to open with the same error message.
javaloader error - no mapping from java to C++
(com.sun.star.uno.RuntimeException) { { Message = javaloader error - no
mapping from java to C++ , Context = (com.sun.star.uno.XInterface) @0 } }
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#63693 Do not force java -d32 for a 64-bit SDK
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3480 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3480/1 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version outputs OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) --- M odk/settings/std.mk 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 31c95217..2227fbc 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -54,9 +54,11 @@ ifneq $(OO_SDK_JAVA_HOME) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail -1 | cut -d -f3) ifeq $(JAVA_BITS) 64-Bit +ifneq $(PROCTYPE) x86_64 JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS) -- To view, visit https://gerrit.libreoffice.org/3480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/fldui/fldmgr.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 04a54e7180c2cf9f4855211055ecbc6a41deff56
Author: Ãdám Csaba Király kiraly.adam.cs...@gmail.com
Date: Wed Apr 17 21:37:41 2013 +0200
fdo#60641, localise strings
Uses resource from numberingtypelistbox.src, to localise
Native Numbering and the Cyrillic and Greek strings.
Change-Id: I3dfafc90686bea9ddee67262044afa2619b882f8
Reviewed-on: https://gerrit.libreoffice.org/3441
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 2dbee73..2750a09 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -75,6 +75,8 @@
#include flddropdown.hxx
#include fldui.hrc
#include tox.hxx
+#include misc.hrc
+#include cnttab.hxx
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
@@ -679,6 +681,9 @@ String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong
nFormatId) const
{
if(xNumberingInfo.is())
{
+SwOLENames aNames(SW_RES(STRRES_NUMTYPES));
+ResStringArray rNames = aNames.GetNames();
+
Sequencesal_Int16 aTypes =
xNumberingInfo-getSupportedNumberingTypes();
const sal_Int16* pTypes = aTypes.getConstArray();
sal_Int32 nOffset = aSwFlds[nPos].nFmtEnd - nStart;
@@ -690,7 +695,15 @@ String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId,
sal_uLong nFormatId) const
{
if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
{
-aRet = xNumberingInfo-getNumberingIdentifier(
pTypes[nType] );
+sal_uInt32 n = rNames.FindIndex(pTypes[nType]);
+if (n != RESARRAY_INDEX_NOTFOUND)
+{
+aRet = rNames.GetString(n);
+}
+else
+{
+aRet = xNumberingInfo-getNumberingIdentifier(
pTypes[nType] );
+}
break;
}
++nValidEntry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#60641, localise strings
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3441 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3441 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dfafc90686bea9ddee67262044afa2619b882f8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#63693 Do not force java -d32 for a 64-bit SDK
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3481 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3481/1 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version outputs OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) --- M odk/settings/std.mk 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 705b528..2a4cdd9 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -36,9 +36,11 @@ ifneq $(OO_SDK_JAVA_HOME) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail -1 | cut -d -f3) ifeq $(JAVA_BITS) 64-Bit +ifneq $(PROCTYPE) x86_64 JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS) -- To view, visit https://gerrit.libreoffice.org/3481 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/CustomTarget_settings.mk odk/examples odk/pack odk/settings ure/source
odk/CustomTarget_settings.mk |3 - odk/examples/CLI/CSharp/Spreadsheet/Makefile |1 odk/examples/CLI/VB.NET/WriterDemo/Makefile |1 odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile |1 odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile |1 odk/examples/DevelopersGuide/Charts/Makefile |1 odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile |1 odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile |3 - odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile |1 odk/examples/DevelopersGuide/Components/CppComponent/Makefile |3 - odk/examples/DevelopersGuide/Components/JavaComponent/Makefile |1 odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile |1 odk/examples/DevelopersGuide/Components/Thumbs/Makefile |1 odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile |1 odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile |1 odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile |1 odk/examples/DevelopersGuide/Config/Makefile |1 odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile |3 - odk/examples/DevelopersGuide/Database/Makefile |1 odk/examples/DevelopersGuide/Drawing/Makefile |1 odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile |1 odk/examples/DevelopersGuide/FirstSteps/Makefile |1 odk/examples/DevelopersGuide/Forms/Makefile |1 odk/examples/DevelopersGuide/GUI/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile |3 - odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile |3 - odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile |3 - odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile |1 odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile |1 odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile |1 odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile |1 odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile |1 odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile |1 odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile |1 odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile |1 odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile |1 odk/examples/DevelopersGuide/Spreadsheet/Makefile |1 odk/examples/DevelopersGuide/Text/Makefile |1 odk/examples/DevelopersGuide/UCB/Makefile |1 odk/examples/OLE/activex/Makefile |3 - odk/examples/cpp/DocumentLoader/Makefile |1
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |9 + 1 file changed, 9 insertions(+) New commits: commit 533f708cc872728a7b46705bde53b7499af30d85 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Apr 19 15:02:03 2013 +0300 Add -wd4996 back in the debvugging runtime (_DEBUG, dbgutil build) case Otherwise we get: 'std::_Copy_impl': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. Change-Id: I7d9cdb243b1bd7c884c5e4e658cfcd13d1ca8223 diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index e33f22e..6f4b6a9 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -126,6 +126,9 @@ gb_AFLAGS := $(AFLAGS) # C4800: 'type' : forcing value to bool 'true' or 'false' (performance # warning) +# C4996: 'function': was declared deprecated +# Also generated for C++ library functions that may be unsafe + gb_CFLAGS := \ -Gd \ -GR \ @@ -177,6 +180,12 @@ gb_CXXFLAGS := \ -Zc:forScope,wchar_t- \ -Zm500 \ +ifneq ($(MSVC_USE_DEBUG_RUNTIME),) +gb_CXXFLAGS += \ + -wd4996 \ + +endif + # New warning(s) in Visual Studio 2010, let's try disabling these only # for that specific compiler version, in case a later one will not # need them disabled. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice SDK on Windows
For the record, here is my status of using the SDK of a recent (post http://cgit.freedesktop.org/libreoffice/core/commit/?id=5051209534c8a2034dcb0016d4a8fe29dcb2947b Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil) master build (--enable-dbgutil even) on Windows: I use the SDK on the Windows 7 machine I also do the LO build on (at C:\lo\core), so that machine already had Visual Studio and a JDK installed. As a prerequisite, install http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20120426/mingw-get-inst-20120426.exe/download and, in Command Prompt do: cd C:\MinGW mingw-get update mingw-get install msys-zip For testing ure/source/uretest/Makefile, additionally do: mingw-get install msys-coreutils mingw-get install msys-sed Then, in Command Prompt do: cd C:\lo\core\solver\wntmsci12\installation\opt\sdk setsdkenv_windows.bat and do the first-time configuration as necessary. The results for me are: ** * * SDK environment is prepared for Windows * * SDK = C:\lo\core\solver\wntmsci12\installation\opt\sdk * Office = C:\lo\core\solver\wntmsci12\installation\opt * URE = C:\lo\core\solver\wntmsci12\installation\opt\URE * Make = C:\MinGW\bin * Zip = C:\MinGW\msys\1.0\bin * C++ Compiler = C:\Program Files\Microsoft Visual Studio 9.0\VC\bin * C# and VB.NET compilers = C:\Windows\Microsoft.NET\Framework\v2.0.50727 * Java = C:\Program Files\Java\jdk1.7.0_11 * Special Output directory = c:\libreoffice4.1.0.0.alpha0+_sdk * Auto deployment = YES * ** Then, to see things are working at least minimally, continue with cd examples\cpp\counter mingw32-make mingw32-make countermain.run At least with my current build, the ure/source/uretest/Makefile test: cd C:\lo\core\ure\source\uretest mingw32-make still fails the test-javanative with: set URE_MORE_TYPES=file:///C:/lo/core/ure/source/uretest/out.sdk/types.rdb set URE_MORE_SERVICES=file:///C:/lo/core/ure/source/uretest/out.sdk/services.rdb C:\Program Files\Java\jdk1.7.0_11/bin/java -jar out.sdk/runner.jar \ file:///C:/lo/core/solver/wntmsci12/installation/opt/URE/java/ file:///C:/lo/core/ure/source/uretest/out.sdk/javanative.jar warn:cppuhelper:2968:3492:cppuhelper/source/shlib.cxx:501: loading component library failed: file:///C:/lo/core/ure/source/uretest/out.sdk/cpptest.uno.dll Exception in thread main java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at com.sun.star.lib.unoloader.UnoClassLoader.execute(UnoClassLoader.java:160) at com.sun.star.lib.unoloader.UnoLoader.execute(UnoLoader.java:81) at test.java.runner.Runner.main(Runner.java:28) Caused by: com.sun.star.uno.DeploymentException: component context fails to supply service test.types.CppTest of type test.types.XTest: com.sun.star.loader.CannotActivateFactoryException: loading component library failed: file:///C:/lo/core/ure/source/uretest/out.sdk/cpptest.uno.dll java stack trace: at com.sun.star.bridges.jni_uno.JNI_proxy.dispatch_call(Native Method) at com.sun.star.bridges.jni_uno.JNI_proxy.invoke(JNI_proxy.java:183) at $Proxy2.createInstanceWithContext(Unknown Source) at test.types.CppTest.create(Unknown Source) at test.java.tester.Tester.test(Tester.java:29) at test.java.javanative.JavaNative.main(JavaNative.java:26) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at com.sun.star.lib.unoloader.UnoClassLoader.execute(UnoClassLoader.java:160) at com.sun.star.lib.unoloader.UnoLoader.execute(UnoLoader.java:81) at test.java.runner.Runner.main(Runner.java:28) at test.types.CppTest.create(Unknown Source) at test.java.tester.Tester.test(Tester.java:29) at test.java.javanative.JavaNative.main(JavaNative.java:26) ... 7 more Makefile:82: recipe for target 'test-javanative' failed mingw32-make: *** [test-javanative] Error 1 but test-cpptest, test-javateset, and the (manual) test-clientserver all work. No idea yet what is broken there. If anybody has insight into my two questions at http://cgit.freedesktop.org/libreoffice/core/commit/?id=5051209534c8a2034dcb0016d4a8fe29dcb2947b Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil, that would be appreciated:
Re: LO project Extensions and master build on OSX 10.8.3
On Friday, 19 April 2013, Alexander Thurgood wrote: It seems like something has gone wrong with registration/activation of the extensions in my latest build of LO from master, the following no That could be my java cleanup work. What version of java are you using? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] date/time IDL datatypes incompatible change
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2783 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2783/24 date/time IDL datatypes incompatible change - nanosecond precision - signed (allowed negative) year Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/formcomponenthandler.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/inc/chgtrack.hxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/chgtrack.cxx M sc/source/core/tool/chgviset.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/oox/unitconverter.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xcl97/XclImpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/docshell/docsh3.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/doc/docredln.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/Library_tl.mk M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx M vcl/source/control/field2.cxx M wizards/com/sun/star/wizards/common/JavaTools.java M xmloff/source/core/xmluconv.cxx M xmloff/source/draw/animationimport.cxx M
Re: Zotero extension hosed with master build on OSX 10.8.3
On Friday, 19 April 2013, Alexander Thurgood wrote: More extension woes with my master build Version: 4.1.0.0.alpha0+ Build ID: f182521948f0d31b0f6ad7b98eb5fc32562ba3d on OSX, this time with Zotero : The extension appears as disable in the Extensions Manager. If I try to enable it, I get the following error : javaloader error - no mapping from java to C+ Can you perhaps fire it up from the console? I'm hoping there is a more complete error message, perhaps a java stack trace. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - odk/settings
odk/settings/std.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit bcebecda16cb8783a720a2bcaff7a74e279c866b Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 19 09:26:53 2013 +0200 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version outputs OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) Reviewed-on: https://gerrit.libreoffice.org/3480 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 31c95217..2227fbc 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -54,9 +54,11 @@ JAVA_OPTIONS= ifneq $(OO_SDK_JAVA_HOME) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail -1 | cut -d -f3) ifeq $(JAVA_BITS) 64-Bit +ifneq $(PROCTYPE) x86_64 JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - odk/settings
odk/settings/std.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0d243a4452acc2a4672901e2782617b82aa135d4 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 19 09:26:53 2013 +0200 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version outputs OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) Reviewed-on: https://gerrit.libreoffice.org/3481 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 705b528..2a4cdd9 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -36,9 +36,11 @@ JAVA_OPTIONS= ifneq $(OO_SDK_JAVA_HOME) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail -1 | cut -d -f3) ifeq $(JAVA_BITS) 64-Bit +ifneq $(PROCTYPE) x86_64 JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#63693 Do not force java -d32 for a 64-bit SDK
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3480 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build failure on master with OSX - datetime.hxx
Hi all, I'm getting a build failure this morning on OSX with pull from master in datetime.hxx : [build CXX] tools/source/datetime/datetime.cxx [build CXX] tools/source/datetime/ttime.cxx [build CXX] tools/source/fsys/tempfile.cxx In file included from /Users/Shared/Repos/LO/core/tools/inc/tools/datetime.hxx:25, from /Users/Shared/Repos/LO/core/tools/source/datetime/datetime.cxx:19: /Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:81: error: integer constant is too large for ‘long’ type /Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:84: error: integer constant is too large for ‘long’ type make[1]: *** [/Users/Shared/Repos/LO/core/workdir/unxmacxi.pro/CxxObject/tools/source/datetime/datetime.o] Error 1 make[1]: *** Waiting for unfinished jobs In file included from /Users/Shared/Repos/LO/core/tools/source/datetime/ttime.cxx:34: /Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:81: error: integer constant is too large for ‘long’ type /Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:84: error: integer constant is too large for ‘long’ type /Users/Shared/Repos/LO/core/tools/source/datetime/ttime.cxx:45: error: integer constant is too large for ‘long’ type /Users/Shared/Repos/LO/core/tools/source/datetime/ttime.cxx:46: error: integer constant is too large for ‘long’ type make[1]: *** [/Users/Shared/Repos/LO/core/workdir/unxmacxi.pro/CxxObject/tools/source/datetime/ttime.o] Error 1 make: *** [build] Error 2 Could this be a result of Lionel's recent changes to that code ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#63693 Do not force java -d32 for a 64-bit SDK
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3481 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3481 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice SDK on Windows
On 19/04/13 14:29, Stephan Bergmann wrote: * The old settings.mk was apparently confused with using /MT (link with LIBCMT.LIB) on cl command line and /MD (link with MSVCRT.LIB) on link command line (where it was ignored), and you apparently can't pass both together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp. /MTd). No idea if that is exactly right, however. hmm... i wonder if it would make more sense to link extensions statically against the runtime libraries. this would mean that an extension would not be dependent on LO bundling a specific dynamic runtime library, which would give us more flexibility in what MSVC version we use for release builds, i.e., we could switch to a newer compiler without having to consider that this may cause existing binary C++ extensions to fail if the user is unlucky enough to have an incomplete collection of MSVC runtimes installed on their system. * Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and msvcrt.lib vs. msvcrtd.lib on Windows. Adapted examples Makefiles and /ure/source/uretest/Makefile accordingly. Some examples Makefiles additionally use msvcprt.lib, no idea whether that still needs to be addressed. there is a msvcprtd.lib corresponding to that one, and i think it shouldn't work at all to link against msvcrtD.lib and msvcprt.lib as it is a mixture of debug and non-debug libs; is that msvcprt.lib really used? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO project Extensions and master build on OSX 10.8.3
Noel, On 19/04/13 14:34, Noel Grandin wrote: That could be my java cleanup work. What version of java are you using? I integrated it today, because it was logical and our baseline java 1.5 supports generics. Maybe I revert until we understand what the problem is? F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO project Extensions and master build on OSX 10.8.3
Le 19/04/13 14:34, Noel Grandin a écrit : Hi Noel, On Friday, 19 April 2013, Alexander Thurgood wrote: It seems like something has gone wrong with registration/activation of the extensions in my latest build of LO from master, the following no That could be my java cleanup work. What version of java are you using? java version 1.6.0_45 Java(TM) SE Runtime Environment (build 1.6.0_45-b06-451-11M4406) Java HotSpot(TM) 64-Bit Server VM (build 20.45-b01-451, mixed mode) In gdb, I see this : warning: Tried to remove a non-existent library: /Applications/LibreOfficeDev.app/Contents/MacOS/libswlo.dylib Reading symbols for shared libraries . done warning: Tried to remove a non-existent library: /Applications/LibreOfficeDev.app/Contents/MacOS/libswlo.dylib warning: Tried to remove a non-existent library: /Applications/LibreOfficeDev.app/Contents/MacOS/libswlo.dylib If I try and open a form in an ODB file, I get the following error message (which I can no longer copy and paste with the mouse - another new bug, but hey) : The document myform could not be opened. loading component library failed : file:///Applications/LibreOfficeDev.app/Contents/MacOS/../program/libswlo.dylib Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/inc editeng/source
editeng/inc/editeng/numitem.hxx |9 ++-
editeng/source/items/numitem.cxx | 103 +--
2 files changed, 104 insertions(+), 8 deletions(-)
New commits:
commit 721d0dfe70323d31e26394cfb32056a7ceec96c7
Author: Eike Rathke er...@redhat.com
Date: Fri Apr 19 13:26:01 2013 +0200
Revert Revert fix fdo#47018 Impress paste destroy bullet
This reverts commit 674a40fe830748b63eafeaf07e0932e2e0a81ba6.
And restores a95cce27295f9cd255fa72eaded00972e3efb69b with the exception
that the sal_Int8 to sal_uInt16 change is omitted.
This stream length change causes loading of autoformats to fail, which
are stored in binary format, i.e. in user config's autotbl.fmt, loaded
and stored in Calc's ScAutoFormat sc/source/core/tool/autoform.cxx and
Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx
Change-Id: I59f5d3b1c7e1011a8db304855b2fcf28971e7cb1
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 86f4aef..f17e9cf 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -157,10 +157,12 @@ public:
explicit SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode =
LABEL_WIDTH_AND_POSITION );
SvxNumberFormat(const SvxNumberFormat rFormat);
+SvxNumberFormat( SvStream rStream );
virtual ~SvxNumberFormat();
SvStream Store(SvStream rStream, FontToSubsFontConverter
pConverter);
+SvxNumberFormat* Create(SvStream rStream );
SvxNumberFormat operator=( const SvxNumberFormat );
sal_Booloperator==( const SvxNumberFormat ) const;
@@ -252,6 +254,7 @@ public:
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule rCopy);
+SvxNumRule(SvStream rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule ) const;
@@ -260,7 +263,7 @@ public:
SvxNumRule operator=( const SvxNumRule );
SvStream Store(SvStream rStream);
-
+SvxNumRule* Create(SvStream rStream);
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat GetLevel(sal_uInt16 nLevel)const;
voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat
rFmt, sal_Bool bIsValid = sal_True);
@@ -294,9 +297,9 @@ public:
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-virtual SfxPoolItem* Create(SvStream , sal_uInt16) const;
+virtual SfxPoolItem* Create(SvStream rStream, sal_uInt16
nItemVersion) const;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
-virtual SvStreamStore(SvStream , sal_uInt16 nItemVersion ) const;
+virtual SvStreamStore(SvStream rStream, sal_uInt16 nItemVersion
) const;
virtual int operator==( const SfxPoolItem ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7c3ec9c..7ef42e0 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -28,6 +28,7 @@
#include editeng/editids.hrc
#include editeng/editrids.hrc
#include editeng/numdef.hxx
+#include editeng/eeitem.hxx
#include vcl/graph.hxx
#include vcl/window.hxx
#include vcl/svapp.hxx
@@ -177,6 +178,59 @@ SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat
rFormat) :
*this = rFormat;
}
+SvxNumberFormat::SvxNumberFormat( SvStream rStream )
+{
+sal_uInt16 nTmp16;
+sal_Int32 nTmp32;
+rStream nTmp16; // Version number
+
+rStream nTmp16; SetNumberingType( nTmp16 );
+rStream nTmp16; eNumAdjust = ( SvxAdjust )nTmp16;
+rStream nTmp16; nInclUpperLevels = nTmp16;
+rStream nStart;
+rStream nTmp16; cBullet = (sal_Unicode)nTmp16;
+
+rStream nFirstLineOffset;
+rStream nAbsLSpace;
+rStream nLSpace;
+
+rStream nCharTextDistance;
+
+sPrefix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+sSuffix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+sCharStyleName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+
+sal_uInt16 hasGraphicBrush = 0;
+rStream hasGraphicBrush;
+if ( hasGraphicBrush )
+{
+pGraphicBrush = new SvxBrushItem( SID_ATTR_BRUSH );
+pGraphicBrush = (SvxBrushItem*)(pGraphicBrush-Create( rStream,
BRUSH_GRAPHIC_VERSION ));
+}
+else pGraphicBrush = 0;
+rStream nTmp16; eVertOrient = nTmp16;
+
+sal_uInt16 hasBulletFont = 0;
+rStream hasBulletFont;
+if ( hasBulletFont )
+{
+pBulletFont = new Font( );
+rStream *pBulletFont;
+}
+else pBulletFont = NULL;
+rStream aGraphicSize;
+
+rStream nBulletColor;
+
Re: Built-in Python Create Table Sample script fails on LO master OSX
Le 19/04/13 12:42, Alexander Thurgood a écrit : Running this through gdb : Reading symbols for shared libraries ..warning: .o file /Developer/SDKs/MacOSX10.6.sdk/usr/lib/gcc/i686-apple-darwin10/4.2.1/libgcc.a(_muldi3.o) more recent than executable timestamp in /Applications/LibreOfficeDev.app/Contents/MacOS/LibreOfficePython.framework/Versions/3.3/LibreOfficePython warning: Could not open OSO file /Developer/SDKs/MacOSX10.6.sdk/usr/lib/gcc/i686-apple-darwin10/4.2.1/libgcc.a(_muldi3.o) to scan for pubtypes for objfile /Applications/LibreOfficeDev.app/Contents/MacOS/LibreOfficePython.framework/Versions/3.3/LibreOfficePython . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done Reading symbols for shared libraries . done warning: Tried to remove a non-existent library: /Applications/LibreOfficeDev.app/Contents/MacOS/libswlo.dylib Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source sw/source
sc/source/core/tool/autoform.cxx |5 - sw/source/core/doc/tblafmt.cxx |5 + 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 8a6a940a469bac1c274b988dce713181f044d6c4 Author: Eike Rathke er...@redhat.com Date: Fri Apr 19 15:06:38 2013 +0200 just added a big red notice Change-Id: I095a824c18a4ea61663e2706daa6616d60aaeb34 diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index d3e036e..18b5061 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -36,7 +36,10 @@ #include globstr.hrc #include document.hxx -// +/* + * XXX: BIG RED NOTICE! Changes MUST be binary file format compatible and MUST + * be synchronized with Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx + */ const sal_Char *linker_dummy = ; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 1a98459..2031563 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -42,6 +42,11 @@ #include fmtornt.hxx #include editsh.hxx +/* + * XXX: BIG RED NOTICE! Changes MUST be binary file format compatible and MUST + * be synchronized with Calc's ScAutoFormat sc/source/core/tool/autoform.cxx + */ + using ::editeng::SvxBorderLine; // until SO5PF ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source tubes/source ucb/source
shell/source/backends/gconfbe/gconfaccess.cxx |2 +-
shell/source/sessioninstall/SyncDbusSessionHelper.cxx |2 +-
tubes/source/manager.cxx |2 +-
ucb/source/ucp/gio/gio_provider.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Apr 19 17:41:20 2013 +0400
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index d5b864d..d1b4b0d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,7 +51,7 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
/* initialize glib object type library */
g_type_init();
#endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index a39c847..49c1344 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(ReferenceXComponentContext
const)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
#endif
}
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a7acc3f..c5b5c39 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
}
diff --git a/ucb/source/ucp/gio/gio_provider.cxx
b/ucb/source/ucp/gio/gio_provider.cxx
index acd6e14..6737417 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,7 +100,7 @@ extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpgio1_component_getFactory( co
uno::Reference lang::XMultiServiceFactory xSMgr
(reinterpret_cast lang::XMultiServiceFactory * ( pServiceManager ) );
uno::Reference lang::XSingleServiceFactory xFactory;
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
if (
!::gio::ContentProvider::getImplementationName_Static().compareToAscii(
pImplName ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO project Extensions and master build on OSX 10.8.3
On Friday, 19 April 2013, Fridrich Strba wrote: Noel, Maybe I revert until we understand what the problem is? Given that python extensions are also failing for Alexander I suspect something else is at work. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/ui/docvw/edtwin.cxx | 57 +-
sw/source/ui/wrtsh/wrtsh2.cxx | 11 ++--
2 files changed, 49 insertions(+), 19 deletions(-)
New commits:
commit 26c6e88ad3779a1a61bb046fc049f0ae9c0df605
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Apr 19 16:05:41 2013 +0200
bnc#802888, fdo#59928: backport two mouse selection of fields fixes from
4.0
94721b2aec614e0d99504138d484b2ad6cd550c7 fdo#59928: sw: fix mouse selection
of fields:
a4a457100a3a6e9f59113e82c9d0b12786273671 fdo#59928: sw: fix mouse selection
of fields differently
Change-Id: I2f08c55996c642aeadb93299e4f469d63da1230b
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 814f677..053bff4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -139,6 +139,7 @@
#include IMark.hxx
#include doc.hxx
+#include txatbase.hxx // FIXME this sucks
#include xmloff/odffields.hxx
#include PostItMgr.hxx
@@ -3107,22 +3108,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
bExecDrawTextLink = sal_True;
}
-
-SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
-
-// Are we selecting a field?
-if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
-{
-// select work, AdditionalMode if applicable
-if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
-{
-rSh.EnterAddMode();
-rSh.SelWrd( aDocPos );
-rSh.LeaveAddMode();
-}
-else
-rSh.SelWrd( aDocPos );
-}
break;
}
case 2:
@@ -3458,6 +3443,28 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
rSh.ClearGCAttr();
}
+SwContentAtPos aFieldAtPos(SwContentAtPos::SW_FIELD);
+
+// Are we clicking on a field?
+if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
+{
+rSh.SetCursor(aDocPos, bOnlyText);
+// Unfortunately the cursor may be on field
+// position or on position after field depending on which
+// half of the field was clicked on.
+SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
+if (rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() != *pTxtFld-GetStart())
+{
+assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == (*pTxtFld-GetStart() + 1));
+rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
+}
+// don't go into the !bOverSelect block below - it moves
+// the cursor
+break;
+}
+
sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf
= sal_False;
if( !bOverSelect )
bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos(
aDocPos );
@@ -4288,7 +4295,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
if(pApplyTempl)
bExecHyperlinks = sal_False;
-SwContentAtPos aCntntAtPos(
SwContentAtPos::SW_CLICKFIELD |
+SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
SwContentAtPos::SW_INETATTR |
SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL);
@@ -4307,7 +4314,23 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
if( SwContentAtPos::SW_FIELD ==
aCntntAtPos.eCntntAtPos )
{
+bool bAddMode(false);
+// AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier()
+ !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
rSh.ClickToField( *aCntntAtPos.aFnd.pFld );
+// a bit of a mystery what this is good for?
+// in this case we assume it's valid since we
+// just selected a field
[Libreoffice-commits] core.git: 2 commits - python3/python-3.3.0-elf-rpath.patch.1 python3/UnpackedTarball_python3.mk pyuno/CustomTarget_python_shell.mk pyuno/zipcore solenv/gbuild
python3/UnpackedTarball_python3.mk |6 ++
python3/python-3.3.0-elf-rpath.patch.1 | 13 +
pyuno/CustomTarget_python_shell.mk |1 -
pyuno/zipcore/nonmac.sh|4
solenv/gbuild/PythonTest.mk|2 +-
5 files changed, 20 insertions(+), 6 deletions(-)
New commits:
commit 0fcc1968daa6b6c877a3c17cc800b47d82c8a10f
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 19 16:11:24 2013 +0200
gbuild: PythonTest: do not invoke the python.bin directly
This works to run the test (with the fixed RPATH in python.bin from
previous commit), but debugging with gdb becomes impossible.
The tests need PYTHONPATH set to find the internal python libraries,
but gdb also uses PYTHONPATH and then tries to load the libraries
there which do not necessarily match the Python version that gdb
is built against. Invoking the python wrapper shell script avoids this,
and since that exec's python.bin debugging with gdb works too.
Change-Id: I6ea2feb44cebeda1ba2c397baa3837f9f1259a08
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 199ffcc..bbf7877 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -10,7 +10,7 @@
# PythonTest class
ifeq ($(SYSTEM_PYTHON),NO)
-gb_Python_EXE := $(OUTDIR)/installation/opt/program/python.bin
+gb_Python_EXE := /bin/sh $(DEVINSTALLDIR)/opt/program/python
else
gb_Python_EXE := $(PYTHON_FOR_BUILD)
endif
commit b865ff3d75a4611eaefe1f35b0dc9c7d9256f1ff
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 19 15:33:57 2013 +0200
python3: put an RPATH into python binary ...
... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.
Change-Id: I7d91c6086460504d656de7b018087264165f396b
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 696c869..0d5fce5 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -40,4 +40,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
))
endif
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-elf-rpath.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-elf-rpath.patch.1
b/python3/python-3.3.0-elf-rpath.patch.1
new file mode 100644
index 000..0007d6b
--- /dev/null
+++ b/python3/python-3.3.0-elf-rpath.patch.1
@@ -0,0 +1,13 @@
+set RPATH (only to be used on ELF platforms)
+
+--- python3/Makefile.pre.in2013-04-19 15:08:43.637715422 +0200
python3/Makefile.pre.in2013-04-19 15:07:32.685711138 +0200
+@@ -464,7 +464,7 @@
+
+ # Build the interpreter
+ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
+- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN
+
+ platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
+ $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import
get_platform ; print(get_platform()+-+sys.version[0:3])' platform
diff --git a/pyuno/CustomTarget_python_shell.mk
b/pyuno/CustomTarget_python_shell.mk
index f4df015..0f254ba 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -47,7 +47,6 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh
: \
$(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g \
- -e s/%%OOO_LIBRARY_PATH_VAR%%/$(gb_Helper_LIBRARY_PATH_VAR)/g
\
$ $@
# vim: set noet sw=4 ts=4:
diff --git a/pyuno/zipcore/nonmac.sh b/pyuno/zipcore/nonmac.sh
index 0757b11..791a340 100644
--- a/pyuno/zipcore/nonmac.sh
+++ b/pyuno/zipcore/nonmac.sh
@@ -1,7 +1,3 @@
-# Set %%OOO_LIBRARY_PATH_VAR%% so that python.bin finds libpython2.6.so (this
-# can go once python.bin contains a proper RPATH):
-%%OOO_LIBRARY_PATH_VAR%%=$sd_prog${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
-export %%OOO_LIBRARY_PATH_VAR%%
PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fix fdo#47018 Impress pasting destroy bullet
Cao Cuong Ngo has abandoned this change. Change subject: fix fdo#47018 Impress pasting destroy bullet .. Patch Set 1: Abandoned Merged -- To view, visit https://gerrit.libreoffice.org/3479 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I11ba65f8a4972ab1a6d4f30337a0a779f22cdd35 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 04/18/2013 04:54 PM, Michael Meeks wrote: * Scripting interface for form elements broken (?) (Lionel) + I've just sent a message to the dev ML with subject Value of a ListBox, FMC paradigm for Form elements (controls) + C++ module / forms / frm:: + not only used by 'base' In short: 1) our scripting (UNO) interface to form elements (controls) sucks. It exposes the models, but the models don't have a getCurrentController() and the control(ler) exposes useful APIs that are thus NOT REACHABLE. + getView returns the same object as the controller AI: + get a second view on what's up (Stephan) I have absolutely no insight into this area, so can't give any input. (My phone line had problems, so I was effectively absent from most of yesterday's meeting.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig openssl/ExternalProject_openssl.mk
cui/source/options/personalization.cxx | 34 ++- cui/uiconfig/ui/personalization_tab.ui | 10 - cui/uiconfig/ui/select_persona_dialog.ui |8 +++ openssl/ExternalProject_openssl.mk |7 +++--- 4 files changed, 25 insertions(+), 34 deletions(-) New commits: commit 6faa622c13969ff198b471b0550aacf10b5baa57 Author: Jan Holesovsky ke...@suse.cz Date: Fri Apr 19 15:57:43 2013 +0200 Personas: Rename them to Themes even in the UI. Change-Id: Ia7916e0cbbf91de09195c20b60f31ffe80256a9c diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index 415a6fb..806915e9 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -134,7 +134,7 @@ property name=can_focusFalse/property child object class=GtkRadioButton id=no_persona -property name=label translatable=yesPlain look, do not use Personas/property +property name=label translatable=yesPlain look, do not use Themes/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -150,7 +150,7 @@ /child child object class=GtkRadioButton id=default_persona -property name=label translatable=yesPre-installed Persona (if available)/property +property name=label translatable=yesPre-installed Theme (if available)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -171,7 +171,7 @@ property name=homogeneousTrue/property child object class=GtkRadioButton id=own_persona -property name=label translatable=yesOwn Persona/property +property name=label translatable=yesOwn Theme/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -187,7 +187,7 @@ /child child object class=GtkButton id=select_persona -property name=label translatable=yesSelect Persona/property +property name=label translatable=yesSelect Theme/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -213,7 +213,7 @@ object class=GtkLabel id=personas_label property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesFirefox Personas/property +property name=label translatable=yesFirefox Themes/property attributes attribute name=weight value=bold/ /attributes diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 14de389..7db2004 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -79,7 +79,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesFirst visit Firefox Personas (http://www.getpersonas.com). Find a Persona you like, and want to choose for LibreOffice./property +property name=label translatable=yesFirst visit Firefox Themes (https://addons.mozilla.org/firefox/themes). Find the Theme you like, and want to choose for LibreOffice./property property name=wrapTrue/property property name=max_width_chars54/property /object @@ -99,7 +99,7 @@ /child child object class=GtkButton id=visit_personas -property name=label translatable=yesVisit Firefox Personas/property +property name=label translatable=yesVisit Firefox Themes/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -126,7 +126,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesThen, in your web browser's location bar, copy the address of the page that contains the Persona to
[Libreoffice-commits] core.git: 2 commits - postprocess/CustomTarget_images.mk solenv/bin solenv/gbuild
postprocess/CustomTarget_images.mk |9 -
solenv/bin/uiimagelist.xsl | 36 +
solenv/gbuild/TargetLocations.mk |5 ++
solenv/gbuild/UIConfig.mk | 63 +++--
4 files changed, 107 insertions(+), 6 deletions(-)
New commits:
commit df0c6367285952a44082d1359a9e053b7c7b556b
Author: David Tardon dtar...@redhat.com
Date: Thu Apr 18 18:18:39 2013 +0200
fdo#63591 pack images referenced by .ui files
Change-Id: Ia7e932a98d3f2c8bca981261406798760b69f8e8
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index 1533fd56..ce3b25f 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -47,13 +47,18 @@ $(packimages_DIR)/images.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
- $(call gb_Postprocess_get_target,AllResources)
+ $(call gb_Postprocess_get_target,AllResources) \
+ $(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/packimages.pl -g
$(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \
$(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \
- -l $(packimages_DIR) -l $(dir $(call
gb_ResTarget_get_imagelist_target)) -s $ -o $@ \
+ -l $(packimages_DIR) \
+ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \
+ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \
+ -l $(dir $(call
gb_UIConfig_get_imagelist_target,modules/)) \
+ -s $ -o $@ \
$(if $(findstring s,$(MAKEFLAGS)), /dev/null))
$(packimages_DIR)/images_%.zip : \
diff --git a/solenv/bin/uiimagelist.xsl b/solenv/bin/uiimagelist.xsl
new file mode 100644
index 000..41aefe3
--- /dev/null
+++ b/solenv/bin/uiimagelist.xsl
@@ -0,0 +1,36 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+--
+
+xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
+xsl:output method=text/
+
+xsl:template match=/|node()
+xsl:apply-templates/
+/xsl:template
+
+xsl:template match=@*|text()|processing-instruction()|comment()/
+
+xsl:template match=property[@name='pixbuf']
+xsl:variable name=inpath select=normalize-space(.)/
+xsl:variable name=outpath
+xsl:choose
+xsl:when test=starts-with($inpath,'res/')
+xsl:value-of
select=concat('%GLOBALRES%/',substring-after($inpath,'res/'))/
+/xsl:when
+xsl:otherwise
+xsl:value-of select=concat('%MODULE%/',$inpath)/
+/xsl:otherwise
+/xsl:choose
+/xsl:variable
+xsl:value-of select=$outpath/
+xsl:text#xA;/xsl:text
+/xsl:template
+
+/xsl:stylesheet
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 43c9dc3..71101ca 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -191,7 +191,9 @@ gb_SrsTemplatePartTarget_get_target =
$(WORKDIR)/SrsTemplatePartTarget/$(firstwo
gb_SrsTemplateTarget_get_include_dir =
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_ThesaurusIndexTarget_get_target =
$(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
-gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1)
+gb_UIConfig_get_imagelist_target = $(WORKDIR)/UIConfig/$(1).ilst
+gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1).done
+gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst
gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml
@@ -311,6 +313,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CustomTarget \
ExternalProject \
UIConfig \
+ UIImageListTarget \
UILocalizeTarget \
UIMenubarTarget \
UnoApiHeadersTarget \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 458ceb9..52cffe5 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -111,6 +111,49 @@ $(call
gb_UIMenubarTarget_UIMenubarTarget_platform,$(1),$(2))
endef
+#
[Libreoffice-commits] core.git: Repository.mk scp2/source
Repository.mk| 10 +++ scp2/source/canvas/cairocanvas.scp | 12 - scp2/source/ooo/file_library_ooo.scp | 44 +++ 3 files changed, 10 insertions(+), 56 deletions(-) New commits: commit ef08518fcfdab0e5fd5c61aa4fb4f7907fcb8355 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Thu Apr 18 16:47:02 2013 -0300 fdo#60949: Move some libs to OOOLIBS Compile test only :) Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1 Reviewed-on: https://gerrit.libreoffice.org/3476 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/Repository.mk b/Repository.mk index 15c3481..22e03be 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,8 +559,13 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +cairocanvas \ +msforms \ mtfrenderer \ OGLTrans \ +vbaevents \ +vbaobj \ +vbaswobj \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -574,7 +579,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ -cairocanvas \ canvasfactory \ cmdmail \ directx5canvas \ @@ -595,7 +599,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ macbe1 \ migrationoo2 \ migrationoo3 \ -msforms \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -613,9 +616,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ ucpgvfs1 \ ucptdoc1 \ updatefeed \ -vbaevents \ -vbaobj \ -vbaswobj \ vclcanvas \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 4b313bc..de5742a 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -27,14 +27,4 @@ #include macros.inc -File gid_File_Lib_CairoCanvas -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); - #else -Name = cairocanvas.uno.dll; - #endif -End - +STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5aafd04..a993630 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -55,16 +55,7 @@ File gid_File_Lib_Basprov #endif End -File gid_File_Lib_Vbaevent -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaevents,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents) File gid_File_Lib_Scriptframe LIB_FILE_BODY; @@ -306,38 +297,11 @@ File gid_File_Lib_Stringresource #endif End -File gid_File_Lib_Vbaobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) -File gid_File_Lib_Vbaswobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaswobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj) -File gid_File_Lib_Vbamsforms -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(msforms,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms) File gid_File_Lib_Vbahelper LIB_FILE_BODY; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#60949: Move some libs to OOOLIBS
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3476 Approvals: LibreOffice gerrit bot: Verified David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3476 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/source sfx2/source svl/inc svl/Package_inc.mk
forms/source/component/DatabaseForm.cxx |2 +- sfx2/source/doc/objmisc.cxx |2 +- svl/Package_inc.mk |2 -- svl/inc/svl/inetmsg.hxx | 22 -- svl/inc/svl/inetstrm.hxx| 22 -- 5 files changed, 2 insertions(+), 48 deletions(-) New commits: commit c7d485d8fc6fe654a428fe25f82bbf89c2149ef5 Author: Michael Dunphy michael.w.dun...@gmail.com Date: Thu Apr 18 19:55:41 2013 -0400 Delete two pass-through include files and update the file that included them. Change-Id: I6f02d312d1425dbb28b7cb7a2aa87a734054c4a7 Reviewed-on: https://gerrit.libreoffice.org/3474 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index ac4305b..13bc624 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -69,11 +69,11 @@ #include cppuhelper/implbase2.hxx #include rtl/math.hxx #include rtl/tencinfo.h -#include svl/inetstrm.hxx #include svl/inettype.hxx #include tools/debug.hxx #include tools/diagnose_ex.h #include tools/inetmsg.hxx +#include tools/inetstrm.hxx #include tools/urlobj.hxx #include unotools/ucblockbytes.hxx #include unotools/ucbstreamhelper.hxx diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 33c9c18..7ce3d1d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -19,7 +19,7 @@ #include config_features.h -#include svl/inetmsg.hxx +#include tools/inetmsg.hxx #include tools/diagnose_ex.h #include svl/eitem.hxx #include svl/stritem.hxx diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk index b3fe708..77323dc 100644 --- a/svl/Package_inc.mk +++ b/svl/Package_inc.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) diff --git a/svl/inc/svl/inetmsg.hxx b/svl/inc/svl/inetmsg.hxx deleted file mode 100644 index c13bc80..000 --- a/svl/inc/svl/inetmsg.hxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include tools/inetmsg.hxx - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inetstrm.hxx b/svl/inc/svl/inetstrm.hxx deleted file mode 100644 index b4f6fee..000 --- a/svl/inc/svl/inetstrm.hxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include tools/inetstrm.hxx - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Re: Build failure on master with OSX - datetime.hxx
Le 19/04/13 14:44, Alexander Thurgood a écrit :
/Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:81: error: integer
constant is too large for ‘long’ type
/Users/Shared/Repos/LO/core/tools/inc/tools/time.hxx:84: error: integer
constant is too large for ‘long’ type
sal_uInt16 GetHour() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
return static_castsal_uInt16(nTempTime /
10); }
sal_uInt16 GetMin() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
return static_castsal_uInt16((nTempTime /
1000) % 100); }
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sal: remove obsolete test/unloading
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3314 -- To view, visit https://gerrit.libreoffice.org/3314 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76ede5abd4662aaa2f5b01739da07cf3169ddb69 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] remove unused component_canUnload functions
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3313 -- To view, visit https://gerrit.libreoffice.org/3313 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3f41e2a620c47bb848718d0fc994739be2d64fc Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Delete two pass-through include files and update the file th...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3474 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3474 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f02d312d1425dbb28b7cb7a2aa87a734054c4a7 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Dunphy michael.w.dun...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: tools/inc
tools/inc/tools/time.hxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ec49915442055f5b8f0055f2c250a0da096a3c1b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 19 17:05:55 2013 +0200
Wrap large values in SAL_CONST_UINT64
Change-Id: I865808911043a61de5c4209fa889dbff7c8baf28
diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 1c3dc61..6a52f26 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.hxx
@@ -78,16 +78,16 @@ public:
voidSetNanoSec( sal_uInt32 nNewNanoSec );
sal_uInt16 GetHour() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
- return static_castsal_uInt16(nTempTime /
10); }
+ return static_castsal_uInt16(nTempTime /
SAL_CONST_UINT64(10)); }
sal_uInt16 GetMin() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
- return static_castsal_uInt16((nTempTime /
1000) % 100); }
+ return static_castsal_uInt16((nTempTime /
SAL_CONST_UINT64(1000)) % 100); }
sal_uInt16 GetSec() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
- return static_castsal_uInt16((nTempTime / 10)
% 100); }
+ return static_castsal_uInt16((nTempTime /
SAL_CONST_UINT64(10)) % 100); }
sal_uInt32 GetNanoSec() const
{ sal_uInt64 nTempTime = (nTime = 0) ? nTime : -nTime;
- return static_castsal_uInt32( nTempTime % 10);
}
+ return static_castsal_uInt32( nTempTime %
SAL_CONST_UINT64(10)); }
// TODO: consider removing GetMSFromTime and MakeTimeFromMS?
sal_Int32 GetMSFromTime() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/datetime/ttime.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 877f55490f7105e2b1a40cd4bd9860fe8be2aebf
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 19 17:08:08 2013 +0200
Wrap large values in SAL_CONST_INT64
Change-Id: I9a263e2232d63e5794f757cab39b93e13c7d159f
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 2841bb1..b10d086 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -41,9 +41,9 @@ extern long altzone;
namespace {
-const sal_Int64 secMask = 10;
-const sal_Int64 minMask = 1000;
-const sal_Int64 hourMask = 10;
+const sal_Int64 secMask = SAL_CONST_INT64(10);
+const sal_Int64 minMask = SAL_CONST_INT64(1000);
+const sal_Int64 hourMask = SAL_CONST_INT64(10);
const sal_Int64 nanoSecInSec = 10;
const sal_Int16 secInMin = 60;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
