[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - svx/Library_svxcore.mk svx/source
svx/Library_svxcore.mk | 12
svx/source/gallery2/gallery1.cxx | 20 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 339f99665b73742afdcfc6595244921ccd2ee019
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 19:08:22 2014 +0300
Fix thinko. Thanks to vmiklos for noticing
Change-Id: Id4e65908cc73978205bc0858a3a809b882864b62
(cherry picked from commit d61f8185e660a6820351b8cea3ac51d344f0ab3e)
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 8f07ffc..c50050f 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -19,7 +19,7 @@
#include config_features.h
-#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) HAVE_FEATURE_READONLY_INSTALLSET
#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include premac.h
#include Foundation/Foundation.h
@@ -244,7 +244,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, sal_Bool rbDirIsR
uno::Reference sdbc::XResultSet xResultSet( aCnt.createCursor(
aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
-#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) HAVE_FEATURE_READONLY_INSTALLSET
if( rBaseURL.GetProtocol() == INET_PROT_FILE )
{
const char *appBundle = [[[NSBundle mainBundle] bundlePath]
UTF8String];
commit 8c127a28fb3e5ba322cae1696a45e20359215850
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 11:28:00 2014 +0300
Don't try to create cdefghij.klm inside the app bundle on OS X when
sandboxed
Actually, we check HAVE_FEATURE_READONLY_INSTALLSET and not
HAVE_FEATURE_MACOSX_SANDBOX, but in practice we set the former only
for the latter case.
We could do this test cross-platform but I didn't bother now. Nobody
uses --enable-readonly-installset when building for Linux or Windows
anyway, I think.
(There must be more places where we could and should check
HAVE_FEATURE_READONLY_INSTALLSET.)
Change-Id: Ie54f436616a1db3119b0bc0148149784127b156d
(cherry picked from commit 96d091d43428472c2c68054ed5dca22f79adc705)
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 4b8914e..cc7bc06 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -82,6 +82,18 @@ $(eval $(call gb_Library_use_externals,svxcore,\
icuuc \
))
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_cxxflags,svxcore,\
+$(gb_OBJCXXFLAGS) \
+))
+
+$(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
+ Foundation \
+))
+
+endif
+
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/core/extedit \
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 004570b..8f07ffc 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -17,6 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#include premac.h
+#include Foundation/Foundation.h
+#include postmac.h
+#endif
+
#include sal/config.h
#include comphelper/processfactory.hxx
@@ -235,6 +244,15 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, sal_Bool rbDirIsR
uno::Reference sdbc::XResultSet xResultSet( aCnt.createCursor(
aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+if( rBaseURL.GetProtocol() == INET_PROT_FILE )
+{
+const char *appBundle = [[[NSBundle mainBundle] bundlePath]
UTF8String];
+OUString path = rBaseURL.GetURLPath();
+if( path.startsWith( OUString( appBundle, strlen( appBundle ),
RTL_TEXTENCODING_UTF8 ) + / ) )
+rbDirIsReadOnly = true;
+}
+#else
try
{
// check readonlyness the very hard way
@@ -266,7 +284,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, sal_Bool rbDirIsR
catch( const uno::Exception )
{
}
-
+#endif
if( xResultSet.is() )
{
uno::Reference ucb::XContentAccess xContentAccess( xResultSet,
uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-10-09
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#84810 Avoid calc crash when using Paste Special - Link in https://gerrit.libreoffice.org/11867 from Matthew Francis about module sc + scripting: Using HashMap in CommandLineTools in https://gerrit.libreoffice.org/11861 from Robert Antoni Buj i Gelonch about module scripting + drop -Wno-long-double compiler flag in https://gerrit.libreoffice.org/11819 from Douglas Mencken about module build, external, solenv + fdo#81356: convert Fraction to boost::rationallong - wip in https://gerrit.libreoffice.org/11551 from Juan Picca about module basctl, basic, chart2, connectivity, cui, dbaccess, desktop, drawinglayer, editeng, filter, forms, include, reportdesign, sc, sd, sfx2, starmath, svtools, svx, sw, toolkit, tools, vcl, writerfilter + fdo#83753: consider JAVA_HOME and PATH when selecting JRE in https://gerrit.libreoffice.org/11392 from Michael Weghorn about module include, jvmfwk + scripting: redundant cast to String in https://gerrit.libreoffice.org/11859 from Robert Antoni Buj i Gelonch about module scripting + fdo#35862 De-/Increase font when multi-sized text in https://gerrit.libreoffice.org/11857 from Daniel Sikeler about module sw + xmerge: Cast to Node in https://gerrit.libreoffice.org/11855 from Robert Antoni Buj i Gelonch about module xmerge End of freshness + Create a new ctor for Sequence with initializer_list in https://gerrit.libreoffice.org/11866 from Marcos Paulo de Souza about module cui, include + gbuild-to-ide fixes in https://gerrit.libreoffice.org/11754 from Peter Foley about module build + Fix LOAndroid build in separate builddir. in https://gerrit.libreoffice.org/11862 from Peter Foley about module android + make gbuild-to-ide VS files work with separate builddir in https://gerrit.libreoffice.org/11799 from Peter Foley about module bin + bump nss from 3.15.3 to 3.16.5 in https://gerrit.libreoffice.org/11700 from Caolán McNamara about module build, external + WIP!!! vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMa in https://gerrit.libreoffice.org/11823 from Chris Sherlock about module include, vcl + create a macro library for implementing bit-flags types in https://gerrit.libreoffice.org/11835 from Noel Grandin about module canvas, cppcanvas, cui, dbaccess, drawinglayer, editeng, filter, forms, include, reportdesign, sc, sfx2, starmath, svtools, svx, sw, test, vcl, writerfilter * Merged changes on master for project core changed in the last 25 hours: + complex: Use 'import com.sun.star.beans.UnknownPropertyException;' in https://gerrit.libreoffice.org/11864 from Robert Antoni Buj i Gelonch + jurt: remove unused import in https://gerrit.libreoffice.org/11863 from Robert Antoni Buj i Gelonch + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11822 from Michaël Lefèvre + convert ParamType enum in SC to enum class in https://gerrit.libreoffice.org/11848 from Noel Grandin + scripting: as of release 5, 'enum' is a keyword in https://gerrit.libreoffice.org/11860 from Robert Antoni Buj i Gelonch + fdo#83141: optimize slow performance after when using replaceall or searc in https://gerrit.libreoffice.org/11829 from Seyeong Kim + fdo#84504: UI- LineNumbering for header/footer in https://gerrit.libreoffice.org/11730 from Charu Tyagi + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11840 from Takeshi Abe + gbuild-to-ide improvments in https://gerrit.libreoffice.org/11797 from Peter Foley + fdo#75757: remove inheritance to std::map in https://gerrit.libreoffice.org/11854 from Takeshi Abe + fdo#80927: css.office.Quickstart should be single-instance service. in https://gerrit.libreoffice.org/11766 from Matúš Kukan * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#80996:Fix for DataLabel not preserved for
Scripting: idesupport package is dead and can be dropped?
I asked this question on IRC yesterday, but didn't get an answer, so re-asking it here. Am i right in my assumption that idesupport package is dead and can be removed? The reason i am asking is while reviewing this Gerrit change [1] i was wondering that the base version was already broken, at least since this commit [2], 1.5 years ago but wasn't noticed because it was never migrated to gbuild or was already dead in dmake era. Anyway if no one objects i will bury this dead body, unless someone else is faster than me ;-) [1] https://gerrit.libreoffice.org/11861 [2] 8be40d31d78723debd47f671544f480c1c606db7 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Scripting: idesupport package is dead and can be dropped?
Hi, On Thu, Oct 09, 2014 at 10:04:45AM +0200, David Ostrovsky wrote: I asked this question on IRC yesterday, but didn't get an answer, so re-asking it here. Am i right in my assumption that idesupport package is dead and can be removed? The reason i am asking is while reviewing this Gerrit change [1] i was wondering that the base version was already broken, at least since this commit [2], 1.5 years ago but wasn't noticed because it was never migrated to gbuild or was already dead in dmake era. If I read the original build.xml correctly, this was never part of a regular build, but had to be built explicitly. I wonder if it actually worked even before gbuildification. And how many people knew about it... Since nobody has protested about it during the past 3 years, I think we can safely assume it is dead. Btw, it is the whole scripting/java/org dir that is dead, not just the idesupport subdir of it. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - comphelper/source sw/source
comphelper/source/misc/sequenceashashmap.cxx | 13 +
sw/source/core/unocore/unodraw.cxx | 11 ++-
2 files changed, 19 insertions(+), 5 deletions(-)
New commits:
commit 358f5280e0f6afb968edc295d8f1dce55f05e18f
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 9 08:38:38 2014 +0200
Fix coverity#1224993 w/o breaking JunitTest_framework_unoapi
Change-Id: Iefa1d79c52c4f951a7a66be98de3c9752bf89daf
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 366c5a2..f6c6b7e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -58,8 +58,10 @@
#include crstate.hxx
#include comphelper/extract.hxx
#include comphelper/makesequence.hxx
+#include cppuhelper/exc_hlp.hxx
#include cppuhelper/supportsservice.hxx
#include svx/scene3d.hxx
+#include com/sun/star/beans/IllegalTypeException.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include fmtwrapinfluenceonobjpos.hxx
#include com/sun/star/text/TextContentAnchorType.hpp
@@ -1462,7 +1464,14 @@ void SwXShape::setPropertyValue(const OUString
rPropertyName, const uno::Any a
if (pFmt)
{
// We have a pFmt (but no pEntry): try to sync TextBox
property.
-SwTextBoxHelper::syncProperty(pFmt, rPropertyName, aValue);
+try {
+SwTextBoxHelper::syncProperty(pFmt, rPropertyName, aValue);
+} catch (css::beans::IllegalTypeException e) {
+css::uno::Any a(cppu::getCaughtException());
+throw css::lang::WrappedTargetException(
+wrapped IllegalTypeException + e.Message,
+css::uno::Referencecss::uno::XInterface(), a);
+}
}
// #i31698# - restore object position, if caption point is set.
commit 52028d4632d4898ad0f9119841bcf171f6e18682
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 9 08:28:52 2014 +0200
Revert coverity#1224993 Uncaught exception
This reverts commit b66a96d792e9ef8022547f835ed4633c8e7f4c10,
follow-up commit will fix w/o breaking JunitTest_framework_unoapi.
Change-Id: Iac12d52c2eb9a1e4ab09d24910cee1838cc7d883
diff --git a/comphelper/source/misc/sequenceashashmap.cxx
b/comphelper/source/misc/sequenceashashmap.cxx
index b34d8c9..35f2d6b 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -75,9 +75,11 @@ void SequenceAsHashMap::operator(const css::uno::Any
aSource)
return;
}
-throw std::invalid_argument(Any contains wrong type.);
+throw css::beans::IllegalTypeException(
+Any contains wrong type. );
}
+
void SequenceAsHashMap::operator(const css::uno::Sequence css::uno::Any
lSource)
{
sal_Int32 c = lSource.getLength();
@@ -92,7 +94,8 @@ void SequenceAsHashMap::operator(const css::uno::Sequence
css::uno::Any lS
(lP.Name.isEmpty()) ||
(!lP.Value.hasValue())
)
-throw std::invalid_argument(PropertyValue struct contains no
useful information.);
+throw css::beans::IllegalTypeException(
+PropertyValue struct contains no useful information.
);
(*this)[lP.Name] = lP.Value;
continue;
}
@@ -104,14 +107,16 @@ void SequenceAsHashMap::operator(const
css::uno::Sequence css::uno::Any lS
(lN.Name.isEmpty()) ||
(!lN.Value.hasValue())
)
-throw std::invalid_argument(NamedValue struct contains no
useful information.);
+throw css::beans::IllegalTypeException(
+NamedValue struct contains no useful information. );
(*this)[lN.Name] = lN.Value;
continue;
}
// ignore VOID Any ... but reject wrong filled ones!
if (lSource[i].hasValue())
-throw std::invalid_argument(Any contains wrong type.);
+throw css::beans::IllegalTypeException(
+Any contains wrong type. );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TblStylePrHandler.cxx | 45 --
writerfilter/source/ooxml/model.xml | 26 ++--
2 files changed, 55 insertions(+), 16 deletions(-)
New commits:
commit 6bd6e19534718b7df394ed4055c71cf2f59269d0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 9 08:59:14 2014 +0200
Use constants for ST_TblStyleOverrideType values
Change-Id: I61a81bf1aab604d27441630dfb5d55f657211410
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 24fee7d..2d05756 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -79,9 +79,48 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value rVal)
{
case NS_ooxml::LN_CT_TblStyleOverrideType:
{
-// The tokenid should be the same in the model.xml than
-// in the TblStyleType enum
-m_nType = TblStyleType( rVal.getInt( ) );
+switch (rVal.getInt())
+{
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_wholeTable:
+m_nType = TBL_STYLE_WHOLETABLE;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_firstRow:
+m_nType = TBL_STYLE_FIRSTROW;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_lastRow:
+m_nType = TBL_STYLE_LASTROW;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_firstCol:
+m_nType = TBL_STYLE_FIRSTCOL;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_lastCol:
+m_nType = TBL_STYLE_LASTCOL;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band1Vert:
+m_nType = TBL_STYLE_BAND1VERT;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band2Vert:
+m_nType = TBL_STYLE_BAND2VERT;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band1Horz:
+m_nType = TBL_STYLE_BAND1HORZ;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band2Horz:
+m_nType = TBL_STYLE_BAND2HORZ;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_neCell:
+m_nType = TBL_STYLE_NECELL;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_nwCell:
+m_nType = TBL_STYLE_NWCELL;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_seCell:
+m_nType = TBL_STYLE_SECELL;
+break;
+case NS_ooxml::LN_Value_ST_TblStyleOverrideType_swCell:
+m_nType = TBL_STYLE_SWCELL;
+break;
+}
}
break;
}
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index c85267c..0f40a4e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -18734,19 +18734,19 @@
element name=numIdMacAtCleanup
tokenid=ooxml:CT_Numbering_numIdMacAtCleanup/
/resource
resource name=ST_TblStyleOverrideType resource=List
- value tokenid=1wholeTable/value
- value tokenid=2firstRow/value
- value tokenid=3lastRow/value
- value tokenid=4firstCol/value
- value tokenid=5lastCol/value
- value tokenid=6band1Vert/value
- value tokenid=7band2Vert/value
- value tokenid=8band1Horz/value
- value tokenid=9band2Horz/value
- value tokenid=10neCell/value
- value tokenid=11nwCell/value
- value tokenid=12seCell/value
- value tokenid=13swCell/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_wholeTablewholeTable/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_firstRowfirstRow/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_lastRowlastRow/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_firstColfirstCol/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_lastCollastCol/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_band1Vertband1Vert/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_band2Vertband2Vert/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_band1Horzband1Horz/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_band2Horzband2Horz/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_neCellneCell/value
+ value
tokenid=ooxml:Value_ST_TblStyleOverrideType_nwCellnwCell/value
+ value
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/appl/shutdownicon.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 17a0e715958e17f13006d278f377d2af2651206c Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 8 07:27:16 2014 +0200 sfx2: missing semicolon Change-Id: Id1c6357c84e03c71136eb92434002e5e0a4b71d7 (cherry picked from commit 86c4762790823c338f018fb2f06c4a5fa4497916) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 55e1c5e..1b41f68 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -172,7 +172,7 @@ bool LoadModule() # endif // UNX #else pInitSystray = disabled_initSystray; -pDeInitSystray = disabled_deInitSystray +pDeInitSystray = disabled_deInitSystray; loaded = false; #endif // ENABLE_QUICKSTART_APPLET } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On 10/08/2014 09:53 PM, Miklos Vajna wrote: I *think* the assert is correct and the RTF tokenizer has to be adjusted, but first I wanted to see how much does e1cbaebe7fe36690e192778c87b5eb63790017d7 help. In any case, it's good to see that this time the jump is around 5 documents and not 1000. :) Just curious, and as those Crash test update mails with their obscure .csv attachments are white noise to me---how do you read from that data that there was a jump of 5 in bad documents, for example? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/CppunitTest_sw_ooxmlimport.mk sw/qa sw/source writerfilter/source
sw/CppunitTest_sw_ooxmlimport.mk |1
sw/qa/extras/ooxmlimport/data/bnc821804.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 111 ++
sw/source/core/uibase/misc/redlndlg.cxx |2
sw/source/core/uibase/shells/textfld.cxx |1
sw/source/core/unocore/unoredline.cxx |1
writerfilter/source/dmapper/DomainMapper.cxx | 37 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 110 +++--
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 25 +---
writerfilter/source/dmapper/PropertyMap.hxx | 18 +++
writerfilter/source/ooxml/model.xml | 10 -
11 files changed, 223 insertions(+), 93 deletions(-)
New commits:
commit c3f4ece4ca8fff2c67504e76bddf89252d75daee
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Wed Oct 1 13:09:36 2014 +0200
fix docx redline import (bnc#821804)
This is a squash of commits b6969634..fd26de3b.
Change-Id: I8984001d7f85c00eb9b9943b25b8abb6e2ee28d3
Reviewed-on: https://gerrit.libreoffice.org/11789
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 2c4682b..a77787e 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \
unotest \
utl \
sw \
+tl \
vcl \
$(gb_UWINAPI) \
))
diff --git a/sw/qa/extras/ooxmlimport/data/bnc821804.docx
b/sw/qa/extras/ooxmlimport/data/bnc821804.docx
new file mode 100644
index 000..9ec2e07
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc821804.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 07761dd..900a25e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -54,11 +54,13 @@
#include com/sun/star/style/CaseMap.hpp
#include com/sun/star/style/PageStyleLayout.hpp
#include com/sun/star/style/ParagraphAdjust.hpp
+#include com/sun/star/util/DateTime.hpp
#include vcl/svapp.hxx
#include unotools/fltrcfg.hxx
#include comphelper/sequenceashashmap.hxx
#include com/sun/star/text/GraphicCrop.hpp
#include swtypes.hxx
+#include tools/datetimeutils.hxx
#include bordertest.hxx
@@ -2284,6 +2286,115 @@ DECLARE_OOXMLIMPORT_TEST(testBnc891663,
bnc891663.docx)
CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
}
+static OString dateTimeToString( const util::DateTime dt )
+{
+return DateTimeToOString( DateTime( Date( dt.Day, dt.Month, dt.Year ),
Time( dt.Hours, dt.Minutes, dt.Seconds )));
+}
+
+DECLARE_OOXMLIMPORT_TEST(testBnc821804, bnc821804.docx)
+{
+CPPUNIT_ASSERT_EQUAL( OUString( TITLE ), getRun( getParagraph( 1 ), 1
)-getString());
+CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(1), 1), RedlineType));
+// Redline information (SwXRedlinePortion) are separate runs apparently.
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(1), 2), RedlineType));
+
CPPUNIT_ASSERT_EQUAL(OUString(Insert),getPropertyOUString(getRun(getParagraph(1),
2), RedlineType));
+CPPUNIT_ASSERT_EQUAL(true,getPropertybool(getRun(getParagraph(1), 2),
IsStart));
+
CPPUNIT_ASSERT_EQUAL(OUString(unknown1),getPropertyOUString(getRun(getParagraph(1),
2), RedlineAuthor));
+
CPPUNIT_ASSERT_EQUAL(OString(2006-08-29T09:46:00Z),dateTimeToString(getPropertyutil::DateTime(getRun(getParagraph(1),
2), RedlineDateTime)));
+// So only the 3rd run is actual text (and the two runs have been merged
into one, not sure why, but that shouldn't be a problem).
+CPPUNIT_ASSERT_EQUAL(OUString( (1st run of an insert) (2nd run of an
insert)), getRun(getParagraph(1),3)-getString());
+CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(1), 3), RedlineType));
+// And the end SwXRedlinePortion of the redline.
+
CPPUNIT_ASSERT_EQUAL(OUString(Insert),getPropertyOUString(getRun(getParagraph(1),
4), RedlineType));
+
CPPUNIT_ASSERT_EQUAL(OUString(unknown1),getPropertyOUString(getRun(getParagraph(1),
4), RedlineAuthor));
+
CPPUNIT_ASSERT_EQUAL(OString(2006-08-29T09:46:00Z),dateTimeToString(getPropertyutil::DateTime(getRun(getParagraph(1),
4), RedlineDateTime)));
+CPPUNIT_ASSERT_EQUAL(false,getPropertybool(getRun(getParagraph(1), 4),
IsStart));
+
+CPPUNIT_ASSERT_EQUAL(OUString(Normal text),
getRun(getParagraph(2),1)-getString());
+CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(2), 1), RedlineType));
+
+
CPPUNIT_ASSERT_EQUAL(OUString(Delete),getPropertyOUString(getRun(getParagraph(3),
1), RedlineType));
+
CPPUNIT_ASSERT_EQUAL(OUString(unknown2),getPropertyOUString(getRun(getParagraph(3),
1), RedlineAuthor));
+
Re: Crash test update
On Oct 9, 2014 6:53 PM, Stephan Bergmann sberg...@redhat.com wrote: On 10/08/2014 09:53 PM, Miklos Vajna wrote: I *think* the assert is correct and the RTF tokenizer has to be adjusted, but first I wanted to see how much does e1cbaebe7fe36690e192778c87b5eb63790017d7 help. In any case, it's good to see that this time the jump is around 5 documents and not 1000. :) Just curious, and as those Crash test update mails with their obscure .csv attachments are white noise to me---how do you read from that data that there was a jump of 5 in bad documents, for example? They list the number of documents that crashed. Each row is for one crash test run. So if the number in the same column increases it means that more documents crashed. Now there are files for import, export and the third one for validation errors. Eike already asked to add the date of the test run into the first column but I had not enough time yet to implement that. Hope that helps, Markus Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 --- Comment #73 from Karel Hruska push...@email.cz --- Added bug 84294 - Wrong frame-background in exported PDF Regression, bibisected. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On 10/09/2014 10:04 AM, Markus Mohrhard wrote: On Oct 9, 2014 6:53 PM, Stephan Bergmann sberg...@redhat.com mailto:sberg...@redhat.com wrote: On 10/08/2014 09:53 PM, Miklos Vajna wrote: I *think* the assert is correct and the RTF tokenizer has to be adjusted, but first I wanted to see how much does e1cbaebe7fe36690e192778c87b5eb63790017d7 help. In any case, it's good to see that this time the jump is around 5 documents and not 1000. :) Just curious, and as those Crash test update mails with their obscure .csv attachments are white noise to me---how do you read from that data that there was a jump of 5 in bad documents, for example? They list the number of documents that crashed. Each row is for one crash test run. So if the number in the same column increases it means that more documents crashed. Now there are files for import, export and the third one for validation errors. Eike already asked to add the date of the test run into the first column but I had not enough time yet to implement that. Ah, so the number of lines in e.g. exportCrashes.csv indeed appears to increase by one for each Crash test update mail. So I would have expected that all lines expect one (either the first or the last, whichever way they are sorted chronologically) would remain the same from one Crash test update mail to the next. But no, that is not the case, so I apparently still did not get what those numbers mean. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx officecfg/registry svx/source sw/source
include/svx/dialogs.hrc |1 +
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
svx/source/tbxctrls/tbcontrl.cxx|2 +-
svx/source/tbxctrls/tbcontrl.src|7
++-
sw/source/uibase/ribbar/workctrl.src|2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 22a5357484f9a31a99146b738a8716a24bf59b3a
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Thu Oct 9 10:15:43 2014 +0200
Improve wording on several actions
* More Styles (Styles dropdown)
* More Fields (Insert field dropdown and menu)
* More Options (Table dropdown)
Change-Id: I593a1d1dd68e666d05a4ac20ae97308ad45ff18e
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index d96bacb..60e134f 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -255,6 +255,7 @@
#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200)
#define RID_SVXSTR_LINECOLOR(RID_SVX_START + 201)
+#define RID_SVXSTR_MORE_STYLES (RID_SVX_START + 202)
// Strings for insert/overwrite mode
#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210)
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 66c2c8d..2c9f5f6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -303,7 +303,7 @@
/node
node oor:name=.uno:InsertField oor:op=replace
prop oor:name=Label oor:type=xs:string
- value xml:lang=en-US~More.../value
+ value xml:lang=en-US~More Fields.../value
/prop
prop oor:name=Properties oor:type=xs:int
value7/value
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9fa36cf..edf9eec 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1790,7 +1790,7 @@ struct SvxStyleToolBoxControl::Impl
inline Impl( void )
:aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
-,aMore ( SVX_RESSTR( RID_SVXSTR_MORE ) )
+,aMore ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) )
,bSpecModeWriter( false )
,bSpecModeCalc ( false )
{
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index e52611d..ab53f86 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -166,9 +166,14 @@ String RID_SVXSTR_CLEARFORM
Text [ en-US ] = Clear formatting;
};
+String RID_SVXSTR_MORE_STYLES
+{
+Text [ en-US ] = More Styles...;
+};
+
String RID_SVXSTR_MORE
{
-Text [ en-US ] = More...;
+Text [ en-US ] = More Options...;
};
String RID_SVXSTR_TEXTCOLOR
diff --git a/sw/source/uibase/ribbar/workctrl.src
b/sw/source/uibase/ribbar/workctrl.src
index 4acde4c..ed87105 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -78,7 +78,7 @@ Menu RID_INSERT_FIELD_CTRL
{
Identifier = FN_INSERT_FIELD ;
HelpId = CMD_FN_INSERT_FIELD ;
-Text [ en-US ] = More... ;
+Text [ en-US ] = More Fields... ;
};
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/tools tools/source
connectivity/source/drivers/dbase/DIndexIter.cxx |6 -
connectivity/source/drivers/dbase/dindexnode.cxx | 58 ++-
connectivity/source/inc/dbase/dindexnode.hxx | 70 +++
include/tools/ref.hxx| 13 +++-
tools/source/ref/ref.cxx | 10 ---
5 files changed, 93 insertions(+), 64 deletions(-)
New commits:
commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
Author: Noel Grandin n...@peralex.com
Date: Fri Oct 3 10:39:28 2014 +0200
remove SvRefBase::QueryDelete
Move it's functionality into the only place that needs it, in the dbase
driver.
Removes an extra virtual call from a widely used class.
The dbase driver seems to be using to perform some kind of whacky object
recycling, so it's not like we want this functionality to be used
somewhere else.
Change-Id: I41018f71e0b0a79fdd3d527536f0ac95c788e614
Reviewed-on: https://gerrit.libreoffice.org/11786
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx
b/connectivity/source/drivers/dbase/DIndexIter.cxx
index b1c0a17..edc3c99 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -52,7 +52,7 @@ sal_uIntPtr OIndexIterator::Find(bool bFirst)
if (bFirst)
{
m_aRoot = m_pIndex-getRoot();
-m_aCurLeaf = NULL;
+m_aCurLeaf.Clear();
}
if (!m_pOperator)
@@ -186,7 +186,7 @@ sal_uIntPtr OIndexIterator::GetCompare(bool bFirst)
if ( ( ( pKey = GetNextKey() ) == NULL ) ||
!m_pOperator-operate(pKey,m_pOperand))
{
pKey = NULL;
-m_aCurLeaf = NULL;
+m_aCurLeaf.Clear();
}
break;
case SQLFilterOperator::GREATER_EQUAL:
@@ -235,7 +235,7 @@ sal_uIntPtr OIndexIterator::GetNull(bool bFirst)
if ( ( ( pKey = GetNextKey() ) == NULL ) || !pKey-getValue().isNull())
{
pKey = NULL;
-m_aCurLeaf = NULL;
+m_aCurLeaf.Clear();
}
return pKey ? pKey-GetRecord() : NODE_NOTFOUND;
}
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index 493ccd5..fe20627 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -86,6 +86,15 @@ ONDXPage::~ONDXPage()
delete[] ppNodes;
}
+void ONDXPage::ReleaseRef()
+{
+assert( nRefCount = 1);
+if(--nRefCount == 0 !bNoDelete)
+{
+QueryDelete();
+}
+}
+
void ONDXPage::QueryDelete()
{
// Store in GarbageCollector
@@ -105,14 +114,20 @@ void ONDXPage::QueryDelete()
ppNodes[i] = ONDXNode();
}
-RestoreNoDelete();
+bNoDelete = 1;
nCount = 0;
aParent.Clear();
rIndex.Collect(this);
}
else
-SvRefBase::QueryDelete();
+{
+// I'm not sure about the original purpose of this line, but right now
+// it serves the purpose that anything that attempts to do an
AddFirstRef()
+// after an object is deleted will trip an assert.
+nRefCount = 1 30;
+delete this;
+}
}
ONDXPagePtr ONDXPage::GetChild(ODbaseIndex* pIndex)
@@ -189,7 +204,7 @@ bool ONDXPage::Insert(ONDXNode rNode, sal_uInt32 nRowsLeft)
{
// this practically reduces the number of nodes by 1
-if (IsLeaf() this == rIndex.m_aCurLeaf)
+if (IsLeaf() this == rIndex.m_aCurLeaf)
{
// assumes, that the node, for which the condition (=)
holds, is stored in m_nCurNode
--nCount; // (otherwise we might get Assertions and GPFs
- 60593)
@@ -344,7 +359,7 @@ void ONDXPage::Release(bool bSave)
ppNodes[i].GetChild().Clear();
}
-aParent = NULL;
+aParent.Clear();
}
void ONDXPage::ReleaseFull(bool bSave)
@@ -487,7 +502,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr
xPage)
sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage-Count() - 1;
if (bRight)
{
-DBG_ASSERT(xPage != this,xPage und THIS duerfen nicht gleich
sein: Endlosschleife);
+DBG_ASSERT(xPage != this,xPage und THIS duerfen nicht gleich
sein: Endlosschleife);
// shift all nodes from xPage to the left node (append)
while (xPage-Count())
{
@@ -497,7 +512,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr
xPage)
}
else
{
-DBG_ASSERT(xPage != this,xPage und THIS duerfen nicht gleich
sein: Endlosschleife);
+DBG_ASSERT(xPage != this,xPage und THIS duerfen nicht gleich
sein:
Re: Crash test update
On Oct 9, 2014 7:14 PM, Stephan Bergmann sberg...@redhat.com wrote: On 10/09/2014 10:04 AM, Markus Mohrhard wrote: On Oct 9, 2014 6:53 PM, Stephan Bergmann sberg...@redhat.com mailto:sberg...@redhat.com wrote: On 10/08/2014 09:53 PM, Miklos Vajna wrote: I *think* the assert is correct and the RTF tokenizer has to be adjusted, but first I wanted to see how much does e1cbaebe7fe36690e192778c87b5eb63790017d7 help. In any case, it's good to see that this time the jump is around 5 documents and not 1000. :) Just curious, and as those Crash test update mails with their obscure .csv attachments are white noise to me---how do you read from that data that there was a jump of 5 in bad documents, for example? They list the number of documents that crashed. Each row is for one crash test run. So if the number in the same column increases it means that more documents crashed. Now there are files for import, export and the third one for validation errors. Eike already asked to add the date of the test run into the first column but I had not enough time yet to implement that. Ah, so the number of lines in e.g. exportCrashes.csv indeed appears to increase by one for each Crash test update mail. So I would have expected that all lines expect one (either the first or the last, whichever way they are sorted chronologically) would remain the same from one Crash test update mail to the next. But no, that is not the case, so I apparently still did not get what those numbers mean. That sounds strange as the old file is just imported again. Only the column ordering might change but if you find a problem please write a bug report and put me into cc. I will have a look at it when I'm back. Also it should always be the last line that is added. Markus Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-3' - sfx2/source
sfx2/source/appl/shutdownicon.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5d2d9f593ae4c8632684c86d559fa6fa744ae80b Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 8 07:27:16 2014 +0200 sfx2: missing semicolon Change-Id: Id1c6357c84e03c71136eb92434002e5e0a4b71d7 (cherry picked from commit 86c4762790823c338f018fb2f06c4a5fa4497916) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 55e1c5e..1b41f68 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -172,7 +172,7 @@ bool LoadModule() # endif // UNX #else pInitSystray = disabled_initSystray; -pDeInitSystray = disabled_deInitSystray +pDeInitSystray = disabled_deInitSystray; loaded = false; #endif // ENABLE_QUICKSTART_APPLET } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 80927, which changed state. Bug 80927 Summary: Win: crash with Quickstarter enabled https://bugs.freedesktop.org/show_bug.cgi?id=80927 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On 10/09/2014 10:20 AM, Markus Mohrhard wrote: That sounds strange as the old file is just imported again. Only the column ordering might change but if you find a problem please write a bug report and put me into cc. I will have a look at it when I'm back. Also it should always be the last line that is added. Indeed, looks just like the columns get sorted differently over time. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_class.mk |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 11044cbf0d92fea3cb55ba46d81f8fe51b1ec0ab
Author: Noel Grandin n...@peralex.com
Date: Thu Oct 9 11:32:31 2014 +0300
fix 'line too long' link error on Windows with merged-libs
Change-Id: I76457af34d5a034197d1b7d847a7120518f44383
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 390a7b8..b4dc1e3 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -136,8 +136,7 @@ gb_LinkTarget_get_linksearchpath_for_layer = \
# avoid fatal error LNK1170 for Library_merged
define gb_LinkTarget_MergedResponseFile
-cut -f -1000 -d ' ' $${RESPONSEFILE} $${RESPONSEFILE}.1 \
-cut -f 1001- -d ' ' $${RESPONSEFILE} $${RESPONSEFILE}.1 \
+cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' $${RESPONSEFILE}.1 \
mv $${RESPONSEFILE}.1 $${RESPONSEFILE}
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
On 08/10/14 17:12, Kohei Yoshida wrote: On Wed, 2014-10-08 at 15:06 +0200, Jean-Baptiste Faure wrote: as if this former behavior was completely broken. There were those users who believed that the former behavior was broken, and fought tooth and nail to get that fixed. Ok, it is not perfect but many spreadsheets are build on this behavior since many years. Which I was not even remotely aware of, but then I'm not aware of 100% of how our users use our software. I get surprised every single day. With 4.3.2 and 4.2.7 all these spreadsheets do not work anymore By the same token, the fix also allows those users wanting the fix to start using Calc to fit their needs. so there are 2 different behaviours of the feature, and users can't agree on which one is correct. The problem is not the original patch (the patch for the master), it works perfectly and Kohei did a fantastic job with it and its complementary patch which added the configuration option allowing the choose between the new behavior and the former. Thank you very much for that. The issue is in the decision to backport the first patch without the configuration option (fdo#81309 only) to 4.3.1 and 4.2.7 It was because of the translation requirement that the backport would add. do we really have to make ourselves slaves to un-changeable processes like there shall be no new strings in bugfix releases, no matter the circumstances? i'd say we leave that kind of attitude to other projects. why don't we make a more pragmatic decision here: let's decide that in this _particular_ case, the one additional string that may be untranslated and show up in English in 4.2.7 is a lesser evil than offering only one of the behaviours that users want functionality-wise; then we don't have to choose which group of users we have to annoy with a regression. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12
sc/source/ui/docshell/datastream.cxx | 15 +--
2 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit fcf953b8ec8ef9652f12a2cc91e9edc6153c1bb1
Author: xukai xu...@multicorewareinc.com
Date: Tue Sep 23 21:55:13 2014 -0400
make streamtimeout a config variable instead of an env. var.
Change-Id: I6c82142265a0a149206d15fbc267ad61e6b9cf3b
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 85fb9f9..cb16b9b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1807,5 +1807,17 @@
/prop
/group
/group
+group oor:name=DataStream
+info
+ descdata stream/desc
+/info
+prop oor:name=UpdateTimeout oor:type=xs:int oor:nillable=false
+ !-- UIHints: Tools - Options - Spreadsheet - Defaults --
+ info
+descset the Timeout of DataStream updating /desc
+ /info
+ value2000/value
+/prop
+/group
/component
/oor:component-schema
diff --git a/sc/source/ui/docshell/datastream.cxx
b/sc/source/ui/docshell/datastream.cxx
index 449a992..92f9519 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -27,6 +27,8 @@
#include documentlinkmgr.hxx
#include config_orcus.h
+#include officecfg/Office/Calc.hxx
+
#if ENABLE_ORCUS
#if defined WNT
@@ -501,18 +503,11 @@ void DataStream::MoveData()
default:
;
}
-
if(mbIsFirst mbIsUpdate)
{
- int nImportTimeout = 0;
- static char * cenv = getenv( streamtimeout );
- if(cenv)
- {
- double nEnv = atof(cenv);
- nImportTimeout = 1000 * nEnv;
- }
- maImportTimer.SetTimeout(nImportTimeout);
- mbIsFirst = false;
+sal_Int32 nStreamTimeout =
officecfg::Office::Calc::DataStream::UpdateTimeout::get();
+maImportTimer.SetTimeout(nStreamTimeout);
+mbIsFirst = false;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
On Thu, Oct 9, 2014 at 10:47 AM, Michael Stahl mst...@redhat.com wrote: The issue is in the decision to backport the first patch without the configuration option (fdo#81309 only) to 4.3.1 and 4.2.7 It was because of the translation requirement that the backport would add. do we really have to make ourselves slaves to un-changeable processes like there shall be no new strings in bugfix releases, no matter the circumstances? AFAIK there is no policy like there shall be no new strings in bugfix releases. The only thing localizers and Pootle maintaners ask, that such change should be announced to them, so they have a chance to catch-up. Of course it is desired that string changes in stable branches should be minimal. But bugfixes can always be accepted. Regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC call Thursday 16:00 central European time ...
On Thu, Oct 9, 2014 at 12:00 PM, Andras Timar tima...@gmail.com wrote: On Thu, Oct 9, 2014 at 10:47 AM, Michael Stahl mst...@redhat.com wrote: The issue is in the decision to backport the first patch without the configuration option (fdo#81309 only) to 4.3.1 and 4.2.7 It was because of the translation requirement that the backport would add. do we really have to make ourselves slaves to un-changeable processes like there shall be no new strings in bugfix releases, no matter the circumstances? AFAIK there is no policy like there shall be no new strings in bugfix releases. The only thing localizers and Pootle maintaners ask, that such change should be announced to them, so they have a chance to catch-up. Can that be done automatically by some script (like in GNOME)? Simos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Unittest fails building on OS X 10.9
What must I do, when a unit test fails? Why does that stops my build? This is the error message: [build CUT] hwpfilter_test_hwpfilter File tested,Test Result,Execution tools::Time (ms) ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2005-1544-1.tiff,Pass,4 ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2006-2656-1.tiff,Pass,5 ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff,Fail,101 ~/lo/core/unotest/source/cpp/filters-test.cxx:125:TiffFilterTest::testCVEs assertion failed - Expression: bRes == (nExpected == test::pass) - ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff ~/lo/core/unotest/source/cpp/filters-test.cxx:125: Assertion Test name: TiffFilterTest::testCVEs assertion failed - Expression: bRes == (nExpected == test::pass) - ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff Failures !!! Run: 1 Failure total: 1 Failures: 1 Errors: 0 2014-10-08 23:47:16.052 cppunittester[59255:507] *** -[NSAutoreleasePool release]: This pool has already been released, do not drain it (double release). Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_filter_tiff_test make[1]: *** [~/lo/core/workdir/CppunitTest/filter_tiff_test.test] Error 1 ---Joost--- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin2.cxx | 17 +++--
sw/source/uibase/inc/edtwin.hxx|5 +
2 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 912ecaf565e68d2ca3fb9584712313e712749f75
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 10:38:34 2014 +0100
Resolves: fdo#55546 center ellipsis tooltips that don't fit on screen
Change-Id: Ic44c9032878892fa33c839e5aaac1996e7bed943
diff --git a/sw/source/uibase/docvw/edtwin2.cxx
b/sw/source/uibase/docvw/edtwin2.cxx
index 0acaf59..19989be 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -94,6 +94,17 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline
rRedl, bool bBalloon )
return sBuf.makeStringAndClear();
}
+OUString SwEditWin::ClipLongToolTip(const OUString rTxt)
+{
+OUString sDisplayTxt(rTxt);
+long nTextWidth = GetTextWidth(sDisplayTxt);
+long nMaxWidth = GetDesktopRectPixel().GetWidth() * 2 / 3;
+nMaxWidth = PixelToLogic(Size(nMaxWidth, 0)).Width();
+if (nTextWidth nMaxWidth)
+sDisplayTxt = GetEllipsisString(sDisplayTxt, nMaxWidth,
TEXT_DRAW_CENTERELLIPSIS);
+return sDisplayTxt;
+}
+
void SwEditWin::RequestHelp(const HelpEvent rEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
@@ -369,7 +380,8 @@ void SwEditWin::RequestHelp(const HelpEvent rEvt)
aPt = OutputToScreenPixel( LogicToPixel(
aRect.BottomRight() ));
aRect.Right() = aPt.X();
aRect.Bottom() = aPt.Y();
-Help::ShowQuickHelp( this, aRect, sTxt, nStyle );
+OUString sDisplayTxt(ClipLongToolTip(sTxt));
+Help::ShowQuickHelp(this, aRect, sDisplayTxt, nStyle);
}
}
@@ -410,7 +422,8 @@ void SwEditWin::RequestHelp(const HelpEvent rEvt)
sTxt = SW_RESSTR(nTabRes);
Size aTxtSize( GetTextWidth(sTxt), GetTextHeight());
Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize);
-Help::ShowQuickHelp(this, aRect, sTxt);
+OUString sDisplayTxt(ClipLongToolTip(sTxt));
+Help::ShowQuickHelp(this, aRect, sDisplayTxt);
}
bContinue = false;
}
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 9871a5c..92e758d 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -286,6 +286,11 @@ public:
voidSetUseInputLanguage( bool bNew );
boolIsUseInputLanguage() const { return m_bUseInputLanguage; }
+/** fdo#55546 cut very long tooltips to 2/3 of the width of the screen
+via center ellipsis
+ */
+OUString ClipLongToolTip(const OUString rTxt);
+
SwFrameControlsManager GetFrameControlsManager() { return
m_aFrameControlsManager; }
SwEditWin(vcl::Window *pParent, SwView );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/text.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3144b8deaf8397d719b7ad7a56b309655a53d90a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 11:13:10 2014 +0100
Resolves: fdo#84809 crash when button is too short for text
regression from 4c539fac018dfd44cd8db52161a8cb930c627da7
commit 4c539fac018dfd44cd8db52161a8cb930c627da7
Date: Tue Dec 17 05:18:35 2013 -0600
vcl get rid of xub_StrLen and STRING_LEN in outdev3
before this there was a dubious cast which hid the problem
Change-Id: I7c01c0f0ac211196a62acaf02297f29ae829403d
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 6919746..9dced6c 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1582,7 +1582,7 @@ void OutputDevice::ImplDrawText( OutputDevice
rTargetDevice, const Rectangle r
long nMaxTextWidth = ImplGetTextLines( aMultiLineInfo, nWidth,
aStr, nStyle, _rLayout );
nLines = (sal_Int32)(nHeight/nTextHeight);
nFormatLines = aMultiLineInfo.Count();
-if ( !nLines )
+if (nLines = 0)
nLines = 1;
if ( nFormatLines nLines )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/templateinfodialog.ui |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit ca25f9a64cfeb4b3a20e5e2d99ffd9b5cf5c4eaf Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Thu Oct 9 04:52:55 2014 -0500 Add missing title to Template Properties dialog And disable manual resizing Change-Id: I3c78b09930833eb84bbd84a553d2f07ff8573e0b Reviewed-on: https://gerrit.libreoffice.org/11870 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sfx2/uiconfig/ui/templateinfodialog.ui b/sfx2/uiconfig/ui/templateinfodialog.ui index 0ba4f9d..51405c5 100644 --- a/sfx2/uiconfig/ui/templateinfodialog.ui +++ b/sfx2/uiconfig/ui/templateinfodialog.ui @@ -1,10 +1,13 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- - !-- interface-requires LibreOffice 1.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=TemplateInfo property name=can_focusFalse/property property name=border_width6/property +property name=title translatable=yesTemplate Properties/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/linenumbering.ui | 159 1 file changed, 62 insertions(+), 97 deletions(-) New commits: commit a2feb420fa547b89bff5e0c6f848e22f503e6602 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Thu Oct 9 03:46:10 2014 -0500 HIG: Miscellaneous improvements to Line Numbering dialog * Add colons for labels that precede colons (fdo#78826) * Sentence capitalization * More concise label for fdo#84504 * Disable nonsensical manual resizing * The usual XML dance caused by saving the file with newer Glade. Change-Id: I3b8a6d5d915c2c6cfb4cf0960f5d59bc644d4994 Reviewed-on: https://gerrit.libreoffice.org/11869 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index bab1cef..64e508b 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -1,10 +1,52 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ + object class=GtkAdjustment id=intervaladjustment +property name=lower1/property +property name=upper1000/property +property name=value5/property +property name=step_increment1/property +property name=page_increment10/property + /object + object class=GtkAdjustment id=lineadjustment +property name=upper1000/property +property name=value3/property +property name=step_increment1/property +property name=page_increment10/property + /object + object class=GtkListStore id=positionstore +columns + !-- column-name positions -- + column type=gchararray/ +/columns +data + row +col id=0 translatable=yesLeft/col + /row + row +col id=0 translatable=yesRight/col + /row + row +col id=0 translatable=yesInner/col + /row + row +col id=0 translatable=yesOuter/col + /row +/data + /object + object class=GtkAdjustment id=spacingadjustment +property name=upper/property +property name=value0.5/property +property name=step_increment1/property +property name=page_increment10/property + /object object class=GtkDialog id=LineNumberingDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesLine Numbering/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -73,21 +115,14 @@ property name=orientationvertical/property property name=spacing6/property child - object class=GtkAlignment id=alignment4 + object class=GtkCheckButton id=shownumbering +property name=label translatable=yesShow numbering/property property name=visibleTrue/property -property name=can_focusFalse/property -property name=left_padding12/property -child - object class=GtkCheckButton id=shownumbering -property name=label translatable=yesShow numbering/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=receives_defaultFalse/property -property name=halignstart/property -property name=xalign0/property -property name=draw_indicatorTrue/property - /object -/child +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=halignstart/property +property name=xalign0/property +property name=draw_indicatorTrue/property /object packing property name=expandFalse/property @@ -124,15 +159,13 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesCharacter Style/property +property name=label translatable=yesCharacter style:/property property name=use_underlineTrue/property property name=mnemonic_widgetstyledropdown/property /object packing property name=left_attach0/property property name=top_attach0/property -
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7086ac7dad014e08160f9a7f87fcfba789420828
Author: Peter Foley pefol...@pefoley.com
Date: Fri Oct 3 14:44:39 2014 -0400
make gbuild-to-ide VS files work with separate builddir
Change-Id: I847885885ed12dbbd64e3b694799e4835497d736
Reviewed-on: https://gerrit.libreoffice.org/11799
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 34ae1fb..ea4cde4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -668,7 +668,7 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
return ide_toolset_map[ide]
def module_make_command(self, targets):
-return '%(sh)s -c PATH=\\/bin:$PATH\\; cd %(location)s
%(makecmd)s -rs ' + targets + ''
+return '%(sh)s -c PATH=\\/bin:$PATH\\;BUILDDIR=\\%(builddir)s\\
%(makecmd)s -rsC %(location)s ' + targets + ''
class Project:
@@ -796,6 +796,7 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
Condition='$(Configuration)|$(Platform)'=='%s|%s' % (cfg_name, platform))
nmake_params = {
'sh': os.path.join(self.gbuildparser.binpath, 'dash.exe'),
+'builddir': self.gbuildparser.builddir,
'location': target.location,
'makecmd': self.gbuildparser.makecmd,
'target': target.target_name()}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source
chart2/source/controller/dialogs/res_ErrorBar.cxx | 20
chart2/source/controller/inc/res_ErrorBar.hxx |2 ++
2 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 38f6065b0272ae4bc80f5f35866012b4ea0bc38b
Author: Katarina Behrens bu...@bubli.org
Date: Thu Jul 17 22:35:46 2014 +0200
fdo#77319: set spinbox value AFTER adjusting no. of decimal places
Doing it the other way round truncates the values
Change-Id: Ieb14c9d1b9dde496eac24737aced7c8da8ce1346
Reviewed-on: https://gerrit.libreoffice.org/11865
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 60b4987..8157301 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -93,6 +93,8 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer*
pParent, Dialog * pPa
m_eErrorBarType( eType ),
m_nConstDecimalDigits( 1 ),
m_nConstSpinSize( 1 ),
+m_fPlusValue(0.0),
+m_fMinusValue(0.0),
m_pParentDialog( pParentDialog ),
m_pCurrentRangeChoosingField( 0 ),
m_bHasInternalDataProvider( true ),
@@ -271,6 +273,13 @@ void ErrorBarResources::UpdateControlStates()
m_pMfNegative-SetDecimalDigits( m_nConstDecimalDigits );
m_pMfNegative-SetSpinSize( m_nConstSpinSize );
}
+
+sal_Int32 nPlusValue = static_cast sal_Int32 ( m_fPlusValue *
pow(10.0,m_pMfPositive-GetDecimalDigits()) );
+sal_Int32 nMinusValue = static_cast sal_Int32 ( m_fMinusValue *
pow(10.0,m_pMfNegative-GetDecimalDigits()) );
+
+m_pMfPositive-SetValue( nPlusValue );
+m_pMfNegative-SetValue( nMinusValue );
+
m_pMfPositive-SetCustomUnitText( aCustomUnit );
m_pMfNegative-SetCustomUnitText( aCustomUnit );
@@ -530,24 +539,19 @@ void ErrorBarResources::Reset(const SfxItemSet rInAttrs)
// parameters
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, true, pPoolItem );
m_bPlusUnique = ( aState != SFX_ITEM_DONTCARE );
-double fPlusValue = 0.0;
if( aState == SFX_ITEM_SET )
{
-fPlusValue = ((const SvxDoubleItem*) pPoolItem)-GetValue();
-sal_Int32 nPlusValue = static_cast sal_Int32 ( fPlusValue *
pow(10.0,m_pMfPositive-GetDecimalDigits()) );
-m_pMfPositive-SetValue( nPlusValue );
+m_fPlusValue = ((const SvxDoubleItem*) pPoolItem)-GetValue();
}
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, true, pPoolItem
);
m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
-double fMinusValue = ((const SvxDoubleItem*) pPoolItem)-GetValue();
-sal_Int32 nMinusValue = static_cast sal_Int32 ( fMinusValue *
pow(10.0,m_pMfNegative-GetDecimalDigits()) );
-m_pMfNegative-SetValue( nMinusValue );
+m_fMinusValue = ((const SvxDoubleItem*) pPoolItem)-GetValue();
if( m_eErrorKind != CHERROR_RANGE
-fPlusValue == fMinusValue )
+m_fPlusValue == m_fMinusValue )
m_pCbSyncPosNeg-Check();
}
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx
b/chart2/source/controller/inc/res_ErrorBar.hxx
index 7851418..95706bc 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -114,6 +114,8 @@ private:
tErrorBarTypem_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits;
sal_Int64m_nConstSpinSize;
+double m_fPlusValue;
+double m_fMinusValue;
Dialog * m_pParentDialog;
boost::scoped_ptr RangeSelectionHelper m_apRangeSelectionHelper;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-7' - sc/source
sc/source/core/tool/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fb3054fcd949b375eb2739d1f1142eec270a922a Author: David Tardon dtar...@redhat.com Date: Mon Oct 6 20:24:52 2014 +0200 avoid use of ref. to possibly deleted object Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69 (cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c) Reviewed-on: https://gerrit.libreoffice.org/11832 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit 53fd61faef7100e4609076a517e349e3b2ff2109) Reviewed-on: https://gerrit.libreoffice.org/11858 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 24f0343..77d7d1d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2386,9 +2386,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references -pCode[j]-DecRef(); ScExternalSingleRefToken* pToken = new ScExternalSingleRefToken(nFileId, aTabName, rRef); pToken-IncRef(); +pCode[j]-DecRef(); // ATTENTION: rRef can't be used after this point pCode[j] = pToken; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - chart2/source desktop/test include/sfx2 qadevOOo/tests scripting/workben sc/source svx/source sw/source
chart2/source/view/axes/VCartesianAxis.cxx |6
desktop/test/deployment/options/readme.txt | 58 +-
include/sfx2/sidebar/ControllerItem.hxx |2
qadevOOo/tests/java/ifc/beans/_XPropertyState.java |2
qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java |6
qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java |2
sc/source/core/opencl/formulagroupcl.cxx |4
scripting/workben/bindings/ScriptBinding.xba | 324 +++
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 17
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |3
sw/source/core/doc/DocumentFieldsManager.cxx |2
11 files changed, 203 insertions(+), 223 deletions(-)
New commits:
commit 9defb89ede306b81a0c31a1afad9e71c95a30d32
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Oct 9 12:55:26 2014 +0200
HAS_IA2 is never defined
Change-Id: Ib71e98d1250e6d077c593801993b88c2963459b7
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index a390fed..bb9994e 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -351,23 +351,6 @@ void ParaPropertyPanel::initial()
InitToolBoxBulletsNumbering();
InitToolBoxSpacing();
InitToolBoxLineSpacing();
-
-#ifdef HAS_IA2
-mpAlignToolBox-SetAccRelationLabeledBy(mpAlignToolBox);
-mpTBxVertAlign-SetMpSubEditAccLableBy(mpTBxVertAlign);
-mpTBxNumBullet-SetAccRelationLabeledBy(mpTBxNumBullet);
-mpTBxBackColor-SetMpSubEditAccLableBy(mpTBxBackColor);
-mpTbxUL_IncDec-SetAccRelationLabeledBy(mpTbxUL_IncDec);
-mpTopDist-SetAccRelationLabeledBy(mpTopDist);
-mpBottomDist-SetAccRelationLabeledBy(mpBottomDist);
-mpLineSPTbx-SetAccRelationLabeledBy(mpLineSPTbx);
-mpTbxIndent_IncDec-SetAccRelationLabeledBy(mpTbxIndent_IncDec);
-mpTbxProDemote-SetAccRelationLabeledBy(mpTbxProDemote);
-mpLeftIndent-SetAccRelationLabeledBy(mpLeftIndent);
-mpRightIndent-SetAccRelationLabeledBy(mpRightIndent);
-mpFLineIndent-SetAccRelationLabeledBy(mpFLineIndent);
-mpColorUpdater-SetAccRelationLabeledBy(mpColorUpdater);
-#endif
}
// for Numbering Bullet
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 4cf7cfa..0ef3d8e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -181,9 +181,6 @@ void PosSizePropertyPanel::Initialize()
mpMtrWidth-SetAccessibleRelationLabeledBy(mpFtWidth);
mpMtrHeight-SetAccessibleRelationLabeledBy(mpFtHeight);
mpMtrAngle-SetAccessibleRelationLabeledBy(mpFtAngle);
-#ifdef HAS_IA2
-mpMtrAngle-SetMpSubEditAccLableBy(mpFtAngle);
-#endif
mpFlipTbx-SetAccessibleRelationLabeledBy(mpFtFlip);
mpMtrAngle-InsertValue(0, FUNIT_CUSTOM);
commit d402819eb46b19c5448360386da425136d30959d
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Oct 9 12:40:47 2014 +0200
typo: proeprty - property
Change-Id: Ib20ca28c2236fc99e1339b6e57e8641a213116c7
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
index 046e1ef..d062af9 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
@@ -204,7 +204,7 @@ public class _XPropertyState extends MultiMethodTest {
/**
* Sets the property to default, then compares the current property
* value to value received by method codegetPropertyDefault/code.
-* Has b OK /b status if the current proeprty value equals to
+* Has b OK /b status if the current property value equals to
* default property. p
* The following method tests are to be completed successfully before :
* ul
diff --git a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
index 2f09838..7cd6bf9 100644
--- a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
+++ b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
@@ -95,7 +95,7 @@ public class _DataAwareControlModel extends MultiPropertyTest
{
* if it was properly set. If code'DataAwareControlModel.NewFieldName'
* /code relation is not found, then new property value is
* 'Address'. p
-* Has b OK /b status if the proeprty was properly set
+* Has b OK /b status if the property was properly set
* and no exceptions were thrown. If old and new values are equal
* the test is OK if no exceptions occurred and the value remains
* the same.p
diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java
b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java
index 28aca58..ad69543 100644
---
Re: ESC call Thursday 16:00 central European time ...
Hi, Le 08/10/2014 15:06, Jean-Baptiste Faure a écrit : The problem is not the original patch (the patch for the master), it works perfectly and Kohei did a fantastic job with it and its complementary patch which added the configuration option allowing the choose between the new behavior and the former. Thank you very much for that. I did new tests yesterday with the master on the configuration option (fdo#81633) and it does not solve the problem anymore. :-( I do not know what happened, I am sure I tested the patch just after it was pushed to the master and that it worked for my test file. But now the current version of the master does not allow to sort correctly the test file, whatever the option is chosen. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 52 commits - avmedia/source bin/unpack-sources chart2/source configure.ac cppuhelper/source download.lst external/coinmp external/co
avmedia/source/framework/modeltools.cxx |3 bin/unpack-sources | 10 chart2/source/controller/dialogs/res_ErrorBar.cxx| 20 chart2/source/controller/inc/res_ErrorBar.hxx|2 configure.ac | 25 cppuhelper/source/servicemanager.cxx |1 download.lst |6 external/coinmp/UnpackedTarball_coinmp.mk|1 external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 10 external/collada2gltf/StaticLibrary_collada2gltf.mk |1 external/collada2gltf/UnpackedTarball_collada2gltf.mk|1 external/collada2gltf/patches/kill_c++11_code.patch.1| 5824 +++ external/freetype/UnpackedTarball_freetype.mk|1 external/freetype/freetype-msvc-disable-sse2.patch.1 | 26 external/glew/UnpackedTarball_glew.mk|1 external/glew/glew-msvc-disable-sse2.patch.1 | 10 external/icu/ExternalProject_icu.mk |2 external/lcms2/UnpackedTarball_lcms2.mk |1 external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 10 external/libgltf/UnpackedTarball_libgltf.mk |1 external/libgltf/libgltf-msvc-disable-sse2.patch.1 | 10 external/libxml2/libxml2-vc10.patch |2 external/libxmlsec/xmlsec1-vc.patch |2 external/libxslt/libxslt-vc10.patch |2 external/nss/ExternalProject_nss.mk |2 external/python3/UnpackedTarball_python3.mk |1 external/python3/python-msvc-disable-sse2.patch.1| 12 filter/source/config/fragments/filters/draw8.xcu |2 filter/source/config/fragments/filters/draw8_template.xcu|2 filter/source/config/fragments/filters/impress8.xcu |2 filter/source/config/fragments/filters/impress8_draw.xcu |2 filter/source/config/fragments/filters/impress8_template.xcu |2 i18npool/Library_localedata_euro.mk |1 i18npool/source/localedata/data/ca_ES_valencia.xml | 43 i18npool/source/localedata/data/es_CR.xml|7 i18npool/source/localedata/localedata.cxx|1 i18npool/source/search/textsearch.cxx|4 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 oox/CustomTarget_generated.mk|1 oox/source/drawingml/color.cxx | 30 oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 10 oox/source/token/properties.txt |1 oox/source/vml/vmlshape.cxx | 27 sc/source/core/tool/token.cxx|2 sc/source/ui/dbgui/validate.cxx | 12 sc/source/ui/view/cellsh2.cxx|2 sc/source/ui/view/tabvwshb.cxx |5 scp2/Module_scp2.mk |1 sd/qa/unit/data/pptx/bnc584721_4.pptx|binary sd/qa/unit/import-tests.cxx | 41 sd/source/filter/html/pubdlg.cxx |2 sd/source/ui/docshell/docshel4.cxx | 22 sd/source/ui/remotecontrol/Server.cxx|6 sd/source/ui/unoidl/UnoDocumentSettings.cxx | 26 sfx2/source/appl/shutdownicon.cxx| 196 sfx2/source/appl/shutdownicon.hxx|8 sfx2/source/appl/shutdowniconunx.cxx |1 sfx2/util/sfx.component |1 svx/Library_svxcore.mk |1 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |2 svx/source/form/dbtoolsclient.cxx|3 sw/CppunitTest_sw_ooxmlimport.mk |1 sw/Library_sw.mk |1 sw/qa/core/data/ooxml/pass/fdo73608-1.docx |binary sw/qa/core/data/ooxml/pass/fdo73608-2.docx |binary sw/qa/core/data/ooxml/pass/fdo79129.docx |binary sw/qa/core/data/ooxml/pass/fdo79131.docx |binary sw/qa/core/data/rtf/pass/fdo84536.rtf| 16 sw/qa/extras/odfimport/data/fdo79269.odt |binary sw/qa/extras/odfimport/data/fdo79269_header.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 35
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - svx/Library_svxcore.mk svx/source
svx/Library_svxcore.mk | 12
svx/source/gallery2/gallery1.cxx | 20 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit b15760a4ae63a4087c3832a99db85d45dd9c3fbf
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 8 11:28:00 2014 +0300
Don't try to create cdefghij.klm inside the app bundle on OS X when
sandboxed
Actually, we check HAVE_FEATURE_READONLY_INSTALLSET and not
HAVE_FEATURE_MACOSX_SANDBOX, but in practice we set the former only
for the latter case.
We could do this test cross-platform but I didn't bother now. Nobody
uses --enable-readonly-installset when building for Linux or Windows
anyway, I think.
(There must be more places where we could and should check
HAVE_FEATURE_READONLY_INSTALLSET.)
Change-Id: Ie54f436616a1db3119b0bc0148149784127b156d
(cherry picked from commit 96d091d43428472c2c68054ed5dca22f79adc705)
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 10f7069..0415955 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -89,6 +89,18 @@ $(eval $(call gb_Library_use_externals,svxcore,\
glew \
))
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_cxxflags,svxcore,\
+$(gb_OBJCXXFLAGS) \
+))
+
+$(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
+ Foundation \
+))
+
+endif
+
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/core/extedit \
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index d77122e..cd95038 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -17,6 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#include premac.h
+#include Foundation/Foundation.h
+#include postmac.h
+#endif
+
#include sal/config.h
#include comphelper/processfactory.hxx
@@ -235,6 +244,15 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, bool rbDirIsReadO
uno::Reference sdbc::XResultSet xResultSet( aCnt.createCursor(
aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
+#if defined(MACOSX) defined(HAVE_FEATURE_READONLY_INSTALLSET)
+if( rBaseURL.GetProtocol() == INET_PROT_FILE )
+{
+const char *appBundle = [[[NSBundle mainBundle] bundlePath]
UTF8String];
+OUString path = rBaseURL.GetURLPath();
+if( path.startsWith( OUString( appBundle, strlen( appBundle ),
RTL_TEXTENCODING_UTF8 ) + / ) )
+rbDirIsReadOnly = true;
+}
+#else
try
{
// check readonlyness the very hard way
@@ -266,7 +284,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, bool rbDirIsReadO
catch( const uno::Exception )
{
}
-
+#endif
if( xResultSet.is() )
{
uno::Reference ucb::XContentAccess xContentAccess( xResultSet,
uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Thu, Oct 09, 2014 at 10:35:46AM +0200, Stephan Bergmann sberg...@redhat.com wrote: Indeed, looks just like the columns get sorted differently over time. Yes, that's possible. There are too many columns to read those .csv's on the console, just open it in Calc, then in case of any column: if (value in the last row value in the last but one row) we are happy else we are sad Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/drawingml.cxx |8 +++-
sw/qa/extras/ooxmlexport/data/crop-pixel.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 ++
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit e16b01a9e4e111b1267c4eec1f5d168e5c2b8e53
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 9 11:09:48 2014 +0200
drawingML export: fix a:srcRect if graphic's map mode is pixels
Change-Id: Idbe399648c60e39c61e2be09a77b0648f57d3347
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4e1a0ce..f1ff69b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1063,7 +1063,13 @@ void DrawingML::WritePattFill( Reference XPropertySet
rXPropSet )
void DrawingML::WriteSrcRect( Reference XPropertySet rXPropSet, const
OUString rURL )
{
-Size aOriginalSize( GraphicObject::CreateGraphicObjectFromURL( rURL
).GetPrefSize() );
+GraphicObject aGraphicObject =
GraphicObject::CreateGraphicObjectFromURL(rURL);
+Size aOriginalSize = aGraphicObject.GetPrefSize();
+const MapMode rMapMode = aGraphicObject.GetPrefMapMode();
+
+// GraphicCrop is in mm100, so in case the original size is in pixels,
convert it over.
+if (rMapMode.GetMapUnit() == MAP_PIXEL)
+aOriginalSize =
Application::GetDefaultDevice()-PixelToLogic(aOriginalSize,
MapMode(MAP_100TH_MM));
if ( GetProperty( rXPropSet, GraphicCrop ) )
{
diff --git a/sw/qa/extras/ooxmlexport/data/crop-pixel.docx
b/sw/qa/extras/ooxmlexport/data/crop-pixel.docx
new file mode 100644
index 000..1ddb2ef
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/crop-pixel.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 279be00..3c0a592 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -435,6 +435,16 @@ DECLARE_OOXMLEXPORT_TEST(testTextboxTable,
textbox-table.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
}
+DECLARE_OOXMLEXPORT_TEST(testCropPixel, crop-pixel.docx)
+{
+// If map mode of the graphic is in pixels, then we used to handle original
+// size of the graphic as mm100, but it was in pixels.
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+// This is 17667 in the original document (i.e. should be 2), but
+// was 504666, so the image become invisible.
+assertXPath(pXmlDoc, //a:srcRect, l, 19072);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Bugzilla commit notifications not working
As of 2014-10-01, the Commit Notification bot doesn’t work. Perhaps this was caused by the upgrade of FreeDesktop.org’s Bugzilla installation to 4.4.5, which happened that day. Anyone who could have a look? Thanks. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bugzilla commit notifications not working
Hi, On Thu, Oct 09, 2014 at 06:21:27AM -0500, Adolfo Jayme Barrientos f...@libreoffice.org wrote: As of 2014-10-01, the Commit Notification bot doesn’t work. Perhaps this was caused by the upgrade of FreeDesktop.org’s Bugzilla installation to 4.4.5, which happened that day. Anyone who could have a look? The code is here: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/ciabot/ libreoffice-bugzilla.pl is the script that is invoked for each commit, then it's expected that it does the bugzilla notification. Copy config.pl.sample to config.pl, set your bugzilla username / password, then you can run it (see run-libreoffice-ciabot.pl on how it's invoked for each commit). If you (or anybody else who is into bugzilla / perl) can spot the problem, and send a patch to fix it, I'm happy to test and/or merge it + update the production instance. Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 4 commits - package/inc package/source
package/inc/ZipOutputStream.hxx| 27 -
package/inc/ZipPackageEntry.hxx| 12
package/inc/ZipPackageFolder.hxx | 11
package/source/zipapi/ZipOutputStream.cxx | 241 -
package/source/zippackage/ZipPackage.cxx |3
package/source/zippackage/ZipPackageEntry.cxx | 24
package/source/zippackage/ZipPackageFolder.cxx | 627 +
package/source/zippackage/ZipPackageStream.cxx | 16
8 files changed, 492 insertions(+), 469 deletions(-)
New commits:
commit e54e5fa12b7a88d7fc39a076fdf801c295daf341
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Oct 9 13:15:22 2014 +0200
ZipOutputStream: No need to explicitly set default values
Change-Id: Ia3a20e0692e658d847e1b825fc97e32ac8a1854b
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index a8d106b..146e642 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -52,7 +52,7 @@ protected:
CRC32 m_aCRC;
ByteChucker m_aChucker;
ZipEntry*m_pCurrentEntry;
-sal_Int16 m_nMethod, m_nLevel, m_nDigested;
+sal_Int16 m_nDigested;
boolm_bFinished, m_bEncryptCurrentEntry;
ZipPackageStream* m_pCurrentStream;
@@ -69,10 +69,6 @@ public:
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
// XZipOutputStream interfaces
-void SAL_CALL setMethod( sal_Int32 nNewMethod )
-throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setLevel( sal_Int32 nNewLevel )
-throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL putNextEntry( ZipEntry rEntry,
ZipPackageStream* pStream,
bool bEncrypt = false )
diff --git a/package/source/zipapi/ZipOutputStream.cxx
b/package/source/zipapi/ZipOutputStream.cxx
index 0a64d09..34f0979 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -45,8 +45,6 @@ ZipOutputStream::ZipOutputStream( const uno::Reference
uno::XComponentContext
, m_aDeflater(DEFAULT_COMPRESSION, true)
, m_aChucker(xOStream)
, m_pCurrentEntry(NULL)
-, m_nMethod(DEFLATED)
-, m_nLevel(0)
, m_nDigested(0)
, m_bFinished(false)
, m_bEncryptCurrentEntry(false)
@@ -60,17 +58,6 @@ ZipOutputStream::~ZipOutputStream( void )
delete m_aZipList[i];
}
-void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod )
-throw(RuntimeException)
-{
-m_nMethod = static_cast sal_Int16 (nNewMethod);
-}
-void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel )
-throw(RuntimeException)
-{
-m_aDeflater.setLevel( nNewLevel);
-}
-
void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry rEntry,
ZipPackageStream* pStream,
bool bEncrypt)
@@ -81,7 +68,7 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry rEntry,
if (rEntry.nTime == -1)
rEntry.nTime = getCurrentDosTime();
if (rEntry.nMethod == -1)
-rEntry.nMethod = m_nMethod;
+rEntry.nMethod = DEFLATED;
rEntry.nVersion = 20;
rEntry.nFlag = 1 11;
if (rEntry.nSize == -1 || rEntry.nCompressedSize == -1 ||
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index 6dd1e82..3bc0627 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1139,9 +1139,6 @@ uno::Reference io::XInputStream
ZipPackage::writeTempFile()
// Hand it to the ZipOutputStream:
ZipOutputStream aZipOut( m_xContext, xTempOut );
-aZipOut.setMethod( DEFLATED );
-aZipOut.setLevel( DEFAULT_COMPRESSION );
-
try
{
if ( m_nFormat == embed::StorageFormats::PACKAGE )
commit d5bd56a7eb22769adc292d723f01ef83b24143cf
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Oct 7 16:04:13 2014 +0200
Split ZipPackageFolder::saveChild into two functions
And make them static. Probably would be better to kill ContentInfo and
add saveChild as pure virtual into ZipPackageEntry, from which are both
ZipPackageFolder and ZipPackageStream inheriting.
This will also create a bit more sensible call graph when profiling.
Change-Id: If8151332cfa6359e8736c912b7a5633a9162ab36
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 81eddd7..6053b48 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -79,10 +79,13 @@ public:
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( bool bRemove ) {
this-mbAllowRemoveOnInsert = bRemove; }
-bool saveChild(const OUString rShortName, const
com::sun::star::packages::ContentInfo rInfo, OUString rPath, std::vector
com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx | 54 +++-
1 file changed, 21 insertions(+), 33 deletions(-)
New commits:
commit ae77dc81c33ab0817264bcf5fc8bb71a55b78a73
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Mon Oct 6 15:51:21 2014 +0200
fdo#75757: remove inheritance to std::vector
from StyleTreeArr_Impl.
Change-Id: I44621f913fc1b7ce0da9f41e4e0864edaea474b2
Reviewed-on: https://gerrit.libreoffice.org/11826
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index f44bfe9..c8d5e61 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -599,21 +599,23 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(
EnableContextMenuHandling();
}
-
-
-class StyleTreeArr_Impl;
-
/* [Description]
Internal structure for the establishment of the hierarchical view
*/
+class StyleTree_Impl;
+typedef std::vectorStyleTree_Impl* StyleTreeArr_Impl;
-struct StyleTree_Impl
+class StyleTree_Impl
{
+private:
OUString aName;
OUString aParent;
-StyleTreeArr_Impl *pChildren;
+StyleTreeArr_Impl pChildren;
bool bIsExpanded;
+
+public:
+
bool HasParent() const { return !aParent.isEmpty(); }
StyleTree_Impl(const OUString rName, const OUString rParent):
@@ -621,42 +623,29 @@ struct StyleTree_Impl
~StyleTree_Impl();
void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
sal_uIntPtr Count();
-};
-
-class StyleTreeArr_Impl : public std::vectorStyleTree_Impl*
-{
-public:
-~StyleTreeArr_Impl()
-{
-for(const_iterator it = begin(); it != end(); ++it)
-delete *it;
-}
+OUString getName() { return aName; }
+OUString getParent() { return aParent; }
+StyleTree_Impl *operator[](size_t idx) const { return pChildren[idx]; }
};
sal_uIntPtr StyleTree_Impl::Count()
{
-return pChildren ? pChildren-size() : 0L;
+return pChildren.size();
}
-
-
StyleTree_Impl::~StyleTree_Impl()
{
-delete pChildren;
+for(StyleTreeArr_Impl::const_iterator it = pChildren.begin(); it !=
pChildren.end(); ++it)
+delete *it;
}
-
-
void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
{
-if ( !pChildren )
-pChildren = new StyleTreeArr_Impl;
-
if ( ULONG_MAX == lPos )
-pChildren-push_back( pIns );
+pChildren.push_back( pIns );
else
-pChildren-insert( pChildren-begin() + (sal_uInt16)lPos, pIns );
+pChildren.insert( pChildren.begin() + (sal_uInt16)lPos, pIns );
}
@@ -679,12 +668,12 @@ StyleTreeArr_Impl MakeTree_Impl(StyleTreeArr_Impl rArr)
for(sal_uInt16 j = 0; j nCount; ++j)
{
StyleTree_Impl* pCmp = rArr[j];
-if(pCmp-aName == pEntry-aParent)
+if(pCmp-getName() == pEntry-getParent())
{
// Paste initial filter
sal_uInt16 nPos;
for( nPos = 0 ; nPos pCmp-Count()
- aSorter.compare((*pCmp-pChildren)[nPos]-aName,
pEntry-aName) 0 ; nPos++)
+ aSorter.compare((*pCmp)[nPos]-getName(),
pEntry-getName()) 0 ; nPos++)
{};
pCmp-Put(pEntry,nPos);
break;
@@ -724,10 +713,9 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox,
const ExpandedEntries_t rEntries,
SvTreeListEntry* pParent = 0)
{
-SvTreeListEntry* pNewEntry = pBox-InsertEntry(pEntry-aName, pParent);
-const sal_uInt16 nCount = pEntry-pChildren ? pEntry-pChildren-size() :
0;
-for(sal_uInt16 i = 0; i nCount; ++i)
-FillBox_Impl(pBox, (*pEntry-pChildren)[i], rEntries, pNewEntry);
+SvTreeListEntry* pNewEntry = pBox-InsertEntry(pEntry-getName(), pParent);
+for(sal_uInt16 i = 0; i pEntry-Count(); ++i)
+FillBox_Impl(pBox, (*pEntry)[i], rEntries, pNewEntry);
return pNewEntry;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source basic/source chart2/source connectivity/inc connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source filter/source
basctl/source/dlged/dlged.cxx |4 basctl/source/dlged/dlgedobj.cxx |4 basctl/source/inc/dlgedobj.hxx|4 basic/source/runtime/methods1.cxx |4 chart2/source/controller/main/ChartController_Window.cxx |4 chart2/source/view/main/DrawModelWrapper.cxx |2 connectivity/inc/pch/precompiled_dbtools.hxx |2 connectivity/source/commontools/RowFunctionParser.cxx |2 cui/source/tabpages/grfpage.cxx |4 cui/source/tabpages/transfrm.cxx | 28 dbaccess/source/ui/inc/JoinController.hxx |2 desktop/source/lib/init.cxx |2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |6 editeng/source/editeng/impedit3.cxx |6 filter/source/graphicfilter/eos2met/eos2met.cxx | 36 filter/source/graphicfilter/epict/epict.cxx | 38 filter/source/graphicfilter/eps/eps.cxx |4 filter/source/graphicfilter/ios2met/ios2met.cxx |4 filter/source/graphicfilter/ipict/ipict.cxx |6 filter/source/graphicfilter/ipsd/ipsd.cxx |4 filter/source/graphicfilter/itiff/itiff.cxx |2 filter/source/msfilter/eschesdo.cxx |2 filter/source/msfilter/msdffimp.cxx | 44 filter/source/msfilter/svdfppt.cxx|6 filter/source/pdf/pdfexport.cxx |1 filter/source/svg/svgwriter.cxx |8 forms/source/richtext/richtextimplcontrol.cxx |2 include/oox/export/chartexport.hxx|2 include/oox/export/shapes.hxx |2 include/sfx2/ipclient.hxx | 10 include/sfx2/objsh.hxx|4 include/sfx2/viewfrm.hxx |4 include/sfx2/viewsh.hxx |4 include/svtools/imap.hxx |4 include/svtools/imapcirc.hxx |4 include/svtools/imappoly.hxx |4 include/svtools/imaprect.hxx |4 include/svtools/ruler.hxx |6 include/svx/obj3d.hxx |2 include/svx/scene3d.hxx |4 include/svx/sdr/properties/defaultproperties.hxx |2 include/svx/sdr/properties/properties.hxx |4 include/svx/svddrag.hxx |6 include/svx/svddrgmt.hxx |4 include/svx/svdedtv.hxx |6 include/svx/svdetc.hxx|6 include/svx/svdglev.hxx |2 include/svx/svdmodel.hxx | 22 include/svx/svdoashp.hxx |4 include/svx/svdobj.hxx|4 include/svx/svdocapt.hxx |2 include/svx/svdocirc.hxx |2 include/svx/svdoedge.hxx |2 include/svx/svdograf.hxx |2 include/svx/svdogrp.hxx |4 include/svx/svdomeas.hxx |2 include/svx/svdoole2.hxx |4 include/svx/svdopath.hxx |2 include/svx/svdorect.hxx |2 include/svx/svdotable.hxx |2 include/svx/svdotext.hxx |6 include/svx/svdouno.hxx |2 include/svx/svdovirt.hxx |4 include/svx/svdpoev.hxx |2 include/svx/svdsnpv.hxx | 12 include/svx/svdtrans.hxx | 40 include/svx/sxfiitm.hxx | 10 include/svx/sxsiitm.hxx |4 include/tools/bigint.hxx |4 include/tools/fract.hxx | 142 --
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/AccessibleSelectionHandler.java |3 ++-
toolkit/test/accessibility/AccessibleTextHandler.java |4 ++--
toolkit/test/accessibility/SelectionDialog.java|2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 14cccfab8111c61bf6707eef423abe79e95f5572
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Thu Oct 9 13:02:21 2014 +0200
As of JDK version 1.5, show() and hide() in Dialog have been deprecated
Change-Id: If96e40ebe2c59f31ca4e2b81c6583eb7f8d5ec81
Reviewed-on: https://gerrit.libreoffice.org/11873
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java
b/toolkit/test/accessibility/AccessibleSelectionHandler.java
index 546bd69..2d4f64f 100644
--- a/toolkit/test/accessibility/AccessibleSelectionHandler.java
+++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java
@@ -140,6 +140,7 @@ class AccessibleSelectionHandler
@Override
public void performAction (AccessibleTreeNode aNode, int nIndex)
{
-new SelectionDialog( (AccTreeNode)aNode ).show();
+SelectionDialog selectionDialog = new SelectionDialog(
(AccTreeNode)aNode );
+selectionDialog.setVisible(true);
}
}
diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java
b/toolkit/test/accessibility/AccessibleTextHandler.java
index 2190253..d29eefd 100644
--- a/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -480,7 +480,7 @@ class AccessibleTextHandler extends NodeHandler
}
if( aDialog != null )
-aDialog.show();
+aDialog.setVisible(true);
}
}
@@ -550,7 +550,7 @@ abstract class TextActionDialog extends JDialog
void cancel()
{
-hide();
+setVisible(false);
dispose();
}
diff --git a/toolkit/test/accessibility/SelectionDialog.java
b/toolkit/test/accessibility/SelectionDialog.java
index 5ca8ca8..10d8413 100644
--- a/toolkit/test/accessibility/SelectionDialog.java
+++ b/toolkit/test/accessibility/SelectionDialog.java
@@ -134,7 +134,7 @@ class SelectionDialog extends JDialog
void close ()
{
-hide();
+setVisible(false);
dispose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa
sc/source/core/data/document10.cxx |4 ++--
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +---
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 4cdce63daf162709c3eff0f9c6c90ecc32109c21
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 9 13:36:44 2014 +0200
testCropPixel: relax requirements a bit for OS X
Change-Id: I5b72e39371671718ac31bbd92a4649a66a1241cf
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3c0a592..cf2c5c0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -440,9 +440,11 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, crop-pixel.docx)
// If map mode of the graphic is in pixels, then we used to handle original
// size of the graphic as mm100, but it was in pixels.
if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
-// This is 17667 in the original document (i.e. should be 2), but
-// was 504666, so the image become invisible.
-assertXPath(pXmlDoc, //a:srcRect, l, 19072);
+{
+// This is 17667 in the original document, was 504666 (so the image
+// become invisible), now is around 19072.
+CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32()
2);
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
commit 2b6619c597a791775e2d41a68f7e85ef75d1aaa2
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Thu Oct 9 13:02:18 2014 +0800
fdo#84810 Avoid calc crash when using Paste Special - Link
Change-Id: I52c072578ccc0b9f75a850613056e74d400eb532
Reviewed-on: https://gerrit.libreoffice.org/11867
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index 5689a68..5b286ec 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -84,6 +84,8 @@ bool ScDocument::CopyOneCellFromClip(
return false;
ScCellValue rSrcCell = rCxt.getSingleCell();
+const ScPatternAttr* pAttr = pClipDoc-GetPattern(aSrcPos);
+rCxt.setSingleCellPattern(pAttr);
if (rCxt.isAsLink())
{
ScSingleRefData aRef;
@@ -97,8 +99,6 @@ bool ScDocument::CopyOneCellFromClip(
else
{
rSrcCell.set(pClipDoc-GetRefCellValue(aSrcPos));
-const ScPatternAttr* pAttr = pClipDoc-GetPattern(aSrcPos);
-rCxt.setSingleCellPattern(pAttr);
// Check the paste flag to see whether we want to paste this cell. If
the
// flag says we don't want to paste this cell, we'll return with true.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/wmf/enhwmf.cxx |2 +-
vcl/source/filter/wmf/winmtf.cxx | 10 +-
vcl/source/filter/wmf/winmtf.hxx | 19 ---
vcl/source/filter/wmf/winwmf.cxx |2 +-
4 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 27ff44965e60a56071d325bde62287a862a53ab7
Author: Noel Grandin n...@peralex.com
Date: Thu Oct 9 14:48:01 2014 +0300
convert BKMODE #defines to 'enum class'
mostly to get the TRANSPARENT #define out of the global namespace
Change-Id: Iec592d26d4d12b5f30f7f9a04dd377a1fb20d643
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 5b33913..290437c 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -775,7 +775,7 @@ bool EnhWMFReader::ReadEnhWMF()
case EMR_SETBKMODE :
{
pWMF-ReadUInt32( nDat32 );
-pOut-SetBkMode( nDat32 );
+pOut-SetBkMode( static_castBkMode(nDat32) );
}
break;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index a6cddf1..5153574 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -611,7 +611,7 @@ void WinMtfOutput::SetTextLayoutMode( ComplexTextLayoutMode
nTextLayoutMode )
mnTextLayoutMode = nTextLayoutMode;
}
-void WinMtfOutput::SetBkMode( sal_uInt32 nMode )
+void WinMtfOutput::SetBkMode( BkMode nMode )
{
mnBkMode = nMode;
}
@@ -803,8 +803,8 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile rGDIMetaFile ) :
maBkColor ( COL_WHITE ),
mnLatestTextLayoutMode( TEXT_LAYOUT_DEFAULT ),
mnTextLayoutMode( TEXT_LAYOUT_DEFAULT ),
-mnLatestBkMode ( 0 ),
-mnBkMode( OPAQUE ),
+mnLatestBkMode ( BkMode::NONE ),
+mnBkMode( BkMode::OPAQUE ),
meLatestRasterOp( ROP_INVERT ),
meRasterOp ( ROP_OVERPAINT ),
maActPos( Point() ),
@@ -907,7 +907,7 @@ void WinMtfOutput::UpdateLineStyle()
void WinMtfOutput::UpdateFillStyle()
{
if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if
no brush is selected
-maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == TRANSPARENT );
+maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode ==
BkMode::TRANSPARENT );
if (!( maLatestFillStyle == maFillStyle ) )
{
maLatestFillStyle = maFillStyle;
@@ -1398,7 +1398,7 @@ void WinMtfOutput::DrawText( Point rPosition, OUString
rText, long* pDXArry, b
aTmp.SetColor( maTextColor );
aTmp.SetFillColor( maBkColor );
-if( mnBkMode == TRANSPARENT )
+if( mnBkMode == BkMode::TRANSPARENT )
aTmp.SetTransparent( true );
else
aTmp.SetTransparent( false );
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 2989556..8eae615 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -40,9 +40,13 @@
#define RGN_DIFF4
#define RGN_COPY5
-#define TRANSPARENT 1
-#define OPAQUE 2
-#define BKMODE_LAST 2
+enum class BkMode
+{
+NONE = 0,
+TRANSPARENT = 1,
+OPAQUE = 2,
+LAST = 2
+};
/* xform stuff */
#define MWT_IDENTITY1
@@ -471,7 +475,8 @@ struct XForm
struct SaveStruct
{
-sal_uInt32 nBkMode, nMapMode, nGfxMode;
+BkMode nBkMode;
+sal_uInt32 nMapMode, nGfxMode;
ComplexTextLayoutMode nTextLayoutMode;
sal_Int32 nWinOrgX, nWinOrgY, nWinExtX, nWinExtY;
sal_Int32 nDevOrgX, nDevOrgY, nDevWidth, nDevHeight;
@@ -596,8 +601,8 @@ class WinMtfOutput
Color maBkColor;
ComplexTextLayoutMode mnLatestTextLayoutMode;
ComplexTextLayoutMode mnTextLayoutMode;
-sal_uInt32 mnLatestBkMode;
-sal_uInt32 mnBkMode;
+BkMode mnLatestBkMode;
+BkMode mnBkMode;
RasterOpmeLatestRasterOp;
RasterOpmeRasterOp;
@@ -680,7 +685,7 @@ public:
voidSetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode =
nGfxMode; };
sal_Int32 GetGfxMode() const { return mnGfxMode; };
-voidSetBkMode( sal_uInt32 nMode );
+voidSetBkMode( BkMode nMode );
voidSetBkColor( const Color rColor );
voidSetTextColor( const Color rColor );
voidSetTextAlign( sal_uInt32 nAlign );
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 919e9f1..fa2dc1b 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -176,7 +176,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
{
sal_uInt16 nDat = 0;
pWMF-ReadUInt16( nDat );
-
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d4c1e55d7a61952b4569ce2f229cbae1cad65044
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 9 14:07:33 2014 +0200
-Werror,-Wunused-private-field
Change-Id: Ia7370c4aaa6c0bf69eab13979b6d2209dae695f0
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c8d5e61..ed3b6a2 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -612,14 +612,13 @@ private:
OUString aName;
OUString aParent;
StyleTreeArr_Impl pChildren;
-bool bIsExpanded;
public:
bool HasParent() const { return !aParent.isEmpty(); }
StyleTree_Impl(const OUString rName, const OUString rParent):
-aName(rName), aParent(rParent), pChildren(0), bIsExpanded(false) {}
+aName(rName), aParent(rParent), pChildren(0) {}
~StyleTree_Impl();
void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
sal_uIntPtr Count();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 84810, which changed state. Bug 84810 Summary: crash in paste special when combine options link and format https://bugs.freedesktop.org/show_bug.cgi?id=84810 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/pagectrl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d0f9675021a07261b2182fb3192c26e2263eff8 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 9 14:15:44 2014 +0200 -Werror,-Wliteral-conversion (implicit conversion from double to long) Change-Id: I89095491d67c382a0b3280755d723039f48229f1 diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 7aa7e8b..998271e 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -128,7 +128,7 @@ void SvxPageWindow::Paint(const Rectangle) // Draw Landscape page of the same size boost::rationallong aX = aMapMode.GetScaleX(); boost::rationallong aY = aMapMode.GetScaleY(); -boost::rationallong a2(1.5); +boost::rationallong a2(3, 2); aX *= a2; aY *= a2; aMapMode.SetScaleX(aX); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/document10.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b2707c0545d7cc762a9ccfbb8a3b3cea495195e2
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Thu Oct 9 13:02:18 2014 +0800
fdo#84810 Avoid calc crash when using Paste Special - Link
Change-Id: I52c072578ccc0b9f75a850613056e74d400eb532
Reviewed-on: https://gerrit.libreoffice.org/11867
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 2b6619c597a791775e2d41a68f7e85ef75d1aaa2)
Reviewed-on: https://gerrit.libreoffice.org/11875
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index e468dd3..baf7314 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -76,6 +76,8 @@ bool ScDocument::CopyOneCellFromClip(
return false;
ScCellValue rSrcCell = rCxt.getSingleCell();
+const ScPatternAttr* pAttr = pClipDoc-GetPattern(aSrcPos);
+rCxt.setSingleCellPattern(pAttr);
if (rCxt.isAsLink())
{
ScSingleRefData aRef;
@@ -89,8 +91,6 @@ bool ScDocument::CopyOneCellFromClip(
else
{
rSrcCell.set(pClipDoc-GetRefCellValue(aSrcPos));
-const ScPatternAttr* pAttr = pClipDoc-GetPattern(aSrcPos);
-rCxt.setSingleCellPattern(pAttr);
// Check the paste flag to see whether we want to paste this cell. If
the
// flag says we don't want to paste this cell, we'll return with true.
___
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/compressedarray.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 430747397508f297be7ae1fa734a43ea705e9a43
Author: Laurent Godard lgodard.li...@laposte.net
Date: Thu Oct 9 14:26:49 2014 +0200
remove warning: ânIndexâ may be used uninitialized
Change-Id: I317c2f4409f556ab967e4f08caa99cffcfce26cc
Reviewed-on: https://gerrit.libreoffice.org/11876
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/data/compressedarray.cxx
b/sc/source/core/data/compressedarray.cxx
index 234d96b..ebe2822 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -241,7 +241,7 @@ template typename A, typename D
void ScCompressedArrayA,D::CopyFrom( const ScCompressedArrayA,D rArray, A
nStart,
A nEnd, long nSourceDy )
{
-size_t nIndex;
+size_t nIndex = 0;
A nRegionEnd;
for (A j=nStart; j=nEnd; ++j)
{
@@ -373,7 +373,7 @@ void ScBitMaskCompressedArrayA,D::CopyFromAnded(
const ScBitMaskCompressedArrayA,D rArray, A nStart, A nEnd,
const D rValueToAnd, long nSourceDy )
{
-size_t nIndex;
+size_t nIndex = 0;
A nRegionEnd;
for (A j=nStart; j=nEnd; ++j)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl_process.mk sal/qa
sal/CppunitTest_sal_osl_process.mk |4 sal/qa/osl/process/osl_process.cxx | 16 2 files changed, 20 insertions(+) New commits: commit 69f8a4cc1022edb386ae985cd39f0518d21a89d1 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 9 10:03:20 2014 +0100 disable environment equality test under valgrind Change-Id: I9e0e06331f134fe89c9942f93b7546b0e67bb821 diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index b6688d7..6c254d9 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -19,6 +19,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_CppunitTest_use_externals,sal_osl_process,\ +valgrind \ +)) + $(eval $(call gb_CppunitTest_use_executable,sal_osl_process,osl_process_child)) # vim: set noet sw=4 ts=4: diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 4713e5f..b0ef781 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -37,6 +37,10 @@ #include osl/module.hxx #include sal/macros.h +#if defined HAVE_VALGRIND_HEADERS +#include valgrind/memcheck.h +#endif + #if ( defined WNT ) // Windows # include windows.h # include tchar.h @@ -363,6 +367,12 @@ public: osl_freeProcessHandle(process); +#if defined HAVE_VALGRIND_HEADERS +//valgrind makes these not match +if (RUNNING_ON_VALGRIND) +return; +#endif + CPPUNIT_ASSERT_MESSAGE ( Parent and child environment not equal, @@ -421,6 +431,12 @@ public: different_child_env_vars.push_back(ENV2); different_child_env_vars.push_back(ENV4); +#if defined HAVE_VALGRIND_HEADERS +//valgrind makes these not match +if (RUNNING_ON_VALGRIND) +return; +#endif + CPPUNIT_ASSERT_MESSAGE ( osl_execProc_merged_child_environment, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Branch libreoffice-4-3-3 and Tag libreoffice-4.3.3.1-buildfix1 created
Hi all, The tag libreoffice-4.3.3.1-buildfix1 (AKA 4.3.3 RC1) and the corresponding branch libreoffice-4-3-3 have been created. The branch will be used for fine tuning of the 4.3.3 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-3' branch is still active and will be used for the 4.3.4 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.3_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-3 origin/libreoffice-4-3-3 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.3.1-buildfix1 libreoffice-4.3.3.1-buildfix1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-3-3 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.2 RC2 (4.3.2 final) Happy hacking, Christian + core + 1~ instead of ~1 and 10~ instead of 1~0 (fdo#84757) [Caolán McNamara] + : Export to PDF with footnotes in tables crash (fdo#84283) [Julien Nabet] + : Wrong CRC Costa Rica currency symbol (fdo#84260) [Julien Nabet] + add GetAddressConvention to RefButton (fdo#83848) [Laurent Balland-Poirier] + add missing legacyOnly currency, (fdo#84260) [Eike Rathke] + add stub locale data for Catalan (Valencian) (fdo#83292) [Andras Timar] + added missing media extensions (fdo#82994) [Daniel Sikeler] + added some more audio formats (fdo#82994) [Daniel Sikeler] + allow pasting into input fields (fdo#76565) [Jan-Marek Glogowski] + avoid accessing 1 character after a string (fdo#83141) [Matthew J. Francis] + avoid use of ref. to possibly deleted object [David Tardon] + be sure to update the sheet index when moving the sort range. (fdo#84009) [Kohei Yoshida] + branch libreoffice-4-3-3 [Christian Lohmaier] + bump product version to 4.3.3.0.0+ [Robinson Tryon] + bump product version to 4.3.3.1 [Christian Lohmaier] + calc is not accessible to screen readers if sheet is modified [a11y] (fdo#81264) [Niklas Johansson] + changed filterlabel of .ac3-files (fdo#82994) [Daniel Sikeler] + crash after 3rd call to ApplicationScriptLibraryContainer (fdo#81635, fdo#79301, fdo#66706, fdo#70607) [Caolán McNamara] + crash in DomainMapper_Impl::CloseFieldCommand (fdo#79130) [Caolán McNamara] + crash in EnhancedCustomShapeTypeNames::Get (fdo#79131) [Caolán McNamara] + crash in oox::drawingml::LayoutNode::setupShape (fdo#79129) [Caolán McNamara] + crash on adding new macro library (fdo#81039) [Caolán McNamara] + css.office.Quickstart should be single-instance service. (fdo#80927) [Matúš Kukan] + css::uno::Reference::query does not have side effects [Stephan Bergmann] + disable sdremote by default, and improve flow control. [Michael Meeks] + display data description in pivot table. (bnc#592918) [Kohei Yoshida] + do not terminate desktop from a Timer [Stephan Bergmann] + don't assign NULL to boost::shared_ptr [Jan-Marek Glogowski] + don't crash on loading specific .docx (fdo#66496) [Caolán McNamara] + don't double destroy the HASH when PDF signing. (fdo#66701) [Michael Meeks] + don't even attempt to unload libqstart_gtklo.so again (i#101245) [Stephan Bergmann] + dos2unix on SSE2 patch files [Andras Timar] + empty/Not empty doesn't work in columns with date format (fdo#65281) [David Ostrovsky] + ensure that the row position is below MAXROW. (fdo#83764) [Kohei Yoshida] + error C2216: 'override' cannot be used with 'inline' [Andras Timar] + error C2782: template parameter '_Ty' is ambiguous [Miklos Vajna] + file crashed while saving. (fdo#82895, fdo#78907) [PriyankaGaikwad] + fix copypaste of conditional format between sheets [Markus Mohrhard] + fix input field tab handling [Jan-Marek Glogowski] + fix ODF import of style:footer-first (fdo#79269) [Michael Stahl] + fix tarball.rebuild on windows [Zolnai Tamás] + fix unpacking of additional tarballs (fdo#82144) [David Tardon] + fix Windows build again [Andras Timar] + fix/improve handling of mso-position-(horizontal|vertical)(-relative) [Luboš Luňák] + handle docx's w:anchor layoutInCell attribute (bnc#891663)
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffc06f9f62497cf6a3ca1ad01e53e0c07ce57c75 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 9 14:54:46 2014 +0200 Updated core Project: help 301caf5470aec71aeac5327f452c15a28caa2f10 diff --git a/helpcontent2 b/helpcontent2 index b1065d4..301caf5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b1065d43c77fc050760c7427d371b5460b54d249 +Subproject commit 301caf5470aec71aeac5327f452c15a28caa2f10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/02010100.xhp | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 301caf5470aec71aeac5327f452c15a28caa2f10
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Oct 9 14:54:46 2014 +0200
add missing paragraph id
Change-Id: I567f054384b50df14011569681bf6341e3550a66
diff --git a/source/text/shared/explorer/database/02010100.xhp
b/source/text/shared/explorer/database/02010100.xhp
index 83a2849..6f1da65 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -576,7 +576,7 @@
/tablecell
/tablerow
-tablerow
+tablerow
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id315379A xml-lang=en-US l10n=U
oldref=118lt;'2001-01-10'/paragraph
/tablecell
@@ -646,7 +646,7 @@
tablerow
tablecell colspan= rowspan=
paragraph role=tablehead id=par_id31537341 xml-lang=en-US l10n=U
oldref=253Date Type Element/paragraph
-/tablecell
+/tablecell
tablecell colspan= rowspan=
paragraph role=tablehead id=par_id31537342 xml-lang=en-US l10n=U
oldref=253SQL Escape syntax #1 - may be obsolete/paragraph
/tablecell
@@ -661,7 +661,7 @@
tablerow
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id315913111 xml-lang=en-US l10n=U
oldref=254Date/paragraph
-/tablecell
+/tablecell
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id315913112 xml-lang=en-US l10n=U
oldref=254{D'-MM-DD'}/paragraph
/tablecell
@@ -684,8 +684,8 @@
/tablecell
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id31559474 xml-lang=en-US l10n=U
oldref=264'HH:MI:SS[.SS]' /paragraph
-/tablecell
-/tablerow
+/tablecell
+/tablerow
tablerow
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id31509641 xml-lang=en-US l10n=U
oldref=257DateTime/paragraph
@@ -698,13 +698,13 @@
/tablecell
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id31509644 xml-lang=en-US l10n=U
oldref=264'-MM-DD HH:MI:SS[.SS]' /paragraph
-/tablecell
-/tablerow
+/tablecell
+/tablerow
/table
-
+
paragraph role=paragraph id=par_id3149539 xml-lang=en-US l10n=U
oldref=267Example: select {d '1999-12-31'} from world.years/paragraph
- paragraph role=paragraph xml-lang=en-US l10n=UExample: select *
from mytable where years='1999-12-31' /paragraph
+ paragraph role=paragraph id=par_id3149540 xml-lang=en-US
l10n=UExample: select * from mytable where years='1999-12-31' /paragraph
paragraph role=paragraph id=par_id3150510 xml-lang=en-US l10n=U
oldref=112All date expressions (literals) must be enclosed with single
quotation marks. (Consult the reference for the particular database and
connnector you are using for more details.)/paragraph
!--//kls end moved --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/gcach_layout.cxx |2 +-
vcl/generic/glyphs/scrptrun.cxx |3 +++
vcl/generic/glyphs/scrptrun.h |4
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 227ca23324fabd77abae1b7eb6186ba11d519fae
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 14:21:30 2014 +0100
move copy of icu's ScriptRun into vcl namespace
Change-Id: Idbd3f3e903d6e411d565d29884e52862c3e1cc58
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index 3f065bb..abd04ba 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout rLayout,
ImplLayoutArgs rArgs)
rLayout.Reserve(nGlyphCapacity);
-ScriptRun aScriptRun(reinterpret_castconst UChar *(rArgs.mpStr),
rArgs.mnLength);
+vcl::ScriptRun aScriptRun(reinterpret_castconst UChar *(rArgs.mpStr),
rArgs.mnLength);
Point aCurrPos(0, 0);
while (true)
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index f72d296..965fbf1 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -41,6 +41,8 @@
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
+namespace vcl {
+
const char ScriptRun::fgClassID=0;
UChar32 ScriptRun::pairedChars[] = {
@@ -230,3 +232,4 @@ UBool ScriptRun::next()
return true;
}
+}
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 6e9bbd6..56ea88c 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -44,6 +44,8 @@
#include unicode/uobject.h
#include unicode/uscript.h
+namespace vcl {
+
struct ScriptRecord
{
UChar32 startChar;
@@ -181,4 +183,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t
start, int32_t length)
reset(start, length);
}
+}
+
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/moduldl2.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 6033e2d29d7ee9df5201c9834ba6b070da03e98e Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 9 15:40:08 2014 +0100 Resolves: fdo#60904 allow export of VBAProject xModLibContainerExport has a VBAProject entry but xDlgLibContainerExport doesn't, so just export the one we do have Change-Id: I15f7794904a5aff7679f2cf9fd654d741fd5cbe3 diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 0428182..15e16db 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1106,8 +1106,14 @@ void LibPage::implExportLib( const OUString aLibName, const OUString aTargetUR if ( xModLibContainerExport.is() ) xModLibContainerExport-exportLibrary( aOULibName, aTargetURL, Handler ); -if ( xDlgLibContainerExport.is() ) -xDlgLibContainerExport-exportLibrary( aOULibName, aTargetURL, Handler ); +if (!xDlgLibContainerExport.is()) +return; +Referencecontainer::XNameAccess xNameAcc(xDlgLibContainerExport, UNO_QUERY); +if (!xNameAcc.is()) +return; +if (!xNameAcc-hasByName(aOULibName)) +return; +xDlgLibContainerExport-exportLibrary(aOULibName, aTargetURL, Handler); } // Implementation XCommandEnvironment ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Andras, Caolán, David, Michael, Miklos, Kendy, Stephan, Cloph, Muthu, Eike, Robinson, Michael S, Jacobo, Bjoern, Kohei * Completed Action Items: + provide wiki links for new processes for design interation (Mirek) [if you want a UX topic be discussed, just go to http://pad.documentfoundation.org/p/design and add it as a topic, it will be discussed at the next meeting (Kendy)] + copy/paste the 4.3 schedule - 4.5 schedule wiki page (Cloph) [ https://wiki.documentfoundation.org/ReleasePlan/4.5 distro builders, please check whether it is conflicting with your schedule, labelled preliminary, please check ] + create an Easy-hack for enabling XML validators automatically (Miklos) [ Have a script that easily sets it up: fdo#84600 ] * Pending Action Items: + Ask Bjoern to do a survey on the wrench icons (Kendy) + come back next week with a proposal for Mac / gatekeeper bits (Norbert) * Release Engineering update (Cloph) + 4.2.7 RC2 + next week is the deadline for the final version of 4.2.x + also time for the first alpha release of 4.4 + reviews appreciated for: + some custom wrapper for LibreOffice needs adapting: + https://gerrit.libreoffice.org/#/c/11700/ AI: + review it (Andras, Caolan, Cloph, Michael) + 4.3.3 RC1 + tagged, built and announced to early-testing QA lists. + deadline for RC2 is in ~2x weeks. + master + switched master to create only one core package for deb/RPM + just 'core' not core01 - core07 + thought the reason was that EPM wasn't able to do big pkgs (Caolan) + EPM had a limitation on a certain file-size; but only an issue for a debug build in RPM form (Cloph) + even with the split, you couldn't reasonably build RPMs with debuginfo and EPM - it would fail. + lots more scope for improvement there (Michael) + hard to see what depends on what (Cloph) + Android Remote * Crashtest update (Miklos) + new results: http://dev-builds.libreoffice.org/crashtest/24fb87501ef9d5aa715d572de7eb5efe49a0d9c3/ (07-Oct-2014) + nothing super-exciting + xlsx issues seem lower with threading fix. + some new writer redline asserts; but not really crashers + hitting the new assertions. + recent assertion changes hard to nail (Caolan) + PDF ones fell from 15 to 5, and database 7 to nothing + unclear why - is the VM the same etc. ? + Yes (Miklos) + perhaps some intermittency; a big improvement since Miklos started building them. + are the old traces reproducible (Michael) + all the old data is still there (Miklos) + some of the PDF issues were hard to reproduce anyway, some PDF export timeout (?) - a race condition ? + perhaps load on machine dropped ? (Michael) * Hackfests + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + scope / focus issues are broadened fixed. AI: + get BZ migration roadmap done for then (Bjoern) + Toulouse Hackfest (Arnaud) + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + budget reserved (Eur 2k) - poke Bjoern. + Munich hack-fest (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + jmux (IRC) can add you if you don't want to create an account + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + we should drop by with 2 or 3 developers, if possible * UX Update (Kendy) + had an amusing issue around table toolbar button behavior + a monster thread; encouraged Cor into the design call + cleared the situation up. + no way to measure what is good for users + so hacked up dumping the amount of clicked buttons in toolbars + talking to Samuel - wrt. looking at Mozilla code in this area. + http://blog.mozilla.org/metrics/2011/08/25/do-90-of-people-not-use-ctrlf/ + https://testpilot.mozillalabs.com/ + hope to re-use the server side. + as of now - dump it into the user profile mail it. + connect it to the infobar etc. (?) + getting people on the call was great. + huge thread wouldn't need to be so huge with better communication + 8x people on the call vs. 4x last week + some good things, and Heiko colleague of Bjoern from User-Prompt there too. + #libreoffice-design IRC chat is live now. + is
[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/breakit.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d7418f8831acdff907d404c1701870b00e974df6
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 16:08:22 2014 +0100
Resolves: fdo#65823 crash on negative position in redlined word
there is possibly something deeper wrong here I think after all, see
946ea643185af680508a0333f63c086ed3f454a3 Resolves: fdo#84649 as well but for
now silence this and I can investigate further later
Change-Id: I1323584d1f71c14634d56ad4e4a705496b1bd1c0
diff --git a/sw/source/core/bastyp/breakit.cxx
b/sw/source/core/bastyp/breakit.cxx
index f3b229c..eec3b79 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -108,7 +108,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString
rTxt, sal_Int32 nPos
nScript = xBreak-getScriptType( rTxt, nPos );
sal_Int32 nChgPos = 0;
-if ( i18n::ScriptType::WEAK == nScript nPos + 1 rTxt.getLength() )
+if (i18n::ScriptType::WEAK == nScript nPos = 0 nPos + 1
rTxt.getLength())
{
// A weak character followed by a mark may be meant to combine with
// the mark, so prefer the following character's script
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |2 +-
sw/source/core/doc/docglos.cxx | 10 +-
sw/source/ui/dbui/mmoutputpage.cxx |5 +
sw/source/uibase/dbui/dbmgr.cxx| 30 ++
4 files changed, 17 insertions(+), 30 deletions(-)
New commits:
commit d3a04fdebf65c7381f1087fbd27104a56ba08e78
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Thu Oct 9 17:13:01 2014 +0200
copy document defaults/properties for separate mailmerge result files
Also remove code duplication (that I'm not even sure why it's there).
Change-Id: I9a20fe0de9b34adbd03155712869bb19f5969f9b
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index cbc9f0d..c072fd1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -914,7 +914,7 @@ public:
This includes the user defined document properties!
*/
-void ReplaceDocumentProperties(const SwDoc rSource);
+void ReplaceDocumentProperties(const SwDoc rSource, bool mailMerge =
false);
// Query if style (paragraph- / character- / frame- / page-) is used.
bool IsUsed( const SwModify ) const;
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 390177e..1507832 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -88,7 +88,7 @@ void SwDoc::ReplaceUserDefinedDocumentProperties(const SwDoc
rSource)
ReplaceUserDefinedDocumentProperties( xSourceDocProps );
}
-void SwDoc::ReplaceDocumentProperties(const SwDoc rSource)
+void SwDoc::ReplaceDocumentProperties(const SwDoc rSource, bool mailMerge)
{
uno::Referencedocument::XDocumentPropertiesSupplier xSourceDPS(
rSource.GetDocShell()-GetModel(), uno::UNO_QUERY_THROW);
@@ -110,6 +110,7 @@ void SwDoc::ReplaceDocumentProperties(const SwDoc rSource)
xDocProps-setDescription(xSourceDocProps-getDescription());
xDocProps-setKeywords(xSourceDocProps-getKeywords());
xDocProps-setLanguage(xSourceDocProps-getLanguage());
+// Note: These below originally weren't copied for mailmerge, but I don't
see why not.
xDocProps-setModifiedBy(xSourceDocProps-getModifiedBy());
xDocProps-setModificationDate(xSourceDocProps-getModificationDate());
xDocProps-setPrintedBy(xSourceDocProps-getPrintedBy());
@@ -124,6 +125,13 @@ void SwDoc::ReplaceDocumentProperties(const SwDoc rSource)
xDocProps-setEditingCycles(xSourceDocProps-getEditingCycles());
xDocProps-setEditingDuration(xSourceDocProps-getEditingDuration());
+if( mailMerge ) // Note: Not sure this is needed.
+{
+// Manually set the creation date, otherwise author field isn't filled
+// during MM, as it's set when saving the document the first time.
+xDocProps-setCreationDate( xSourceDocProps-getModificationDate() );
+}
+
ReplaceUserDefinedDocumentProperties( xSourceDocProps );
}
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx
b/sw/source/ui/dbui/mmoutputpage.cxx
index f1ced02..ba2aa1e 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -56,6 +56,7 @@
#include com/sun/star/sdbcx/XColumnsSupplier.hpp
#include com/sun/star/sdb/XColumn.hpp
#include com/sun/star/task/ErrorCodeIOException.hpp
+#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
#include dbmgr.hxx
#include swunohelper.hxx
#include osl/mutex.hxx
@@ -66,6 +67,7 @@
#include dbui.hxx
#include dbui.hrc
#include helpid.h
+#include doc.hxx
#include sfx2/app.hxx
#include statstr.hrc
#include unomid.h
@@ -679,6 +681,9 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl,
PushButton*, pButton)
aOpt.SetMerge( false );
pTempView-GetDocShell()-LoadStylesFromFile(
sTargetTempURL, aOpt, true );
+pTempView-GetDocShell()-GetDoc()-ReplaceCompatabilityOptions(
*pTargetView-GetDocShell()-GetDoc());
+pTempView-GetDocShell()-GetDoc()-ReplaceDefaults(
*pTargetView-GetDocShell()-GetDoc());
+pTempView-GetDocShell()-GetDoc()-ReplaceDocumentProperties(
*pTargetView-GetDocShell()-GetDoc(), true );
pTargetView-GetWrtShell().PastePages(pTempView-GetWrtShell(),
(sal_uInt16)rInfo.nStartPageInTarget,
(sal_uInt16)rInfo.nEndPageInTarget );
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 225b3cc..4d50418 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -776,32 +776,6 @@ static void lcl_RemoveSectionLinks( SwWrtShell rWorkShell
)
rWorkShell.SetLabelDoc( false );
}
-// based on SwDoc::ReplaceDocumentProperties
-static void lcl_CopyDocumentPorperties(
-const uno::Referencedocument::XDocumentProperties xSourceDocProps,
-const SfxObjectShell *xTargetDocShell, SwDoc *pTargetDoc)
-{
-uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
-xTargetDocShell-GetModel(), uno::UNO_QUERY_THROW);
-uno::Referencedocument::XDocumentProperties xTargetDocProps(
[Libreoffice-commits] core.git: 3 commits - dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk include/jvmfwk jvmfwk/distributions jvmfwk/Library_
Repository.mk |1 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk |1 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk|1 include/jvmfwk/framework.h | 13 include/jvmfwk/jvmfwkplugindllapi.h | 24 - include/jvmfwk/vendorplugin.h |9 jvmfwk/Library_jvmfwk.mk| 23 jvmfwk/Library_sunjavaplugin.mk | 62 -- jvmfwk/Module_jvmfwk.mk |1 jvmfwk/README |2 jvmfwk/distributions/OpenOfficeorg/javavendors.xsd | 31 - jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |6 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml|8 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |6 jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml |4 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |4 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |5 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx| 16 jvmfwk/source/elements.hxx | 17 jvmfwk/source/framework.cxx | 277 +--- jvmfwk/source/fwkbase.cxx | 111 jvmfwk/source/fwkbase.hxx | 13 sal/qa/osl/process/osl_process.cxx | 91 +-- solenv/gbuild/CppunitTest.mk|1 ure/source/README |2 25 files changed, 120 insertions(+), 609 deletions(-) New commits: commit 2c914e3ff69811ca04ecccf30a582c58b34a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 9 17:24:52 2014 +0200 Remove jvmfwk plugin feature ...which was effectively unused; there only ever was a single sunjavaplugin that is now folded directly into jvmfwk. Leaves room for further clean up. Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b diff --git a/Repository.mk b/Repository.mk index 05365ec..706bf7a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -519,7 +519,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ sal_textenc \ stocservices \ store \ - $(if $(ENABLE_JAVA),sunjavaplugin) \ unoidl \ uuresolver \ xmlreader \ diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 0331398..2fe7e94 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest, jvmfwk \ sal \ subsequenttest \ -sunjavaplugin \ utl \ test \ tk \ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 07a96ec..9cc4718 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -25,7 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \ jvmfwk \ sal \ subsequenttest \ -sunjavaplugin \ utl \ test \ tk \ diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h index dc99015..e791a1f 100644 --- a/include/jvmfwk/framework.h +++ b/include/jvmfwk/framework.h @@ -197,7 +197,6 @@ typedef enum _javaFrameworkError JFW_E_NEED_RESTART, JFW_E_RUNNING_JVM, JFW_E_JAVA_DISABLED, -JFW_E_NO_PLUGIN, JFW_E_NOT_RECOGNIZED, JFW_E_FAILED_VERSION, JFW_E_NO_JAVA_FOUND, @@ -376,7 +375,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) @return JFW_E_NONE function ran successfully.br/ JFW_E_ERROR an error occurred. br/ -JFW_E_NO_PLUGIN a plug-in library could not be found.br/ JFW_E_NO_JAVA_FOUND no JRE was found that meets the requirements./br JFW_E_DIRECT_MODE the function cannot be used in this mode. /br JFW_E_CONFIGURATION mode was not properly set or their prerequisites @@ -407,7 +405,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pIn JFW_E_NONE function ran successfully.br/ JFW_E_INVALID_ARG at least on of the parameters was NULLbr/ JFW_E_ERROR an error occurred. br/ -JFW_E_NO_PLUGIN a plug-in library could not be found.br/ JFW_E_CONFIGURATION mode was not properly set or their prerequisites were not met. */ @@ -439,7 +436,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs( JFW_E_ERROR an error occurred. br/ JFW_E_CONFIGURATION mode was not properly set or their prerequisites
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2014-10-09 at 15:59 +0100, Michael Meeks wrote: Writer - 151 (+9) Spreadsheet - 96 (+3) Presentation - 32 (+0) Crashes - 31 (+0) Database - 25 (-1) Libreoffice - 24 (+0) Graphics - 23 (+1) UI - 23 (+0) Drawing - 19 (+3) Borders - 19 (+0) Filters - 18 (+1) Print / PDF - 14 (+0) Chart - 11 (+1) BASIC - 5 (+0) Extensions - 5 (+0) Linguistic - 4 (+0) Installation - 4 (+0) Formula - 4 (+0) framework - 1 (+0) sdk - 0 (+0) Impress Remote - 0 (+0) Wouldn't it be nice if the bugs could be split into two categories of 100% reproducible and not, and script the 100% reproducers and automatically re-run the script on each milestone to see which ones got fixed in passing. Though I guess in practice that would depend on reliable gui automation in a lot of cases. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Lightproof] Binary URP bridge disposed during call
Hi,
I recently discovered the existance of the Lightproof grammar checker, and I
would like to experiment wth it for the Galician language, mainly to
complement our Hunspell spellchecker, which allows words that are actually
only correct when used together. I know about LanguageTool, but I like the
LightProof approach better (easier syntax, Python), and in any case I would
aim to write rules in some software-agnostic format that I can convert to both
the Lightproof and the LanguageTool formats.
So, first stone in my path:
$ git clone git://anongit.freedesktop.org/libreoffice/lightproof
$ cd lightproof
$ python3 make.py src/hu_HU/hu_HU.cfg
$ libreoffice lightproof_hu-1.5.oxt
Click OK
And I get:
(com.sun.star.lang.DisposedException) { { { Message = Binary URP
bridge
disposed during call, Context = (com.sun.star.uno.XInterface)
@7f7570034d40 } } }
I’ve searched for Binary URP bridge disposed during call and found some
posts online¹, but so far I have had no luck solving the issue.
Anyone else has run into this and solved the issue, or knows how to solve it?
Do I need to build Libreoffice with some special flag? (I had read about “--
enable-lightproof” somewhere, but that flag does not exist)
—
¹ e.g. I am currently looking at https://bugs.archlinux.org/task/27257
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmoutputpage.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit fab88063281761dbdac7ea550072660fe0f8c863 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Thu Oct 9 17:47:42 2014 +0200 copy document defaults/properties for separate mailmerge result files #2 Another place, sigh. Change-Id: Id5b73ade2ee5de5d89abf98a0fe2608d5100240b diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index ba2aa1e..369d41f 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1088,6 +1088,9 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) aOpt.SetMerge( false ); pTempView-GetDocShell()-LoadStylesFromFile( sTargetTempURL, aOpt, true ); +pTempView-GetDocShell()-GetDoc()-ReplaceCompatabilityOptions( *pTargetView-GetDocShell()-GetDoc()); +pTempView-GetDocShell()-GetDoc()-ReplaceDefaults( *pTargetView-GetDocShell()-GetDoc()); +pTempView-GetDocShell()-GetDoc()-ReplaceDocumentProperties( *pTargetView-GetDocShell()-GetDoc(), true ); pTargetView-GetWrtShell().PastePages(pTempView-GetWrtShell(), (sal_uInt16)rInfo.nStartPageInTarget, (sal_uInt16)rInfo.nEndPageInTarget ); pTargetView-GetWrtShell().EndAction(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/source
svgio/source/svgreader/svgnode.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit f73813d9e0f13e3bdf735f8626dbf540701a1900
Author: Armin Le Grand a...@apache.org
Date: Thu Oct 9 15:03:55 2014 +
i125329 Take care of Css selector '*'
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 5f4afdf..0149324 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -201,6 +201,15 @@ namespace svgio
// check the hierarchy for concatenated patterns of Selectors
fillCssStyleVectorUsingHierarchyAndSelectors(rClassStr, *this,
rtl::OUString());
+
+// #125329# find Css selector '*', add as last element if found
+const SvgStyleAttributes* pNew =
getDocument().findGlobalCssStyleAttributes(rtl::OUString::createFromAscii(*));
+
+if(pNew)
+{
+// add CssStyle for selector '*' if found
+maCssStyleVector.push_back(pNew);
+}
}
const SvgStyleAttributes* SvgNode::checkForCssStyle(const
rtl::OUString rClassStr, const SvgStyleAttributes rOriginal) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/dialog/backingwindow.cxx |7 +
sfx2/source/dialog/backingwindow.hxx |1
sfx2/uiconfig/ui/startcenter.ui | 139 ---
3 files changed, 90 insertions(+), 57 deletions(-)
New commits:
commit fe421533614cce6819c72c16f19b8de19e0d99da
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 17:07:43 2014 +0100
Resolves: fdo#83003 provide a means to return from template view
Change-Id: Ie6d2cfb5ee28fbd9395a49fa074a252c9c6e20ec
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 0d5801d..1e87b42 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -101,6 +101,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
m_pUIBuilder = new VclBuilder(this, getUIRootDir(),
sfx/ui/startcenter.ui, StartCenter );
get(mpOpenButton, open_all);
+get(mpRecentButton, open_recent);
get(mpTemplateButton, templates_all);
get(mpCreateLabel, create_label);
@@ -274,6 +275,7 @@ void BackingWindow::initControls()
mpLocalView-setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
setupButton( mpOpenButton );
+setupButton( mpRecentButton );
setupButton( mpTemplateButton );
setupButton( mpWriterAllButton );
setupButton( mpDrawAllButton );
@@ -545,6 +547,11 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
}
+else if( pButton == mpRecentButton )
+{
+mpLocalView-Hide();
+mpAllRecentThumbnails-Show();
+}
else if( pButton == mpTemplateButton )
{
mpAllRecentThumbnails-Hide();
diff --git a/sfx2/source/dialog/backingwindow.hxx
b/sfx2/source/dialog/backingwindow.hxx
index 72c8a67..cc1e9e5 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -62,6 +62,7 @@ class BackingWindow
com::sun::star::uno::Reference
com::sun::star::datatransfer::dnd::XDropTargetListener mxDropTargetListener;
PushButton* mpOpenButton;
+PushButton* mpRecentButton;
MenuButton* mpTemplateButton;
FixedText* mpCreateLabel;
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index e23d8f8..18660ce 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,7 +1,7 @@
?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.0 on Fri Aug 8 17:26:41 2014 --
+!-- Generated with glade 3.16.1 --
interface
- !-- interface-requires gtk+ 3.0 --
+ requires lib=gtk+ version=3.0/
!-- interface-requires LibreOffice 1.0 --
object class=GtkImage id=calc_all_image
property name=visibleTrue/property
@@ -18,6 +18,51 @@
property name=can_focusFalse/property
property name=pixbufres/odg_32_8.png/property
/object
+ object class=GtkMenu id=filtermenu
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkMenuItem id=filter_writer
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesWriter Templates/property
+ /object
+/child
+child
+ object class=GtkMenuItem id=filter_calc
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesCalc Templates/property
+ /object
+/child
+child
+ object class=GtkMenuItem id=filter_impress
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesImpress Templates/property
+ /object
+/child
+child
+ object class=GtkMenuItem id=filter_draw
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesDraw Templates/property
+ /object
+/child
+child
+ object class=GtkSeparatorMenuItem id=menuitem3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+ /object
+/child
+child
+ object class=GtkMenuItem id=edit
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesEdit Templates/property
+ /object
+/child
+ /object
object class=GtkImage id=impress_all_image
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -33,6 +78,11 @@
property name=can_focusFalse/property
property name=pixbufframework/res/folder_32.png/property
/object
+ object class=GtkImage id=open_all_image1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufframework/res/folder_32.png/property
+ /object
object class=GtkImage
[Libreoffice-commits] core.git: 2 commits - include/jvmfwk jvmfwk/inc jvmfwk/Library_jvmfwk.mk jvmfwk/plugins jvmfwk/source
include/jvmfwk/jvmfwkdllapi.h |1
include/jvmfwk/vendorplugin.h | 257
jvmfwk/Library_jvmfwk.mk|5
jvmfwk/inc/vendorplugin.hxx | 247 +++
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |6
jvmfwk/source/framework.cxx |2
jvmfwk/source/framework.hxx |4
7 files changed, 256 insertions(+), 266 deletions(-)
New commits:
commit 04a290b107ac0c0c7b1e03da541a4a0c315743e1
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 9 18:08:19 2014 +0200
vendorplugin.h is jvmfwk-internal (and no need for extern C)
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 5b99f58..15f1a26 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -19,6 +19,11 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\
))
endif
+$(eval $(call gb_Library_set_include,jvmfwk,\
+-I$(SRCDIR)/jvmfwk/inc \
+$$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_api,jvmfwk,\
udkapi \
))
diff --git a/include/jvmfwk/vendorplugin.h b/jvmfwk/inc/vendorplugin.hxx
similarity index 98%
rename from include/jvmfwk/vendorplugin.h
rename to jvmfwk/inc/vendorplugin.hxx
index d51943e..02ea040 100644
--- a/include/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -18,18 +18,13 @@
*/
/** @HTML */
-#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
-#define INCLUDED_JVMFWK_VENDORPLUGIN_H
+#ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
+#define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
#include jvmfwk/framework.h
#include rtl/ustring.h
#include jni.h
-#ifdef __cplusplus
-extern C {
-#endif
-
-
/**
@file
p
@@ -247,11 +242,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
*/
javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
-#ifdef __cplusplus
-}
-#endif
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index ab5153d..d1e02ce 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -51,7 +51,7 @@
#include jni.h
#include rtl/byteseq.hxx
-#include jvmfwk/vendorplugin.h
+#include vendorplugin.hxx
#include util.hxx
#include sunversion.hxx
#include vendorlist.hxx
@@ -200,7 +200,6 @@ extern C void JNICALL abort_handler()
}
-extern C
javaPluginError jfw_plugin_getAllJavaInfos(
rtl_uString *sVendor,
rtl_uString *sMinVersion,
@@ -330,7 +329,6 @@ javaPluginError jfw_plugin_getAllJavaInfos(
return JFW_PLUGIN_E_NONE;
}
-extern C
javaPluginError jfw_plugin_getJavaInfoByPath(
rtl_uString *path,
rtl_uString *sVendor,
@@ -585,7 +583,6 @@ static void do_msvcr_magic(rtl_uString *jvm_dll)
during instantiation.
/p
*/
-extern C
javaPluginError jfw_plugin_startJavaVirtualMachine(
const JavaInfo *pInfo,
const JavaVMOption* arOptions,
@@ -782,7 +779,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return errorcode;
}
-extern C
javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
{
javaPluginError ret = JFW_PLUGIN_E_NONE;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cd7d551..bdb75f7 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -23,7 +23,7 @@
#include osl/thread.hxx
#include osl/file.hxx
#include jvmfwk/framework.h
-#include jvmfwk/vendorplugin.h
+#include vendorplugin.hxx
#include cassert
#include vector
#include functional
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 808bff5..0d0ba18 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -22,9 +22,9 @@
#include rtl/ustring.hxx
#include rtl/byteseq.hxx
#include jvmfwk/framework.h
-#include jvmfwk/vendorplugin.h
+#include vendorplugin.hxx
-/** typedefs for functions from vendorplugin.h
+/** typedefs for functions from vendorplugin.hxx
*/
typedef javaPluginError (*jfw_plugin_getAllJavaInfos_ptr)(
rtl_uString * sVendor,
commit 0ef36a8d631bf891db9ada80e6a213c8b08392b7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 9 17:56:25 2014 +0200
Remove unused JVMFWK_DLLPRIVATE
Change-Id: I9b562e085e0b2a446a16ff5189c1d6b03c0d924b
diff --git a/include/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.h
index 52c8273..a4919bf 100644
--- a/include/jvmfwk/jvmfwkdllapi.h
+++ b/include/jvmfwk/jvmfwkdllapi.h
@@ -17,7 +17,6 @@
#else
# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b5167e1866efb646270edce8b37894a93bea2cde
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 9 17:18:24 2014 +0100
Related: fdo#83003 warp directly to the templates/recentfiles on changing
mode
which has the side-effect that the keyboard and tab key will cycle
through all the contents of the start center. Otherwise in the template
view on first clicking templates you are stuck
Change-Id: Iceed2492e8dde28c0ada381ef0f430738441179f
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 1e87b42..08ccff1 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -551,6 +551,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
{
mpLocalView-Hide();
mpAllRecentThumbnails-Show();
+mpAllRecentThumbnails-GrabFocus();
}
else if( pButton == mpTemplateButton )
{
@@ -558,6 +559,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
mpLocalView-Show();
mpLocalView-reload();
+mpLocalView-GrabFocus();
}
return 0;
}
@@ -598,6 +600,7 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*,
pButton )
mpAllRecentThumbnails-Hide();
mpLocalView-Show();
mpLocalView-reload();
+mpLocalView-GrabFocus();
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source dbaccess/source dbaccess/uiconfig
connectivity/source/commontools/DateConversion.cxx |6 +++---
connectivity/source/parse/sqlbison.y |8
dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 +-
dbaccess/uiconfig/ui/specialsettingspage.ui|2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit ee12e843c609e747be2f7d5a89ffd889c78378de
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Oct 5 21:14:46 2014 +0200
fdo#84073: change ODBC/JDBC escapes to lowercase
Change-Id: I19ce3acb9575fbef8273bbd84cb4dc322e101ac8
diff --git a/connectivity/source/commontools/DateConversion.cxx
b/connectivity/source/commontools/DateConversion.cxx
index 24e41dd..f762c64 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -136,7 +136,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType,
const Any _rVal, bool b
if ( bOk )
{
if (bQuote)
-aRet.appendAscii({TS ');
+aRet.appendAscii({ts ');
aRet.append(DBTypeConversion::toDateTimeString(aDateTime));
if (bQuote)
aRet.appendAscii('});
@@ -166,7 +166,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType,
const Any _rVal, bool b
bOk = _rVal = aDate;
OSL_VERIFY_RES( bOk, DBTypeConversion::toSQLString: _rVal
is not date!);
if (bQuote)
-aRet.appendAscii({D ');
+aRet.appendAscii({d ');
aRet.append(DBTypeConversion::toDateString(aDate));
if (bQuote)
aRet.appendAscii('});
@@ -193,7 +193,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType,
const Any _rVal, bool b
bOk = _rVal = aTime;
OSL_VERIFY_RES( bOk,DBTypeConversion::toSQLString: _rVal
is not time!);
if (bQuote)
-aRet.appendAscii({T ');
+aRet.appendAscii({t ');
aRet.append(DBTypeConversion::toTimeString(aTime));
if (bQuote)
aRet.appendAscii('});
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index e63bfe1..7a2ad83 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4660,6 +4660,14 @@ OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID,
const IParseContext* pCont
aStr = yytname[YYTRANSLATE(nTokenID)];
if(aStr.startsWith(SQL_TOKEN_))
aStr = aStr.copy(10);
+ switch( nTokenID )
+ {
+ case SQL_TOKEN_OJ:
+ case SQL_TOKEN_TS:
+ case SQL_TOKEN_T:
+ case SQL_TOKEN_D:
+ aStr = aStr.toAsciiLowerCase();
+ }
}
return aStr;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index c095a73..4914156 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1074,7 +1074,7 @@ namespace
{
// create outer join
if ( bUseEscape )
-aStr += { OJ ;
+aStr += { oj ;
aStr += aJoin;
if ( bUseEscape )
aStr += };
diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui
b/dbaccess/uiconfig/ui/specialsettingspage.ui
index 3574615..0072f8c 100644
--- a/dbaccess/uiconfig/ui/specialsettingspage.ui
+++ b/dbaccess/uiconfig/ui/specialsettingspage.ui
@@ -76,7 +76,7 @@
/child
child
object class=GtkCheckButton id=useoj
-property name=label translatable=yesUse Outer Join
syntax '{OJ }'/property
+property name=label translatable=yesUse Outer Join
syntax '{oj }'/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/qa
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e0b14b922204acf541bedf658236d30dc5878fca
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Oct 9 18:26:21 2014 +0200
forgotten part of previous commit
Change-Id: If050e630edacef67ab194c0b6941a6542e4ebceb
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index 7cb054b..08eea00 100644
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -51,7 +51,7 @@ public class SingleSelectQueryComposer extends
CRMBasedTestCase
+ OR ( \ID\ = 3 AND \Postal\ = '6' AND \Address\ = '7' )
+ OR ( \Address\ = '8' )
+ OR ( \Postal\ = '9' )
-+ OR ( NOW( ) = {D '2010-01-01' } );
++ OR ( NOW( ) = {d '2010-01-01' } );
private final static String INNERPRODUCTSQUERY = products (inner);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/nss
download.lst |2 external/nss/ExternalProject_nss.mk |2 external/nss/nspr-build-config.patch | 3370 +++ external/nss/nss-linux-x86.patch.0 | 12 external/nss/nss-pem.patch | 17 external/nss/nss.aix.patch | 133 - external/nss/nss.patch | 160 - external/nss/nss_macosx.patch| 66 8 files changed, 2103 insertions(+), 1659 deletions(-) New commits: commit 726172e3eb8370125b89f853cebb1fb901547ebe Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 29 16:58:50 2014 +0100 bump nss from 3.15.3 to 3.16.5 Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/download.lst b/download.lst index e8f336b..3be0bbc 100644 --- a/download.lst +++ b/download.lst @@ -105,7 +105,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz -export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz +export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 08291e0..c12c24a 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ $(call gb_ExternalProject_get_state_target,nss,configure): $(call gb_ExternalProject_run,configure,\ - $(if $(filter MSC,$(COM)),LIB=$(ILIB)) \ + $(if $(filter MSC,$(COM)),INCLUDE=$(COMPATH)/include LIB=$(ILIB)) \ $(if $(CROSS_COMPILING),\ NSINSTALL=$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py) \ nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ diff --git a/external/nss/nspr-build-config.patch b/external/nss/nspr-build-config.patch index 5395997..5fce0ec 100644 --- a/external/nss/nspr-build-config.patch +++ b/external/nss/nspr-build-config.patch @@ -1,1484 +1,38 @@ a/a/nspr/build/autoconf/config.guess 2013-11-09 10:49:40.0 +0100 -+++ b/b/nspr/build/autoconf/config.guess 2014-07-09 12:46:25.0 +0200 -@@ -1,13 +1,12 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2005-10-13' -+timestamp='2014-03-23' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -16,26 +15,22 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see http://www.gnu.org/licenses/. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner p...@bothner.com. --# Please send patches to config-patc...@gnu.org. Submit a context --# diff and a properly formatted ChangeLog entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 (GPLv3). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgnode.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit e17a730c0076b10678c860ae3285bc8a98282415
Author: Armin Le Grand a...@apache.org
Date: Thu Oct 9 15:03:55 2014 +
Resolves: #i125329# Take care of Css selector '*'
(cherry picked from commit f73813d9e0f13e3bdf735f8626dbf540701a1900)
Conflicts:
svgio/source/svgreader/svgnode.cxx
Change-Id: Ifc5df8bed47d69709ef590eced19635b6b9580d0
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 029fdf8..edd287b 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -194,6 +194,15 @@ namespace svgio
// check the hierarchy for concatenated patterns of Selectors
fillCssStyleVectorUsingHierarchyAndSelectors(rClassStr, *this,
OUString());
+
+// #i125329# find Css selector '*', add as last element if found
+const SvgStyleAttributes* pNew =
getDocument().findGlobalCssStyleAttributes(*);
+
+if(pNew)
+{
+// add CssStyle for selector '*' if found
+maCssStyleVector.push_back(pNew);
+}
}
const SvgStyleAttributes* SvgNode::checkForCssStyle(const OUString
rClassStr, const SvgStyleAttributes rOriginal) 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' - f7/3813d9e0f13e3bdf735f8626dbf540701a1900
f7/3813d9e0f13e3bdf735f8626dbf540701a1900 |1 + 1 file changed, 1 insertion(+) New commits: commit d00ae844ef364b8419221dd4f77972bce0c4d2f5 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 9 17:32:36 2014 +0100 Notes added by 'git notes add' diff --git a/f7/3813d9e0f13e3bdf735f8626dbf540701a1900 b/f7/3813d9e0f13e3bdf735f8626dbf540701a1900 new file mode 100644 index 000..de80f30 --- /dev/null +++ b/f7/3813d9e0f13e3bdf735f8626dbf540701a1900 @@ -0,0 +1 @@ +merged as: e17a730c0076b10678c860ae3285bc8a98282415 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Lightproof] Binary URP bridge disposed during call
On 10/09/2014 05:48 PM, Adrian Chaves Fernandez wrote:
$ git clone git://anongit.freedesktop.org/libreoffice/lightproof
$ cd lightproof
$ python3 make.py src/hu_HU/hu_HU.cfg
$ libreoffice lightproof_hu-1.5.oxt
Click OK
And I get:
(com.sun.star.lang.DisposedException) { { { Message = Binary URP
bridge
disposed during call, Context = (com.sun.star.uno.XInterface)
@7f7570034d40 } } }
I cannot reproduce that failure, at least with my local Linux x86_64
master build.
During extension installation, soffice.bin spawns a uno.bin process with
which it communicates via URP. Binary URP bridge disposed during call
mostly means that the other end (i.e., uno.bin in this case) crashed.
Assuming you're on Linux,
ulimit -c unlimited
and re-doing the experiment might leave around a core file of the
crashed process (on which to use gdb to get a backtrace).
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement - Juan Picca
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, Oct 09, 2014 at 04:35:12PM +0100, Caolán McNamara wrote: Wouldn't it be nice if the bugs could be split into two categories of 100% reproducible and not, and script the 100% reproducers and automatically re-run the script on each milestone to see which ones got fixed in passing. Though I guess in practice that would depend on reliable gui automation in a lot of cases. Hmm, I kinda like that. Just wondering: Maybe we should have an EasyHack to write tests for these regressions? At least some of those should be possible to recreate in good test code. For one, this would give us relevant information: 1/ Is this regression really still around on master 2/ Should allow full-auto bibisect to the commit introducing the trouble 3/ Is this a Heisenbug? Does it happen on all platform? etc. And fianlly: We will have a test in the end even after this is fixed. After all, we all know that the motivation to write a test drops even harder once there is a fix as this is not a problem anymore. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
Hi, On Thu, Oct 09, 2014 at 07:30:00PM +0200, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hmm, I kinda like that. Just wondering: Maybe we should have an EasyHack to write tests for these regressions? At least some of those should be possible to recreate in good test code. For one, this would give us relevant information: 1/ Is this regression really still around on master 2/ Should allow full-auto bibisect to the commit introducing the trouble Sadly my experience is that usually writing the test is harder than fixing the bug itself, i.e. this is not an EasyHack. At least I would not volunteer to mentor such an EasyHack. Sure, there are exceptions, like we nowadays have a pretty good framework for filter tests, but that's not yet the majority. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |2 +- sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f62a0ed0bfdab62efe259119589be04bcb313a7e Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 9 20:29:09 2014 +0200 DOCX export: handle name of Writer pictures Change-Id: I1863da23fc25bd271494d48863ff4bf0554d0439 diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index d636f9d..62e9df0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -636,7 +636,7 @@ DECLARE_OOXMLEXPORT_TEST(testSmartArtAnchoredInline, fdo73227.docx) assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr,name,10-Point Star 3); assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr,id,3); -assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr,name,Picture); +assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr,name,Picture 1); } DECLARE_OOXMLEXPORT_TEST(testFdo65833, fdo65833.docx) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 3b144fd..015531e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4164,7 +4164,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size // picture description (used for pic:cNvPr later too) ::sax_fastparser::FastAttributeList* docPrattrList = m_pSerializer-createAttrList(); docPrattrList-add( XML_id, OString::number( m_anchorId++).getStr()); -docPrattrList-add( XML_name, Picture ); +docPrattrList-add( XML_name, OUStringToOString( pFrmFmt-GetName(), RTL_TEXTENCODING_UTF8 ) ); docPrattrList-add( XML_descr, OUStringToOString( pGrfNode ? pGrfNode-GetDescription() : pOLEFrmFmt-GetObjDescription(), RTL_TEXTENCODING_UTF8 ).getStr()); if( GetExport().GetFilter().getVersion( ) != oox::core::ECMA_DIALECT ) docPrattrList-add( XML_title, OUStringToOString( pGrfNode ? pGrfNode-GetTitle() : pOLEFrmFmt-GetObjTitle(), RTL_TEXTENCODING_UTF8 ).getStr()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 3 commits - android/experimental
android/experimental/LOAndroid3/res/layout/about.xml
| 22 --
android/experimental/LOAndroid3/res/values/strings.xml
|5 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|6 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
|4 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 19 +++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 34 --
6 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 3079c9b15152470db8b4ac48edbb9785c9c51313
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Oct 9 20:50:35 2014 +0200
android: Fix the application lifecycle.
Now onStart() loads the file, and onStop() closes it again. Fixes the case
when the user leaves the app by pressing Home, and starts it again;
previously, this caused a race.
Change-Id: I493a76eaf5e8ca8a68b53f70c7acd09b638f7e11
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 3f39257..d9f3219 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -13,7 +13,8 @@ public class LOEvent {
public static final int DRAW = 4;
public static final int CHANGE_PART = 5;
public static final int LOAD = 6;
-public static final int REDRAW = 7;
+public static final int CLOSE = 7;
+public static final int REDRAW = 8;
public int mType;
private ImmutableViewportMetrics mViewportMetrics;
@@ -58,6 +59,9 @@ public class LOEvent {
}
public String getTypeString() {
+if (mTypeString == null) {
+return Event type: + mType;
+}
return mTypeString;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
index 90a3582..a63b5db 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
@@ -31,6 +31,10 @@ public class LOEventFactory {
return new LOEvent(LOEvent.LOAD, inputFile);
}
+public static LOEvent close() {
+return new LOEvent(LOEvent.CLOSE);
+}
+
public static LOEvent redraw() {
return new LOEvent(LOEvent.REDRAW);
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 528f419..e5765e6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -61,7 +61,7 @@ public class LOKitThread extends Thread {
LOKitShell.hideProgressSpinner();
}
-private boolean load(String filename) {
+private boolean loadDocument(String filename) {
if (mApplication == null) {
mApplication = LibreOfficeMainActivity.mAppContext;
}
@@ -69,10 +69,6 @@ public class LOKitThread extends Thread {
mController = mApplication.getLayerController();
mLayerClient = mApplication.getLayerClient();
-if (mTileProvider != null) {
-mTileProvider.close();
-}
-
mTileProvider = TileProviderFactory.create(mController, filename);
boolean isReady = mTileProvider.isReady();
if (isReady) {
@@ -82,9 +78,16 @@ public class LOKitThread extends Thread {
refresh();
LOKitShell.hideProgressSpinner();
}
+
return isReady;
}
+public void closeDocument() {
+if (mTileProvider != null) {
+mTileProvider.close();
+}
+}
+
public void run() {
try {
while (true) {
@@ -95,9 +98,13 @@ public class LOKitThread extends Thread {
}
private void processEvent(LOEvent event) {
+Log.i(LOGTAG, processEvent: + event.getTypeString());
switch (event.mType) {
case LOEvent.LOAD:
-load(event.getFilename());
+loadDocument(event.getFilename());
+break;
+case LOEvent.CLOSE:
+closeDocument();
break;
case LOEvent.VIEWPORT:
mViewportMetrics = event.getViewport();
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1778e35..6ca7b4d 100644
---
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/LOAndroid3/res/layout/about.xml
| 22 --
android/experimental/LOAndroid3/res/values/strings.xml
|5 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|6 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
|4 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 19 +++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 34 --
6 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 83386129f5be002f2649db81bba4c468c7f6e4de
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Oct 9 20:50:35 2014 +0200
android: Fix the application lifecycle.
Now onStart() loads the file, and onStop() closes it again. Fixes the case
when the user leaves the app by pressing Home, and starts it again;
previously, this caused a race.
Change-Id: I493a76eaf5e8ca8a68b53f70c7acd09b638f7e11
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 3f39257..d9f3219 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -13,7 +13,8 @@ public class LOEvent {
public static final int DRAW = 4;
public static final int CHANGE_PART = 5;
public static final int LOAD = 6;
-public static final int REDRAW = 7;
+public static final int CLOSE = 7;
+public static final int REDRAW = 8;
public int mType;
private ImmutableViewportMetrics mViewportMetrics;
@@ -58,6 +59,9 @@ public class LOEvent {
}
public String getTypeString() {
+if (mTypeString == null) {
+return Event type: + mType;
+}
return mTypeString;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
index 90a3582..a63b5db 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
@@ -31,6 +31,10 @@ public class LOEventFactory {
return new LOEvent(LOEvent.LOAD, inputFile);
}
+public static LOEvent close() {
+return new LOEvent(LOEvent.CLOSE);
+}
+
public static LOEvent redraw() {
return new LOEvent(LOEvent.REDRAW);
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 528f419..e5765e6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -61,7 +61,7 @@ public class LOKitThread extends Thread {
LOKitShell.hideProgressSpinner();
}
-private boolean load(String filename) {
+private boolean loadDocument(String filename) {
if (mApplication == null) {
mApplication = LibreOfficeMainActivity.mAppContext;
}
@@ -69,10 +69,6 @@ public class LOKitThread extends Thread {
mController = mApplication.getLayerController();
mLayerClient = mApplication.getLayerClient();
-if (mTileProvider != null) {
-mTileProvider.close();
-}
-
mTileProvider = TileProviderFactory.create(mController, filename);
boolean isReady = mTileProvider.isReady();
if (isReady) {
@@ -82,9 +78,16 @@ public class LOKitThread extends Thread {
refresh();
LOKitShell.hideProgressSpinner();
}
+
return isReady;
}
+public void closeDocument() {
+if (mTileProvider != null) {
+mTileProvider.close();
+}
+}
+
public void run() {
try {
while (true) {
@@ -95,9 +98,13 @@ public class LOKitThread extends Thread {
}
private void processEvent(LOEvent event) {
+Log.i(LOGTAG, processEvent: + event.getTypeString());
switch (event.mType) {
case LOEvent.LOAD:
-load(event.getFilename());
+loadDocument(event.getFilename());
+break;
+case LOEvent.CLOSE:
+closeDocument();
break;
case LOEvent.VIEWPORT:
mViewportMetrics = event.getViewport();
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1778e35..6ca7b4d 100644
---
[Libreoffice-commits] core.git: 2 commits - configure.ac desktop/unx
configure.ac| 12 ++-- desktop/unx/source/file_image_unx.c |6 -- 2 files changed, 6 insertions(+), 12 deletions(-) New commits: commit da4a5fa517a7379da84bf7d514eafe2c721246d3 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 9 21:04:15 2014 +0200 configure: let's default to GStreamer 1.0 Support was added 2 years ago, it is probably more likely to be installed than 0.10 now. Change-Id: Ia2e36725f50f96889eb602468840dde9259c2b90 diff --git a/configure.ac b/configure.ac index 7da6486..e5e6143 100644 --- a/configure.ac +++ b/configure.ac @@ -1208,14 +1208,14 @@ AC_ARG_ENABLE(randr-link, ,enable_randr_link=yes) AC_ARG_ENABLE(gstreamer, -AS_HELP_STRING([--enable-gstreamer], -[Enable building with the new gstreamer 1.0 avmedia backend.]), -,enable_gstreamer=no) +AS_HELP_STRING([--disable-gstreamer], +[Disable building with the new gstreamer 1.0 avmedia backend.]), +,enable_gstreamer=yes) AC_ARG_ENABLE(gstreamer-0-10, -AS_HELP_STRING([--disable-gstreamer-0-10], -[Disable building the gstreamer avmedia backend.]), -,enable_gstreamer_0_10=yes) +AS_HELP_STRING([--enable-gstreamer-0-10], +[Enable building the gstreamer 0.10 avmedia backend.]), +,enable_gstreamer_0_10=no) AC_ARG_ENABLE(vlc, AS_HELP_STRING([--enable-vlc], commit 2e69b60cc2abb8e0a6773e101c03050c57a12ca3 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 9 20:41:11 2014 +0200 desktop: -Werror=unused-macros The documented feature test macro is _BSD_SOURCE, and anyway, feature test macros must be defined before the first libc header is included, so this one is evidently useless. Change-Id: Ib4b2db0c6151c2f3df322992b189257f5dd0ea22 diff --git a/desktop/unx/source/file_image_unx.c b/desktop/unx/source/file_image_unx.c index 89df91e..f1320cc 100644 --- a/desktop/unx/source/file_image_unx.c +++ b/desktop/unx/source/file_image_unx.c @@ -24,12 +24,6 @@ #include errno.h #include fcntl.h -#if defined(LINUX) -# ifndef __USE_BSD -#define __USE_BSD /* madvise, MADV_WILLNEED */ -# endif -#endif /* Linux */ - #include sys/mman.h #include sys/stat.h ___ 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/ui/view/viewfun6.cxx | 24 +---
1 file changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 980fd719648fb5b7cbe93ba23c1ee2f180ffcee8
Author: Eike Rathke er...@redhat.com
Date: Thu Oct 9 21:10:35 2014 +0200
InsertCurrentTime: in input mode inherit matching format if set
In case a date or time cell format was set, inherit that format for
Ctrl+; or Ctrl+: date/time insertion while editing the cell.
Change-Id: If13e680fc74ab36611f8c11d992dba4b9c91ddb4
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 228e1b4..d88650a 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -267,22 +267,29 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
const sal_uInt32 nCurNumFormat = rDoc.GetNumberFormat(aCurPos);
SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
const SvNumberformat* pCurNumFormatEntry =
pFormatter-GetEntry(nCurNumFormat);
+const short nCurNumFormatType = (pCurNumFormatEntry ?
+(pCurNumFormatEntry-GetType() ~NUMBERFORMAT_DEFINED) :
NUMBERFORMAT_UNDEFINED);
if (bInputMode)
{
double fVal = 0.0;
+sal_uInt32 nFormat = 0;
switch (nReqFmt)
{
case NUMBERFORMAT_DATE:
{
Date aActDate( Date::SYSTEM );
fVal = aActDate - *pFormatter-GetNullDate();
+if (nCurNumFormatType == NUMBERFORMAT_DATE)
+nFormat = nCurNumFormat;
}
break;
case NUMBERFORMAT_TIME:
{
tools::Time aActTime( tools::Time::SYSTEM );
fVal = aActTime.GetTimeInDays();
+if (nCurNumFormatType == NUMBERFORMAT_TIME)
+nFormat = nCurNumFormat;
}
break;
default:
@@ -293,15 +300,20 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
{
DateTime aActDateTime( DateTime::SYSTEM );
fVal = aActDateTime - DateTime(
*pFormatter-GetNullDate());
+if (nCurNumFormatType == NUMBERFORMAT_DATETIME)
+nFormat = nCurNumFormat;
}
break;
}
-LanguageType nLang = (pCurNumFormatEntry ?
pCurNumFormatEntry-GetLanguage() : ScGlobal::eLnge);
-sal_uInt32 nFormat = pFormatter-GetStandardFormat( nReqFmt, nLang);
-// This would return a more precise format with seconds and 100th
-// seconds for a time request.
-//nFormat = pFormatter-GetStandardFormat( fVal, nFormat, nReqFmt,
nLang);
+if (!nFormat)
+{
+const LanguageType nLang = (pCurNumFormatEntry ?
pCurNumFormatEntry-GetLanguage() : ScGlobal::eLnge);
+nFormat = pFormatter-GetStandardFormat( nReqFmt, nLang);
+// This would return a more precise format with seconds and 100th
+// seconds for a time request.
+//nFormat = pFormatter-GetStandardFormat( fVal, nFormat, nReqFmt,
nLang);
+}
OUString aString;
Color* pColor;
pFormatter-GetOutputString( fVal, nFormat, aString, pColor);
@@ -317,8 +329,6 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
}
else
{
-const short nCurNumFormatType = (pCurNumFormatEntry ?
-(pCurNumFormatEntry-GetType() ~NUMBERFORMAT_DEFINED) :
NUMBERFORMAT_UNDEFINED);
bool bForceReqFmt = false;
const double fCell = rDoc.GetValue( aCurPos);
// Combine requested date/time stamp with existing cell time/date, if
any.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Lightproof] Binary URP bridge disposed during call
I’ve run:
$ ulimit -c unlimited
$ libreoffice lightproof_hu-1.5.oxt
$ ls
doc/ META-INF/ __pycache__/ pythonpath/ src/ ChangeLog COPYING
description.xml Dialog.py lightproof_hu-1.5.oxt Lightproof.py
Linguistic.xcu make.py NEWS README THANKS VERSION
So either no file is generated or it is not being generated in $(pwd). I did
get some X errors on the command line, but I don’t think they are relevant
here. Just in case though:
X Error: BadMatch (invalid parameter attributes) 8
Major opcode: 42 (X_SetInputFocus)
Resource id: 0x7e0041c
I’m running Chakra, and I am currently building the Arch Linux source package
for LibreOffice on my system, to see if it is something that we do differently
in Chakra when we build LibreOffice.
O Xoves, 9 de Outubro de 2014 18:34:14 Stephan Bergmann escribiu:
On 10/09/2014 05:48 PM, Adrian Chaves Fernandez wrote:
$ git clone git://anongit.freedesktop.org/libreoffice/lightproof
$ cd lightproof
$ python3 make.py src/hu_HU/hu_HU.cfg
$ libreoffice lightproof_hu-1.5.oxt
Click OK
And I get:
(com.sun.star.lang.DisposedException) { { { Message = Binary URP bridge
disposed during call, Context = (com.sun.star.uno.XInterface)
@7f7570034d40 } } }
I cannot reproduce that failure, at least with my local Linux x86_64
master build.
During extension installation, soffice.bin spawns a uno.bin process with
which it communicates via URP. Binary URP bridge disposed during call
mostly means that the other end (i.e., uno.bin in this case) crashed.
Assuming you're on Linux,
ulimit -c unlimited
and re-doing the experiment might leave around a core file of the
crashed process (on which to use gdb to get a backtrace).
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unittest fails building on OS X 10.9
Build has succeeded. I saw in this that --disable-cve-test is needed on OS X Mavericks Still I had to do 2 little, dirty hacks: - Moved away 4 CVE-test file from ~/lo/core/writerfilter/qa/cppunittest/data/pass/ (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and CVS-pseudo-2009-0238-1.rtf) - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx (skipping testN192129) Beside that, this is what I have done: Install Ant (OS X Mavericks does not have that anymore) ./autogen.sh --with-ant-home=/usr/local/bin/apache-ant --wiithout-junit --enable-python=internal --disable-cve-tests I could not found instdir/program/soffice to start the program, but used: instdir/LibreOfficeDev.app/Contents/MacOS/soffice It would be nice if someone would review my information and update the building instructions for Mac: https://wiki.documentfoundation.org/Development/BuildingOnMac ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/docs odk/examples odk/index.html odk/index_online.html
odk/docs/install.html |2 +- odk/docs/tools.html|2 +- odk/examples/DevelopersGuide/examples.html |2 +- odk/examples/examples.html |2 +- odk/index.html |2 +- odk/index_online.html |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 52781ca83d3ad90d8b8861692f2b10bf56fff601 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 9 22:31:34 2014 +0200 update page footer of SDK docs Change-Id: Id69c946e4e3166f7a9fe20de2247f208d05f2680 diff --git a/odk/docs/install.html b/odk/docs/install.html index e29b30a..bd11818 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -438,7 +438,7 @@ /p p a href=http://www.documentfoundation.org/privacy; target=_blankPrivacy Policy/a | a href=http://www.documentfoundation.org/imprint; target=_blankImpressum (Legal Info)/a -| Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (a href=http://www.libreoffice.org/download/license/; target=_blankLGPLv3/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy; target=_blanktrademark policy/a. +| Copyright information: The source code of LibreOffice is licensed under the Mozilla Public License v2.0 (a href=http://www.libreoffice.org/download/license/; target=_blankMPLv2/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy; target=_blanktrademark policy/a. /p /div /div diff --git a/odk/docs/tools.html b/odk/docs/tools.html index e0cfffb..96b4552 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -918,7 +918,7 @@ types the specified types depend on./p /p p a href=http://www.documentfoundation.org/privacy; target=_blankPrivacy Policy/a | a href=http://www.documentfoundation.org/imprint; target=_blankImpressum (Legal Info)/a -| Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (a href=http://www.libreoffice.org/download/license/; target=_blankLGPLv3/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy; target=_blanktrademark policy/a. +| Copyright information: The source code of LibreOffice is licensed under the Mozilla Public License v2.0 (a href=http://www.libreoffice.org/download/license/; target=_blankMPLv2/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy; target=_blanktrademark policy/a. /p /div /div diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 1bb5d27..8bffaef 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -2869,7 +2869,7 @@ for the Office application./td /p p a href=http://www.documentfoundation.org/privacy; target=_blankPrivacy Policy/a | a href=http://www.documentfoundation.org/imprint; target=_blankImpressum (Legal Info)/a -| Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (a href=http://www.libreoffice.org/download/license/; target=_blankLGPLv3/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 10 commits - chart2/source offapi/com
chart2/source/view/axes/Tickmarks.cxx| 20 +--
chart2/source/view/axes/Tickmarks.hxx|6 -
chart2/source/view/axes/VAxisBase.cxx|6 -
chart2/source/view/axes/VAxisBase.hxx|2
chart2/source/view/axes/VAxisProperties.cxx | 15 --
chart2/source/view/axes/VAxisProperties.hxx | 17 +--
chart2/source/view/axes/VCartesianAxis.cxx | 138 +++
chart2/source/view/axes/VCartesianAxis.hxx | 35 +-
chart2/source/view/axes/VPolarRadiusAxis.cxx |2
chart2/source/view/diagram/VDiagram.cxx |2
chart2/source/view/inc/PlotterBase.hxx |2
chart2/source/view/inc/VDiagram.hxx |5
offapi/com/sun/star/chart2/XScaling.idl | 29 +++--
13 files changed, 144 insertions(+), 135 deletions(-)
New commits:
commit cc243d4bbd30d3d41d085fddbe12ff3391df8095
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 16:30:12 2014 -0400
B2DVector supports operator!=. Let's use it.
Change-Id: Iecf58e0f24909ec2fd2780a5f4b219105c7c4b47
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index b6c95ad..1c91a10 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1258,19 +1258,15 @@ TickFactory2D* VCartesianAxis::createTickFactory2D()
void lcl_hideIdenticalScreenValues( TickIter rTickIter )
{
-TickInfo* pPreviousTickInfo = rTickIter.firstInfo();
-if(!pPreviousTickInfo)
+TickInfo* pPrevTickInfo = rTickIter.firstInfo();
+if (!pPrevTickInfo)
return;
-pPreviousTickInfo-bPaintIt = true;
+
+pPrevTickInfo-bPaintIt = true;
for( TickInfo* pTickInfo = rTickIter.nextInfo(); pTickInfo; pTickInfo =
rTickIter.nextInfo())
{
-pTickInfo-bPaintIt =
-( static_castsal_Int32(pTickInfo-aTickScreenPosition.getX())
-!=
static_castsal_Int32(pPreviousTickInfo-aTickScreenPosition.getX()) )
-||
-( static_castsal_Int32(pTickInfo-aTickScreenPosition.getY())
-!=
static_castsal_Int32(pPreviousTickInfo-aTickScreenPosition.getY()) );
-pPreviousTickInfo = pTickInfo;
+pTickInfo-bPaintIt = (pTickInfo-aTickScreenPosition !=
pPrevTickInfo-aTickScreenPosition);
+pPrevTickInfo = pTickInfo;
}
}
commit 31a62d4e8d745493000544a35e3efe51e77aa498
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 12:33:15 2014 -0400
Make it clear which bounding rectangle it returns const.
Change-Id: I9c8080225cfbe0f38133ce2503bd2d0c1d0f5e13
diff --git a/chart2/source/view/diagram/VDiagram.cxx
b/chart2/source/view/diagram/VDiagram.cxx
index 30913e2..bdbc3dd 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -675,7 +675,7 @@ void VDiagram::createShapes_3d()
adjustPosAndSize_3d( m_aAvailablePosIncludingAxes,
m_aAvailableSizeIncludingAxes );
}
-::basegfx::B2IRectangle VDiagram::getCurrentRectangle()
+basegfx::B2IRectangle VDiagram::getCurrentRectangle() const
{
return
BaseGFXHelper::makeRectangle(m_aCurrentPosWithoutAxes,m_aCurrentSizeWithoutAxes);
}
diff --git a/chart2/source/view/inc/VDiagram.hxx
b/chart2/source/view/inc/VDiagram.hxx
index ecf6cf2..a57cc14 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -54,7 +54,10 @@ public: //methods
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
getCoordinateRegion() { return
css::uno::Referencecss::drawing::XShapes( m_xCoordinateRegionShape,
css::uno::UNO_QUERY );}
-::basegfx::B2IRectanglegetCurrentRectangle();
+/**
+ * Get current bounding rectangle for the diagram without axes.
+ */
+basegfx::B2IRectangle getCurrentRectangle() const;
voidreduceToMimimumSize();
commit ea9b2e8aaa4376ec8357a851edf99605ed01e06d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 10:27:26 2014 -0400
Improve method descriptions.
Change-Id: I25074578607dedaec9689dff9a6bb9c2fa7be56b
diff --git a/offapi/com/sun/star/chart2/XScaling.idl
b/offapi/com/sun/star/chart2/XScaling.idl
index 7d65c84..0daf41b 100644
--- a/offapi/com/sun/star/chart2/XScaling.idl
+++ b/offapi/com/sun/star/chart2/XScaling.idl
@@ -28,16 +28,27 @@ module com { module sun { module star { module chart2 {
interface XScaling : ::com::sun::star::uno::XInterface
{
-/** needs to keep relative ordering
-*/
-double doScaling([in] double value);
+/**
+ * Given a numeric value, return the scaled value that conforms
+ * to a predefined scaling rule. For instance, for linear
+ * scaling, given a x value, the method may return a y value as
+ * defined by y = Ax + B for predefined values of A and B.
+ *
+ * @param value input value from which to calculate the scaled
+ * value.
+ *
+ * @return scaled value
[Libreoffice-commits] core.git: 10 commits - chart2/source offapi/com
chart2/source/view/axes/Tickmarks.cxx| 20 +--
chart2/source/view/axes/Tickmarks.hxx|6 -
chart2/source/view/axes/VAxisBase.cxx|6 -
chart2/source/view/axes/VAxisBase.hxx|2
chart2/source/view/axes/VAxisProperties.cxx | 15 --
chart2/source/view/axes/VAxisProperties.hxx | 17 +--
chart2/source/view/axes/VCartesianAxis.cxx | 138 +++
chart2/source/view/axes/VCartesianAxis.hxx | 35 +-
chart2/source/view/axes/VPolarRadiusAxis.cxx |2
chart2/source/view/diagram/VDiagram.cxx |2
chart2/source/view/inc/PlotterBase.hxx |2
chart2/source/view/inc/VDiagram.hxx |5
offapi/com/sun/star/chart2/XScaling.idl | 29 +++--
13 files changed, 144 insertions(+), 135 deletions(-)
New commits:
commit c5cb66b537327247ebaf303951d718583de63710
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 16:30:12 2014 -0400
B2DVector supports operator!=. Let's use it.
Change-Id: Iecf58e0f24909ec2fd2780a5f4b219105c7c4b47
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 48d5e89..5f5a35d 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1258,19 +1258,15 @@ TickFactory2D* VCartesianAxis::createTickFactory2D()
void lcl_hideIdenticalScreenValues( TickIter rTickIter )
{
-TickInfo* pPreviousTickInfo = rTickIter.firstInfo();
-if(!pPreviousTickInfo)
+TickInfo* pPrevTickInfo = rTickIter.firstInfo();
+if (!pPrevTickInfo)
return;
-pPreviousTickInfo-bPaintIt = true;
+
+pPrevTickInfo-bPaintIt = true;
for( TickInfo* pTickInfo = rTickIter.nextInfo(); pTickInfo; pTickInfo =
rTickIter.nextInfo())
{
-pTickInfo-bPaintIt =
-( static_castsal_Int32(pTickInfo-aTickScreenPosition.getX())
-!=
static_castsal_Int32(pPreviousTickInfo-aTickScreenPosition.getX()) )
-||
-( static_castsal_Int32(pTickInfo-aTickScreenPosition.getY())
-!=
static_castsal_Int32(pPreviousTickInfo-aTickScreenPosition.getY()) );
-pPreviousTickInfo = pTickInfo;
+pTickInfo-bPaintIt = (pTickInfo-aTickScreenPosition !=
pPrevTickInfo-aTickScreenPosition);
+pPrevTickInfo = pTickInfo;
}
}
commit bd485290c77ce9b0a3a557513bf84817b48a5772
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 12:33:15 2014 -0400
Make it clear which bounding rectangle it returns const.
Change-Id: I9c8080225cfbe0f38133ce2503bd2d0c1d0f5e13
diff --git a/chart2/source/view/diagram/VDiagram.cxx
b/chart2/source/view/diagram/VDiagram.cxx
index 30913e2..bdbc3dd 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -675,7 +675,7 @@ void VDiagram::createShapes_3d()
adjustPosAndSize_3d( m_aAvailablePosIncludingAxes,
m_aAvailableSizeIncludingAxes );
}
-::basegfx::B2IRectangle VDiagram::getCurrentRectangle()
+basegfx::B2IRectangle VDiagram::getCurrentRectangle() const
{
return
BaseGFXHelper::makeRectangle(m_aCurrentPosWithoutAxes,m_aCurrentSizeWithoutAxes);
}
diff --git a/chart2/source/view/inc/VDiagram.hxx
b/chart2/source/view/inc/VDiagram.hxx
index ecf6cf2..a57cc14 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -54,7 +54,10 @@ public: //methods
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
getCoordinateRegion() { return
css::uno::Referencecss::drawing::XShapes( m_xCoordinateRegionShape,
css::uno::UNO_QUERY );}
-::basegfx::B2IRectanglegetCurrentRectangle();
+/**
+ * Get current bounding rectangle for the diagram without axes.
+ */
+basegfx::B2IRectangle getCurrentRectangle() const;
voidreduceToMimimumSize();
commit 7df90ca4ddc3edd2df10a7d74772f0bea28d35c0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 10:27:26 2014 -0400
Improve method descriptions.
Change-Id: I25074578607dedaec9689dff9a6bb9c2fa7be56b
diff --git a/offapi/com/sun/star/chart2/XScaling.idl
b/offapi/com/sun/star/chart2/XScaling.idl
index 7d65c84..0daf41b 100644
--- a/offapi/com/sun/star/chart2/XScaling.idl
+++ b/offapi/com/sun/star/chart2/XScaling.idl
@@ -28,16 +28,27 @@ module com { module sun { module star { module chart2 {
interface XScaling : ::com::sun::star::uno::XInterface
{
-/** needs to keep relative ordering
-*/
-double doScaling([in] double value);
+/**
+ * Given a numeric value, return the scaled value that conforms
+ * to a predefined scaling rule. For instance, for linear
+ * scaling, given a x value, the method may return a y value as
+ * defined by y = Ax + B for predefined values of A and B.
+ *
+ * @param value input value from which to calculate the scaled
+ * value.
+ *
+ * @return scaled value
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d5b0697cebd7d66ee90d12f7b893c193ae36eaa6 Author: Arkadiusz MiÅkiewicz ar...@maven.pl Date: Thu Oct 9 23:40:29 2014 +0200 Avoid bashizm in AbsolutePath() function is another bashizm. Avoid that since configure is run using POSIX shell. Some POSIX compatible shells like mksh do not understand bash syntax. cd - /dev/null was causing cd - command to go into background which means we never changed back to original directory thus fooling configure script later: config.status: error: cannot find input file: `config_host.mk.in' was also redirecting stderr which we don't want to do anymore since it hides real and interesting errors. Change-Id: I286a32e6a200afca883b159d9196f606e0fe7063 Reviewed-on: https://gerrit.libreoffice.org/11896 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/configure.ac b/configure.ac index e5e6143..03f58b9 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ AbsolutePath() if test -d $rel ; then cd $rel || AC_MSG_ERROR([absolute path resolution failed for $rel.]) absolute_path=$(pwd) -cd - /dev/null +cd - /dev/null else AC_MSG_ERROR([Failed to resolve absolute path. $rel does not exist or is not a directory.]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 3 commits - chart2/source
chart2/source/view/axes/Tickmarks.cxx | 12 +---
chart2/source/view/axes/Tickmarks.hxx | 22 ++
chart2/source/view/axes/VAxisBase.hxx | 11 ++-
chart2/source/view/axes/VAxisProperties.cxx |4
chart2/source/view/axes/VAxisProperties.hxx | 11 +--
5 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 70ed2c1c9651c53cae201bc965d9da79fe99061a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 17:44:56 2014 -0400
Clean this up a bit.
Change-Id: Ief207c72a22eee6a745f885912ea929ade717321
diff --git a/chart2/source/view/axes/Tickmarks.cxx
b/chart2/source/view/axes/Tickmarks.cxx
index 0ab95cb..39c1fae 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -23,15 +23,13 @@
#include ViewDefines.hxx
#include rtl/math.hxx
-namespace chart
-{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using namespace ::rtl::math;
using ::basegfx::B2DVector;
-TickInfo::TickInfo( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverse )
+namespace chart {
+
+TickInfo::TickInfo( const uno::Referencechart2::XScaling xInverse )
: fScaledTickValue( 0.0 )
, xInverseScaling( xInverse )
, aTickScreenPosition(0.0,0.0)
@@ -115,7 +113,7 @@ TickFactory::~TickFactory()
bool TickFactory::isDateAxis() const
{
-return m_rScale.AxisType == AxisType::DATE;
+return m_rScale.AxisType == chart2::AxisType::DATE;
}
void TickFactory::getAllTicks( ::std::vector ::std::vector TickInfo
rAllTickInfos ) const
@@ -148,7 +146,7 @@ TickFactory2D::TickFactory2D(
, m_fOffset_LogicToScreen(0.0)
{
double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
-if( AxisOrientation_MATHEMATICAL==m_rScale.Orientation )
+if (chart2::AxisOrientation_MATHEMATICAL == m_rScale.Orientation)
{
m_fStrech_LogicToScreen = 1.0/fWidthY;
m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
diff --git a/chart2/source/view/axes/Tickmarks.hxx
b/chart2/source/view/axes/Tickmarks.hxx
index 411b80f..e791b41 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -29,39 +29,36 @@
#include vector
-namespace chart
-{
+namespace chart {
struct TickInfo
{
double fScaledTickValue;
-::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverseScaling;
+css::uno::Referencecss::chart2::XScaling xInverseScaling;
::basegfx::B2DVector aTickScreenPosition;
boolbPaintIt;
-::com::sun::star::uno::Reference
-::com::sun::star::drawing::XShape xTextShape;
+css::uno::Referencecss::drawing::XShape xTextShape;
OUString aText;//used only for complex categories so far
sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of
complex categories can have more place than a single simple category
//methods:
-TickInfo( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverseScaling );
+TickInfo( const css::uno::Referencecss::chart2::XScaling xInverse );
double getUnscaledTickValue() const;
sal_Int32 getScreenDistanceBetweenTicks( const TickInfo rOherTickInfo )
const;
private:
TickInfo();
};
+
class TickIter
{
public:
-virtual ~TickIter(){};
-virtual TickInfo* firstInfo()=0;
-virtual TickInfo* nextInfo()=0;
+virtual ~TickIter() {}
+virtual TickInfo* firstInfo() = 0;
+virtual TickInfo* nextInfo() = 0;
};
class PureTickIter : public TickIter
@@ -111,7 +108,7 @@ public:
, const ExplicitIncrementData rIncrement
, const ::basegfx::B2DVector rStartScreenPos, const
::basegfx::B2DVector rEndScreenPos
, const ::basegfx::B2DVector rAxisLineToLabelLineShift );
-//, double fStrech_SceneToScreen, double fOffset_SceneToScreen );
+
virtual ~TickFactory2D();
static sal_Int32getTickScreenDistance( TickIter rIter );
@@ -146,6 +143,7 @@ private: //member
};
} //namespace chart
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c51e9c1eaa47ba12140498a52de83e07bf5ad98a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 17:37:38 2014 -0400
Description for m_aAllTickInfos.
Especially wrt why it is nested vectors.
Change-Id: I143785778ef62abbdc047a2d18c713f43a6522d9
diff --git a/chart2/source/view/axes/VAxisBase.hxx
b/chart2/source/view/axes/VAxisBase.hxx
index b27c604..a53341a 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -87,7 +87,16 @@ protected: //member
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
m_xGroupShape_Shapes;
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
m_xTextTarget;
-::std::vector ::std::vector
[Libreoffice-commits] core.git: 3 commits - chart2/source
chart2/source/view/axes/Tickmarks.cxx | 12 +---
chart2/source/view/axes/Tickmarks.hxx | 22 ++
chart2/source/view/axes/VAxisBase.hxx | 11 ++-
chart2/source/view/axes/VAxisProperties.cxx |4
chart2/source/view/axes/VAxisProperties.hxx | 11 +--
5 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit e776418ce41191a8b10e7ff62cd676a19e3e06ba
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 17:44:56 2014 -0400
Clean this up a bit.
Change-Id: Ief207c72a22eee6a745f885912ea929ade717321
diff --git a/chart2/source/view/axes/Tickmarks.cxx
b/chart2/source/view/axes/Tickmarks.cxx
index 0ab95cb..39c1fae 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -23,15 +23,13 @@
#include ViewDefines.hxx
#include rtl/math.hxx
-namespace chart
-{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using namespace ::rtl::math;
using ::basegfx::B2DVector;
-TickInfo::TickInfo( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverse )
+namespace chart {
+
+TickInfo::TickInfo( const uno::Referencechart2::XScaling xInverse )
: fScaledTickValue( 0.0 )
, xInverseScaling( xInverse )
, aTickScreenPosition(0.0,0.0)
@@ -115,7 +113,7 @@ TickFactory::~TickFactory()
bool TickFactory::isDateAxis() const
{
-return m_rScale.AxisType == AxisType::DATE;
+return m_rScale.AxisType == chart2::AxisType::DATE;
}
void TickFactory::getAllTicks( ::std::vector ::std::vector TickInfo
rAllTickInfos ) const
@@ -148,7 +146,7 @@ TickFactory2D::TickFactory2D(
, m_fOffset_LogicToScreen(0.0)
{
double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
-if( AxisOrientation_MATHEMATICAL==m_rScale.Orientation )
+if (chart2::AxisOrientation_MATHEMATICAL == m_rScale.Orientation)
{
m_fStrech_LogicToScreen = 1.0/fWidthY;
m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
diff --git a/chart2/source/view/axes/Tickmarks.hxx
b/chart2/source/view/axes/Tickmarks.hxx
index 411b80f..e791b41 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -29,39 +29,36 @@
#include vector
-namespace chart
-{
+namespace chart {
struct TickInfo
{
double fScaledTickValue;
-::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverseScaling;
+css::uno::Referencecss::chart2::XScaling xInverseScaling;
::basegfx::B2DVector aTickScreenPosition;
boolbPaintIt;
-::com::sun::star::uno::Reference
-::com::sun::star::drawing::XShape xTextShape;
+css::uno::Referencecss::drawing::XShape xTextShape;
OUString aText;//used only for complex categories so far
sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of
complex categories can have more place than a single simple category
//methods:
-TickInfo( const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::XScaling xInverseScaling );
+TickInfo( const css::uno::Referencecss::chart2::XScaling xInverse );
double getUnscaledTickValue() const;
sal_Int32 getScreenDistanceBetweenTicks( const TickInfo rOherTickInfo )
const;
private:
TickInfo();
};
+
class TickIter
{
public:
-virtual ~TickIter(){};
-virtual TickInfo* firstInfo()=0;
-virtual TickInfo* nextInfo()=0;
+virtual ~TickIter() {}
+virtual TickInfo* firstInfo() = 0;
+virtual TickInfo* nextInfo() = 0;
};
class PureTickIter : public TickIter
@@ -111,7 +108,7 @@ public:
, const ExplicitIncrementData rIncrement
, const ::basegfx::B2DVector rStartScreenPos, const
::basegfx::B2DVector rEndScreenPos
, const ::basegfx::B2DVector rAxisLineToLabelLineShift );
-//, double fStrech_SceneToScreen, double fOffset_SceneToScreen );
+
virtual ~TickFactory2D();
static sal_Int32getTickScreenDistance( TickIter rIter );
@@ -146,6 +143,7 @@ private: //member
};
} //namespace chart
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5aa51c08cd697ed22b16903926b3b43d5a978514
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 17:37:38 2014 -0400
Description for m_aAllTickInfos.
Especially wrt why it is nested vectors.
Change-Id: I143785778ef62abbdc047a2d18c713f43a6522d9
diff --git a/chart2/source/view/axes/VAxisBase.hxx
b/chart2/source/view/axes/VAxisBase.hxx
index b27c604..a53341a 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -87,7 +87,16 @@ protected: //member
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
m_xGroupShape_Shapes;
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
m_xTextTarget;
-::std::vector ::std::vector
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/nss
download.lst|2
external/nss/ExternalProject_nss.mk |2
external/nss/nss-linux-x86.patch.0 | 12 +-
external/nss/nss-pem.patch | 17 +++
external/nss/nss.aix.patch | 133 ++---
external/nss/nss.patch | 160 ++--
external/nss/nss_macosx.patch | 41 -
7 files changed, 195 insertions(+), 172 deletions(-)
New commits:
commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 29 16:58:50 2014 +0100
bump nss from 3.15.3 to 3.16.5
Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl mst...@redhat.com
Conflicts:
external/nss/ExternalProject_nss.mk
external/nss/nspr-build-config.patch
external/nss/nss_macosx.patch
Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
diff --git a/download.lst b/download.lst
index 9c0de03..6f26f2e 100644
--- a/download.lst
+++ b/download.lst
@@ -103,7 +103,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2
export MYSQLCPPCONN_TARBALL :=
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL :=
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
+export NSS_TARBALL :=
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index 8fd1085..d88810f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
$(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\
- $(if $(filter MSC,$(COM)),LIB=$(ILIB)) \
+ $(if $(filter MSC,$(COM)),INCLUDE=$(COMPATH)/include
LIB=$(ILIB)) \
nspr/configure --includedir=$(call
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
diff --git a/external/nss/nss-linux-x86.patch.0
b/external/nss/nss-linux-x86.patch.0
index e23a786..95a489b 100644
--- a/external/nss/nss-linux-x86.patch.0
+++ b/external/nss/nss-linux-x86.patch.0
@@ -1,10 +1,10 @@
nss/lib/freebl/Makefile
-+++ nss/lib/freebl/Makefile
-@@ -195,6 +195,7 @@
- ifeq ($(CPU_ARCH),x86)
- ASFILES = mpi_x86.s
+--- nss/lib/freebl/Makefile2014-09-29 16:52:50.356265282 +0100
nss/lib/freebl/Makefile2014-09-29 16:53:01.823340024 +0100
+@@ -110,6 +110,7 @@
+ ifeq (OS2,$(OS_TARGET))
+ ASFILES = mpi_x86_os2.s
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+DEFINES += -DMP_USE_UINT_DIGIT
DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+ DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
- # The floating point ECC code doesn't work on Linux x86 (bug 311432).
diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
index c2f34fe..c3f28bc 100644
--- a/external/nss/nss-pem.patch
+++ b/external/nss/nss-pem.patch
@@ -5230,7 +5230,7 @@ new file mode 100644
index 000..1179f2a
--- /dev/null
+++ b/b/nss/lib/ckfw/pem/rsawrapr.c
-@@ -0,0 +1,808 @@
+@@ -0,0 +1,823 @@
+/*
+ * PKCS#1 encoding and decoding functions.
+ * This file is believed to contain no code licensed from other parties.
@@ -5435,6 +5435,21 @@ index 000..1179f2a
+}
+
+/*
++ * RSA block types
++ *
++ * The actual values are important -- they are fixed, *not* arbitrary.
++ * The explicit value assignments are not needed (because C would give
++ * us those same values anyway) but are included as a reminder...
++ */
++typedef enum {
++RSA_BlockPrivate0 = 0, /* unused, really */
++RSA_BlockPrivate = 1, /* pad for a private-key operation */
++RSA_BlockPublic = 2,/* pad for a public-key operation */
++RSA_BlockRaw = 4, /* simply justify the block appropriately */
++RSA_BlockTotal
++} RSA_BlockType;
++
++/*
+ * Format one block of data for public/private key encryption using
+ * the rules defined in PKCS #1.
+ */
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index c83ae57..da9aacb 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
[Libreoffice-commits] core.git: sd/CppunitTest_sd_uimpress.mk vcl/CppunitTest_vcl_filters_test.mk
sd/CppunitTest_sd_uimpress.mk |1 + vcl/CppunitTest_vcl_filters_test.mk |1 + 2 files changed, 2 insertions(+) New commits: commit 7f900e2e2f5faa0a568209791c57cb024f14fe33 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 10 00:48:58 2014 +0200 vcl, sd: fix some TempFile leaks from vcl Graphic in cppunit tests The problem is that utl::TempFile::GetURL() will return an empty string if the file UCP is not available. There will be an entry in the log file: warn:legacy.osl:25344:1:ucb/source/core/provprox.cxx:366: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.FileContentProvider. Change-Id: I2741a04cf4b8b420294ae521199706921b37e5c6 diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index b4fe76a..bb8e977 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -93,6 +93,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ i18npool/util/i18npool \ linguistic/source/lng \ ucb/source/core/ucb1 \ +ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ )) diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk index 53122b1..1f498eb 100644 --- a/vcl/CppunitTest_vcl_filters_test.mk +++ b/vcl/CppunitTest_vcl_filters_test.mk @@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_components,vcl_filters_test,\ configmgr/source/configmgr \ i18npool/util/i18npool \ ucb/source/core/ucb1 \ +ucb/source/ucp/file/ucpfile1 \ )) $(eval $(call gb_CppunitTest_use_configuration,vcl_filters_test)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67040] resizable autocorrect replacement table dialog
https://bugs.freedesktop.org/show_bug.cgi?id=67040 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEW |RESOLVED Version|3.3.0 release |Inherited From OOo Resolution|--- |FIXED --- Comment #4 from tommy27 ba...@quipo.it --- retested under Win7x64 this is actually fixed in the 4.3.x and 4.4.x branches https://wiki.documentfoundation.org/ReleaseNotes/4.4#Dialogs_conversion_to_WidgetLayout_finished thank Caolan -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 67040] resizable autocorrect replacement table dialog
https://bugs.freedesktop.org/show_bug.cgi?id=67040 tommy27 ba...@quipo.it changed: What|Removed |Added Status|RESOLVED|VERIFIED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 63024, which changed state. Bug 63024 Summary: FILESAVE FILEOPEN Writer does not preserve position of images in its own RTF files https://bugs.freedesktop.org/show_bug.cgi?id=63024 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unittest fails building on OS X 10.9
Hi, I've added the section Minimal Setup with MacPorts for external dependencies [1] which can be very helpful to build LO easily. [1] https://wiki.documentfoundation.org/Development/BuildingOnMac#Minimal_Setup_with_MacPorts_for_external_dependencies Regards, Robert On Thu, Oct 9, 2014 at 9:38 PM, Joost Eekhoorn joost.eekho...@gmail.com wrote: Build has succeeded. I saw in this that --disable-cve-test is needed on OS X Mavericks Still I had to do 2 little, dirty hacks: - Moved away 4 CVE-test file from ~/lo/core/writerfilter/qa/cppunittest/data/pass/ (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and CVS-pseudo-2009-0238-1.rtf) - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx (skipping testN192129) Beside that, this is what I have done: Install Ant (OS X Mavericks does not have that anymore) ./autogen.sh --with-ant-home=/usr/local/bin/apache-ant --wiithout-junit --enable-python=internal --disable-cve-tests I could not found instdir/program/soffice to start the program, but used: instdir/LibreOfficeDev.app/Contents/MacOS/soffice It would be nice if someone would review my information and update the building instructions for Mac: https://wiki.documentfoundation.org/Development/BuildingOnMac ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 --- Comment #31 from Harry Chapman harry@openmailbox.org --- I'm not sure if the fix has already included this, but I would really love if the TOC could transfer *highlighting* from headings to the index. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 4 commits - chart2/inc chart2/source
chart2/inc/ChartView.hxx |5
chart2/source/view/axes/Tickmarks.cxx | 20
chart2/source/view/axes/Tickmarks.hxx | 21
chart2/source/view/axes/Tickmarks_Dates.cxx | 10
chart2/source/view/axes/Tickmarks_Dates.hxx |6
chart2/source/view/axes/Tickmarks_Equidistant.cxx |8
chart2/source/view/axes/Tickmarks_Equidistant.hxx |8
chart2/source/view/axes/VAxisBase.cxx | 10
chart2/source/view/axes/VAxisBase.hxx |4
chart2/source/view/axes/VCartesianAxis.cxx| 56
chart2/source/view/axes/VCartesianAxis.hxx|8
chart2/source/view/axes/VCartesianGrid.cxx| 14
chart2/source/view/axes/VPolarGrid.cxx| 30
chart2/source/view/axes/VPolarGrid.hxx| 10
chart2/source/view/axes/VPolarRadiusAxis.cxx |2
chart2/source/view/main/ChartView.cxx | 1926 +++---
16 files changed, 1074 insertions(+), 1064 deletions(-)
New commits:
commit 5086abc60cb25e98b9206bbffb5f343b512bfb59
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 22:35:12 2014 -0400
Put SeriesPlotterContainer into CreateShapeParam2D.
Change-Id: I537c131c0c927d2cbbd7cd44f07e9e4748b8ed6c
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index dc3d495..d155c45 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -52,7 +52,6 @@ namespace chart {
class VCoordinateSystem;
class DrawModelWrapper;
-class SeriesPlotterContainer;
class VDataSeries;
class GL3DPlotterBase;
class GL2DRenderer;
@@ -222,9 +221,7 @@ private: //methods
void render();
-css::awt::Rectangle impl_createDiagramAndContent(
-SeriesPlotterContainer rSeriesPlotterContainer,
-const CreateShapeParam2D rParam, const css::awt::Size rPageSize );
+css::awt::Rectangle impl_createDiagramAndContent( const
CreateShapeParam2D rParam, const css::awt::Size rPageSize );
DECL_LINK( UpdateTimeBased, void* );
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 9d75323..9078343 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -128,1157 +128,1161 @@ namespace {
class theExplicitValueProviderUnoTunnelId : public
rtl::StaticUnoTunnelIdInit, theExplicitValueProviderUnoTunnelId {};
-}
+typedef std::pair sal_Int32, sal_Int32 tFullAxisIndex; //first index is the
dimension, second index is the axis index that indicates whether this is a main
or secondary axis
+typedef std::map VCoordinateSystem*, tFullAxisIndex tCoordinateSystemMap;
-struct CreateShapeParam2D
+struct AxisUsage
{
-css::awt::Rectangle maRemainingSpace;
+AxisUsage();
+~AxisUsage();
-boost::shared_ptrVTitle mpVTitleX;
-boost::shared_ptrVTitle mpVTitleY;
-boost::shared_ptrVTitle mpVTitleZ;
+void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex );
+::std::vector VCoordinateSystem* getCoordinateSystems( sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex );
+sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
-boost::shared_ptrVTitle mpVTitleSecondX;
-boost::shared_ptrVTitle mpVTitleSecondY;
+ScaleAutomatism aScaleAutomatism;
-css::uno::Referencecss::drawing::XShape mxMarkHandles;
-css::uno::Referencecss::drawing::XShape mxPlotAreaWithAxes;
+private:
+tCoordinateSystemMapaCoordinateSystems;
+std::map sal_Int32, sal_Int32 aMaxIndexPerDimension;
+};
-css::uno::Referencecss::drawing::XShapes mxDiagramWithAxesShapes;
+AxisUsage::AxisUsage()
+: aScaleAutomatism(AxisHelper::createDefaultScale(),Date( Date::SYSTEM ))
+{
+}
-bool mbAutoPosTitleX;
-bool mbAutoPosTitleY;
-bool mbAutoPosTitleZ;
+AxisUsage::~AxisUsage()
+{
+aCoordinateSystems.clear();
+}
-bool mbAutoPosSecondTitleX;
-bool mbAutoPosSecondTitleY;
+void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex )
+{
+if(!pCooSys)
+return;
-bool mbUseFixedInnerSize;
+tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
+tCoordinateSystemMap::const_iterator aFound(
aCoordinateSystems.find(pCooSys) );
-CreateShapeParam2D() :
-mbAutoPosTitleX(true),
-mbAutoPosTitleY(true),
-mbAutoPosTitleZ(true),
-mbAutoPosSecondTitleX(true),
-mbAutoPosSecondTitleY(true),
-mbUseFixedInnerSize(false) {}
-};
+//use one scale only once for each coordinate system
+//main axis are preferred over secondary axis
+//value scales are preferred
+if(aFound!=aCoordinateSystems.end())
+{
+sal_Int32 nFoundAxisIndex = aFound-second.second;
+if( nFoundAxisIndex nAxisIndex )
+return;
+sal_Int32 nFoundDimension = aFound-second.first;
+if(
[Libreoffice-commits] core.git: 4 commits - chart2/inc chart2/source
chart2/inc/ChartView.hxx |5
chart2/source/view/axes/Tickmarks.cxx | 20
chart2/source/view/axes/Tickmarks.hxx | 21
chart2/source/view/axes/Tickmarks_Dates.cxx | 10
chart2/source/view/axes/Tickmarks_Dates.hxx |6
chart2/source/view/axes/Tickmarks_Equidistant.cxx |8
chart2/source/view/axes/Tickmarks_Equidistant.hxx |8
chart2/source/view/axes/VAxisBase.cxx | 10
chart2/source/view/axes/VAxisBase.hxx |4
chart2/source/view/axes/VCartesianAxis.cxx| 56
chart2/source/view/axes/VCartesianAxis.hxx|8
chart2/source/view/axes/VCartesianGrid.cxx| 14
chart2/source/view/axes/VPolarGrid.cxx| 30
chart2/source/view/axes/VPolarGrid.hxx| 10
chart2/source/view/axes/VPolarRadiusAxis.cxx |2
chart2/source/view/main/ChartView.cxx | 1901 +++---
16 files changed, 1062 insertions(+), 1051 deletions(-)
New commits:
commit a80f74add22c303327dd3203d9be5eeb901a73a4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 22:35:12 2014 -0400
Put SeriesPlotterContainer into CreateShapeParam2D.
Change-Id: I537c131c0c927d2cbbd7cd44f07e9e4748b8ed6c
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index dc3d495..d155c45 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -52,7 +52,6 @@ namespace chart {
class VCoordinateSystem;
class DrawModelWrapper;
-class SeriesPlotterContainer;
class VDataSeries;
class GL3DPlotterBase;
class GL2DRenderer;
@@ -222,9 +221,7 @@ private: //methods
void render();
-css::awt::Rectangle impl_createDiagramAndContent(
-SeriesPlotterContainer rSeriesPlotterContainer,
-const CreateShapeParam2D rParam, const css::awt::Size rPageSize );
+css::awt::Rectangle impl_createDiagramAndContent( const
CreateShapeParam2D rParam, const css::awt::Size rPageSize );
DECL_LINK( UpdateTimeBased, void* );
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index deeda97..aeb16fa 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -128,196 +128,237 @@ namespace {
class theExplicitValueProviderUnoTunnelId : public
rtl::StaticUnoTunnelIdInit, theExplicitValueProviderUnoTunnelId {};
-}
+typedef std::pair sal_Int32, sal_Int32 tFullAxisIndex; //first index is the
dimension, second index is the axis index that indicates whether this is a main
or secondary axis
+typedef std::map VCoordinateSystem*, tFullAxisIndex tCoordinateSystemMap;
-struct CreateShapeParam2D
+struct AxisUsage
{
-css::awt::Rectangle maRemainingSpace;
+AxisUsage();
+~AxisUsage();
-boost::shared_ptrVTitle mpVTitleX;
-boost::shared_ptrVTitle mpVTitleY;
-boost::shared_ptrVTitle mpVTitleZ;
+void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex );
+::std::vector VCoordinateSystem* getCoordinateSystems( sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex );
+sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
-boost::shared_ptrVTitle mpVTitleSecondX;
-boost::shared_ptrVTitle mpVTitleSecondY;
+ScaleAutomatism aScaleAutomatism;
-css::uno::Referencecss::drawing::XShape mxMarkHandles;
-css::uno::Referencecss::drawing::XShape mxPlotAreaWithAxes;
+private:
+tCoordinateSystemMapaCoordinateSystems;
+std::map sal_Int32, sal_Int32 aMaxIndexPerDimension;
+};
-css::uno::Referencecss::drawing::XShapes mxDiagramWithAxesShapes;
+AxisUsage::AxisUsage()
+: aScaleAutomatism(AxisHelper::createDefaultScale(),Date( Date::SYSTEM ))
+{
+}
-bool mbAutoPosTitleX;
-bool mbAutoPosTitleY;
-bool mbAutoPosTitleZ;
+AxisUsage::~AxisUsage()
+{
+aCoordinateSystems.clear();
+}
-bool mbAutoPosSecondTitleX;
-bool mbAutoPosSecondTitleY;
+void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32
nDimensionIndex, sal_Int32 nAxisIndex )
+{
+if(!pCooSys)
+return;
-bool mbUseFixedInnerSize;
+tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
+tCoordinateSystemMap::const_iterator aFound(
aCoordinateSystems.find(pCooSys) );
-CreateShapeParam2D() :
-mbAutoPosTitleX(true),
-mbAutoPosTitleY(true),
-mbAutoPosTitleZ(true),
-mbAutoPosSecondTitleX(true),
-mbAutoPosSecondTitleY(true),
-mbUseFixedInnerSize(false) {}
-};
+//use one scale only once for each coordinate system
+//main axis are preferred over secondary axis
+//value scales are preferred
+if(aFound!=aCoordinateSystems.end())
+{
+sal_Int32 nFoundAxisIndex = aFound-second.second;
+if( nFoundAxisIndex nAxisIndex )
+return;
+sal_Int32 nFoundDimension = aFound-second.first;
+if(
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 9dfc5fe09a8561600175fba77b1533c8db3e9f8f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 23:09:59 2014 -0400
Fix git's wrong 3-way merge.
Change-Id: I30520ff78f47bcfa487cea6f40904bf718610967
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index aeb16fa..f5ef610 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1106,11 +1106,10 @@ ChartView::~ChartView()
if ( xComp.is() )
xComp-dispose();
-if( m_pDrawModelWrapper.get() )
-{
-SolarMutexGuard aSolarGuard;
-EndListening( m_pDrawModelWrapper-getSdrModel(), false /*bAllDups*/ );
-m_pDrawModelWrapper.reset();
+if (nDimensionCount == 3)
+{
+ xDiaProp-getPropertyValue( 3DRelativeHeight ) =
n3DRelativeHeight;
+}
}
m_xDrawPage = NULL;
impl_deleteCoordinateSystems();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/experimental
android/experimental/LOAndroid3/res/layout/document_viewer.xml | 34 android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml | 10 android/experimental/LOAndroid3/res/layout/file_grid.xml | 22 android/experimental/LOAndroid3/res/layout/file_list.xml | 10 android/experimental/LOAndroid3/res/layout/file_list_item.xml | 58 android/experimental/LOAndroid3/res/layout/main.xml |2 android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml | 20 android/experimental/LOAndroid3/res/values/arrays.xml |6 android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml | 24 android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java | 186 +- android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java | 121 - android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java | 177 + android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 893 -- android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java | 274 +-- android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java | 86 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PreferenceEditor.java | 20 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java | 55 17 files changed, 1007 insertions(+), 991 deletions(-) New commits: commit 492cfffd5490272d993753af1d6e7240743c9a3a Author: Jan Holesovsky ke...@collabora.com Date: Fri Oct 10 07:34:44 2014 +0200 More tabs - spaces. Change-Id: I9a3e104b05479413dc314f299824a48ead004693 diff --git a/android/experimental/LOAndroid3/res/layout/document_viewer.xml b/android/experimental/LOAndroid3/res/layout/document_viewer.xml index 62f5556..b4f4501 100644 --- a/android/experimental/LOAndroid3/res/layout/document_viewer.xml +++ b/android/experimental/LOAndroid3/res/layout/document_viewer.xml @@ -7,27 +7,27 @@ -- RelativeLayout xmlns:android=http://schemas.android.com/apk/res/android; android:layout_width=wrap_content -android:layout_height=match_parent +android:layout_height=match_parent android:id=@+id/document_viewer_root -ViewFlipper +ViewFlipper android:id=@+id/page_flipper android:layout_width=match_parent - android:layout_height=match_parent - +android:layout_height=match_parent + /ViewFlipper -HorizontalScrollView +HorizontalScrollView android:layout_width=match_parent android:layout_height=wrap_content - android:layout_alignBottom=@id/page_flipper - android:scrollbarAlwaysDrawHorizontalTrack=true - android:background=#aa00 - LinearLayout - android:id=@+id/navigator - android:layout_width=wrap_content - android:layout_height=120dp - android:layout_margin=15dp - android:orientation=horizontal - /LinearLayout - /HorizontalScrollView +android:layout_alignBottom=@id/page_flipper +android:scrollbarAlwaysDrawHorizontalTrack=true +android:background=#aa00 +LinearLayout +android:id=@+id/navigator +android:layout_width=wrap_content +android:layout_height=120dp +android:layout_margin=15dp +android:orientation=horizontal +/LinearLayout +/HorizontalScrollView -/RelativeLayout \ No newline at end of file +/RelativeLayout diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml index 585a805..e4569e0 100644 --- a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml +++ b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml @@ -10,15 +10,15 @@ android:layout_height=match_parent android:paddingTop=10dp android:orientation=vertical - - ImageView + +ImageView android:id=@+id/grid_item_image android:layout_width=100dp android:layout_height=142dp android:scaleType=fitStart android:layout_gravity=center /ImageView - + TextView android:id=@+id/grid_item_label android:layout_width=wrap_content @@ -28,9 +28,9 @@ android:paddingRight=10dp android:paddingTop=10dp android:layout_gravity=center -android:textSize=15dp +android:textSize=15dp android:textStyle=bold android:maxLines=2 /TextView
