[Libreoffice-commits] .: lcms2/lcms2.patch lcms2/makefile.mk
lcms2/lcms2.patch | 20 lcms2/makefile.mk |2 ++ 2 files changed, 22 insertions(+) New commits: commit 2f465a8863ada2b620440e239fb5e48df581253f Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 12 10:51:48 2012 +0200 Add patch to recognize Android diff --git a/lcms2/lcms2.patch b/lcms2/lcms2.patch new file mode 100644 index 000..851a4b6 --- /dev/null +++ b/lcms2/lcms2.patch @@ -0,0 +1,20 @@ +--- misc/build/lcms2-2.3/config.sub misc/build/lcms2-2.3/config.sub +@@ -123,7 +123,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) +@@ -1294,7 +1294,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 9369c75..7d834ac 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,6 +39,8 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 +PATCH_FILES = lcms2.patch + .IF $(SYSTEM_LCMS2) == YES @all: @echo Using system littlecms2... ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5eee7de29362ecd00d43ed9eb9ed7230606dc92a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Mar 12 10:40:10 2012 +0100 CP error diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index dc257a3..897ce4e 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -1484,9 +1484,9 @@ void OdgGeneratorPrivate::_writeGraphicsStyle() if (mxStyle[draw:fill-image-ref-point]) pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point, mxStyle[draw:fill-image-ref-point]-getStr()); if (mxStyle[draw:fill-image-ref-point-x]) - pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-x, mxStyle[draw:fill-image-ref-point]-getStr()); + pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-x, mxStyle[draw:fill-image-ref-point-x]-getStr()); if (mxStyle[draw:fill-image-ref-point-y]) - pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-y, mxStyle[draw:fill-image-ref-point]-getStr()); + pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-y, mxStyle[draw:fill-image-ref-point-y]-getStr()); } else pStyleGraphicsPropertiesElement-addAttribute(draw:fill, none); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - extensions/source sal/Library_sal.mk sal/osl
extensions/source/config/ldap/ldapaccess.cxx | 26 +
sal/Library_sal.mk |2
sal/osl/unx/module.c | 364 ---
sal/osl/unx/module.cxx | 356 ++
4 files changed, 371 insertions(+), 377 deletions(-)
New commits:
commit 6a94909b44126428133e87033959c94ead3f16b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 12 11:53:37 2012 +0100
Fix WITH_OPENLDAP case
diff --git a/extensions/source/config/ldap/ldapaccess.cxx
b/extensions/source/config/ldap/ldapaccess.cxx
index 681c33c..c1d07ed 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -273,26 +273,28 @@ void LdapConnection::initConnection()
return userDn ;
}
+#if defined WNT || !defined WITH_OPENLDAP
extern C { static void SAL_CALL thisModule() {} }
+#endif
+
void LdapConnection::loadModule()
{
if ( !s_Ldap_Module )
{
-#if defined(WNT)
-# define LIBLDAP nsldap32v50.dll
+#if defined WNT
+s_Ldap_Module = osl_loadModuleRelativeAscii(
+thisModule, nsldap32v50.dll, 0);
+#elif defined WITH_OPENLDAP
+s_Ldap_Module = osl_loadModuleAscii(
+(libldap- SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) .
+ SAL_STRINGIFY(LDAP_VENDOR_VERSION_MINOR) .so.
+ SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR)),
+0);
#else
-# ifdef WITH_OPENLDAP
-# define xstr(s) str(s)
-# define str(s) #s
-# define LIBLDAP libldap- xstr(LDAP_VENDOR_VERSION_MAJOR) .
xstr(LDAP_VENDOR_VERSION_MINOR) .so. xstr(LDAP_VENDOR_VERSION_MAJOR)
-# else
-# define LIBLDAP libldap50.so
-# endif
+s_Ldap_Module = osl_loadModuleRelativeAscii(
+thisModule, libldap50.so, 0);
#endif
-const ::rtl::OUString
sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
-// load the dbtools library
-s_Ldap_Module = osl_loadModuleRelative(thisModule, sModuleName.pData,
0);
if ( s_Ldap_Module != NULL )
{
s_p_unbind_s =
(t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ldap_unbind_s)).pData));
commit 25292b154ecfb33450307357f006b652cd673967
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 12 11:52:26 2012 +0100
module.c - module.cxx, use sal/log.hxx
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index ed738d7..f573bfa 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/file_stat \
sal/osl/unx/file_url \
sal/osl/unx/file_volume \
+ sal/osl/unx/module \
sal/osl/unx/process \
sal/osl/unx/process_impl \
sal/osl/unx/salinit \
@@ -166,7 +167,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/diagnose \
- sal/osl/unx/module \
sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
sal/osl/unx/pipe \
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
deleted file mode 100644
index ea41a7e..000
--- a/sal/osl/unx/module.c
+++ /dev/null
@@ -1,364 +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.
- *
- /
-
-#include sal/types.h
-#include osl/diagnose.h
-#include osl/module.h
-#include osl/thread.h
-#include osl/process.h
-#include osl/file.h
-
-#include system.h
-
-#if OSL_DEBUG_LEVEL 1
-#include stdio.h
-#endif
-
-#ifdef AIX
-#include sys/ldr.h
-#endif
-
-#ifdef ANDROID
-#include osl/detail/android-bootstrap.h
-#endif
-
-/* implemented in file.c */
-extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-
-static sal_Bool
[Libreoffice-commits] .: 8 commits - svl/inc svl/source svx/inc svx/source sw/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source vcl/win xmloff/inc xmloff/Library_xo.mk xmloff/Pack
svl/inc/svl/nranges.hxx|4 -
svl/source/items/itemset.cxx |6 -
svl/source/items/nranges.cxx | 24 --
svx/inc/svx/charmap.hxx|3
svx/source/dialog/charmap.cxx |6 +
sw/source/filter/inc/msfilter.hxx | 26 --
sw/source/filter/rtf/swparrtf.cxx | 41 +-
sw/source/filter/rtf/swparrtf.hxx |2
sw/source/filter/ww8/writerhelper.cxx |2
sw/source/filter/ww8/ww8par.cxx|2
sw/source/filter/ww8/ww8par.hxx|2
sw/source/filter/ww8/ww8par4.cxx | 27 +--
unotools/inc/unotools/confignode.hxx | 16
unotools/source/config/confignode.cxx |5 -
unusedcode.easy| 24 ++
vcl/inc/outdev.h |4 -
vcl/inc/outfont.hxx| 11 +-
vcl/source/gdi/outdev3.cxx | 38 +++---
vcl/win/source/gdi/salgdi3.cxx | 17 +++-
xmloff/Library_xo.mk |1
xmloff/Package_inc.mk |1
xmloff/inc/xmloff/VisAreaContext.hxx | 67 -
xmloff/source/style/VisAreaContext.cxx | 125 -
23 files changed, 67 insertions(+), 387 deletions(-)
New commits:
commit 80e33b0cf3dbb5cfec90daf22068a71fb2669c4a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 12 11:00:24 2012 +
ditch SfxULongRanges
diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx
index badb3e9..84f0716 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -41,9 +41,6 @@
#include svl/nranges.hxx
#undef NUMTYPE
-#define NUMTYPE sal_uLong
-#define SfxNumRanges SfxULongRanges
-#include svl/nranges.hxx
#define _SFXNRANGES_HXX
@@ -62,7 +59,6 @@ public:
SfxNumRanges() : _pRanges( 0 ) {}
SfxNumRanges( const SfxNumRanges rOrig );
SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2
);
-SfxNumRanges( NUMTYPE_ARG nWh1, NUMTYPE_ARG
nWh2, NUMTYPE_ARG nNull, ... );
SfxNumRanges( const NUMTYPE* nNumTable );
~SfxNumRanges()
{ delete [] _pRanges; }
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index b526749..9eba806 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -58,12 +58,6 @@ DBG_NAME(SfxItemSet)
#undef NUMTYPE
#undef SfxNumRanges
-#define NUMTYPE sal_uLong
-#define SfxNumRangesSfxULongRanges
-#include nranges.cxx
-#undef NUMTYPE
-#undef SfxNumRanges
-
//
#ifdef DBG_UTIL
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index c3d89d8..c7bf2e8 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -190,30 +190,6 @@ SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE
nWhich2 )
//
-SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG
nNull, ... )
-
-/** H3Description/H3
-
-Constructs an SfxNumRanges-instance from more than one sorted ranges of
-NUMTYPEs terminated with one 0.
-
-precondition: for each n = 0 n nArgs
-nWh(2n) = nWh(2n+1) ( nWh(2n+2)-nWh(2n+1) ) 1
-*/
-
-{
-va_list pArgs;
-va_start( pArgs, nNull );
-InitializeRanges_Impl(
-_pRanges, pArgs, sal::static_int_cast NUMTYPE (nWh0),
-sal::static_int_cast NUMTYPE (nWh1),
-sal::static_int_cast NUMTYPE (nNull));
-va_end(pArgs);
-DBG_CHECK_RANGES(NUMTYPE, _pRanges);
-}
-
-//
-
SfxNumRanges::SfxNumRanges( const NUMTYPE* pArr )
/** H3Description/H3
diff --git a/unusedcode.easy b/unusedcode.easy
index 0a39eb2..b591d6a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -143,11 +143,6 @@ SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const, unsigned short)
SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char
(*)(unsigned int const, void*), void*)
-SfxULongRanges::SfxULongRanges(int, int, int, ...)
-SfxULongRanges::SfxULongRanges(unsigned long const*)
-SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
-SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
-SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
commit da91ce535e51c814d56a6b1eddb44b5d71989261
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 12 10:41:35 2012 +
remove unused FontFamily argument in ImplFindByAttributes
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/items/svt_rngitem.cxx |6 -- binfilter/bf_svtools/source/items1/svt_itemset.cxx |8 binfilter/bf_svtools/util/svt.flt |3 --- binfilter/inc/bf_svtools/nranges.hxx |4 binfilter/inc/bf_svtools/rngitem.hxx | 10 -- 5 files changed, 31 deletions(-) New commits: commit f89f0d123f9155e0832d1186eb1bd64bbfddd3f1 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 12 11:05:37 2012 + ditch SfxULongRanges from binfilter diff --git a/binfilter/bf_svtools/source/items/svt_rngitem.cxx b/binfilter/bf_svtools/source/items/svt_rngitem.cxx index 401926b..1964e71 100644 --- a/binfilter/bf_svtools/source/items/svt_rngitem.cxx +++ b/binfilter/bf_svtools/source/items/svt_rngitem.cxx @@ -36,12 +36,6 @@ #include bf_svtools/rngitem.hxx #include svt_rngitem_inc.cxx -#define NUMTYPE sal_uInt32 -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#include svt_rngitem_inc.cxx - #else // We leave this condition just in case NUMTYPE has been defined externally to this diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx index c525349..cfb3ada 100644 --- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx +++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx @@ -66,14 +66,6 @@ DBG_NAME(SfxItemSet) #undef SvNums #undef SfxNumRanges -#define NUMTYPE ULONG -#define SvNums SvULongs -#define SfxNumRangesSfxULongRanges -#include svt_nranges.cxx -#undef NUMTYPE -#undef SvNums -#undef SfxNumRanges - // #ifdef DBG_UTIL diff --git a/binfilter/bf_svtools/util/svt.flt b/binfilter/bf_svtools/util/svt.flt index 693a888..5032849 100644 --- a/binfilter/bf_svtools/util/svt.flt +++ b/binfilter/bf_svtools/util/svt.flt @@ -53,9 +53,6 @@ Sdbyy_scan SfxListUndoAction SfxPointerEntry SfxUINT32s -SfxULongRangeItem -SfxULongRanges -SfxULongRangesItem SgfFontLst SgfFontOne SqlInternalNode diff --git a/binfilter/inc/bf_svtools/nranges.hxx b/binfilter/inc/bf_svtools/nranges.hxx index 194a158..9abd313 100644 --- a/binfilter/inc/bf_svtools/nranges.hxx +++ b/binfilter/inc/bf_svtools/nranges.hxx @@ -39,11 +39,7 @@ #define NUMTYPE USHORT #define SfxNumRanges SfxUShortRanges #include bf_svtools/nranges.hxx - #undef NUMTYPE -#define NUMTYPE ULONG -#define SfxNumRanges SfxULongRanges -#include bf_svtools/nranges.hxx #define _SFXNRANGES_HXX diff --git a/binfilter/inc/bf_svtools/rngitem.hxx b/binfilter/inc/bf_svtools/rngitem.hxx index 7768d23..39dfebb 100644 --- a/binfilter/inc/bf_svtools/rngitem.hxx +++ b/binfilter/inc/bf_svtools/rngitem.hxx @@ -38,16 +38,6 @@ #undef SfxXRangeItem #undef SfxXRangesItem -#ifndef _SFXITEMS_HXX -#define NUMTYPE ULONG -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#undef NUMTYPE -#undef SfxXRangeItem -#undef SfxXRangesItem -#endif - #define _SFXRNGITEM_HXX #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit.hxx |6 ++--
editeng/source/editeng/impedit3.cxx | 50 ++--
editeng/source/editeng/impedit4.cxx |4 +-
3 files changed, 25 insertions(+), 35 deletions(-)
New commits:
commit f2d0fcc26be481c2f872056fb3b8402169d124d8
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Sat Mar 10 22:16:16 2012 +0100
Replace VARARR_SORT with std
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 2076d29..5196703 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -905,7 +905,7 @@ public:
LanguageTypeGetDefaultLanguage() const { return eDefLanguage; }
-LanguageTypeGetLanguage( const EditSelection rSelection ) const;
+LanguageTypeGetLanguage( const EditSelection rSelection ) const;
LanguageTypeGetLanguage( const EditPaM rPaM, sal_uInt16* pEndPos
= NULL ) const;
::com::sun::star::lang::Locale GetLocale( const EditPaM rPaM ) const;
@@ -945,12 +945,12 @@ public:
//adds one or more portions of text to the SpellPortions depending on
language changes
voidAddPortionIterated(
EditView rEditView,
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill);
//adds one portion to the SpellPortions
voidAddPortion(
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill,
bool bIsField );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index d37d8d9..a7919a2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -68,6 +68,7 @@
#include editeng/unolingu.hxx
+#include set
#include math.h
#include vcl/svapp.hxx
#include vcl/metric.hxx
@@ -86,9 +87,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16 )
-SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 );
-
#define CH_HYPH '-'
#define RESDIFF 10
@@ -2252,14 +2250,14 @@ sal_uInt16 ImpEditEngine::SplitTextPortion(
ParaPortion* pPortion, sal_uInt16 nP
return nSplitPortion;
}
-void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart /* , sal_Bool bCreateBlockPortions */ )
+void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart )
{
sal_uInt16 nStartPos = rStart;
ContentNode* pNode = pParaPortion-GetNode();
DBG_ASSERT( pNode-Len(), CreateTextPortions should not be used for empty
paragraphs! );
-SortedPositions aPositions;
-aPositions.Insert( (sal_uInt32) 0 );
+::std::set sal_uInt32 aPositions;
+aPositions.insert( 0 );
sal_uInt16 nAttr = 0;
EditCharAttrib* pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(),
nAttr );
@@ -2267,23 +2265,23 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
// Insert Start and End into the Array...
// The Insert method does not allow for duplicate values
-aPositions.Insert( pAttrib-GetStart() );
-aPositions.Insert( pAttrib-GetEnd() );
+aPositions.insert( pAttrib-GetStart() );
+aPositions.insert( pAttrib-GetEnd() );
nAttr++;
pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(), nAttr );
}
-aPositions.Insert( pNode-Len() );
+aPositions.insert( pNode-Len() );
if ( pParaPortion-aScriptInfos.empty() )
((ImpEditEngine*)this)-InitScriptTypes( GetParaPortions().GetPos(
pParaPortion ) );
const ScriptTypePosInfos rTypes = pParaPortion-aScriptInfos;
for ( size_t nT = 0; nT rTypes.size(); nT++ )
-aPositions.Insert( rTypes[nT].nStartPos );
+aPositions.insert( rTypes[nT].nStartPos );
const WritingDirectionInfos rWritingDirections =
pParaPortion-aWritingDirectionInfos;
for ( size_t nD = 0; nD rWritingDirections.size(); nD++ )
-aPositions.Insert( rWritingDirections[nD].nStartPos );
+aPositions.insert( rWritingDirections[nD].nStartPos );
if ( mpIMEInfos mpIMEInfos-nLen mpIMEInfos-pAttribs (
mpIMEInfos-aPos.GetNode() == pNode ) )
{
@@ -2292,11 +2290,11 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
if ( mpIMEInfos-pAttribs[n] != nLastAttr )
{
-aPositions.Insert( mpIMEInfos-aPos.GetIndex() + n );
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/manager/dp_manager.cxx | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 61eeb689d7605a23c3e71c652b57ee65cf5b28dc
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 12 13:19:32 2012 +
fix smoketest - need to check read-only-ness of non-existent paths
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 126aa04..80a9522 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -316,12 +316,19 @@ void PackageManagerImpl::initRegistryBackends()
// as to whether a directory is truly read-only or not
static bool isMacroURLReadOnly( const OUString rMacro )
{
-rtl::OUString aURL( rMacro );
-::rtl::Bootstrap::expandMacros( aURL );
+rtl::OUString aDirURL( rMacro );
+::rtl::Bootstrap::expandMacros( aDirURL );
+
+::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL );
+if ( aErr == ::osl::FileBase::E_None )
+return false; // it will be writeable
+if ( aErr != ::osl::FileBase::E_EXIST )
+return true; // some serious problem creating it
bool bError;
sal_uInt64 nWritten = 0;
-::osl::File aFile( aURL );
+rtl::OUString aFileURL( aDirURL + /stamp.sys );
+::osl::File aFile( aFileURL );
bError = aFile.open( osl_File_OpenFlag_Read |
osl_File_OpenFlag_Write |
@@ -330,12 +337,12 @@ static bool isMacroURLReadOnly( const OUString rMacro )
bError = aFile.write( 1, 1, nWritten ) != ::osl::FileBase::E_None;
if (aFile.close() != ::osl::FileBase::E_None)
bError = true;
-if (osl::File::remove( aURL ) != ::osl::FileBase::E_None)
+if (osl::File::remove( aFileURL ) != ::osl::FileBase::E_None)
bError = true;
SAL_INFO(
desktop.deployment,
-local url ' rMacro ' - ' aURL '
+local url ' rMacro ' - ' aFileURL '
(bError ? is : is not) readonly\n);
return bError;
}
@@ -370,7 +377,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
//using virtualization it appears that he/she can. Then a shared
extension can
//be installed but is only visible for the user (because the extension
is in
//the virtual store).
-stamp = OUSTR($UNO_USER_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_USER_PACKAGES_CACHE);
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(shared) )) {
that-m_activePackages = OUSTR(
@@ -381,7 +388,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry);
logFile = OUSTR(
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt);
-stamp = OUSTR($UNO_SHARED_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_SHARED_PACKAGES_CACHE);
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(bundled) )) {
that-m_activePackages = OUSTR(
@@ -420,7 +427,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$TMP_EXTENSIONS);
that-m_registryCache = OUSTR(
vnd.sun.star.expand:$TMP_EXTENSIONS/registry);
-stamp = OUSTR($TMP_EXTENSIONS/stamp.sys);
+stamp = OUSTR($TMP_EXTENSIONS);
}
else if (! context.matchAsciiL(
RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.tdoc:/) )) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit b68f06287d34833a59841b8000641a02d0994eb8
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 12 15:19:14 2012 +0200
Fix crash with document from bnc#693238
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 505f5c3..b0a0c5d 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -424,10 +424,15 @@ OOXMLPropertySetImpl::~OOXMLPropertySetImpl()
void OOXMLPropertySetImpl::resolve(Properties rHandler)
{
-OOXMLProperties_t::iterator aIt = begin();
-while (aIt != end())
+size_t nIt = 0;
+
+// The pProp-resolve(rHandler) call below can cause elements to
+// be appended to mProperties. I don't think it can cause elements
+// to be deleted. But let's check with here just to be safe that
+// the indexing below works.
+while (nIt mProperties.size())
{
-OOXMLProperty::Pointer_t pProp = *aIt;
+OOXMLProperty::Pointer_t pProp = mProperties[nIt];
if (pProp.get() != NULL)
pProp-resolve(rHandler);
@@ -440,7 +445,7 @@ void OOXMLPropertySetImpl::resolve(Properties rHandler)
}
#endif
-++aIt;
+++nIt;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 32 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +++-
2 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit ede11e29bf051e3d7850b45118cd011d582a
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 13 18:42:56 2012 +0100
fdo#45543 fix RTF import of ms932-encoded characters
(cherry picked from commits d7baacd81bbcfaa35b7fbf9981fa3fa7c9fb1cb4,
0915f1b3d77afa694a2ca692aec307846827da99 and
00859026749e005759ce4e7115b746b064cd902b)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 737350b..824615d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -305,7 +305,8 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_bWasInFrame(false),
m_bIsInFrame(false),
m_bHasPage(false),
-m_aUnicodeBuffer()
+m_aUnicodeBuffer(),
+m_aHexBuffer()
{
OSL_ASSERT(xInputStream.is());
m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream,
sal_True));
@@ -738,9 +739,13 @@ int RTFDocumentImpl::resolvePict(bool bInline)
int RTFDocumentImpl::resolveChars(char ch)
{
+if (m_aStates.top().nInternalState != INTERNAL_HEX)
+checkUnicode(false, true);
+
OStringBuffer aBuf;
bool bUnicodeChecked = false;
+bool bSkipped = false;
while(!Strm().IsEof() ch != '{' ch != '}' ch != '\\')
{
if (ch != 0x0d ch != 0x0a)
@@ -749,13 +754,16 @@ int RTFDocumentImpl::resolveChars(char ch)
{
if (!bUnicodeChecked)
{
-checkUnicode();
+checkUnicode(true, false);
bUnicodeChecked = true;
}
aBuf.append(ch);
}
else
+{
+bSkipped = true;
m_aStates.top().nCharsToSkip--;
+}
}
// read a single char if we're in hex mode
if (m_aStates.top().nInternalState == INTERNAL_HEX)
@@ -764,6 +772,14 @@ int RTFDocumentImpl::resolveChars(char ch)
}
if (m_aStates.top().nInternalState != INTERNAL_HEX !Strm().IsEof())
Strm().SeekRel(-1);
+
+if (m_aStates.top().nInternalState == INTERNAL_HEX
m_aStates.top().nDestinationState != DESTINATION_LEVELNUMBERS)
+{
+if (!bSkipped)
+m_aHexBuffer.append(ch);
+return 0;
+}
+
if (m_aStates.top().nDestinationState == DESTINATION_SKIP)
return 0;
OString aStr = aBuf.makeStringAndClear();
@@ -2031,8 +2047,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
-if (nKeyword != RTF_U)
-checkUnicode();
+checkUnicode(nKeyword != RTF_U, true);
RTFSkipDestination aSkip(*this);
int nSprm = 0;
RTFValue::Pointer_t pIntValue(new RTFValue(nParam));
@@ -3370,13 +3385,18 @@ void RTFDocumentImpl::setSkipUnknown(bool bSkipUnknown)
m_bSkipUnknown = bSkipUnknown;
}
-void RTFDocumentImpl::checkUnicode()
+void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
{
-if (m_aUnicodeBuffer.getLength() 0)
+if (bUnicode m_aUnicodeBuffer.getLength() 0)
{
OUString aString = m_aUnicodeBuffer.makeStringAndClear();
text(aString);
}
+if (bHex m_aHexBuffer.getLength() 0)
+{
+OUString aString =
OStringToOUString(m_aHexBuffer.makeStringAndClear(),
m_aStates.top().nCurrentEncoding);
+text(aString);
+}
}
RTFParserState::RTFParserState()
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 713fd7d..3644375 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -364,8 +364,8 @@ namespace writerfilter {
void replayBuffer(RTFBuffer_t rBuffer);
/// If we got tokens indicating we're in a frame.
bool inFrame();
-/// If we have some unicode characters to send.
-void checkUnicode();
+/// If we have some unicode or hex characters to send.
+void checkUnicode(bool bUnicode = true, bool bHex = true);
uno::Referenceuno::XComponentContext const m_xContext;
uno::Referenceio::XInputStream const m_xInputStream;
@@ -454,6 +454,8 @@ namespace writerfilter {
bool m_bHasPage;
// Unicode characters are collected here so we don't have to
send them one by one.
rtl::OUStringBuffer m_aUnicodeBuffer;
+/// Same for hex characters.
+rtl::OStringBuffer m_aHexBuffer;
};
} // namespace
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - pyuno/source
pyuno/source/module/pyuno.cxx | 13 ++---
pyuno/source/module/uno.py| 14 ++
2 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 94541ebd9eb95a47f40bac95f5f6982a562e5a4d
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 9 11:28:28 2012 +0100
fdo#46926: fix the fix for Python 3
Thanks to Maxime de Roucy for the hint that the cmpfunc type doesn't
exist.
(cherry picked from commit 06484b6946ac6a974c24af6624fb75bbe298c1e8)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 82e29ac..7f5f0b5 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -661,7 +661,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0,
(getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr,
-(cmpfunc) 0,
+/* this type does not exist in Python 3: (cmpfunc) */ 0,
(reprfunc) PyUNO_repr,
0,
0,
commit fc290187f08981c734d1f2d3f6649c94e3ac6f99
Author: David Bolen db3l@gmail.com
Date: Wed Mar 7 11:07:42 2012 +0100
fdo#46859: adapt string type checks to work with both Python 2 and 3
(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
(cherry picked from commit 4634cbc237239da771e0f6a81f78171ecec726ba)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index f93ac5e..e82d2fe 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -35,6 +35,12 @@ try:
except ImportError:
import builtins as __builtin__
+try:
+unicode
+except NameError:
+# Python 3 compatibility
+unicode = str
+
import socket # since on Windows sal3.dll no longer calls WSAStartup
# all functions and variables starting with a underscore (_) must be
considered private
@@ -159,9 +165,9 @@ class Bool(object):
Note: This class is deprecated. Use python's True and False directly
instead
def __new__(cls, value):
-if isinstance(value, str) and value == true:
+if isinstance(value, (str, unicode)) and value == true:
return True
-if isinstance(value, str) and value == false:
+if isinstance(value, (str, unicode)) and value == false:
return False
if value:
return True
@@ -171,7 +177,7 @@ class Char:
Represents a UNO char, use an instance of this class to explicitly pass a
char to UNO
# @param value pass a Unicode string with length 1
def __init__(self,value):
-assert isinstance(value, str)
+assert isinstance(value, unicode)
assert len(value) == 1
self.value=value
@@ -179,7 +185,7 @@ class Char:
return Char instance %s % (self.value, )
def __eq__(self, that):
-if isinstance(that, str):
+if isinstance(that, (str, unicode)):
if len(that) 1:
return False
return self.value == that[0]
commit 82bf2998cb243f3269e39de8daee56cb6bc04550
Author: David Bolen db3l@gmail.com
Date: Wed Mar 7 11:13:52 2012 +0100
fdo#46926: fix UNO struct comparison in Python 2
This requires setting a rich comparison flag in Python 2, while Python 3
uses rich comparison by default.
(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
(cherry picked from commit 387389b644b91808fdee74846b2d855382f48ed7)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 2bfbe7b..82e29ac 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -641,9 +641,16 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
{
raisePyExceptionWithAny( makeAny( e ) );
}
-return Py_False;
+return (op == Py_EQ ? Py_False : Py_True);
}
+/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
+#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
+#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
+#else
+#define TP_FLAGS 0
+#endif
+
static PyTypeObject PyUNOType =
{
PyVarObject_HEAD_INIT( PyType_Type, 0 )
@@ -654,7 +661,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0,
(getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr,
-0,
+(cmpfunc) 0,
(reprfunc) PyUNO_repr,
0,
0,
@@ -665,7 +672,7 @@ static PyTypeObject PyUNOType =
(getattrofunc)0,
(setattrofunc)0,
NULL,
-0,
+TP_FLAGS,
NULL,
(traverseproc)0,
(inquiry)0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/module.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9895690965e79cc57502001f95a2cb09971fe7d5
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 12 15:57:31 2012 +0200
Fix Android compilation error
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index e5e91e6..419bfc5 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -160,19 +160,19 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
{
#ifndef NO_DL_FUNCTIONS
#ifdef ANDROID
-void *pLib = lo_dlopen(pModuleName);
(void) nRtldMode;
+void *pLib = lo_dlopen(pModuleName);
#else
int rtld_mode =
((nRtldMode SAL_LOADMODULE_NOW) ? RTLD_NOW : RTLD_LAZY) |
((nRtldMode SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
void* pLib = dlopen(pModuleName, rtld_mode);
-#endif
+
SAL_INFO_IF(
pLib == 0, sal.osl,
dlopen( pModuleName , rtld_mode ):
dlerror());
-
+#endif
return ((oslModule)(pLib));
#else /* NO_DL_FUNCTIONS */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 36e877cf80eb3b7fc092c08cdc166b75d674bf53 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Mar 10 16:23:34 2012 +0100 take explicit number format before implicit number format, fdo#47084 Follow-up to fdo#43467 Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 93dcb56..effb9e8 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3285,7 +3285,7 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress rPos) return nFormat; ScBaseCell* pCell = pDoc-GetCell(rPos); -if (!pCell || pCell-GetCellType() != CELLTYPE_FORMULA) +if (!pCell || pCell-GetCellType() != CELLTYPE_FORMULA || nFormat) return nFormat; // With formula cell, the format may be inferred from the formula result. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/qa
sal/qa/rtl/strings/test_ostring_stringliterals.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9fabd6c078b1aeaa565887ee83fb57daf5c123e0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Mar 12 16:11:20 2012 +0100
handle msvc not even compiling a test that should fail
but that is fine, because outside the unittest it should fail
everywhere
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 46da8c8..22f79ab 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -100,7 +100,12 @@ void test::ostring::StringLiterals::checkCtors()
void test::ostring::StringLiterals::testcall( const char str[] )
{
+#ifndef _MSC_VER
CPPUNIT_ASSERT( !CONST_CTOR_USED( str ));
+#else
+// MSVC just errors out on this for some reason, which is fine as well
+(void)str;
+#endif
}
#undef CONST_CTOR_USED
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 11 commits - Makefile Repository.mk desktop/Library_deploymentmisc.mk desktop/Library_sofficeapp.mk desktop/Library_unopkgapp.mk desktop/source extensions/Executable_nsplugin.
Makefile |7
Repository.mk|3
desktop/Library_deploymentmisc.mk|1
desktop/Library_sofficeapp.mk|6
desktop/Library_unopkgapp.mk |1
desktop/source/app/lockfile.cxx | 227 ---
desktop/source/app/lockfile.hxx | 97 ---
desktop/source/deployment/inc/lockfile.hxx | 99 +++
desktop/source/deployment/misc/lockfile.cxx | 227 +++
desktop/source/pkgchk/unopkg/unopkg_misc.cxx |2
extensions/Executable_nsplugin.mk|5
extensions/Executable_pluginapp.bin.mk |6
extensions/Library_npsoplugin.mk |2
extensions/Library_pl.mk |6
extensions/Module_extensions.mk |2
extensions/StaticLibrary_npsoenv.mk | 34
extensions/StaticLibrary_plugcon.mk | 75
sax/Library_expwrap.mk |2
sax/Library_fastsax.mk |9 -
sax/Library_sax.mk |1
sax/inc/xml2utf.hxx | 11 -
sax/source/expatwrap/xml2utf.cxx |8
sdext/CppunitTest_pdfimport.mk |5
sdext/Executable_pdf2xml.mk | 23 --
sdext/Executable_pdfunzip.mk | 23 --
sdext/Library_pdfimport.mk | 29 ---
sdext/Module_sdext.mk|1
sdext/StaticLibrary_pdfimport_s.mk | 76 +
smoketest/CppunitTest_smoketest.mk |5
vcl/Library_vcl.mk |4
30 files changed, 561 insertions(+), 436 deletions(-)
New commits:
commit b7c79fc2efddc38bea2a459d146c2f80300eb34e
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:26:00 2012 +0100
sax: replace Min/Max macros with std::max
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 2421442..b22b96a 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -29,10 +29,6 @@
#include sax/dllapi.h
-// TODO: Woher?
-#define Max( a, b ) (((a)(b)) ? (a) : (b) )
-#define Min( a, b ) (((a)(b)) ? (a) : (b) )
-
/*
*
* Text2UnicodeConverter
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index edebc8a..b49d3dc 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -27,12 +27,13 @@
/
#include string.h
+#include algorithm
+
#include sal/types.h
#include rtl/textenc.h
#include rtl/tencinfo.h
-
#include com/sun/star/io/XInputStream.hpp
using namespace ::com::sun::star::uno;
@@ -54,8 +55,9 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert(
Sequencesal_Int8 seq , sal_In
throw NotConnectedException();
}
if( ! m_bStarted ) {
-nMaxToRead = Max( 512 , nMaxToRead ); // it should be possible to
find the encoding attribute
- // within the first 512 bytes
== 128 chars in UCS-4
+// it should be possible to find the encoding attribute
+// within the first 512 bytes == 128 chars in UCS-4
+nMaxToRead = ::std::max( 512 , nMaxToRead );
}
sal_Int32 nRead;
commit 7191b52c00b1affbf44c7bf6d4cd43d21ae5e3ce
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:06:28 2012 +0100
Makefile: subsequentcheck should only run tests
... so drop the dependency on dev-install (with it, subsequentcheck is
just a synonym for check, which does not seem useful).
diff --git a/Makefile b/Makefile
index 4af3892..c9ff3b8 100644
--- a/Makefile
+++ b/Makefile
@@ -486,9 +486,9 @@ findunusedcode:
| grep -v ^WPS \
unusedcode.easy
-check: subsequentcheck
+check: dev-install subsequentcheck
-subsequentcheck: dev-install
+subsequentcheck :| $(if $(filter-out
subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
debugrun:
commit 5f86eca62fc53fbd9de2a6d74188116722bd9d62
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 17:55:32 2012 +0100
Makefile: add $(module).subsequentcheck targets
diff --git a/Makefile b/Makefile
index f43fa3c..4af3892 100644
--- a/Makefile
+++ b/Makefile
@@ -254,6 +254,9 @@ $(1).all: bootstrap fetch
$(1).clean:
cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean
gb_PARTIALBUILD=T
+$(1).subsequentcheck:
+ cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
subsequentcheck gb_PARTIALBUILD=T
+
$(1).deliver:
@true
commit 9365c975f8d2423c238961c0771ddeeae687f4cf
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 18:16:54 2012 +0100
sax: move xml2utf.cxx to libsax to prevent duplicate linkage warnings
diff --git a/sax/Library_expwrap.mk
[Libreoffice-commits] .: 6 commits - cui/source editeng/inc editeng/source offapi/com svx/sdi sw/inc sw/source writerfilter/source xmloff/inc xmloff/source
cui/source/inc/paragrph.hxx |2 +
cui/source/tabpages/paragrph.cxx | 16 -
cui/source/tabpages/paragrph.hrc |1
cui/source/tabpages/paragrph.src | 21 +++
editeng/inc/editeng/memberids.hrc |1
editeng/inc/editeng/ulspitem.hxx |4 ++
editeng/source/items/frmitems.cxx |8
offapi/com/sun/star/style/ParagraphProperties.idl |9 +
svx/sdi/svxitems.sdi |1
sw/inc/unoprnms.hxx |4 +-
sw/source/core/layout/flowfrm.cxx | 39 +-
sw/source/core/unocore/unomap.cxx |2 +
sw/source/core/unocore/unoprnms.cxx |2 +
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++
sw/source/ui/chrdlg/pardlg.cxx|2 -
writerfilter/source/dmapper/DomainMapper.cxx |2 -
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
xmloff/inc/xmloff/xmltoken.hxx|1
xmloff/source/core/xmltoken.cxx |1
xmloff/source/text/txtprmap.cxx |1
21 files changed, 111 insertions(+), 12 deletions(-)
New commits:
commit 9f4bb5bd4f55b4a80544413efde26391849b1d7f
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Mar 12 17:35:16 2012 +0100
xmloff: implement contextual spacing import/export
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 3a07e30..f241023 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -467,6 +467,7 @@ namespace xmloff { namespace token {
XML_CONTENT_VALIDATION,
XML_CONTENT_VALIDATION_NAME,
XML_CONTENT_VALIDATIONS,
+XML_CONTEXTUAL_SPACING,
XML_CONTINUE,
XML_CONTINUE_NUMBERING,
XML_CONTOUR_PATH,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 9ccc67f..7c56037 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -471,6 +471,7 @@ namespace xmloff { namespace token {
TOKEN( content-validation, XML_CONTENT_VALIDATION ),
TOKEN( content-validation-name, XML_CONTENT_VALIDATION_NAME
),
TOKEN( content-validations, XML_CONTENT_VALIDATIONS ),
+TOKEN( contextual-spacing, XML_CONTEXTUAL_SPACING ),
TOKEN( continue,XML_CONTINUE ),
TOKEN( continue-numbering, XML_CONTINUE_NUMBERING ),
TOKEN( contour-path,XML_CONTOUR_PATH ),
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index ba5c899..c1ec7e0 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -101,6 +101,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
MP_E( ParaTopMarginRelative, FO, MARGIN_TOP,
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
MP_E( ParaBottomMargin, FO, MARGIN_BOTTOM,
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM,
XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
+{ ParaContextMargin, sizeof(ParaContextMargin)-1, XML_NAMESPACE_STYLE,
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0,
SvtSaveOptions::ODFVER_LATEST },
// RES_CHRATR_CASEMAP
MT_E( CharCaseMap,FO, FONT_VARIANT,
XML_TYPE_TEXT_CASEMAP_VAR, 0 ),
MT_E( CharCaseMap,FO, TEXT_TRANSFORM,
XML_TYPE_TEXT_CASEMAP, 0 ),
commit 8631dbf85fb5ed56d225e32ea5a9c36c96b0d649
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 9 15:48:53 2012 +0100
cui: implement contextual spacing UI
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7a7af80..1267298 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -85,6 +85,7 @@ private:
SvxRelativeFieldaTopDist;
FixedText aBottomLabel;
SvxRelativeFieldaBottomDist;
+CheckBoxaContextualCB;
// Zeilenabstand
FixedLine aLineDistFrm;
@@ -132,6 +133,7 @@ public:
voidSetPageWidth( sal_uInt16 nPageWidth );
voidEnableRelativeMode();
voidEnableRegisterMode();
+voidEnableContextualMode();
voidEnableAutoFirstLine();
voidEnableAbsLineDist(long nMinTwip);
voidEnableNegativeMode();
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5672b45..a2334b5 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -282,7 +282,8 @@ sal_Bool
[Libreoffice-commits] .: sax/source
sax/source/expatwrap/xml2utf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53f661b3140fe728fe3b8f421841dcb8e6f716ab
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Mar 12 22:26:05 2012 +0400
sax: no matching function for call to 'max(int, sal_Int32)'
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index b49d3dc..2fb07f5 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -57,7 +57,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert(
Sequencesal_Int8 seq , sal_In
if( ! m_bStarted ) {
// it should be possible to find the encoding attribute
// within the first 512 bytes == 128 chars in UCS-4
-nMaxToRead = ::std::max( 512 , nMaxToRead );
+nMaxToRead = ::std::max( sal_Int32(512) , nMaxToRead );
}
sal_Int32 nRead;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_components' - io/inc io/InternalUnoApi_acceptor.mk io/InternalUnoApi_connectr.mk io/InternalUnoApi_stm.mk io/Library_acceptor.mk io/Library_connector.mk
Repository.mk |5 + io/InternalUnoApi_acceptor.mk | 32 io/InternalUnoApi_connectr.mk | 32 io/InternalUnoApi_stm.mk | 32 io/Library_acceptor.mk | 48 +++ io/Library_connector.mk| 48 +++ io/Library_streams.mk | 51 io/Library_textinstream.mk | 46 ++ io/Library_textoutstream.mk| 46 ++ io/Makefile| 40 +++ io/Module_io.mk| 42 io/Package_xml.mk | 34 + io/inc/makefile.mk | 40 --- io/prj/build.lst |7 -- io/prj/d.lst | 12 io/prj/makefile.mk |1 io/source/TextInputStream/makefile.mk | 69 --- io/source/TextOutputStream/makefile.mk | 70 --- io/source/acceptor/makefile.mk | 80 --- io/source/connector/makefile.mk| 80 --- io/source/stm/makefile.mk | 83 - ure/Rdb_ure.mk | 10 +-- 22 files changed, 463 insertions(+), 445 deletions(-) New commits: commit 59162c85c269e247dc0c07fabb8b67d361d6392c Author: David Tardon dtar...@redhat.com Date: Mon Mar 12 19:51:20 2012 +0100 gbuildize io diff --git a/Repository.mk b/Repository.mk index 3167d77..4aa91bb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -475,7 +475,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ endif $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ +acceptor \ binaryurp \ +connector \ introspection \ invocadapt \ invocation \ @@ -483,6 +485,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ javavm \ namingservice \ proxyfac \ +streams \ +textinstream \ +textoutstream \ )) $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk new file mode 100644 index 000..ddd31d2 --- /dev/null +++ b/io/InternalUnoApi_acceptor.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,acceptor)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk new file mode 100644 index 000..4896069 --- /dev/null +++ b/io/InternalUnoApi_connectr.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dpcachetable.hxx | 21 +++-
sc/source/core/data/dpcachetable.cxx | 67 +++--
sc/source/core/data/dpgroup.cxx | 91 ---
sc/source/core/data/dptabres.cxx |2
sc/source/core/data/dptabsrc.cxx |7 +-
5 files changed, 76 insertions(+), 112 deletions(-)
New commits:
commit 85f580ac0c0ed73ee24cf88be7866015c903b2eb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 12 15:46:10 2012 -0400
Get double-click drill-down of pivot data to work again.
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 00e9db2..47114e0 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -32,6 +32,7 @@
#include sal/types.h
#include osl/mutex.hxx
#include global.hxx
+#include dpitemdata.hxx
#include vector
#include boost/unordered_set.hpp
@@ -68,12 +69,10 @@ public:
/** individual filter item used in SingleFilter and GroupFilter. */
struct FilterItem
{
-rtl::OUString maString;
-double mfValue;
-boolmbHasValue;
+ScDPItemData maItem;
FilterItem();
-bool match( const ScDPItemData rCellData ) const;
+bool match(const ScDPItemData rCellData) const;
};
/** interface class used for filtering of rows. */
@@ -90,19 +89,17 @@ public:
class SingleFilter : public FilterBase
{
public:
-explicit SingleFilter(const rtl::OUString aString, double fValue,
bool bHasValue);
+explicit SingleFilter(const ScDPItemData rItem);
virtual ~SingleFilter() {}
virtual bool match(const ScDPItemData rCellData) const;
-const rtl::OUString getMatchString() const;
-double getMatchValue() const;
-boolhasValue() const;
+const ScDPItemData getMatchValue() const;
private:
explicit SingleFilter();
-FilterItem maItem;
+ScDPItemData maItem;
};
/** multi-item (group) filter. */
@@ -111,12 +108,12 @@ public:
public:
GroupFilter();
virtual ~GroupFilter() {}
-virtual bool match( const ScDPItemData rCellData ) const;
-void addMatchItem(const rtl::OUString rStr, double fVal, bool
bHasValue);
+virtual bool match(const ScDPItemData rCellData) const;
+void addMatchItem(const ScDPItemData rItem);
size_t getMatchItemCount() const;
private:
-::std::vectorFilterItem maItems;
+::std::vectorScDPItemData maItems;
};
/** single filtering criterion. */
diff --git a/sc/source/core/data/dpcachetable.cxx
b/sc/source/core/data/dpcachetable.cxx
index d751e39..ff0335e 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -84,74 +84,47 @@ ScDPCacheTable::RowFlag::RowFlag() :
{
}
-ScDPCacheTable::FilterItem::FilterItem() :
-mfValue(0.0),
-mbHasValue(false)
-{
-}
+ScDPCacheTable::FilterItem::FilterItem() {}
-bool ScDPCacheTable::FilterItem::match( const ScDPItemData rCellData ) const
+bool ScDPCacheTable::FilterItem::match(const ScDPItemData rCellData) const
{
-if (!rCellData.GetString().equals(maString)
-(!rCellData.IsValue()|| rCellData.GetValue()!= mfValue))
-return false;
-return true;
+return rCellData == maItem;
}
//
-ScDPCacheTable::SingleFilter::SingleFilter(const rtl::OUString aString,
double fValue, bool bHasValue)
-{
-maItem.maString = aString;
-maItem.mfValue = fValue;
-maItem.mbHasValue = bHasValue;
-}
-
-bool ScDPCacheTable::SingleFilter::match( const ScDPItemData rCellData )
const
-{
- return maItem.match(rCellData);
-}
+ScDPCacheTable::SingleFilter::SingleFilter(const ScDPItemData rItem) :
+maItem(rItem) {}
-const rtl::OUString ScDPCacheTable::SingleFilter::getMatchString() const
+bool ScDPCacheTable::SingleFilter::match(const ScDPItemData rCellData) const
{
-return maItem.maString;
+return maItem == rCellData;
}
-double ScDPCacheTable::SingleFilter::getMatchValue() const
+const ScDPItemData ScDPCacheTable::SingleFilter::getMatchValue() const
{
-return maItem.mfValue;
+return maItem;
}
-bool ScDPCacheTable::SingleFilter::hasValue() const
-{
-return maItem.mbHasValue;
-}
-
-//
-
ScDPCacheTable::GroupFilter::GroupFilter()
{
}
-bool ScDPCacheTable::GroupFilter::match( const ScDPItemData rCellData ) const
+bool ScDPCacheTable::GroupFilter::match(const ScDPItemData rCellData) const
{
-vectorFilterItem::const_iterator itrEnd = maItems.end();
-for (vectorFilterItem::const_iterator itr = maItems.begin(); itr !=
itrEnd; ++itr)
-{
-bool bMatch = itr-match( rCellData);
-if (bMatch)
-return true;
-}
-
[Libreoffice-commits] .: svtools/inc sw/qa sw/source writerfilter/source
svtools/inc/svtools/rtfkeywd.hxx |1
sw/qa/extras/rtftok/data/n750757.rtf | 45 +
sw/qa/extras/rtftok/rtftok.cxx | 21 +++
sw/source/filter/ww8/rtfattributeoutput.cxx|2 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +++
5 files changed, 75 insertions(+)
New commits:
commit f722299e133568fe75f7cf9ce0c103a1553474c4
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Mar 12 20:43:42 2012 +0100
implement RTF support of contextual spacing
Import, export and testcase.
diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx
index dca17c9..67aa41e 100644
--- a/svtools/inc/svtools/rtfkeywd.hxx
+++ b/svtools/inc/svtools/rtfkeywd.hxx
@@ -130,6 +130,7 @@
#define OOO_STRING_SVTOOLS_RTF_COLUMN \\column
#define OOO_STRING_SVTOOLS_RTF_COLW \\colw
#define OOO_STRING_SVTOOLS_RTF_COMMENT \\comment
+#define OOO_STRING_SVTOOLS_RTF_CONTEXTUALSPACE \\contextualspace
#define OOO_STRING_SVTOOLS_RTF_CREATIM \\creatim
#define OOO_STRING_SVTOOLS_RTF_CTRL \\ctrl
#define OOO_STRING_SVTOOLS_RTF_DEFF \\deff
diff --git a/sw/qa/extras/rtftok/data/n750757.rtf
b/sw/qa/extras/rtftok/data/n750757.rtf
new file mode 100644
index 000..04d78b6
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/n750757.rtf
@@ -0,0 +1,45 @@
+{\rtf1
+{\stylesheet
+{\s15\ql
\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
\f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033
+\sbasedon0 \snext15 \sqformat \spriority34 \styrsid13858768 List Paragraph;}
+}
+{\*\listtable
+{\list\listtemplateid188802200\listhybrid
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid68026383
+\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li720\lin720 }
+{\listname ;}
+\listid983924569}
+}
+{\*\listoverridetable
+{\listoverride\listid983924569\listoverridecount0\ls4}
+}
+\pard\plain \ltrpar\ql
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4409714
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+\f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4409714 before
+\par
+{\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0
\f31506\fs22\lang1033\langfe1033\langnp1033\insrsid4409714\charrsid13858768
\hich\af31506\dbch\af31506\loch\f31506 1.\tab}
+}
+\pard\plain \ltrpar
+\s15\ql
\fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin720\itap0\pararsid13858768\contextualspace
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+\f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033
+{\rtlch\fcs1 \af31507 \ltrch\fcs0
\lang1033\langfe1033\langnp1033\insrsid4409714\charrsid13858768 num}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4409714 1
+\par
+{\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0
\f31506\fs22\lang1033\langfe1033\langnp1033\insrsid4409714\charrsid13858768
\hich\af31506\dbch\af31506\loch\f31506 2.\tab}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0
+\lang1033\langfe1033\langnp1033\insrsid4409714\charrsid13858768 num}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4409714 2
+\par
+{\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0
\f31506\fs22\insrsid420015 \hich\af31506\dbch\af31506\loch\f31506 3.\tab}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid420015 num 3
+\par }
+\pard\plain \ltrpar\ql
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4409714
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
\f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033
+{
+\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4409714 after
+\par }
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 1174626..c11af26 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -62,6 +62,7 @@ public:
void testFdo42465();
void testFdo45187();
void testFdo46662();
+void testN750757();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -72,6 +73,7 @@ public:
CPPUNIT_TEST(testFdo42465);
CPPUNIT_TEST(testFdo45187);
CPPUNIT_TEST(testFdo46662);
+CPPUNIT_TEST(testN750757);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -301,6 +303,25 @@ void RtfModelTest::testFdo46662()
}
}
+void RtfModelTest::testN750757()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(n750757.rtf)));
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+
[Libreoffice-commits] .: 3 commits - sc/inc sc/source unusedcode.easy
sc/inc/dpcache.hxx |3 ---
sc/inc/dpcachetable.hxx |8
sc/inc/dptabres.hxx |3 ---
sc/source/core/data/dpcache.cxx | 32
sc/source/core/data/dpcachetable.cxx |9 -
sc/source/core/data/dptabres.cxx | 18 --
unusedcode.easy |5 -
7 files changed, 78 deletions(-)
New commits:
commit 6f7bf17e3147c2064362216d6b60df9f6818535a
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Mar 12 19:22:44 2012 +0100
Remove unused code in dptabres
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index bfdef7f..36ed4ac 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -83,7 +83,6 @@ public:
longGetCount() const{ return nCount; }
const long* GetSource() const { return pIndex; }
const SCROW* GetNameIds() const{ return pData; }
-SCROW GetNameIdForIndex( long nIndexValue ) const;
};
typedef ::std::vectorsal_Int32 ScMemberSortOrder;
@@ -337,8 +336,6 @@ public:
boolIsBaseForGroup( long nDim ) const; // any
group
longGetGroupBase( long nGroupDim ) const;
boolIsNumOrDateGroup( long nDim ) const;
-boolIsInGroup( const ScDPItemData rGroupData, long
nGroupIndex,
- long nBaseDataId, long nBaseIndex ) const;
boolIsInGroup( SCROW nGroupDataId, long nGroupIndex,
const ScDPItemData rBaseData, long
nBaseIndex ) const;
boolHasCommonElement( SCROW nFirstDataId, long nFirstIndex,
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 9ffe37c..314fc7e 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -279,15 +279,6 @@ void ScDPInitState::RemoveMember()
--nCount;
}
-SCROW ScDPInitState::GetNameIdForIndex( long nIndexValue ) const
-{
-for (long i=0; inCount; i++)
-if ( pIndex[i] == nIndexValue )
-return pData[i];
-
-return -1;// not found
-}
-
// ---
void lcl_DumpRow( const String rType, const String rName, const ScDPAggData*
pAggData,
@@ -920,15 +911,6 @@ bool ScDPResultData::IsNumOrDateGroup( long nDim ) const
return pSource-GetData()-IsNumOrDateGroup( nDim );
}
-bool ScDPResultData::IsInGroup( const ScDPItemData rGroupData, long
nGroupIndex,
-long nBaseDataId, long nBaseIndex ) const
-{
-const ScDPItemData* pData = pSource-GetItemDataById( nGroupIndex ,
nBaseDataId);
-if ( pData )
- return pSource-GetData()-IsInGroup( rGroupData, nGroupIndex, *pData
, nBaseIndex );
-else
-return false;
-}
bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
const ScDPItemData rBaseData, long nBaseIndex
) const
{
diff --git a/unusedcode.easy b/unusedcode.easy
index ecc821d..e1067ed 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,11 +72,9 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned
short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator__gnu_debug::_Safe_iterator__gnu_cxx::__normal_iteratorvoid**,
std::__cxx1998::vectorvoid*, std::allocatorvoid* ,
std::__debug::vectorvoid*, std::allocatorvoid* , ScDBData)
ScDBCollection::AnonDBs::size() const
-ScDPInitState::GetNameIdForIndex(long) const
ScDPItemData::ScDPItemData(double)
ScDPItemData::SetGroupValue(int, int)
ScDPLabelData::ScDPLabelData(rtl::OUString const, short, bool)
-ScDPResultData::IsInGroup(ScDPItemData const, long, long, long) const
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
commit 411a0f08f951809ea71fba7c64eba2762d4a1330
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Mar 12 19:04:03 2012 +0100
Remove unused code in dpcache
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 9f33db5..8ece780 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -136,9 +136,7 @@ public:
long AppendGroupField();
void ResetGroupItems(long nDim, const ScDPNumGroupInfo rNumInfo);
SCROW SetGroupItem(long nDim, const ScDPItemData rData);
-const DataListType* GetGroupDimMemberValues(long nDim) const;
void GetGroupDimMemberIds(long nDim, std::vectorSCROW rIds) const;
-void ClearGroupFields();
SCCOL GetDimensionIndex(const rtl::OUString sName) const;
sal_uLong GetNumberFormat( long nDim ) const;
@@ -158,7 +156,6 @@ public:
ScDocument* GetDoc() const;
long GetColumnCount()
[Libreoffice-commits] .: sw/source
sw/source/core/layout/flowfrm.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b7c2124b39e8a93c8dadfaec5257e491da9fdda1
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 12 22:42:15 2012 +0100
SwFlowFrm::CalcUpperSpace: fix crash with null pPrevFrm in framework_unoapi
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index fe1ed54..1aacdbc 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1626,8 +1626,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
bool bContextualSpacing = pAttrs-GetULSpace().GetContext();
delete pAccess;
-if (bContextualSpacing lcl_getContextualSpacing(pPrevFrm)
lcl_IdenticalStyles(pPrevFrm, rThis))
+if (bContextualSpacing pPrevFrm lcl_getContextualSpacing(pPrevFrm)
+ lcl_IdenticalStyles(pPrevFrm, rThis))
+{
return 0;
+}
else
return nUpper;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autogen.sh
autogen.sh |8
1 file changed, 8 insertions(+)
New commits:
commit 6635337181c3c3530ceaa2fb49330c2b152107d7
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Tue Mar 13 08:57:16 2012 +1030
Fix authgen.sh to not clobber autogen.lastrun when using --help
Fix also works for -h and -?
diff --git a/autogen.sh b/autogen.sh
index 2935619..78a6f67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,6 +86,14 @@ sub invalid_distro($$)
closedir ($dirh);
}
+# Handle help arguments first, so we don't clobber autogen.lastrun
+for my $arg (@ARGV) {
+if ($arg =~ /^(--help|-h|-\?)$/) {
+system (./configure --help);
+exit;
+}
+}
+
my @cmdline_args = ();
if (!@ARGV) {
my $lastrun = autogen.lastrun;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/transobj.cxx |3 ---
sc/source/ui/docshell/impex.cxx | 20 ++--
2 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 2a26fe4a39b6f3b2af269b801340c32c28806250
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 13 01:19:48 2012 +0100
only shrink to used area in text export, fdo#46230, related n#677811
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 38afe52..b52ca6f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -172,9 +172,6 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const
TransferableObjectDesc
}
OSL_ENSURE(!bFirst, no sheet selected);
-if (!pDoc-GetClipParam().isMultiRange() nTab1 == nTab2)
-pDoc-ShrinkToDataArea( nTab1, nCol1, nRow1, nCol2, nRow2 );
-
// only limit to used cells if whole sheet was marked
// (so empty cell areas can be copied)
if ( nCol2=MAXCOL nRow2=MAXROW )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7bb959e..d4a8f80 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -70,6 +70,7 @@ class StarBASIC;
#include editable.hxx
#include compiler.hxx
#include warnbox.hxx
+#include clipparam.hxx
#include impex.hxx
@@ -1437,26 +1438,33 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
SCROW nRow;
SCCOL nStartCol = aRange.aStart.Col();
SCROW nStartRow = aRange.aStart.Row();
+SCTAB nStartTab = aRange.aStart.Tab();
SCCOL nEndCol = aRange.aEnd.Col();
SCROW nEndRow = aRange.aEnd.Row();
+SCTAB nEndTab = aRange.aEnd.Tab();
+
+if (!pDoc-GetClipParam().isMultiRange() nStartTab == nEndTab)
+pDoc-ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol,
nEndRow );
+
String aCell;
+
bool bConvertLF = (GetSystemLineEnd() != LINEEND_LF);
for (nRow = nStartRow; nRow = nEndRow; nRow++)
{
-if (bIncludeFiltered || !pDoc-RowFiltered( nRow, aRange.aStart.Tab()
))
+if (bIncludeFiltered || !pDoc-RowFiltered( nRow, nStartTab ))
{
for (nCol = nStartCol; nCol = nEndCol; nCol++)
{
CellType eType;
-pDoc-GetCellType( nCol, nRow, aRange.aStart.Tab(), eType );
+pDoc-GetCellType( nCol, nRow, nStartTab, eType );
switch (eType)
{
case CELLTYPE_FORMULA:
{
if (bFormulas)
{
-pDoc-GetFormula( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetFormula( nCol, nRow, nStartTab, aCell );
if( aCell.Search( cSep ) != STRING_NOTFOUND )
lcl_WriteString( rStrm, aCell, cStr, cStr );
else
@@ -1464,7 +1472,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
}
else
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
bool bMultiLineText = ( aCell.Search( _LF ) !=
STRING_NOTFOUND );
if( bMultiLineText )
@@ -1487,7 +1495,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
break;
case CELLTYPE_VALUE:
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
lcl_WriteSimpleString( rStrm, aCell );
}
break;
@@ -1496,7 +1504,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
break;
default:
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
bool bMultiLineText = ( aCell.Search( _LF ) !=
STRING_NOTFOUND );
if( bMultiLineText )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - configure.in io/prj io/source ios/qa sal/osl solenv/lldb
configure.in|4 +-
io/prj/d.lst|1
io/source/acceptor/makefile.mk |4 ++
io/source/connector/makefile.mk |4 ++
ios/qa/sc/filters-test.m|2 +
sal/osl/unx/process_impl.cxx|6 ---
solenv/lldb/libreoffice/LO.py | 71
7 files changed, 85 insertions(+), 7 deletions(-)
New commits:
commit d37b4908efae30432df98bd25f4870c7e8758033
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 13 02:39:43 2012 +0200
Setenv SAL_LOG to yes for maximum logging for now
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index 19be41e..8805ed3 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -74,6 +74,8 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
setenv(SRC_ROOT, app_root, 1);
setenv(OUTDIR_FOR_BUILD, app_root, 1);
+ setenv(SAL_LOG, yes, 1);
+
CppUnitTestPlugIn *iface = cppunitTestPlugIn();
iface-initialize(CppUnit::TestFactoryRegistry::getRegistry(),
CppUnit::PlugInParameters());
commit 9a188e78b24edbca4315fc81fa1d345c14e6a57c
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 13 02:37:31 2012 +0200
Don't usse -D_FILE_OFFSET_BITS=no
diff --git a/configure.in b/configure.in
index 33109ca..e4ca6a4 100644
--- a/configure.in
+++ b/configure.in
@@ -4052,10 +4052,10 @@ if test $_os != WINNT -o $WITH_MINGW = yes; then
dnl Check for large file support
AC_SYS_LARGEFILE
-if test -n $ac_cv_sys_file_offset_bits; then
+if test -n $ac_cv_sys_file_offset_bits -a $ac_cv_sys_file_offset_bits
!= no; then
LFS_CFLAGS=-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits
fi
-if test -n $ac_cv_sys_large_files test $ac_cv_sys_large_files !=
no; then
+if test -n $ac_cv_sys_large_files -a $ac_cv_sys_large_files != no;
then
LFS_CFLAGS=$LFS_CFLAGS -D_LARGE_FILES
fi
else
commit 2b2804b9560a436c764143dbc6b2fe451d16a131
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 12 11:03:02 2012 +0200
Use _NSGetExecutablePath also on iOS
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 168b9be..94128a2 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -77,7 +77,7 @@ extern C oslProcessError SAL_CALL
osl_bootstrap_getExecutableFile_Impl (
) SAL_THROW_EXTERN_C();
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
#include mach-o/dyld.h
oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
@@ -89,11 +89,7 @@ oslProcessError SAL_CALL
osl_bootstrap_getExecutableFile_Impl (
char buffer[PATH_MAX];
size_t buflen = sizeof(buffer);
-#if defined(__GNUC__) defined(MACOSX)
if (_NSGetExecutablePath (buffer, (uint32_t*)buflen) == 0)
-#else
-if (_NSGetExecutablePath (buffer, buflen) == 0)
-#endif
{
/* Determine absolute path. */
char abspath[PATH_MAX];
commit bbe99e9c7b28b9e68e0fda5f853542cd9b07f659
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 10 16:21:45 2012 +0200
No inter-process UNO on iOS
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 2473aad..40d6c02 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
DLLPRE =
# --
+.IF $(OS) != IOS
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
UNOUCROUT=$(OUT)$/inc$/acceptor
@@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets --
.ENDIF # L10N_framework
+.ENDIF
+
.INCLUDE : target.mk
ALLTAR : $(MISC)/acceptor.component
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index c254e36..a484430 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
DLLPRE =
# --
+.IF $(OS) != IOS
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
UNOUCROUT=$(OUT)$/inc$/connector
@@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets --
.ENDIF # L10N_framework
+.ENDIF
+
.INCLUDE : target.mk
ALLTAR : $(MISC)/connector.component
commit 53baab726138aa221103cc5924a6c0316ae04c26
Author: Tor Lillqvist t...@iki.fi
Date: Sat Mar 10 16:12:33 2012 +0200
Deliver the static libraries built for iOS
diff --git a/io/prj/d.lst b/io/prj/d.lst
index 40eb9ab..963dfa2 100644
--- a/io/prj/d.lst
+++ b/io/prj/d.lst
@@ -5,6 +5,7 @@
..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml
..\%__SRC%\lib\*.so %_DEST%\lib\*
..\%__SRC%\lib\*.dylib %_DEST%\lib\*
+..\%__SRC%\lib\*.a %_DEST%\lib\*
..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Extension.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 794f4e23290c8346b8e0ba2a2267a0eb2e745885 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Mar 13 01:55:12 2012 +0100 missing $: announce only if something is happening diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3bfc6b5..8011227 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -187,7 +187,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(S $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) - $(call gb_Output_announce,$(2),$(true),XHP,3) + $$(call gb_Output_announce,$(2),$(true),XHP,3) mkdir -p $$(dir $$@) \ $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/dpgroup.cxx| 69 ++---
sc/source/core/data/dpitemdata.cxx |1
2 files changed, 58 insertions(+), 12 deletions(-)
New commits:
commit 32b3e93e04df2b09cb3bdeda8bea32a51bbf1b09
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 13 00:17:21 2012 -0400
Get drill-down by double-click to work with number-grouped data.
This never worked before, going back to the OOo days...
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 57403c0..9b7720d 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -77,6 +77,46 @@ inline bool IsInteger( double fValue )
}
+class ScDPGroupNumFilter : public ScDPCacheTable::FilterBase
+{
+public:
+ScDPGroupNumFilter(const ScDPItemData rValue, const ScDPNumGroupInfo
rInfo);
+virtual ~ScDPGroupNumFilter() {}
+virtual bool match(const ScDPItemData rCellData) const;
+private:
+ScDPItemData maValue;
+ScDPNumGroupInfo maNumInfo;
+};
+
+ScDPGroupNumFilter::ScDPGroupNumFilter(const ScDPItemData rValue, const
ScDPNumGroupInfo rInfo) :
+maValue(rValue), maNumInfo(rInfo) {}
+
+bool ScDPGroupNumFilter::match(const ScDPItemData rCellData) const
+{
+if (rCellData.GetType() != ScDPItemData::Value)
+return false;
+
+double fVal = maValue.GetValue();
+if (rtl::math::isInf(fVal))
+{
+if (rtl::math::isSignBitSet(fVal))
+{
+// Less than the min value.
+return rCellData.GetValue() maNumInfo.mfStart;
+}
+
+// Greater than the max value.
+return maNumInfo.mfEnd rCellData.GetValue();
+}
+
+double low = fVal;
+double high = low + maNumInfo.mfStep;
+if (maNumInfo.mbIntegerOnly)
+high += 1.0;
+
+return low = rCellData.GetValue() rCellData.GetValue() high;
+}
+
class ScDPGroupDateFilter : public ScDPCacheTable::FilterBase
{
public:
@@ -89,9 +129,9 @@ public:
private:
ScDPGroupDateFilter(); // disabled
-ScDPItemDatamaValue;
-const Date maNullDate;
-const ScDPNumGroupInfo maNumInfo;
+ScDPItemData maValue;
+Date maNullDate;
+ScDPNumGroupInfo maNumInfo;
};
//
@@ -682,19 +722,24 @@ void
ScDPGroupTableData::ModifyFilterCriteria(vectorScDPCacheTable::Criterion
if (IsNumGroupDimension(itr-mnFieldIndex))
{
// internal number group field
+ScDPCacheTable::Criterion aCri;
+aCri.mnFieldIndex = itr-mnFieldIndex;
const ScDPNumGroupDimension rNumGrpDim =
pNumGroups[itr-mnFieldIndex];
const ScDPDateGroupHelper* pDateHelper =
rNumGrpDim.GetDateHelper();
-if (!pDateHelper)
+
+if (pDateHelper)
{
-// What do we do here !?
-continue;
+// grouped by dates.
+aCri.mpFilter.reset(
+new ScDPGroupDateFilter(
+pFilter-getMatchValue(),
*pDoc-GetFormatTable()-GetNullDate(), pDateHelper-GetNumInfo()));
+}
+else
+{
+// This dimension is grouped by numeric ranges.
+aCri.mpFilter.reset(
+new ScDPGroupNumFilter(pFilter-getMatchValue(),
rNumGrpDim.GetInfo()));
}
-
-ScDPCacheTable::Criterion aCri;
-aCri.mnFieldIndex = itr-mnFieldIndex;
-aCri.mpFilter.reset(
-new ScDPGroupDateFilter(
-pFilter-getMatchValue(),
*pDoc-GetFormatTable()-GetNullDate(), pDateHelper-GetNumInfo()));
aNewCriteria.push_back(aCri);
}
commit 307bfa235b40f013f6c5fda30aced14957b62dd7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 12 22:09:36 2012 -0400
Forgot to add break here...
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index dd370ca..43c01cb 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -278,6 +278,7 @@ void ScDPItemData::Dump(const char* msg) const
break;
case RangeStart:
printf(range start: %g\n, mfValue);
+break;
default:
printf(unknown type\n);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/osl/file.hxx | 16
1 file changed, 16 deletions(-)
New commits:
commit bde32dc95d33943e301bd165955655eb02e1e223
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Tue Mar 13 16:02:18 2012 +1030
Removed FileStatus::isFile. Use ::isRegular instead.
See:
https://bugs.freedesktop.org/show_bug.cgi?id=44982#c6
https://bugs.freedesktop.org/show_bug.cgi?id=44982#c7
for why.
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 2cc43d0..16f7a06 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -733,22 +733,6 @@ public:
return static_cast Type (_aStatus.eType);
}
-/** Is it a file?
-This method returns True for both regular files, and links.
-
-@return
-True if it's a file, False otherwise.
-
-@see getFileType
-@see isRegular
-@see isLink
-@since LibreOffice 3.6
-*/
-inline sal_Bool isFile() const
-{
-return ( getFileType() == Regular || getFileType() == Link );
-}
-
/** Is it a directory?
This method returns True for both directories, and volumes.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
