[Libreoffice-commits] .: 2 commits - odk/source xmerge/Module_xmerge.mk
odk/source/unoapploader/win/unoapploader.c |3 ++- xmerge/Module_xmerge.mk| 14 -- 2 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 8ac7152ca8b3b71c17ea55ec9e660804990ab86c Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Oct 8 10:56:27 2011 +0200 Don't build jars when java is disabled diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk index b5ef278..3b8503c 100644 --- a/xmerge/Module_xmerge.mk +++ b/xmerge/Module_xmerge.mk @@ -29,11 +29,13 @@ $(eval $(call gb_Module_Module,xmerge)) $(eval $(call gb_Module_add_targets,xmerge,\ - Jar_aportisdoc \ - Jar_htmlsoff \ - Jar_pexcel \ - Jar_pocketword \ - Jar_xmerge \ - Jar_XMergeBridge \ + $(if $(SOLAR_JAVA), \ + Jar_aportisdoc \ + Jar_htmlsoff \ + Jar_pexcel \ + Jar_pocketword \ + Jar_xmerge \ + Jar_XMergeBridge \ + ) \ Package_xmergesync \ )) commit 7e9a597202568a812a6470939b0ad1a693685adc Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Oct 8 10:19:23 2011 +0200 Revert cppcheck reduce scope of var in odk/..unoapploader.c This reverts commit 595de860c7a3fb274d2cf432bd1fa04a008503a0. MSVC couldn't handle this. diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c index 990b002..762b554 100644 --- a/odk/source/unoapploader/win/unoapploader.c +++ b/odk/source/unoapploader/win/unoapploader.c @@ -81,6 +81,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, char* value = NULL; char* envstr = NULL; char* cmdline = NULL; +int size; STARTUPINFO startup_info; PROCESS_INFORMATION process_info; BOOL bCreate; @@ -229,7 +230,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, * note that this only affects the environment variable of the current * process, the command processor's environment is not changed */ -int size = strlen( ENVVARNAME ) + strlen( = ) + strlen( path ) + 1; +size = strlen( ENVVARNAME ) + strlen( = ) + strlen( path ) + 1; if ( value != NULL ) size += strlen( PATHSEPARATOR ) + strlen( value ); envstr = (char*) malloc( size ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug
bug/bug/bug.js |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 38fe6a669b4fa44eb791aae87cc7776aa4b44e73
Author: Loic Dachary l...@dachary.org
Date: Sat Oct 8 11:27:35 2011 +0200
http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-March/018981.html
in a nutshell : deal with it, it won't go away
The original plan was to just have the filename. Unfortunately, it turns
out that if you do that, there are certain sites that break, because they
expect the path (and they expect a Windows path, no less). This is why
Opera and IE8 return a fake path -- not because HTML5 says to do it. In
fact I made HTML5 say it because they were doing it.
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 955d408..964af78 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -186,7 +186,10 @@
});
}
$(input[type='file'], element).change(function() {
-$(input[name='ignored'], element).val($(this).val());
+//
http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-March/018981.html
+// in a nutshell : deal with it, it won't go away
+var path = $(this).val().replace(C:\\fakepath\\,)
+$(input[name='ignored'], element).val(path);
});
$.bug.current_step('attach');
element.show();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source sal/inc sal/osl sal/util sfx2/source vcl/unx
basic/source/app/app.cxx |7 --
basic/source/uno/namecont.cxx | 115 --
sal/inc/osl/diagnose.h| 20 -
sal/osl/all/formatstring.cxx | 58 -
sal/osl/all/makefile.mk |2
sal/util/sal.map |5 -
sfx2/source/appl/module.cxx | 12 ++-
vcl/unx/generic/printer/ppdparser.cxx | 56 +++-
8 files changed, 74 insertions(+), 201 deletions(-)
New commits:
commit 256f1925826436ed8902848369a5744b4d2f22b8
Author: Tor Lillqvist tlillqv...@suse.com
Date: Sat Oct 8 15:07:06 2011 +0300
Revert Introduced OSL_FORMAT, adpated some places to it.
Breaks the MSVC build for me: 'osl_detail_formatString' : C linkage
function cannot return C++ class 'rtl::OString'.
This reverts commit 6b900b8bede24c8710d62e9e7cbff613a0b12f9f.
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 9eb83c8..3f714dd 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -1848,12 +1848,7 @@ String BasicFrame::GenRealString( const String
aResString )
}
else
{
-OSL_FAIL(
-OSL_FORMAT(
-Unknown replacement in String: %s,
-rtl::OUStringToOString(
-aResult.Copy(nStart, nEnd - nStart),
-RTL_TEXTENCODING_UTF8).getStr()));
+OSL_FAIL( CByteString(Unknown replacement in String: ).Append(
ByteString( aResult.Copy(nStart,nEnd-nStart), RTL_TEXTENCODING_UTF8 )
).GetBuffer() );
nStartPos = nStartPos + StartKenn.Len();
}
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c0733a3..d14ca98 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -384,21 +384,21 @@ SfxLibraryContainer::SfxLibraryContainer( void )
mxMSF = comphelper::getProcessServiceFactory();
if( !mxMSF.is() )
{
-OSL_FAIL( couldn't get ProcessServiceFactory );
+OSL_FAIL( ### couldn't get ProcessServiceFactory\n );
}
mxSFI = Reference XSimpleFileAccess ( mxMSF-createInstance
(
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccess)) ),
UNO_QUERY );
if( !mxSFI.is() )
{
-OSL_FAIL( couldn't create SimpleFileAccess component );
+OSL_FAIL( ### couldn't create SimpleFileAccess component\n );
}
mxStringSubstitution = Reference XStringSubstitution (
mxMSF-createInstance
(
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.util.PathSubstitution)) ),
UNO_QUERY );
if( !mxStringSubstitution.is() )
{
-OSL_FAIL( couldn't create PathSubstitution component );
+OSL_FAIL( ### couldn't create PathSubstitution component\n );
}
}
@@ -673,7 +673,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
OUString( RTL_CONSTASCII_USTRINGPARAM(com.sun.star.xml.sax.Parser) )
), UNO_QUERY );
if( !xParser.is() )
{
-OSL_FAIL( couldn't create sax parser component );
+OSL_FAIL( ### couldn't create sax parser component\n );
return sal_False;
}
@@ -824,13 +824,13 @@ sal_Bool SfxLibraryContainer::init_Impl(
catch ( xml::sax::SAXException e )
{
(void) e; // avoid warning
-OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
+OSL_FAIL( OUStringToOString( e.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
return sal_False;
}
catch ( io::IOException e )
{
(void) e; // avoid warning
-OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
+OSL_FAIL( OUStringToOString( e.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
return sal_False;
}
@@ -918,16 +918,12 @@ sal_Bool SfxLibraryContainer::init_Impl(
{
#if OSL_DEBUG_LEVEL 0
Any aError( ::cppu::getCaughtException() );
-OSL_FAIL(
-OSL_FORMAT(
-(couldn't open sub storage for library
- \%s\. Exception: %s),
-(rtl::OUStringToOString(
-rLib.aName, RTL_TEXTENCODING_UTF8).
- getStr()),
-rtl::OUStringToOString(
-comphelper::anyToString(aError),
-RTL_TEXTENCODING_UTF8).getStr()));
+::rtl::OStringBuffer aMessage;
+aMessage.append( couldn't open sub storage for
library ' );
+
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/cmis/makefile.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 5f981343a5fcd2c66bd874422ecb5e6918f1d11f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Oct 8 15:13:43 2011 +0200 When building with system libcmis, look for headers where they are diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk index ebaf703..4f43c29 100644 --- a/ucb/source/ucp/cmis/makefile.mk +++ b/ucb/source/ucp/cmis/makefile.mk @@ -41,6 +41,7 @@ DLLPRE = .IF $(SYSTEM_LIBCMIS)==YES CMISLIB=$(LIBCMIS_LIBS) +INCPRE+=$(LIBCMIS_CFLAGS) .ELSE CMISLIB=-lcmislib .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - desktop/source desktop/unx filter/inc filter/source Module_tail_build.mk package/source package/util postprocess/prj tail_build/prj
Module_tail_build.mk |1
desktop/source/deployment/deployment.component |2
desktop/source/deployment/dp_services.cxx|2
desktop/source/deployment/gui/deploymentgui.component|2
desktop/source/deployment/gui/dp_gui_service.cxx |2
desktop/source/migration/services/cexports.cxx |2
desktop/source/migration/services/cexportsoo3.cxx|2
desktop/source/migration/services/migrationoo2.component |2
desktop/source/migration/services/migrationoo3.component |2
desktop/source/offacc/acceptor.cxx |2
desktop/source/offacc/offacc.component |2
desktop/source/splash/services_spl.cxx |2
desktop/source/splash/spl.component |2
desktop/unx/splash/splash.component |2
desktop/unx/splash/unxsplash.cxx |2
filter/inc/registration.hxx | 113 ---
filter/source/config/cache/filterconfig1.component |2
filter/source/config/cache/registration.cxx | 85 +++
filter/source/odfflatxml/OdfFlatXml.cxx | 36 +++-
package/source/manifest/UnoRegister.cxx |2
package/source/xstor/register.cxx|2
package/source/xstor/xstor.component |2
package/util/package2.component |2
postprocess/prj/build.lst|2
tail_build/prj/build.lst |2
25 files changed, 103 insertions(+), 174 deletions(-)
New commits:
commit 51798a4ecf01aa225875e8582787323b1092b2dd
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Oct 8 13:31:52 2011 +0200
do not use _COMPHELPER_COMPONENT_GETFACTORY macro
diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx
deleted file mode 100644
index 060a77d..000
--- a/filter/inc/registration.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef __COMPHELPER_REGISTRATION_HXX_
-#define __COMPHELPER_REGISTRATION_HXX_
-
-//___
-// includes
-
-#include com/sun/star/lang/XSingleServiceFactory.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include rtl/ustrbuf.hxx
-#include cppuhelper/factory.hxx
-
-//___
-// namespace
-
-namespace comphelper{
-
-//___
-// declaration
-
-//___
-
-/** TODOdoc
- */
-#define _COMPHELPER_MULTIINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES,
FACTORYMETHOD) \
-if (IMPLEMENTATIONNAME == sImplName)
\
-xFactory = ::cppu::createSingleFactory(xSMGR ,
\
- IMPLEMENTATIONNAME,
\
- FACTORYMETHOD ,
\
- SERVICENAMES );
-
-//___
-
-/** TODOdoc
- */
-#define _COMPHELPER_ONEINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES,
FACTORYMETHOD) \
-if (IMPLEMENTATIONNAME == sImplName)
\
-xFactory = ::cppu::createOneInstanceFactory(xSMGR ,
\
-IMPLEMENTATIONNAME,
\
-
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d71c0373433da965f8a2d512f72df1d0a0adee2b Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Oct 8 17:00:51 2011 +0200 convert path for windows diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 0b3cb5a..458216b 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -38,9 +38,10 @@ define gb_JavaClassSet__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) \ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ + $(call gb_Helper_convert_native,\ $(if $(filter-out $(JARDEPS),$(3)),\ $(filter-out $(JARDEPS),$(3)),\ - $(filter-out $(JARDEPS),$(4 \ + $(filter-out $(JARDEPS),$(4) \ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ $(gb_JavaClassSet_JAVACDEBUG) \ -cp $(CLASSPATH) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basctl/source tools/inc tools/source
basctl/source/basicide/basicrenderable.cxx | 30 +---
tools/inc/tools/multisel.hxx |3
tools/source/memtools/multisel.cxx | 99 ++---
3 files changed, 71 insertions(+), 61 deletions(-)
New commits:
commit e0ffea7232fe4bd52424b321562baa809686fb09
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Oct 8 22:25:09 2011 +0400
migrate to StringRangeEnumerator in Basic
diff --git a/basctl/source/basicide/basicrenderable.cxx
b/basctl/source/basicide/basicrenderable.cxx
index 1671238..b3e787d 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -121,10 +121,13 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( PageRange ) );
-MultiSelection aSel( aPageRange );
-long nSelCount = aSel.GetSelectCount();
-if( nSelCount = 0 nSelCount nCount )
-nCount = nSelCount;
+if( aPageRange.getLength() )
+{
+StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1
);
+sal_Int32 nSelCount = aRangeEnum.size();
+if( nSelCount = 0 )
+nCount = nSelCount;
+}
}
}
else
@@ -177,12 +180,19 @@ void SAL_CALL BasicRenderable::render (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( PageRange ) );
-MultiSelection aSel( aPageRange );
-long nSelect = aSel.FirstSelected();
-while( nSelect != long(SFX_ENDOFSELECTION) nRenderer-- )
-nSelect = aSel.NextSelected();
-if( nSelect != long(SFX_ENDOFSELECTION) )
-mpWindow-printPage( sal_Int32(nSelect-1), pPrinter );
+if( aPageRange.getLength() )
+{
+sal_Int32 nPageCount = mpWindow-countPages( pPrinter );
+StringRangeEnumerator aRangeEnum( aPageRange, 0,
nPageCount-1 );
+StringRangeEnumerator::Iterator it = aRangeEnum.begin();
+for( ; it != aRangeEnum.end() nRenderer; --nRenderer )
+++it;
+
+sal_Int32 nPage = ( it != aRangeEnum.end() ) ? *it :
nRenderer;
+mpWindow-printPage( nPage, pPrinter );
+}
+else
+mpWindow-printPage( nRenderer, pPrinter );
}
else
mpWindow-printPage( nRenderer, pPrinter );
commit 9cbc1c3253f1c7ac7507ec89ed879d157c809bb6
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Oct 8 22:24:21 2011 +0400
no need to return size_t instead of sal_Int32
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 733682f..6d3c3de 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -162,7 +162,7 @@ public:
sal_Int32 i_nLogicalOffset = -1
);
-size_t size() const { return size_t(mnCount); }
+sal_Int32 size() const { return mnCount; }
Iterator begin( const std::set sal_Int32 * i_pPossibleValues = NULL )
const;
Iterator end( const std::set sal_Int32 * i_pPossibleValues = NULL )
const;
diff --git a/tools/source/memtools/multisel.cxx
b/tools/source/memtools/multisel.cxx
index 395082e..bf504e5 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -1168,7 +1168,7 @@ bool StringRangeEnumerator::getRangesFromString( const
OUString i_rPageRange,
//Even if the input range wasn't completely valid, return what ranges could
//be extracted from the input.
-o_rPageVector.reserve( aEnum.size() );
+o_rPageVector.reserve( static_cast size_t ( aEnum.size() ) );
for( StringRangeEnumerator::Iterator it = aEnum.begin( i_pPossibleValues );
it != aEnum.end( i_pPossibleValues ); ++it )
{
commit 6dcfa9d2aefc161ce61ea9b007d8997be3f31af9
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Oct 8 22:20:42 2011 +0400
allow parsing of joined ranges
i.e. 1-4-2 means 1,2,3,4,3,2 now. This is for eliminating ambiguity,
it is doubtful whether users will find this useful.
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index bb74783..733682f 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -127,6 +127,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
sal_Int32 mnOffset;
bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool
bMayAdjust );
+bool insertJoinedRanges( const std::vector sal_Int32 rNumbers, bool
i_bStrict );
bool checkValue( sal_Int32, const std::set
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/textaction.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 946090359b231f55e2498dcfe4fff7294c2b9504 Author: Stephan Bergmann sberg...@redhat.com Date: Sat Oct 8 23:46:03 2011 +0200 Added the unreachable code back in, even for GCC 4.0, so Mac OS X would not fail. diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 2e0f78a..4fd78a9 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -2286,6 +2286,12 @@ namespace cppcanvas rState ) ); } } +#if defined __GNUC__ +#if __GNUC__ == 4 +// Unreachable; to avoid bogus warning: +return ActionSharedPtr(); +#endif +#endif } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/qa
sc/qa/unit/data/contentCSV/mathematical-functions.csv |4 sc/qa/unit/data/contentCSV/spreadsheet-functions.csv |6 -- sc/qa/unit/data/ods/functions.ods |binary sc/qa/unit/filters-test.cxx |3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) New commits: commit bb549e2d50e548c2deda3af77ac444a4dde35700 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Oct 8 23:30:09 2011 +0200 add unit test cases for mathematical functions diff --git a/sc/qa/unit/data/contentCSV/mathematical-functions.csv b/sc/qa/unit/data/contentCSV/mathematical-functions.csv new file mode 100644 index 000..106e570 --- /dev/null +++ b/sc/qa/unit/data/contentCSV/mathematical-functions.csv @@ -0,0 +1,4 @@ +0, 1, 10 +1.5707963268, 0, 3.1415926536 +0, Err:502 +1.5707963268, 2.3561944902, 0.7853981634 diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods index 10ddcea..4c09824 100644 Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 525a917..38eb940 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -394,6 +394,9 @@ void ScFiltersTest::testFunctions() //test spreadsheet functions createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(spreadsheet-functions.)), aCSVFileName); testFile(aCSVFileName, pDoc, 1); +//test mathematical functions + createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(mathematical-functions.)), aCSVFileName); +testFile(aCSVFileName, pDoc, 2, PureString); xDocSh-DoClose(); } commit c85b929b532c56c061df4fcfe32734d5db3bd5b8 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Oct 8 23:13:01 2011 +0200 extend test for spreadsheet functions diff --git a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv index 412ca58..da53433 100644 --- a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv +++ b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv @@ -1,2 +1,4 @@ -$C$2, $A$1 -1, 3, 4 +$C$2, $A$1, Sheet.B$2, Sheet!R2C2 +2, 4, 4, 5, 6, 15, 15, 6 +1, 3, 4, 4, 2, 2 +2, 4, 7, 8 diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods index 4b8c55a..10ddcea 100644 Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
