[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit e66d3da2836121886d3ddbf5129e53eb5662686c
Author: Stephan Bergmann
Date: Tue Nov 5 13:20:19 2013 +0100
Use rtl::Reference
Change-Id: I7e3922ba635acdb14ca489bda2535a69249cb001
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 10781c5..8a0b689 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -119,8 +119,7 @@ namespace sd
const uno::Reference< embed::XStorage > &xStorage );
void AssignURL( XPropertyListType t, const Any* pValue, bool *pOk,
bool *pChanged );
void ExtractURL( XPropertyListType t, Any* pValue );
-Reference< XModel > mxModel;
-SdXImpressDocument* mpModel;
+rtl::Reference mxModel;
};
Reference< XInterface > SAL_CALL DocumentSettings_createInstance(
SdXImpressDocument* pModel )
@@ -217,8 +216,7 @@ using namespace ::sd;
DocumentSettings::DocumentSettings( SdXImpressDocument* pModel )
: PropertySetHelper( createSettingsInfoImpl( !pModel->IsImpressDocument() )
),
-mxModel( pModel ),
-mpModel( pModel )
+mxModel( pModel )
{
}
@@ -229,7 +227,7 @@ DocumentSettings::~DocumentSettings() throw()
bool DocumentSettings::LoadList( XPropertyListType t, const OUString &rInPath,
const uno::Reference< embed::XStorage >
&xStorage )
{
-SdDrawDocument* pDoc = mpModel->GetDoc();
+SdDrawDocument* pDoc = mxModel->GetDoc();
sal_Int32 nSlash = rInPath.lastIndexOf('/');
OUString aPath, aName;
@@ -327,7 +325,7 @@ uno::Sequence
uno::Sequence aRet( aConfigProps.getLength() );
bool bHasEmbed = false;
-SdDrawDocument* pDoc = mpModel->GetDoc();
+SdDrawDocument* pDoc = mxModel->GetDoc();
for( size_t i = 0; i < SAL_N_ELEMENTS( aURLPropertyNames ); i++ )
{
XPropertyListRef pList = pDoc->GetPropertyList( (XPropertyListType) i
);
@@ -396,8 +394,8 @@ throw (UnknownPropertyException, PropertyVetoException,
{
::SolarMutexGuard aGuard;
-SdDrawDocument* pDoc = mpModel->GetDoc();
-::sd::DrawDocShell* pDocSh = mpModel->GetDocShell();
+SdDrawDocument* pDoc = mxModel->GetDoc();
+::sd::DrawDocShell* pDocSh = mxModel->GetDocShell();
if( NULL == pDoc || NULL == pDocSh )
{
throw RuntimeException("Document or Shell missing",
@@ -940,12 +938,12 @@ throw (UnknownPropertyException, PropertyVetoException,
}
if( bChanged || bOptionsChanged )
-mpModel->SetModified( sal_True );
+mxModel->SetModified( sal_True );
}
void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue )
{
-XPropertyListRef pList = mpModel->GetDoc()->GetPropertyList( t );
+XPropertyListRef pList = mxModel->GetDoc()->GetPropertyList( t );
if( !pList.is() )
return;
@@ -963,8 +961,8 @@ throw (UnknownPropertyException, WrappedTargetException,
RuntimeException)
{
::SolarMutexGuard aGuard;
-SdDrawDocument* pDoc = mpModel->GetDoc();
-::sd::DrawDocShell* pDocSh = mpModel->GetDocShell();
+SdDrawDocument* pDoc = mxModel->GetDoc();
+::sd::DrawDocShell* pDocSh = mxModel->GetDocShell();
if( NULL == pDoc || NULL == pDocSh )
{
throw RuntimeException("Document or Shell missing",
@@ -1009,7 +1007,7 @@ throw (UnknownPropertyException, WrappedTargetException,
RuntimeException)
ExtractURL( XBITMAP_LIST, pValue );
break;
case HANDLE_FORBIDDENCHARS:
-*pValue <<= mpModel->getForbiddenCharsTable();
+*pValue <<= mxModel->getForbiddenCharsTable();
break;
case HANDLE_APPLYUSERDATA:
*pValue <<= pDocSh->IsUseUserData();
@@ -1264,7 +1262,7 @@ Sequence< OUString > SAL_CALL
DocumentSettings::getSupportedServiceNames( )
{
Sequence< OUString > aSeq( 2 );
aSeq[0] = "com.sun.star.document.Settings" ;
-if( mpModel->IsImpressDocument() )
+if( mxModel->IsImpressDocument() )
{
aSeq[1] = "com.sun.star.presentation.DocumentSettings" ;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac external/firebird external/libatomic_ops RepositoryExternal.mk
RepositoryExternal.mk |9 +---
configure.ac | 27 +
external/firebird/ExternalProject_firebird.mk | 12 ---
external/libatomic_ops/Module_libatomic_ops.mk |4 +++
4 files changed, 34 insertions(+), 18 deletions(-)
New commits:
commit f479f62c140bbab3869b8e2e783ee0c3f72dab3a
Author: Andrzej J.R. Hunt
Date: Thu Sep 5 16:27:50 2013 +0100
Make libatomic_ops buildable and enable on non-X86.
Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt
Tested-by: Andrzej J.R. Hunt
Reviewed-on: https://gerrit.libreoffice.org/6600
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 32711b4..4228803 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -703,15 +703,10 @@ $(LIBATOMIC_OPS_CFLAGS) \
$(call gb_LinkTarget_use_external_project,$(1),\
libatomic_ops \
)
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \
-)
-else
+
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs
-latomic_ops-7.2d \
+ -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops
\
)
-endif
endef
diff --git a/configure.ac b/configure.ac
index 3fbfdcd..b92cb4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8468,14 +8468,22 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
elif test "$cross_compiling" = "yes"; then
AC_MSG_RESULT([none])
else
-dnl ===
-dnl Check for system libatomic-ops
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >=
0.7.2])
-if test "$with_system_libatomic_ops" = "yes"; then
-SYSTEM_LIBATOMIC_OPS=YES
-AC_CHECK_HEADERS(atomic_ops.h, [],
-[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
+dnl We need libatomic-ops for any non X86/X64 system
+if test "$CPU" != I -a "$CPU" != X; then
+dnl
===
+dnl Check for system libatomic-ops
+dnl
===
+libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops
>= 0.7.2])
+if test "$with_system_libatomic_ops" = "yes"; then
+SYSTEM_LIBATOMIC_OPS=YES
+AC_CHECK_HEADERS(atomic_ops.h, [],
+[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)],
[])
+else
+SYSTEM_LIBATOMIC_OPS=NO
+
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
+LIBATOMIC_OPS_LIBS="-latomic_ops"
+BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS"
+fi
fi
AC_MSG_RESULT([internal])
@@ -8489,6 +8497,9 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi
AC_SUBST(ENABLE_FIREBIRD_SDBC)
+AC_SUBST(SYSTEM_LIBATOMIC_OPS)
+AC_SUBST(LIBATOMIC_OPS_CFLAGS)
+AC_SUBST(LIBATOMIC_OPS_LIBS)
AC_SUBST(SYSTEM_FIREBIRD)
AC_SUBST(FIREBIRD_CFLAGS)
AC_SUBST(FIREBIRD_LIBS)
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index b87b4d3..97db740 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -29,16 +29,22 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
&& export PKG_CONFIG="" \
+ && export CPPFLAGS=" \
+ $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \
+ -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
+ ,$(LIBATOMIC_OPS_CFLAGS)) \
+ " \
&& export CXXFLAGS=" \
$(if $(filter NO,$(SYSTEM_BOOST)), \
- -I$(call
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \
- -L$(call
gb_UnpackedTarball_get_dir,boost)/source/lib) \
+ -I$(call gb_UnpackedTarball_get_dir,boost) \
+ -L$(call
gb_UnpackedTarball_get_dir,boost)/source/lib \
+ ,$(BOOST_CPPFLAGS)) \
$(if $(filter NO,$(SYSTEM_ICU)), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source
\
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call
gb_UnpackedTarball_get_dir,icu)/
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|67401 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on||67401 --- Comment #108 from tommy27 --- I add Bug 67401 "Help -> About LibreOffice" Logo not smooth this issue doesn't affect productivity and is just a matter of aesthetics... however I feel that this ugly about logo could be used against the LibO project to discredit the quality of the project. I mean, somebody could argue that "LibO comes out with a scrambled about box, would you dare editing your documents with such a buggy software?" -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/edit.hxx|8
vcl/source/control/edit.cxx | 12 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 628a812db0d9a53c1936874028c32c975153941d
Author: Noel Grandin
Date: Tue Oct 29 13:54:16 2013 +0200
convert vcl/Edit::Impl* methods from xub_StrLen to sal_Int32
Change-Id: I009dd167d399d817689877a5e7e22dc4ab60ec61
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index f41908f..f02879b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -93,8 +93,8 @@ private:
SAL_DLLPRIVATE voidImplInitEditData();
SAL_DLLPRIVATE voidImplModified();
SAL_DLLPRIVATE OUStringImplGetText() const;
-SAL_DLLPRIVATE voidImplRepaint( xub_StrLen nStart = 0, xub_StrLen
nEnd = STRING_LEN, bool bLayout = false );
-SAL_DLLPRIVATE voidImplInvalidateOrRepaint( xub_StrLen nStart = 0,
xub_StrLen nEnd = STRING_LEN );
+SAL_DLLPRIVATE voidImplRepaint( sal_Int32 nStart = 0, sal_Int32
nEnd = STRING_LEN, bool bLayout = false );
+SAL_DLLPRIVATE voidImplInvalidateOrRepaint( sal_Int32 nStart = 0,
sal_Int32 nEnd = STRING_LEN );
SAL_DLLPRIVATE voidImplDelete( const Selection& rSelection,
sal_uInt8 nDirection, sal_uInt8 nMode );
SAL_DLLPRIVATE voidImplSetText( const OUString& rStr, const
Selection* pNewSelection = 0 );
SAL_DLLPRIVATE voidImplInsertText( const OUString& rStr, const
Selection* pNewSelection = 0, sal_Bool bIsUserInput = sal_False );
@@ -104,8 +104,8 @@ private:
SAL_DLLPRIVATE voidImplShowCursor( sal_Bool bOnlyIfVisible =
sal_True );
SAL_DLLPRIVATE voidImplAlign();
SAL_DLLPRIVATE voidImplAlignAndPaint();
-SAL_DLLPRIVATE xub_StrLen ImplGetCharPos( const Point& rWindowPos ) const;
-SAL_DLLPRIVATE voidImplSetCursorPos( xub_StrLen nChar, sal_Bool
bSelect );
+SAL_DLLPRIVATE sal_Int32 ImplGetCharPos( const Point& rWindowPos ) const;
+SAL_DLLPRIVATE voidImplSetCursorPos( sal_Int32 nChar, sal_Bool
bSelect );
SAL_DLLPRIVATE voidImplShowDDCursor();
SAL_DLLPRIVATE voidImplHideDDCursor();
SAL_DLLPRIVATE sal_BoolImplHandleKeyEvent( const KeyEvent& rKEvt );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6fd9fd2..98edce1 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -496,7 +496,7 @@ OUString Edit::ImplGetText() const
// ---
-void Edit::ImplInvalidateOrRepaint( xub_StrLen nStart, xub_StrLen nEnd )
+void Edit::ImplInvalidateOrRepaint( sal_Int32 nStart, sal_Int32 nEnd )
{
if( IsPaintTransparent() )
{
@@ -522,7 +522,7 @@ long Edit::ImplGetTextYPosition() const
// ---
-void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout )
+void Edit::ImplRepaint( sal_Int32 nStart, sal_Int32 nEnd, bool bLayout )
{
if ( !IsReallyVisible() )
return;
@@ -705,7 +705,7 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd,
bool bLayout )
nIndex++;
}
i = nIndex;
-aClip.Intersect(aRegion);
+aClip.Intersect(aRegion);
if( !aClip.IsEmpty() && nAttr )
{
Font aFont = GetFont();
@@ -1283,9 +1283,9 @@ void Edit::ImplAlignAndPaint()
// ---
-xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos ) const
+sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
{
-xub_StrLen nIndex = STRING_LEN;
+sal_Int32 nIndex = STRING_LEN;
OUString aText = ImplGetText();
sal_Int32 nDXBuffer[256];
@@ -1344,7 +1344,7 @@ xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos
) const
// ---
-void Edit::ImplSetCursorPos( xub_StrLen nChar, sal_Bool bSelect )
+void Edit::ImplSetCursorPos( sal_Int32 nChar, sal_Bool bSelect )
{
Selection aSelection( maSelection );
aSelection.Max() = nChar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2013-11-07
Moin! * Open changes on master for project core changed in the last 25 hours: + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/6600 from Andrzej J.R. Hunt + [docx] CustomXml relationship files saved in InteropGrabBag and exported. in https://gerrit.libreoffice.org/6603 from Sushil Shinde + fdo#65588 - Elements Dock: Scrollbar moves into input window in https://gerrit.libreoffice.org/6602 from José Guilherme Vanz + remove INPATH and PROEXT in https://gerrit.libreoffice.org/6601 from Michael Stahl + fdo#63020: Replace ::comphelper::stl_begin()... in https://gerrit.libreoffice.org/6599 from Marcos Souza + Windows: Require at least Windows XP SP2 in https://gerrit.libreoffice.org/6496 from Thomas Arnhold + fdo#71309 Export SWF with Multiple files crashes in https://gerrit.libreoffice.org/6598 from Laurent BP + Name threads for debug purpose in https://gerrit.libreoffice.org/6322 from Arnaud Versini + Save downloaded tarballs under external/tarballs/ in https://gerrit.libreoffice.org/6597 from Khaled Hosny + Save Image-Crop information for GIF in docx in https://gerrit.libreoffice.org/6595 from Pallavi Jadhav * Merged changes on master for project core changed in the last 25 hours: + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + bug in perl installer that make UnixLink entries to be lost in https://gerrit.libreoffice.org/6574 from Norbert Thiebaud + codesign: fix script to support spaces in the CODESIGN_IDENTITY in https://gerrit.libreoffice.org/6594 from Norbert Thiebaud * Abandoned changes on master for project core changed in the last 25 hours: + Version 4.2.0.0.alpha1, tag libreoffice-4.2.0.0.alpha1 in https://gerrit.libreoffice.org/6593 from Norbert Thiebaud * Open changes needing tweaks, but being untouched for more than a week: + fdo#70978 Improve Word Count display in https://gerrit.libreoffice.org/6479 from Samuel Mehrbrodt + Respect svg:font-face-format element. in https://gerrit.libreoffice.org/6144 from Brennan T Vincent + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/impop.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 95df39e382920dcd8bf86cb88f02dd219acbfa6f Author: Markus Mohrhard Date: Thu Nov 7 05:00:08 2013 +0100 we need to use ScDocumentImport for all calls otherwise a reallocation of the cell vector will invalidate the iterators for the position hint e.g. fdo#35208-1.xls Change-Id: I26e473c968633eb6e9cc3ecb1c8060105f5f47aa diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 8db86c3..d9d89f2 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -320,7 +320,7 @@ void ImportExcel::ReadInteger() maStrm >> nValue; GetXFRangeBuffer().SetXF( aScPos, nXFIdx ); -GetDoc().SetValue(aScPos, nValue); +GetDocImport().setNumericCell(aScPos, nValue); } } @@ -392,7 +392,7 @@ void ImportExcel::ReadBoolErr() const ScTokenArray* pScTokArr = ErrorToFormula( nType, nValue, fValue ); ScFormulaCell* pCell = pScTokArr ? new ScFormulaCell(pD, aScPos, *pScTokArr) : new ScFormulaCell(pD, aScPos); pCell->SetHybridDouble( fValue ); -GetDoc().SetFormulaCell(aScPos, pCell); +GetDocImport().setFormulaCell(aScPos, pCell); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/token.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7220b55f6347e2236e63491cd5d1ef9355c3320a
Author: Kohei Yoshida
Date: Wed Nov 6 20:56:20 2013 -0500
Correct reference count type.
Change-Id: Id7902c8d21d22a6d5f3740a6bd72e0c1213461e7
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index ea91e2c..f5b49cc 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -93,13 +93,13 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
protected:
const StackVar eType; // type of data
-mutable sal_uInt16 nRefCnt;// reference count
+mutable oslInterlockedCount mnRefCnt;// reference count
public:
FormulaToken( StackVar eTypeP,OpCode e =
ocPush ) :
-eOp(e), eType( eTypeP ), nRefCnt(0) {}
+eOp(e), eType( eTypeP ), mnRefCnt(0) {}
FormulaToken( const FormulaToken& r ) :
IFormulaToken(),
-eOp(r.eOp), eType( r.eType ), nRefCnt(0) {}
+eOp(r.eOp), eType( r.eType ), mnRefCnt(0)
{}
virtual ~FormulaToken();
@@ -111,16 +111,16 @@ public:
inline void IncRef() const
{
-osl_atomic_increment(&nRefCnt);
+osl_atomic_increment(&mnRefCnt);
}
inline void DecRef() const
{
-if (!osl_atomic_decrement(&nRefCnt))
+if (!osl_atomic_decrement(&mnRefCnt))
const_cast(this)->Delete();
}
-inline sal_uInt16 GetRef() const { return nRefCnt; }
+inline oslInterlockedCount GetRef() const { return mnRefCnt; }
inline OpCode GetOpCode() const { return eOp; }
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - include/formula
include/formula/token.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 13683a0719c52b451b6e906a115f4bb0e40bd7ae
Author: Kohei Yoshida
Date: Wed Nov 6 20:56:20 2013 -0500
Correct reference count type.
Change-Id: Id7902c8d21d22a6d5f3740a6bd72e0c1213461e7
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index ea91e2c..f5b49cc 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -93,13 +93,13 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
protected:
const StackVar eType; // type of data
-mutable sal_uInt16 nRefCnt;// reference count
+mutable oslInterlockedCount mnRefCnt;// reference count
public:
FormulaToken( StackVar eTypeP,OpCode e =
ocPush ) :
-eOp(e), eType( eTypeP ), nRefCnt(0) {}
+eOp(e), eType( eTypeP ), mnRefCnt(0) {}
FormulaToken( const FormulaToken& r ) :
IFormulaToken(),
-eOp(r.eOp), eType( r.eType ), nRefCnt(0) {}
+eOp(r.eOp), eType( r.eType ), mnRefCnt(0)
{}
virtual ~FormulaToken();
@@ -111,16 +111,16 @@ public:
inline void IncRef() const
{
-osl_atomic_increment(&nRefCnt);
+osl_atomic_increment(&mnRefCnt);
}
inline void DecRef() const
{
-if (!osl_atomic_decrement(&nRefCnt))
+if (!osl_atomic_decrement(&mnRefCnt))
const_cast(this)->Delete();
}
-inline sal_uInt16 GetRef() const { return nRefCnt; }
+inline oslInterlockedCount GetRef() const { return mnRefCnt; }
inline OpCode GetOpCode() const { return eOp; }
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 17 commits - bridges/Library_cpp_uno.mk bridges/Module_bridges.mk codemaker/source config_host.mk.in configure.ac download.lst external/hyphen external/mingw-externals
bridges/Library_cpp_uno.mk | 32 -
bridges/Module_bridges.mk |2
codemaker/source/codemaker/global.cxx |5 -
config_host.mk.in |4 -
configure.ac | 60 ++---
download.lst |6 -
external/hyphen/ExternalProject_hyphen.mk |2
external/mingw-externals/CustomTarget_jawt.mk |2
external/mythes/ExternalProject_mythes.mk |2
external/nss/ExternalProject_nss.mk|6 -
external/openssl/ExternalProject_openssl.mk| 14 +--
external/postgresql/postgresql-9.2.1-libreoffice.patch | 41 ---
idl/inc/lex.hxx|4 -
idl/source/cmptools/lex.cxx|4 -
include/rtl/string.hxx |7 -
include/rtl/ustring.hxx|3
odk/CustomTarget_check.mk | 16 ++--
sal/Library_sal.mk |2
scp2/source/accessories/file_font_accessories.scp |2
solenv/bin/modules/installer/archivefiles.pm |6 -
solenv/bin/modules/installer/control.pm|2
solenv/bin/modules/installer/environment.pm|2
solenv/bin/modules/installer/globals.pm|1
solenv/bin/modules/installer/parameter.pm |5 -
solenv/bin/modules/installer/systemactions.pm |5 -
solenv/bin/modules/installer/ziplist.pm|9 --
solenv/bin/modules/par2script/systemactions.pm |7 -
solenv/bin/modules/pre2par/systemactions.pm|7 -
solenv/gbuild/ExternalExecutable.mk|4 -
solenv/gbuild/TargetLocations.mk |2
solenv/gbuild/platform/com_MSC_class.mk|3
vcl/Library_vcl.mk |2
vcl/generic/glyphs/gcach_ftyp.cxx |2
vcl/source/glyphs/graphite_features.cxx|2
vcl/unx/generic/printer/ppdparser.cxx |4 -
35 files changed, 76 insertions(+), 201 deletions(-)
New commits:
commit 518f404db780939e3f1d96300ebeeb1faaad6838
Author: Michael Stahl
Date: Wed Nov 6 16:51:05 2013 +0100
installer: remove some special-casing of obsolete "common.pro" dirs
Change-Id: I8e79bb278759c3d6c5c782c6f2e0df8758e801c8
diff --git a/solenv/bin/modules/installer/archivefiles.pm
b/solenv/bin/modules/installer/archivefiles.pm
index ae138d9..e309418 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -162,14 +162,8 @@ sub resolving_archive_flag
if ( $styles =~ /\bARCHIVE\b/ ) # copying, unzipping and changing
the file list
{
-my $iscommonfile = 0;
my $sourcepath = $onefile->{'sourcepath'};
-if ( $sourcepath =~
/\Q$installer::globals::separator\E\bcommon\Q$installer::globals::separator\E/
) # /common/ or /common.pro/
-{
-$iscommonfile = 1;
-}
-
my $use_internal_rights = 0;
if ( $styles =~ /\bUSE_INTERNAL_RIGHTS\b/ ) { $use_internal_rights
= 1; } # using the rights used inside the zip file
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index 2037c10..0c17b48 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -202,11 +202,6 @@ sub create_directories
if ($newdirectory eq "unzip" ) # special handling for common directory
{
-$path = $path . ".." . $installer::globals::separator . "common" .
$installer::globals::separator;
-create_directory($path);
-
-$path = $path . $newdirectory . $installer::globals::separator;
-create_directory($path);
}
else
{
diff --git a/solenv/bin/modules/par2script/systemactions.pm
b/solenv/bin/modules/par2script/systemactions.pm
index 475f276..4783927 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -75,11 +75,6 @@ sub create_directories
if ($directory eq "unzip" )
{
-$path = $path . "common" . $par2script::globals::separator;
-create_directory($path);
-
-$path = $path . $directory . $par2script::globals::separator;
-create_directory($path);
}
else
{
diff --git a/solenv/bin/modules/pre2par/systemactions.pm
b/solenv/bin/modules/pre2par/systemactions.pm
index cd2deaf..2cf3bdf 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -98,11 +98,6 @@ sub create_directories
if ($director
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 5 commits - formula/source sc/inc sc/source svl/source
formula/source/core/api/FormulaCompiler.cxx | 66 +++--
sc/inc/compiler.hxx |3
sc/inc/document.hxx |1
sc/source/core/data/documen2.cxx|5
sc/source/core/data/poolhelp.cxx| 28 +-
sc/source/core/inc/poolhelp.hxx |4
sc/source/core/tool/compiler.cxx| 62 ++---
sc/source/filter/inc/formulabuffer.hxx | 38 ++-
sc/source/filter/oox/formulabuffer.cxx | 318 ++--
svl/source/numbers/zforfind.cxx |6
svl/source/numbers/zforfind.hxx |3
11 files changed, 354 insertions(+), 180 deletions(-)
New commits:
commit 4af2f3c8cc98949271df5dc70358e3d33e751719
Author: Kohei Yoshida
Date: Wed Nov 6 18:51:34 2013 -0500
Perform formula cell compilations in multiple threads during xlsx import.
One sheet per thread. Right now the thread count is set to 1 due to non
re-entrancy of a large portion of Calc core, and beyond. We need to fix
that first before setting the thread count to more than 1.
Change-Id: I6997c1e9540de939f1f00b1798e2b32059787ae5
diff --git a/sc/source/filter/inc/formulabuffer.hxx
b/sc/source/filter/inc/formulabuffer.hxx
index f9e5229..7e881ee 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -13,6 +13,8 @@
#include
#include "oox/helper/refmap.hxx"
#include "oox/helper/refvector.hxx"
+#include "salhelper/thread.hxx"
+#include "osl/mutex.hxx"
#include "workbookhelper.hxx"
#include
#include
@@ -29,6 +31,21 @@ namespace oox { namespace xls {
class FormulaBuffer : public WorkbookHelper
{
+class FinalizeThread : public salhelper::Thread
+{
+FormulaBuffer& mrParent;
+size_t mnThreadCount;
+public:
+FinalizeThread( FormulaBuffer& rParent, size_t nThreadCount );
+virtual ~FinalizeThread();
+
+protected:
+virtual void execute();
+};
+
+friend class FinalizeThread;
+
+public:
/**
* Represents a shared formula definition.
*/
@@ -74,6 +91,20 @@ class FormulaBuffer : public WorkbookHelper
TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const
::com::sun::star::table::CellRangeAddress& rCellRangeAddress ) :
maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress )
{}
};
+typedef std::pair
ValueAddressPair;
+
+struct SheetItem
+{
+std::vector* mpCellFormulas;
+std::vector* mpArrayFormulas;
+std::vector* mpCellFormulaValues;
+std::vector* mpSharedFormulaEntries;
+std::vector* mpSharedFormulaIDs;
+
+SheetItem();
+};
+
+private:
typedef ::std::map< SCTAB, std::vector > FormulaDataMap;
typedef ::std::map< SCTAB, std::vector >
ArrayFormulaDataMap;
// sheet -> list of shared formula descriptions
@@ -81,19 +112,16 @@ class FormulaBuffer : public WorkbookHelper
// sheet -> stuff needed to create shared formulae
typedef ::std::map< SCTAB, std::vector >
SheetToFormulaEntryMap;
-typedef ::std::pair< ::com::sun::star::table::CellAddress, double >
ValueAddressPair;
typedef ::std::map< SCTAB, std::vector > FormulaValueMap;
+osl::Mutex maMtxData;
FormulaDataMap maCellFormulas;
ArrayFormulaDataMap maCellArrayFormulas;
SheetToFormulaEntryMap maSharedFormulas;
SheetToSharedFormulaid maSharedFormulaIds;
FormulaValueMap maCellFormulaValues;
-voidapplyArrayFormulas( const std::vector<
TokenRangeAddressItem >& rVector );
-voidapplyCellFormulas( const std::vector<
TokenAddressItem >& rVector );
-voidapplyCellFormulaValues( const std::vector<
ValueAddressPair >& rVector );
-void applySharedFormulas( SCTAB nTab );
+SheetItem getSheetItem( SCTAB nTab );
public:
explicitFormulaBuffer( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index 04be139..c3e1d24 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -33,114 +33,22 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::container;
-namespace oox { namespace xls {
-
-FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry(
-const table::CellAddress& rAddr, const table::CellRangeAddress& rRange,
-const OUString& rTokenStr, sal_Int32 nSharedId ) :
-maAddress(rAddr), maRange(rRange), maTokenStr(rTokenStr),
mnSharedId(nSharedId) {}
-
-FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc(
-const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId,
-const OUString& rCellValue, sal_Int32 nValueType ) :
-maAddress(rAddr), mnSharedId(nSharedId), maCellValue(rCellValue),
mnValueType(nValueType) {}
-
-FormulaBuffer::FormulaBuffer( const Wo
David DELMA license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. David DELMA Tél.(226) 50402811 Burkina Faso ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jorendc changed: What|Removed |Added Depends on||71321 --- Comment #15 from Jorendc --- Hereby I nominate Bug 71321 - Can't scroll down in Calc and Writer on Mac osx A blocker for Mac OSX users. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source reportdesign/source sd/source svx/source sw/qa sw/source xmloff/source
dbaccess/source/filter/xml/xmlfilter.cxx |5 --
dbaccess/source/ui/browser/genericcontroller.cxx |8
reportdesign/source/filter/xml/xmlfilter.cxx |6 ---
sd/source/filter/xml/sdxmlwrp.cxx| 12 --
svx/source/svdraw/svdmodel.cxx | 24
sw/qa/core/Test-BigPtrArray.cxx | 45 ---
sw/source/filter/xml/swxml.cxx |7 ---
xmloff/source/core/xmlexp.cxx| 14 ---
xmloff/source/core/xmlimp.cxx|9
9 files changed, 130 deletions(-)
New commits:
commit 107c2c7c7bb7eacba4045159ac40fe3b6737d4f3
Author: Stephan Bergmann
Date: Wed Nov 6 20:54:44 2013 +0100
Remove #ifdef TIMELOG'ed SAL_INFOs
...the code doesn't make much sense that way.
Change-Id: I506e37b44924701255431f6d20d4610f7f52287d
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 8ead508..b94e0ce 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -331,11 +331,6 @@ sal_Int32 ReadThroughComponent(
return 1; // TODO/LATER: error handling
}
-#ifdef TIMELOG
-// if we do profiling, we want to know the stream
- SAL_INFO("dbaccess", "dbaxml ReadThroughComponent : parsing \"" <<
pStreamName << "\"" );
-#endif
-
uno::Reference< XInputStream > xInputStream =
xDocStream->getInputStream();
// read from the stream
return ReadThroughComponent( xInputStream
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5ea4421..064670c 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -728,14 +728,6 @@ void OGenericUnoController::dispatch(const URL& _aURL,
const Sequence< PropertyV
// for locking in the proper order (SolarMutex and m_aMutex), and b) this
would be too many places
// for the time frame of the fix.
// #i52602#
-
-#ifdef TIMELOG
-OString sLog( "OGenericUnoController::dispatch( '" );
-sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(),
osl_getThreadTextEncoding() );
-sLog += OString( "' )" );
-SAL_INFO("dbaccess.ui", "dbaccess frank.schoenh...@sun.com" <<
sLog.getStr() );
-#endif
-
executeChecked(_aURL,aArgs);
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index a7109c2..1cdc9c4 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -152,12 +152,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-
-#ifdef TIMELOG
-// if we do profiling, we want to know the stream
-SAL_INFO( "reportdesign", "rptxml ReadThroughComponent : parsing \"" <<
pStreamName << "\"" );
-#endif
-
// finally, parser the stream
try
{
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index 50aba6f..9c102da 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -432,12 +432,6 @@ sal_Int32 ReadThroughComponent(
sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
-SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Import" );
-#ifdef TIMELOG
-OString aFile(OUStringToOString(mrMedium.GetName(),
RTL_TEXTENCODING_ASCII_US));
-SAL_INFO( "sd.filter", "importing " << aFile.getStr() );
-#endif
-
sal_uInt32 nRet = 0;
// Get service factory
@@ -809,12 +803,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
sal_Bool SdXMLFilter::Export()
{
-#ifdef TIMELOG
-SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Export" );
-OString aFile(OUStringToOString(mrMedium.GetName(),
RTL_TEXTENCODING_ASCII_US));
-SAL_INFO( "sd.filter", "exporting " << aFile.getStr() );
-#endif
-
SvXMLEmbeddedObjectHelper* pObjectHelper = NULL;
SvXMLGraphicHelper* pGraphicHelper = NULL;
sal_BoolbDocRet = sal_False;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 1693d49..f0ab176 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -218,10 +218,6 @@ SdrModel::SdrModel(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* pPers, sal
maMaPag(),
maPages()
{
-#ifdef TIMELOG
-SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -232,10 +228,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool*
pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
-#ifdef TIMELOG
-SAL_INFO( "svx.svdraw", "SdrModel::SdrModel(...)" );
-#endif
-
DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, fals
[Libreoffice-commits] core.git: configure.ac external/firebird external/libatomic_ops RepositoryExternal.mk
RepositoryExternal.mk | 10 ++---
configure.ac | 27 +++--
external/firebird/ExternalProject_firebird.mk |7 --
external/libatomic_ops/Module_libatomic_ops.mk |4 ---
4 files changed, 16 insertions(+), 32 deletions(-)
New commits:
commit 31fd531b2757269dde108b362752f7949615736a
Author: Andrzej J.R. Hunt
Date: Wed Nov 6 19:41:30 2013 +
Revert "Make libatomic_ops buildable and enable on non-X86."
(Pushed from wrong branch -- incomplete/broken.)
This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6.
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0f557a7..32711b4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -703,10 +703,15 @@ $(LIBATOMIC_OPS_CFLAGS) \
$(call gb_LinkTarget_use_external_project,$(1),\
libatomic_ops \
)
-
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call
gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \
+)
+else
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops
\
+ -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs
-latomic_ops-7.2d \
)
+endif
endef
@@ -3153,7 +3158,6 @@ $(call gb_ExternalExecutable_set_external,python,$(call
gb_UnpackedTarball_get_d
# target, as that is not used on Mac)
$(call gb_ExternalExecutable_add_dependencies,python,$(call
gb_GeneratedPackage_get_target_for_build,python3))
-<<< HEAD
else
$(call
gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if
$(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
diff --git a/configure.ac b/configure.ac
index 13751e9..b73df30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8511,22 +8511,14 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
elif test "$cross_compiling" = "yes"; then
AC_MSG_RESULT([none])
else
-dnl We need libatomic-ops for any non X86/X64 system
-if test "$CPU" != I -a "$CPU" != X; then
-dnl
===
-dnl Check for system libatomic-ops
-dnl
===
-libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops
>= 0.7.2])
-if test "$with_system_libatomic_ops" = "yes"; then
-SYSTEM_LIBATOMIC_OPS=YES
-AC_CHECK_HEADERS(atomic_ops.h, [],
-[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)],
[])
-else
-SYSTEM_LIBATOMIC_OPS=NO
-
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
-LIBATOMIC_OPS_LIBS="-latomic_ops"
-BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS"
-fi
+dnl ===
+dnl Check for system libatomic-ops
+dnl ===
+libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >=
0.7.2])
+if test "$with_system_libatomic_ops" = "yes"; then
+SYSTEM_LIBATOMIC_OPS=YES
+AC_CHECK_HEADERS(atomic_ops.h, [],
+[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
fi
AC_MSG_RESULT([internal])
@@ -8540,9 +8532,6 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi
AC_SUBST(ENABLE_FIREBIRD_SDBC)
-AC_SUBST(SYSTEM_LIBATOMIC_OPS)
-AC_SUBST(LIBATOMIC_OPS_CFLAGS)
-AC_SUBST(LIBATOMIC_OPS_LIBS)
AC_SUBST(SYSTEM_FIREBIRD)
AC_SUBST(FIREBIRD_CFLAGS)
AC_SUBST(FIREBIRD_LIBS)
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 871286f..b87b4d3 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -29,12 +29,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
&& export PKG_CONFIG="" \
- && export CPPFLAGS=" \
- $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \
- -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
- ,$(LIBATOMIC_OPS_CFLAGS)) \
- " \
- && export CFLAGS=" \
+ && export CXXFLAGS=" \
$(if $(filter NO,$(SYSTEM_BOOST)), \
-I$(call
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \
-L$(call
gb_UnpackedTarball_get_dir,boost)/source/lib) \
diff --git a/external/libatomic_ops/Module_libatomic_ops.mk
b/external/libatomic_ops/Module_libatomic_ops.mk
index 0a9a534..7dca670 100644
--- a/
[Libreoffice-commits] core.git: configure.ac external/firebird external/libatomic_ops RepositoryExternal.mk
RepositoryExternal.mk | 10 ++---
configure.ac | 27 +
external/firebird/ExternalProject_firebird.mk |7 +-
external/libatomic_ops/Module_libatomic_ops.mk |4 +++
4 files changed, 32 insertions(+), 16 deletions(-)
New commits:
commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6
Author: Andrzej J.R. Hunt
Date: Thu Sep 5 16:27:50 2013 +0100
Make libatomic_ops buildable and enable on non-X86.
Change-Id: I9423672b03caa4d500d44155bc47d4a8fa10c3cb
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt
Tested-by: Andrzej J.R. Hunt
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 32711b4..0f557a7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -703,15 +703,10 @@ $(LIBATOMIC_OPS_CFLAGS) \
$(call gb_LinkTarget_use_external_project,$(1),\
libatomic_ops \
)
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \
-)
-else
+
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs
-latomic_ops-7.2d \
+ -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops
\
)
-endif
endef
@@ -3158,6 +3153,7 @@ $(call gb_ExternalExecutable_set_external,python,$(call
gb_UnpackedTarball_get_d
# target, as that is not used on Mac)
$(call gb_ExternalExecutable_add_dependencies,python,$(call
gb_GeneratedPackage_get_target_for_build,python3))
+<<< HEAD
else
$(call
gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if
$(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
diff --git a/configure.ac b/configure.ac
index b73df30..13751e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8511,14 +8511,22 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
elif test "$cross_compiling" = "yes"; then
AC_MSG_RESULT([none])
else
-dnl ===
-dnl Check for system libatomic-ops
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >=
0.7.2])
-if test "$with_system_libatomic_ops" = "yes"; then
-SYSTEM_LIBATOMIC_OPS=YES
-AC_CHECK_HEADERS(atomic_ops.h, [],
-[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
+dnl We need libatomic-ops for any non X86/X64 system
+if test "$CPU" != I -a "$CPU" != X; then
+dnl
===
+dnl Check for system libatomic-ops
+dnl
===
+libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops
>= 0.7.2])
+if test "$with_system_libatomic_ops" = "yes"; then
+SYSTEM_LIBATOMIC_OPS=YES
+AC_CHECK_HEADERS(atomic_ops.h, [],
+[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)],
[])
+else
+SYSTEM_LIBATOMIC_OPS=NO
+
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
+LIBATOMIC_OPS_LIBS="-latomic_ops"
+BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS"
+fi
fi
AC_MSG_RESULT([internal])
@@ -8532,6 +8540,9 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi
AC_SUBST(ENABLE_FIREBIRD_SDBC)
+AC_SUBST(SYSTEM_LIBATOMIC_OPS)
+AC_SUBST(LIBATOMIC_OPS_CFLAGS)
+AC_SUBST(LIBATOMIC_OPS_LIBS)
AC_SUBST(SYSTEM_FIREBIRD)
AC_SUBST(FIREBIRD_CFLAGS)
AC_SUBST(FIREBIRD_LIBS)
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index b87b4d3..871286f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -29,7 +29,12 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
&& export PKG_CONFIG="" \
- && export CXXFLAGS=" \
+ && export CPPFLAGS=" \
+ $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \
+ -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
+ ,$(LIBATOMIC_OPS_CFLAGS)) \
+ " \
+ && export CFLAGS=" \
$(if $(filter NO,$(SYSTEM_BOOST)), \
-I$(call
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \
-L$(call
gb_UnpackedTarball_get_dir,boost)/source/lib) \
diff --git a/external/libatomic_ops/Module_libatomic_ops.mk
b/external/libatomic_ops/Module_libato
Re: LICENSE.html packaging on Mac
On Wed, Nov 6, 2013 at 4:40 AM, Andras Timar wrote: > On Wed, Nov 6, 2013 at 11:05 AM, Michael Stahl wrote: >> On 06/11/13 07:20, Norbert Thiebaud wrote: >>> on Mac we put LICENCE.html in a LICENSEs/ directory at the top level of the >>> dmg >>> at the same level than the LibreOffice.app bundle >>> >>> I suspect that >>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa424af27 >>> broke that.. now the packager cannot find LICENSE.html >> >> dd08ef89d53831246acefcd7c14d00b3c3da4e0f has "fixed" that with a >> horrible hack >> that should be reverted. but if it is now broken again there must be >> a different problem. perhaps b08f6ca2e1f3d9b393435a137dbd247f3cf20b6d >> broke it? > > This morning I pushed b08f6ca2e1f3d9b393435a137dbd247f3cf20b6d which > solved the issue for me. I cherry piked it on top of alpha1 and that solve the problem for me too... thanks Andras. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Track features of LO that should become ODF standard
Hi Caolán, Caolán McNamara schrieb: On Wed, 2013-11-06 at 15:08 +0100, Regina Henschel wrote: Hi all, I know, that LO has a lot of features, which are not ODF standard (yet). I'm looking for an overview or a place where they are tracked. Something to collect: Is this what you are looking for: https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#LibreOffice_ODF_extensions Yes, that is it exactly. Thanks. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 71043] Use STACK lint tool to clean code ...
https://bugs.freedesktop.org/show_bug.cgi?id=71043 José Guilherme Vanz changed: What|Removed |Added Attachment #88526|0 |1 is obsolete|| --- Comment #13 from José Guilherme Vanz --- Created attachment 88771 --> https://bugs.freedesktop.org/attachment.cgi?id=88771&action=edit stack_result I executed STACK lint tool again. And finally! We can see some warnings in our codebase. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #16 from Marcos Souza --- It seems that in scripting module we have 6 libs that are used in the same conditions inside Repository.mk. They just link to some libs in some cases, but most of the depencies are equal. I'll try to make some prototyping and see what happens :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/cp115.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |7 +++
sw/source/filter/ww8/docxattributeoutput.cxx |6 +++---
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 7813bd3113beb2b2860f9eb213c5c67ef54f5bf0
Author: Miklos Vajna
Date: Wed Nov 6 17:05:03 2013 +0100
cp#115 DOCX export: fix not-well-formed XML on redline end + hyperlink
Change-Id: I3a87a0277952ba0a422df8988151f8b14e166e06
diff --git a/sw/qa/extras/ooxmlexport/data/cp115.odt
b/sw/qa/extras/ooxmlexport/data/cp115.odt
new file mode 100644
index 000..7d8dc9f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/cp115.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1355f51..d137de54 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1548,6 +1548,13 @@ DECLARE_OOXML_TEST(testFdo69644, "fdo69644.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblGrid/w:gridCol", 5);
}
+DECLARE_OOXML_TEST(testCp115, "cp115.odt")
+{
+// Redline and hyperlink end got exported in an incorrect order.
+getParagraph(1, "Hello.");
+getParagraph(2, "http://www.google.com/";);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8f5859f..bd49937 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -712,6 +712,9 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath();
WritePendingPlaceholder();
+// if there is some redlining in the document, output it
+EndRedline();
+
if ( m_closeHyperlinkInThisRun )
{
if ( m_startedHyperlink )
@@ -729,9 +732,6 @@ void DocxAttributeOutput::EndRun()
delete m_Fields.front().pField;
m_Fields.erase( m_Fields.begin( ) );
}
-
-// if there is some redlining in the document, output it
-EndRedline();
}
void DocxAttributeOutput::WriteCommentRanges()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
TextListener behavior
When adding a Textlistener on a DialogControl the Listener is reacting on "textchanged" once when adding a character or replacing some characters. But the Listenere is reactiong twice when using the delete or backspace key. Is this wanted behavior or a bug ? Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
Dear Ladies & Gentlemen, All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. With kind regards, Henning Diedler ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Track features of LO that should become ODF standard
On Wed, 2013-11-06 at 15:08 +0100, Regina Henschel wrote: > Hi all, > > I know, that LO has a lot of features, which are not ODF standard (yet). > I'm looking for an overview or a place where they are tracked. Something > to collect: Is this what you are looking for: https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#LibreOffice_ODF_extensions C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - offapi/com sw/inc sw/qa sw/source writerfilter/source
offapi/com/sun/star/style/Style.idl | 10 +
sw/inc/cmdid.h |1
sw/inc/docstyle.hxx |2 +
sw/inc/format.hxx |6 +++
sw/inc/unoprnms.hxx |1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|5 ++
sw/source/core/attr/format.cxx | 23
sw/source/core/unocore/unomap.cxx |3 +
sw/source/core/unocore/unoprnms.cxx |1
sw/source/core/unocore/unostyle.cxx | 15 +++
sw/source/filter/ww8/docxattributeoutput.cxx| 37 +++
sw/source/filter/ww8/docxtablestyleexport.cxx | 23 +++-
sw/source/filter/ww8/wrtww8.hxx |2 -
sw/source/filter/ww8/ww8atr.cxx |2 -
sw/source/ui/app/docstyle.cxx | 46
writerfilter/source/dmapper/StyleSheetTable.cxx | 40 +++-
writerfilter/source/dmapper/StyleSheetTable.hxx | 11 +++--
17 files changed, 194 insertions(+), 34 deletions(-)
New commits:
commit eb3942a24918e9537c85cc79a405fff8c167d456
Author: Miklos Vajna
Date: Wed Nov 6 15:11:05 2013 +0100
DOCX export of para style's qFormat, rsid and friends
Change-Id: I4ed35f2b497fec96d012303001d4861768daef6a
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6aeae7b..1355f51 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1299,6 +1299,11 @@ DECLARE_OOXML_TEST(testStyleInheritance,
"style-inheritance.docx")
assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='TableNormal']/w:tblPr/w:tblCellMar/w:left", "w",
"108");
assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='TableNormal']/w:semiHidden", 1);
assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='TableNormal']/w:unhideWhenUsed", 1);
+
+// Additional para style properties should be also roundtripped.
+assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='ListParagraph']/w:uiPriority", "val", "34");
+assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='Normal']/w:qFormat", 1);
+assertXPath(pXmlStyles, "/w:styles/w:style[@w:styleId='Normal']/w:rsid",
"val", "00780346");
}
DECLARE_OOXML_TEST(testCalendar1, "calendar1.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 755f606..8f5859f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3609,6 +3609,43 @@ void DocxAttributeOutput::StartStyle( const OUString&
rName, StyleType eType,
FSNS( XML_w, XML_val ), OUStringToOString( OUString( rName ),
RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
+if (eType == STYLE_TYPE_PARA)
+{
+const SwFmt* pFmt = m_rExport.pStyles->GetSwFmt(nId);
+uno::Any aAny;
+pFmt->GetGrabBagItem(aAny);
+const uno::Sequence& rGrabBag = aAny.get<
uno::Sequence >();
+
+bool bQFormat = false, bUnhideWhenUsed = false;
+OUString aRsid, aUiPriority;
+for (sal_Int32 i = 0; i < rGrabBag.getLength(); ++i)
+{
+if (rGrabBag[i].Name == "uiPriority")
+aUiPriority = rGrabBag[i].Value.get();
+else if (rGrabBag[i].Name == "qFormat")
+bQFormat = true;
+else if (rGrabBag[i].Name == "rsid")
+aRsid = rGrabBag[i].Value.get();
+ else if (rGrabBag[i].Name == "unhideWhenUsed")
+ bUnhideWhenUsed = true;
+else
+SAL_WARN("sw.ww8", "Unhandled style property: " <<
rGrabBag[i].Name);
+}
+
+if (!aUiPriority.isEmpty())
+m_pSerializer->singleElementNS(XML_w, XML_uiPriority,
+FSNS(XML_w, XML_val), OUStringToOString(aUiPriority,
RTL_TEXTENCODING_UTF8).getStr(),
+FSEND);
+if (bQFormat)
+m_pSerializer->singleElementNS(XML_w, XML_qFormat, FSEND);
+if (bUnhideWhenUsed)
+m_pSerializer->singleElementNS(XML_w, XML_unhideWhenUsed, FSEND);
+if (!aRsid.isEmpty())
+m_pSerializer->singleElementNS(XML_w, XML_rsid,
+FSNS(XML_w, XML_val), OUStringToOString(aRsid,
RTL_TEXTENCODING_UTF8).getStr(),
+FSEND);
+}
+
if ( nBase != 0x0FFF && eType != STYLE_TYPE_LIST)
{
m_pSerializer->singleElementNS( XML_w, XML_basedOn,
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 61eea42..3fc7246 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -14,7 +14,6 @@
#include
#include
-#include
#include
#include
@@ -538,8 +537,7 @@ void
DocxTableStyleExport::Impl::tabl
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/langid.pl | 47 +++
1 file changed, 10 insertions(+), 37 deletions(-)
New commits:
commit db1118a652891543a4d71e29d7a4fcd9c2d79515
Author: Eike Rathke
Date: Wed Nov 6 16:34:04 2013 +0100
cut cruft
Change-Id: Ibd1669b22e990d21b3fb35a6d412067e80b602b8
diff --git a/i18nlangtag/source/isolang/langid.pl
b/i18nlangtag/source/isolang/langid.pl
index 838ef2c..0ac2017 100755
--- a/i18nlangtag/source/isolang/langid.pl
+++ b/i18nlangtag/source/isolang/langid.pl
@@ -56,20 +56,13 @@ sub Usage()
"If option --single is given, only the first match will be
processed.\n\n";
}
-my $SOLARVERSION = $ENV{"SOLARVERSION"};
-my $INPATH = $ENV{"INPATH"};
-my $SRC_ROOT = $ENV{"SRC_ROOT"};
-my $UPDMINOREXT = $ENV{"UPDMINOREXT"};
-if (!defined($SOLARVERSION) || !defined($INPATH) || !defined($SRC_ROOT))
+my $SRC_ROOT = $ENV{"SRC_ROOT"};
+if (!defined($SRC_ROOT))
{
-print "\nNeed \$SOLARVERSION, \$INPATH and \$SRC_ROOT, please set your OOo
environment!\n";
+print "\nNeed \$SRC_ROOT, please set your LibreOffice environment!\n";
Usage();
exit 1;
}
-if (!defined($UPDMINOREXT)) {
-$UPDMINOREXT = '';
-}
-my $SOLENVINC = "$SOLARVERSION/$INPATH/inc$UPDMINOREXT";
my $LANGUAGE_MASK_PRIMARY = 0x03ff;
@@ -99,13 +92,9 @@ sub grepFile(@)
my $found = 0;
my $areopen = 0;
my $arecloser = '';
-my $file;
# Try module under current working directory first to catch local
-# modifications. A Not yet delivered lang.h is a special case.
-if ("$path/$module/$name" eq "$SOLENVINC/i18nlangtag/lang.h") {
-$file = "./include/$module/lang.h"; }
-else {
-$file = "./$module/$name"; }
+# modifications.
+my $file = "./$module/$name";
if (!($found = open( IN, $file)))
{
# Then with the given path.
@@ -113,13 +102,6 @@ sub grepFile(@)
if (!($found = open( IN, $file)))
{
print "No $file\n";
-$file = "$path/$module.lnk/$name";
-if (!($found = open( IN, $file))) {
-print "No $file.\n";
-$file = "$path/$module.link/$name";
-if (!($found = open( IN, $file))) {
-print "No $file either.\n"; }
-}
}
}
if ($found)
@@ -232,7 +214,7 @@ sub main()
# #define LANGUAGE_AFRIKAANS 0x0436
@resultlist = grepFile(
$modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef,
-$SOLENVINC, "i18nlangtag", "lang.h", ());
+"$SRC_ROOT", "i18nlangtag", "lang.h", ());
}
else
{
@@ -241,7 +223,7 @@ sub main()
my $buf = sprintf( "0x%04X", $lcid);
@resultlist = grepFile(
'^\s*#\s*define\s+\w+\s+' . $buf,
-$SOLENVINC, "i18nlangtag", "lang.h", ());
+"$SRC_ROOT", "i18nlangtag", "lang.h", ());
}
for $result (@resultlist)
{
@@ -294,7 +276,7 @@ sub main()
# #define LANGUAGE_AFRIKAANS 0x0436
@resultlist = grepFile(
$modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef,
-$SOLENVINC, "i18nlangtag", "lang.h", ());
+"$SRC_ROOT", "i18nlangtag", "lang.h", ());
my @lcidlist;
for $result (@resultlist)
{
@@ -330,16 +312,7 @@ sub main()
push( @langcoungreplist, '\b' . $lang . '\b');
}
my $file =
"$SRC_ROOT/i18npool/source/localedata/data/$loca.xml";
-my $found;
-if (!($found = open( LD, $file)))
-{
-$file =
"$SRC_ROOT/i18npool.lnk/source/localedata/data/$loca.xml";
-if (!($found = open( LD, $file)))
-{
-$file =
"$SRC_ROOT/i18npool.link/source/localedata/data/$loca.xml";
-$found = open( LD, $file);
-}
-}
+my $found = open( LD, $file);
if ($found)
{
print "Found $file:\n";
@@ -356,7 +329,7 @@ sub main()
close( LD);
}
else {
-print "No
$SRC_ROOT/i18npool/source/localedata/data/$loca.xml\n"; }
+print "No $file\n"; }
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 929ab83d93da4250cc55aee96738c8b1b4f55c1d
Author: Caolán McNamara
Date: Wed Nov 6 15:31:53 2013 +
check for valid string len
as demonstrated by fdo59762-2.ods
Change-Id: I36cddaba5f664d5d95e9a661eed1cbe9dec1c273
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 952e50c..3e8a537 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8061,7 +8061,6 @@ void ScInterpreter::ScSearch()
}
}
-
void ScInterpreter::ScMid()
{
if ( MustHaveParamCount( GetByte(), 3 ) )
@@ -8074,12 +8073,14 @@ void ScInterpreter::ScMid()
else
{
sal_Int32 nCharacters =
std::min(static_cast(fAnz), aStr.getLength() - fAnfang +
1);
-PushString(aStr.copy(static_cast(fAnfang-1),
nCharacters));
+OUString sRes;
+if (nCharacters > 0)
+sRes = aStr.copy(static_cast(fAnfang-1),
nCharacters);
+PushString(sRes);
}
}
}
-
void ScInterpreter::ScText()
{
if ( MustHaveParamCount( GetByte(), 2 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7c6ebf38fe5e27c598dff970851d2e9fef6adc5
Author: Caolán McNamara
Date: Wed Nov 6 15:24:55 2013 +
check string bounds
as demonstrated by fdo54887-1.ods
Change-Id: I2d5568126c58c831446b4c4b050ffed193f7921d
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 1fb4d65..fe0bc31 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -762,7 +762,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString&
rStr,
eType = nTmpType;
sal_Int32 nLen = sKeyword[eType].getLength();
sSymbol = rStr.copy( nPos-1, nLen );
-if ( eType == NF_KEY_E || IsAmbiguousE( eType ) )
+if ((eType == NF_KEY_E || IsAmbiguousE(eType)) &&
nPos < rStr.getLength())
{
sal_Unicode cNext = rStr[nPos];
switch ( cNext )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-l10n] string freeze has been broken in libreoffice-4-1
On Wed, Nov 06, 2013 at 02:10:15PM +0100, Andras Timar wrote: > Hi Sérgio, > > On 2013.11.06. 1:11, Sérgio Marques wrote: > > Hi Andras, > > > > I´ve run "Update from templates" and now I have 205 words in sbasic > > and 470 in shared. Is this ok? > > > > These are to many changes from a brach that it is supposed to be freezed. > > > > Well, we could have avoided re-translating the 470 words in shared, > because the translatable strings have not changed, only identifiers. > That's a pity. If only Pootle were more intelligent, and distinguished > tags from text... Can you elaborate on this issue? Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlnumi.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f8f0f18d7109db4dc140524027c1dd18b6c7dee7 Author: Caolán McNamara Date: Wed Nov 6 15:16:34 2013 + check for empty string as demonstrated by kde246118-4.odp Change-Id: Idf1224555e0d7be9a679862da9ff256cf7a4d128 diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index b3680e1..6d5b221 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -315,7 +315,8 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( sTextStyleName = rValue; break; case XML_TOK_TEXT_LEVEL_ATTR_BULLET_CHAR: -cBullet = rValue[0]; +if (!rValue.isEmpty()) +cBullet = rValue[0]; break; case XML_TOK_TEXT_LEVEL_ATTR_HREF: if( bImage ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54514] PRINT PREVIEW: Old icon for page left
https://bugs.freedesktop.org/show_bug.cgi?id=54514 Rolf Koetter changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |rolf-koet...@gmx.de |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 0325093fdfbb150f8a5176c56cc1a4803ffd1c80 Author: Caolán McNamara Date: Wed Nov 6 15:03:41 2013 + check for empty string as demonstrated by ooo29618-1.doc Change-Id: I81c953530cd3a617a245ed03a9c355f3383045ab diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index eea9498..f6f3b36b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4046,12 +4046,15 @@ int RTFDocumentImpl::popState() aStr = aStr.copy(8); // extract name int nLength = aStr.toChar(); -aStr = aStr.copy(1); +if (!aStr.isEmpty()) +aStr = aStr.copy(1); OString aName = aStr.copy(0, nLength); -aStr = aStr.copy(nLength+1); // zero-terminated string +if (!aStr.isEmpty()) +aStr = aStr.copy(nLength+1); // zero-terminated string // extract default text nLength = aStr.toChar(); -aStr = aStr.copy(1); +if (!aStr.isEmpty()) +aStr = aStr.copy(1); RTFValue::Pointer_t pNValue(new RTFValue(OStringToOUString(aName, aState.nCurrentEncoding))); m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFData_name, pNValue); if (nLength > 0) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65108] Clean-up header includes (global/local)
https://bugs.freedesktop.org/show_bug.cgi?id=65108 --- Comment #17 from Norbert Thiebaud --- I would favor that the whole source tree be cleaned-up to whatever 'norm' is agreed upon. There are 3 proposed scheme, as I read it: 1/ use "" systematically (well except for and other true system include I suspect 2/ use <> systematically 3/ use "" for 'local' include, i.e in the same directory than the cxx and <> for the rest 4/ use "" for include private to the module you are in and <> for include that are 'public' header (iow system from the point of view of other module) I favor 4/ because a/ that does solve the original pch problem b/ that convey a useful semantic content to the reader of the code: where is the include in question supposed to be. iow in 'standard speak' considering $(SRCDIR)/include as a system include path -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDROutputElementList.cpp |6 --
src/lib/CDROutputElementList.h |1
src/lib/CDRTransforms.cpp| 58 ---
src/lib/CDRTransforms.h |8 ---
src/lib/CDRTypes.cpp | 97 ---
src/lib/CDRTypes.h | 12
src/lib/libcdr_utils.cpp |5 --
src/lib/libcdr_utils.h |1
8 files changed, 188 deletions(-)
New commits:
commit 08177147508465da5207bac24661465cf0c39a12
Author: Fridrich Å trba
Date: Wed Nov 6 15:54:40 2013 +0100
callcatcher action
Change-Id: I4e84acb68b51c9087206dfda37c592229fcc77a7
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index 13b297d..c34224f 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -357,12 +357,6 @@ libcdr::CDROutputElementList
&libcdr::CDROutputElementList::operator=(const libc
return *this;
}
-void libcdr::CDROutputElementList::append(const libcdr::CDROutputElementList
&elementList)
-{
- for (std::vector::const_iterator cstiter =
elementList.m_elements.begin(); cstiter != elementList.m_elements.end();
++cstiter)
-m_elements.push_back((*cstiter)->clone());
-}
-
libcdr::CDROutputElementList::~CDROutputElementList()
{
for (std::vector::iterator iter = m_elements.begin();
iter != m_elements.end(); ++iter)
diff --git a/src/lib/CDROutputElementList.h b/src/lib/CDROutputElementList.h
index 536f68c..9c77e9e 100644
--- a/src/lib/CDROutputElementList.h
+++ b/src/lib/CDROutputElementList.h
@@ -48,7 +48,6 @@ public:
CDROutputElementList(const CDROutputElementList &elementList);
CDROutputElementList &operator=(const CDROutputElementList &elementList);
virtual ~CDROutputElementList();
- void append(const CDROutputElementList &elementList);
void draw(librevenge::RVNGDrawingInterface *painter) const;
void addStyle(const librevenge::RVNGPropertyList &propList, const
librevenge::RVNGPropertyListVector &propListVec);
void addPath(const librevenge::RVNGPropertyListVector &propListVec);
diff --git a/src/lib/CDRTransforms.cpp b/src/lib/CDRTransforms.cpp
index 71b87cd..861a5c3 100644
--- a/src/lib/CDRTransforms.cpp
+++ b/src/lib/CDRTransforms.cpp
@@ -172,64 +172,6 @@ void libcdr::CDRTransform::applyToArc(double &rx, double
&ry, double &rotation,
}
}
-double libcdr::CDRTransform::_getScaleX() const
-{
- double x0 = 0.0;
- double x1 = 1.0;
- double y0 = 0.0;
- double y1 = 0.0;
- applyToPoint(x0, y0);
- applyToPoint(x1, y1);
- return x1 - x0;
-}
-
-double libcdr::CDRTransform::getScaleX() const
-{
- return fabs(_getScaleX());
-}
-
-bool libcdr::CDRTransform::getFlipX() const
-{
- return (0 > _getScaleX());
-}
-
-double libcdr::CDRTransform::_getScaleY() const
-{
- double x0 = 0.0;
- double x1 = 0.0;
- double y0 = 0.0;
- double y1 = 1.0;
- applyToPoint(x0, y0);
- applyToPoint(x1, y1);
- return y1 - y0;
-}
-
-double libcdr::CDRTransform::getScaleY() const
-{
- return fabs(_getScaleY());
-}
-
-bool libcdr::CDRTransform::getFlipY() const
-{
- return (0 > _getScaleY());
-}
-
-double libcdr::CDRTransform::getTranslateX() const
-{
- double x = 0.0;
- double y = 0.0;
- applyToPoint(x, y);
- return x;
-}
-
-double libcdr::CDRTransform::getTranslateY() const
-{
- double x = 0.0;
- double y = 0.0;
- applyToPoint(x, y);
- return y;
-}
-
libcdr::CDRTransforms::CDRTransforms()
: m_trafos()
diff --git a/src/lib/CDRTransforms.h b/src/lib/CDRTransforms.h
index 8bcbe34..38697ea 100644
--- a/src/lib/CDRTransforms.h
+++ b/src/lib/CDRTransforms.h
@@ -45,16 +45,8 @@ public:
void applyToPoint(double &x, double &y) const;
void applyToArc(double &rx, double &ry, double &rotation, bool &sweep,
double &endx, double &endy) const;
- double getScaleX() const;
- double getScaleY() const;
- double getTranslateX() const;
- double getTranslateY() const;
- bool getFlipX() const;
- bool getFlipY() const;
private:
- double _getScaleX() const;
- double _getScaleY() const;
double m_v0;
double m_v1;
double m_x0;
diff --git a/src/lib/CDRTypes.cpp b/src/lib/CDRTypes.cpp
index c020415..ee98cd4 100644
--- a/src/lib/CDRTypes.cpp
+++ b/src/lib/CDRTypes.cpp
@@ -101,102 +101,5 @@ void libcdr::CDRSplineData::create(libcdr::CDRPath &path)
const
path.appendSplineTo(tmpPoints);
}
-libcdr::CDRCMYKColor::CDRCMYKColor(unsigned colorValue, bool percentage)
- : c((double)(colorValue & 0xff) / (percentage ? 100.0 : 255.0)),
-m((double)((colorValue & 0xff00) >> 8) / (percentage ? 100.0 : 255.0)),
-y((double)((colorValue & 0xff) >> 16) / (percentage ? 100.0 : 255.0)),
-k((double)((colorValue & 0xff00) >> 24) / (percentage ? 100.0 : 255.0))
-{
-}
-
-void libcdr::CDRCMYKColor::applyTint(double tint)
-{
- if (tint < 0.0)
-tint = 0.0;
- if (tint > 1.0)
-tint = 1.0;
- c *= tint;
- m *= tint;
- y *= tint;
- k *= tint;
-}
-
-unsigned libcdr::CDRCMYKColor::getColorValue() const
-{
- return 0
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 8f25d823a8d5488ae4880ae009a026f6fc07f611 Author: Caolán McNamara Date: Wed Nov 6 14:52:42 2013 + check for return of -1 from getToken as demonstrated by ooo91883-1.doc Change-Id: I11a7f0747334f4cecbfd34c9353598d875be02c2 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index e1515d4..aaea9e0 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1161,12 +1161,14 @@ util::DateTime lcl_DateStringToDateTime( const OUString& rDateTime ) nIndex = 0; aDateTime.Year = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() ); aDateTime.Month = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() ); -aDateTime.Day = sal_uInt16( sDate.copy( nIndex ).toInt32() ); +if (nIndex != -1) +aDateTime.Day = sal_uInt16( sDate.copy( nIndex ).toInt32() ); nIndex = 0; aDateTime.Hours = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() ); aDateTime.Minutes = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() ); -aDateTime.Seconds = sal_uInt16( sTime.copy( nIndex ).toInt32() ); +if (nIndex != -1) +aDateTime.Seconds = sal_uInt16( sTime.copy( nIndex ).toInt32() ); return aDateTime; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porexp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8050da9683e859c59ed0b74b1e040a59b888aeac
Author: Caolán McNamara
Date: Wed Nov 6 14:45:02 2013 +
don't access past end of string
Change-Id: Ia431f51cb02bbd235cdfe56a8131d7b622e9e311
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 40eeb2a..8c7a2b1 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -150,7 +150,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo
&rInf,
return 0; // Nur noch BlankPortions unterwegs
// Wenn vor uns ein Blank ist, brauchen wir kein Underflow ausloesen,
// wenn hinter uns ein Blank ist, brauchen wir kein Underflow weiterreichen
-if( bUnderFlow && CH_BLANK == rInf.GetTxt()[ nIdx + 1] )
+if (bUnderFlow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK ==
rInf.GetTxt()[nIdx + 1])
return 0;
if( nIdx && !((SwTxtFormatInfo&)rInf).GetFly() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3aa58661aab928548c73a61cf450c010cd2b44dc
Author: Caolán McNamara
Date: Wed Nov 6 14:37:28 2013 +
fix wrong test for end of field
regression since 2564c5bbe4acd3f29530b056cef3f6e8ecb6194c
Change-Id: I40741875e873d64a682468616700d25904302878
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e949d35..837bf7b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3615,7 +3615,8 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const
sal_uInt8*, short nLen )
for (;;)
{
nFnd = sFieldName.indexOf(0x15);
-if (nFnd<0)
+//found field end, we can stop now
+if (nFnd != -1)
break;
OUString sTemp;
nFieldLen = pSBase->WW8ReadString( *pStrm, sTemp,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit bf205162f1509cf27e7f4d65a240beda899c06ef
Author: Caolán McNamara
Date: Wed Nov 6 14:24:30 2013 +
preview might be empty
as demonstrated by ooo110440-1.doc
Change-Id: I780a756d328eb35c9be1572319dd4f802c1831e1
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e2f6d7e..e1515d4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1821,11 +1821,14 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference< drawing::XShape
*/
void DomainMapper_Impl::UpdateEmbeddedShapeProps(const uno::Reference<
drawing::XShape > xShape)
{
-PropertyNameSupplier& rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
-uno::Reference xEmbeddedProperties(m_xEmbedded,
uno::UNO_QUERY_THROW);
-awt::Size aSize = xShape->getSize( );
-
xEmbeddedProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_WIDTH),
uno::makeAny(sal_Int32(aSize.Width)));
-
xEmbeddedProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_HEIGHT),
uno::makeAny(sal_Int32(aSize.Height)));
+if (!xShape.is())
+return;
+
+PropertyNameSupplier& rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+uno::Reference xEmbeddedProperties(m_xEmbedded,
uno::UNO_QUERY_THROW);
+awt::Size aSize = xShape->getSize( );
+
xEmbeddedProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_WIDTH),
uno::makeAny(sal_Int32(aSize.Width)));
+
xEmbeddedProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_HEIGHT),
uno::makeAny(sal_Int32(aSize.Height)));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par2.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit bc71cd3d645474aba462dcc524a0f93721374af6
Author: Caolán McNamara
Date: Wed Nov 6 14:18:01 2013 +
avoid out of bounds string access
as demonstrated by ooo110088-1.doc
Change-Id: I1df32536c1eb78e3ba93885df78328fde894c186
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 829131d..d0ec6f3 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -344,12 +344,13 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
SwTxtNode* pTNd = rNIdx.GetNode().GetTxtNode();
if (pTNd && !pTNd->GetTxt().isEmpty() && !sChar.isEmpty())
{
-if (pTNd->GetTxt()[0] == sChar[0])
+const OUString &rTxt = pTNd->GetTxt();
+if (rTxt[0] == sChar[0])
{
pPaM->GetPoint()->nContent.Assign( pTNd, 0 );
pPaM->SetMark();
// Strip out tabs we may have inserted on export #i24762#
-if (pTNd->GetTxt()[1] == 0x09)
+if (rTxt.getLength() > 1 && rTxt[1] == 0x09)
pPaM->GetMark()->nContent++;
pPaM->GetMark()->nContent++;
pReffingStck->Delete(*pPaM);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/itrform2.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9649cb574f9416ca4061ebed6f1538438cb55cb0
Author: Caolán McNamara
Date: Wed Nov 6 14:11:11 2013 +
avoid out of bounds string access
as demonstrated by ooo109591-1.doc
Change-Id: I91b4940828038561885e8d3a109c40a668aeb15b
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 5fa4029..c058849 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -467,7 +467,11 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
}
}
else
-bAllowBehind = rCC.isLetterNumeric( rInf.GetTxt(),
rInf.GetIdx() );
+{
+const OUString& rTxt = rInf.GetTxt();
+sal_Int32 nIdx = rInf.GetIdx();
+bAllowBehind = nIdx < rTxt.getLength() ?
rCC.isLetterNumeric(rTxt, nIdx) : false;
+}
const SwLinePortion* pLast = rInf.GetLast();
if ( bAllowBehind && pLast )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Track features of LO that should become ODF standard
Hi all, I know, that LO has a lot of features, which are not ODF standard (yet). I'm looking for an overview or a place where they are tracked. Something to collect: - description of the feature - why it was introduced - how it is stored in file format - whether there exists a proposal at OASIS already and if yes, what the status of that proposal is. Does something like this exists? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
codesign problem on Mac OS X 10.9
Hi, I upgraded to Mac OS X 10.9 recently. Now my builds fail at packaging. When it comes to code signing, the codesign command returns with exit code 1. Yet, the app seems to be signed correctly. I patched solenv/bin/modules/installer/simplepackage.pm not to fail on this. Here is the output: ... codesign --sign DEADBEEFDEADBEEFDEADBEEFDEADBEEF --force -v -v -v /Users/timar/cp-4.1/workdir/unxmacxi.pro/installation/LibreOffice/dmg/install/lang_28_id_47a0697b_inprogress_temp.11790/LibreOffice_4.1-1_MacOS_x86/LibreOffice.app ... /Users/timar/cp-4.1/workdir/unxmacxi.pro/installation/LibreOffice/dmg/install/lang_28_id_47a0697b_inprogress_temp.11790/LibreOffice_4.1-1_MacOS_x86/LibreOffice.app: replacing existing signature /Users/timar/cp-4.1/workdir/unxmacxi.pro/installation/LibreOffice/dmg/install/lang_28_id_47a0697b_inprogress_temp.11790/LibreOffice_4.1-1_MacOS_x86/LibreOffice.app: code object is not signed at all In subcomponent: /Users/timar/cp-4.1/workdir/unxmacxi.pro/installation/LibreOffice/dmg/install/lang_28_id_47a0697b_inprogress_temp.11790/LibreOffice_4.1-1_MacOS_x86/LibreOffice.app/Contents/CREDITS.odt WARNING: "codesign --sign DEADBEEFDEADBEEFDEADBEEFDEADBEEF --force -v -v -v /Users/timar/cp-4.1/workdir/unxmacxi.pro/installation/LibreOffice/dmg/install/lang_28_id_47a0697b_inprogress_temp.11790/LibreOffice_4.1-1_MacOS_x86/LibreOffice.app" returned with non-zero! Return value: 1 Any ideas, how to fix the situation? Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] string freeze has been broken in libreoffice-4-1
Ok. Thanks 2013/11/6 Andras Timar : > Hi Sérgio, > > On 2013.11.06. 1:11, Sérgio Marques wrote: >> Hi Andras, >> >> I´ve run "Update from templates" and now I have 205 words in sbasic >> and 470 in shared. Is this ok? >> >> These are to many changes from a brach that it is supposed to be freezed. >> > > Well, we could have avoided re-translating the 470 words in shared, > because the translatable strings have not changed, only identifiers. > That's a pity. If only Pootle were more intelligent, and distinguished > tags from text... The 205 words in sbasic are the help of the new > Date/Time functions in Basic. It was exceptional that an API change > happened in stable branch. > > Best regards, > Andras > -- Sérgio Marques ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/util.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d4d56060eeba4dd78c518e4e1728396efab67962
Author: Caolán McNamara
Date: Wed Nov 6 13:43:28 2013 +
make WW8ReadFieldParams::GetResult safe
as shown by kde239121-4.doc
Change-Id: I60356e7d76cc271869079f2fffa00e149274a8cc
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 5646e23..828d5de 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -490,7 +490,7 @@ OUString WW8ReadFieldParams::GetResult() const
return OUString();
else
{
-return nSavPtr == -1 ? aData.copy(nFnd) : aData.copy(nFnd,
nSavPtr-nFnd);
+return nSavPtr < nFnd ? aData.copy(nFnd) : aData.copy(nFnd,
nSavPtr-nFnd);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/util.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ce59fb3e1758e6ac0b2d7e203c4770117ff7d36 Author: Caolán McNamara Date: Wed Nov 6 13:27:34 2013 + rearrange tests to avoid access past end of string as demonstrated by abi6637-1.doc Change-Id: Ieed0ca7ccf2d8587179a4530a1da29d7d8228363 diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index c2e48ce..5646e23 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -516,7 +516,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() nSavPtr = nNext; -if ( aData[nFnd]=='\\' && nFnd+1___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/matus/sc-hacks'
New branch 'private/matus/sc-hacks' available with the following commits: commit 374000614e351e935f1510633fe5eb082940a594 Author: Matúš Kukan Date: Wed Nov 6 14:11:38 2013 +0100 WIP: experiments with importing CSV files commit 20ba93ae44e33e39935f9136f873bc46695eb431 Author: Matúš Kukan Date: Mon Nov 4 12:58:37 2013 +0100 ScRefreshTimer: allow to run in another thread Change-Id: Ie817f55ebeadda78225aafd9a2014d2d2c206a00 commit fbef8647bb6ba9b5b6eca47b6e04fd7107eb583f Author: Matúš Kukan Date: Thu Oct 31 10:56:15 2013 +0100 ScRefreshTimer: implement methods in source file And don't export any of them. Change-Id: Ib29eec6765f0fe71c9c7fbc82b0531f562b6404a commit 22019d3a3b8afe0c80cd6a106042a857fa09bbaa Author: Matúš Kukan Date: Thu Oct 31 10:14:53 2013 +0100 move ScRefreshTimerProtector into its own header file So that, we don't have to include "refreshtimer.hxx" in docsh.hxx. Also implement destructor in source file. Change-Id: Ie0251ad3511b44cf1dd6dae34e22ade0ab32cec4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7332236cdf059645ec206b890d7975cf965da54
Author: Caolán McNamara
Date: Wed Nov 6 13:18:52 2013 +
don't access beyond end of string
as shown by assert in fdo37872-1
Change-Id: Iccc27b7898a72a0f580c0e8996c8e69de7ea8842
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 45485c3..62bf259 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2606,7 +2606,7 @@ bool ScCompiler::IsPredetectedReference(const OUString&
rName)
return false; // $#REF!.AB42 or $#REF!42 or $#REF!#REF!
c = rName[nPos-2]; // before $#REF!
}
-sal_Unicode c2 = rName[nPos+5]; // after #REF!
+sal_Unicode c2 = nPos+5 < rName.getLength() ? rName[nPos+5] : 0;
// after #REF!
switch (c)
{
case '.':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-l10n] string freeze has been broken in libreoffice-4-1
Hi Sérgio, On 2013.11.06. 1:11, Sérgio Marques wrote: > Hi Andras, > > I´ve run "Update from templates" and now I have 205 words in sbasic > and 470 in shared. Is this ok? > > These are to many changes from a brach that it is supposed to be freezed. > Well, we could have avoided re-translating the 470 words in shared, because the translatable strings have not changed, only identifiers. That's a pity. If only Pootle were more intelligent, and distinguished tags from text... The 205 words in sbasic are the help of the new Date/Time functions in Basic. It was exceptional that an API change happened in stable branch. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - c8/1c999eeccc3657c712e50b39dc783c9cde0152 e8/739b2f2d7ec5119f63fe108840a645948d65dd
c8/1c999eeccc3657c712e50b39dc783c9cde0152 |1 + e8/739b2f2d7ec5119f63fe108840a645948d65dd |1 + 2 files changed, 2 insertions(+) New commits: commit d8c38b74436f6441d06cc6c50106631659ef3f43 Author: Caolán McNamara Date: Wed Nov 6 11:50:32 2013 + Notes added by 'git notes add' diff --git a/e8/739b2f2d7ec5119f63fe108840a645948d65dd b/e8/739b2f2d7ec5119f63fe108840a645948d65dd new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/e8/739b2f2d7ec5119f63fe108840a645948d65dd @@ -0,0 +1 @@ +ignore: obsolete commit ed5ddb472caaadac36261b83a5e2b026bfb76390 Author: Caolán McNamara Date: Wed Nov 6 11:50:20 2013 + Notes added by 'git notes add' diff --git a/c8/1c999eeccc3657c712e50b39dc783c9cde0152 b/c8/1c999eeccc3657c712e50b39dc783c9cde0152 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/c8/1c999eeccc3657c712e50b39dc783c9cde0152 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/NCatalog.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb16855eb0b775fe7a36fc4e3c8515e7fe3d70f7 Author: Herbert Dürr Date: Wed Nov 6 08:24:01 2013 + #i123575# RmMoz 7/9: fix mismatching header guard comment (cherry picked from commit ce2260c549c1cafadd1182e4e7155b18ab44e771) diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 36d3f96..b991c8d 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -44,6 +44,6 @@ namespace connectivity }; } } -#endif // _CONNECTIVITY_MOZAB_CATALOG_HXX_ +#endif // _CONNECTIVITY_EVOAB_CATALOG_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 04/03575c37d0788c0369f07531a50ed10ed7f4c2
04/03575c37d0788c0369f07531a50ed10ed7f4c2 |1 + 1 file changed, 1 insertion(+) New commits: commit e71df280f40368b022017dbff1e6e652c629e231 Author: Caolán McNamara Date: Wed Nov 6 11:48:49 2013 + Notes added by 'git notes add' diff --git a/04/03575c37d0788c0369f07531a50ed10ed7f4c2 b/04/03575c37d0788c0369f07531a50ed10ed7f4c2 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/04/03575c37d0788c0369f07531a50ed10ed7f4c2 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/2260c549c1cafadd1182e4e7155b18ab44e771
ce/2260c549c1cafadd1182e4e7155b18ab44e771 |1 + 1 file changed, 1 insertion(+) New commits: commit 91aa4524b2e47ea74ceabc2fb732eba18a0c6fc1 Author: Caolán McNamara Date: Wed Nov 6 11:49:51 2013 + Notes added by 'git notes add' diff --git a/ce/2260c549c1cafadd1182e4e7155b18ab44e771 b/ce/2260c549c1cafadd1182e4e7155b18ab44e771 new file mode 100644 index 000..eb86730 --- /dev/null +++ b/ce/2260c549c1cafadd1182e4e7155b18ab44e771 @@ -0,0 +1 @@ +merged as: bb16855eb0b775fe7a36fc4e3c8515e7fe3d70f7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 52/1852b416e8049290ec2da2fdd92b34fb597d76
52/1852b416e8049290ec2da2fdd92b34fb597d76 |1 + 1 file changed, 1 insertion(+) New commits: commit ddd3be6667e41132ca34e346946ccdd40e45f623 Author: Caolán McNamara Date: Wed Nov 6 11:48:28 2013 + Notes added by 'git notes add' diff --git a/52/1852b416e8049290ec2da2fdd92b34fb597d76 b/52/1852b416e8049290ec2da2fdd92b34fb597d76 new file mode 100644 index 000..cf845c3 --- /dev/null +++ b/52/1852b416e8049290ec2da2fdd92b34fb597d76 @@ -0,0 +1 @@ +prefer: e04361c897c08374c7be54ff3ae09d789ca7627f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c7/3bec02e4df8f4ed00e7cee928e7025ee96519f
c7/3bec02e4df8f4ed00e7cee928e7025ee96519f |1 + 1 file changed, 1 insertion(+) New commits: commit 8cfbf1477645a86ac10e010e3e0556b84b1a5178 Author: Caolán McNamara Date: Wed Nov 6 11:47:55 2013 + Notes added by 'git notes add' diff --git a/c7/3bec02e4df8f4ed00e7cee928e7025ee96519f b/c7/3bec02e4df8f4ed00e7cee928e7025ee96519f new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/c7/3bec02e4df8f4ed00e7cee928e7025ee96519f @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 11/09b7c9943904894a48de284b50f6042c35e96a de/6061ba06c00e94e90a0b3d1fa999814fd24575
11/09b7c9943904894a48de284b50f6042c35e96a |1 + de/6061ba06c00e94e90a0b3d1fa999814fd24575 |1 + 2 files changed, 2 insertions(+) New commits: commit fecf9fba33c8f50f601b4014808c65afa65e1a2f Author: Caolán McNamara Date: Wed Nov 6 11:47:45 2013 + Notes added by 'git notes add' diff --git a/11/09b7c9943904894a48de284b50f6042c35e96a b/11/09b7c9943904894a48de284b50f6042c35e96a new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/11/09b7c9943904894a48de284b50f6042c35e96a @@ -0,0 +1 @@ +ignore: obsolete commit 41133987b1261107d260ab97a3f3663e85375152 Author: Caolán McNamara Date: Wed Nov 6 11:47:35 2013 + Notes added by 'git notes add' diff --git a/de/6061ba06c00e94e90a0b3d1fa999814fd24575 b/de/6061ba06c00e94e90a0b3d1fa999814fd24575 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/de/6061ba06c00e94e90a0b3d1fa999814fd24575 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/79e8da3f8042f7d7bd94b2c9f03cff7545b05c
1e/79e8da3f8042f7d7bd94b2c9f03cff7545b05c |1 + 1 file changed, 1 insertion(+) New commits: commit 24121d91f6b5a3cb2cef233e579e800056db1492 Author: Caolán McNamara Date: Wed Nov 6 11:46:21 2013 + Notes added by 'git notes add' diff --git a/1e/79e8da3f8042f7d7bd94b2c9f03cff7545b05c b/1e/79e8da3f8042f7d7bd94b2c9f03cff7545b05c new file mode 100644 index 000..09ac9c6 --- /dev/null +++ b/1e/79e8da3f8042f7d7bd94b2c9f03cff7545b05c @@ -0,0 +1 @@ +merged as: f120005ea41d59caf4b7d7f6017f3549d25b4287 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/fr_BF.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 3476768dc52dac9ed10a204ffcf000cd042d8993 Author: Eike Rathke Date: Wed Nov 6 12:37:25 2013 +0100 corrected Time100SecSeparator and quotation marks, fdo#71243 Change-Id: I86fc8a6e7a1b09f54a20db55b6079d945fdb7338 diff --git a/i18npool/source/localedata/data/fr_BF.xml b/i18npool/source/localedata/data/fr_BF.xml index 44d9335..6319e6b 100644 --- a/i18npool/source/localedata/data/fr_BF.xml +++ b/i18npool/source/localedata/data/fr_BF.xml @@ -25,7 +25,7 @@  , : - . + , ; @@ -33,10 +33,10 @@ - « - » - â - â + â + â + « + » am pm @@ -175,10 +175,10 @@ [HH]:MM:SS - MM:SS.00 + MM:SS,00 - [HH]:MM:SS.00 + [HH]:MM:SS,00 DD/MM/YY HH:MM ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65108] Clean-up header includes (global/local)
https://bugs.freedesktop.org/show_bug.cgi?id=65108 --- Comment #16 from Thomas Arnhold --- And we don't need to clean up the whole code base. I have especially those headers in mind which are duplicated in the precompiled* header files due to the ".." and <..> difference. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LICENSE.html packaging on Mac
On Wed, Nov 6, 2013 at 11:05 AM, Michael Stahl wrote: > On 06/11/13 07:20, Norbert Thiebaud wrote: >> on Mac we put LICENCE.html in a LICENSEs/ directory at the top level of the >> dmg >> at the same level than the LibreOffice.app bundle >> >> I suspect that >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa424af27 >> broke that.. now the packager cannot find LICENSE.html > > dd08ef89d53831246acefcd7c14d00b3c3da4e0f has "fixed" that with a > horrible hack > that should be reverted. but if it is now broken again there must be > a different problem. perhaps b08f6ca2e1f3d9b393435a137dbd247f3cf20b6d > broke it? This morning I pushed b08f6ca2e1f3d9b393435a137dbd247f3cf20b6d which solved the issue for me. Cheers, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/Makefile.am |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 55a6ddba97e6c331623bf4f08a8a7f1052298d0f Author: Fridrich Å trba Date: Wed Nov 6 11:37:51 2013 +0100 Set dependencies right Change-Id: I77f674bf6e70d6dd0d400677802c9b247824d455 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 5831340..a3b4247 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -77,7 +77,11 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES = \ $(generated_files) -$(libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_OBJECTS) : $(generated_files) +VDXParser.lo : $(generated_files) +VSDXMLParserBase.lo : $(generated_files) +VSDXMLTokenMap.lo : $(generated_files) +VSDXParser.lo : $(generated_files) +VSDXTheme.lo : $(generated_files) $(top_builddir)/src/lib/tokens.h : $(top_builddir)/src/lib/tokens.gperf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LICENSE.html packaging on Mac
On 11/06/2013 11:05 AM, Michael Stahl wrote: On 06/11/13 07:20, Norbert Thiebaud wrote: on Mac we put LICENCE.html in a LICENSEs/ directory at the top level of the dmg at the same level than the LibreOffice.app bundle I suspect that http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa424af27 broke that.. now the packager cannot find LICENSE.html dd08ef89d53831246acefcd7c14d00b3c3da4e0f has "fixed" that with a horrible hack that should be reverted. My take is that we want to get away from those instsetoo_native/util/openoffice.lst.in inlcude lists and instead have the code that generates installation sets know exactly where the files are located within instdir, no? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: 3 commits - configure.ac libvisio.spec.in libvisio-zip.in Makefile.am src/lib
Makefile.am | 12 -
configure.ac |2
libvisio-zip.in | 44 --
libvisio.spec.in | 100 --
src/lib/Makefile.am | 19 ---
src/lib/VSDInternalStream.cpp | 16 --
src/lib/VSDInternalStream.h |2
src/lib/VSDStencils.cpp |5 --
src/lib/VSDStencils.h |1
src/lib/VSDStyles.cpp | 28 ---
src/lib/VSDStyles.h |4 -
src/lib/VSDXMLParserBase.cpp | 25 --
src/lib/VSDXMLParserBase.h|1
src/lib/VSDXMLTokenMap.cpp| 16 --
src/lib/VSDXMLTokenMap.h |1
15 files changed, 12 insertions(+), 264 deletions(-)
New commits:
commit fd93a83e675ebff31c9ab8d3d0abdc8e41c964fc
Author: Fridrich Å trba
Date: Wed Nov 6 11:31:17 2013 +0100
Some callcatcher stuff
Change-Id: Icf5b5ade64b81a37fac79e930527e3e2b8d841bb
diff --git a/src/lib/VSDInternalStream.cpp b/src/lib/VSDInternalStream.cpp
index 85e3b4d..bf0b605 100644
--- a/src/lib/VSDInternalStream.cpp
+++ b/src/lib/VSDInternalStream.cpp
@@ -33,22 +33,6 @@
#include "VSDInternalStream.h"
-VSDInternalStream::VSDInternalStream(const std::vector &buffer)
:
- librevenge::RVNGInputStream(),
- m_offset(0),
- m_buffer(buffer)
-{
-}
-
-VSDInternalStream::VSDInternalStream(const unsigned char *buffer, size_t
bufferLength) :
- librevenge::RVNGInputStream(),
- m_offset(0),
- m_buffer(bufferLength)
-{
- memcpy(&m_buffer[0], buffer, bufferLength);
-}
-
-
VSDInternalStream::VSDInternalStream(librevenge::RVNGInputStream *input,
unsigned long size, bool compressed) :
librevenge::RVNGInputStream(),
m_offset(0),
diff --git a/src/lib/VSDInternalStream.h b/src/lib/VSDInternalStream.h
index 87d0436..89a1f5f 100644
--- a/src/lib/VSDInternalStream.h
+++ b/src/lib/VSDInternalStream.h
@@ -40,8 +40,6 @@ class VSDInternalStream : public librevenge::RVNGInputStream
{
public:
VSDInternalStream(librevenge::RVNGInputStream *input, unsigned long size,
bool compressed=false);
- VSDInternalStream(const std::vector &buffer);
- VSDInternalStream(const unsigned char *buffer, size_t bufferLength);
~VSDInternalStream() {}
virtual bool isStructured()
diff --git a/src/lib/VSDStencils.cpp b/src/lib/VSDStencils.cpp
index e963f72..b6ce4e8 100644
--- a/src/lib/VSDStencils.cpp
+++ b/src/lib/VSDStencils.cpp
@@ -215,9 +215,4 @@ const libvisio::VSDShape
*libvisio::VSDStencils::getStencilShape(unsigned pageId
return tmpStencil->getStencilShape(shapeId);
}
-void libvisio::VSDStencils::clear()
-{
- m_stencils.clear();
-}
-
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDStencils.h b/src/lib/VSDStencils.h
index 4b5139f..dff1cdb 100644
--- a/src/lib/VSDStencils.h
+++ b/src/lib/VSDStencils.h
@@ -104,7 +104,6 @@ public:
{
return m_stencils.size();
}
- void clear();
private:
std::map m_stencils;
};
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index e820c0e..1ea7356 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -131,13 +131,6 @@ libvisio::VSDOptionalLineStyle
libvisio::VSDStyles::getOptionalLineStyle(unsigne
return lineStyle;
}
-libvisio::VSDLineStyle libvisio::VSDStyles::getLineStyle(unsigned
lineStyleIndex) const
-{
- VSDLineStyle lineStyle;
- lineStyle.override(getOptionalLineStyle(lineStyleIndex));
- return lineStyle;
-}
-
libvisio::VSDOptionalFillStyle
libvisio::VSDStyles::getOptionalFillStyle(unsigned fillStyleIndex) const
{
VSDOptionalFillStyle fillStyle;
@@ -195,13 +188,6 @@ libvisio::VSDOptionalTextBlockStyle
libvisio::VSDStyles::getOptionalTextBlockSty
return textBlockStyle;
}
-libvisio::VSDTextBlockStyle libvisio::VSDStyles::getTextBlockStyle(unsigned
textStyleIndex) const
-{
- VSDTextBlockStyle textBlockStyle;
- textBlockStyle.override(getOptionalTextBlockStyle(textStyleIndex));
- return textBlockStyle;
-}
-
libvisio::VSDOptionalCharStyle
libvisio::VSDStyles::getOptionalCharStyle(unsigned textStyleIndex) const
{
VSDOptionalCharStyle charStyle;
@@ -227,13 +213,6 @@ libvisio::VSDOptionalCharStyle
libvisio::VSDStyles::getOptionalCharStyle(unsigne
return charStyle;
}
-libvisio::VSDCharStyle libvisio::VSDStyles::getCharStyle(unsigned
textStyleIndex) const
-{
- VSDCharStyle charStyle;
- charStyle.override(getOptionalCharStyle(textStyleIndex));
- return charStyle;
-}
-
libvisio::VSDOptionalParaStyle
libvisio::VSDStyles::getOptionalParaStyle(unsigned textStyleIndex) const
{
VSDOptionalParaStyle paraStyle;
@@ -259,11 +238,4 @@ libvisio::VSDOptionalParaStyle
libvisio::VSDStyles::getOptionalParaStyle(unsigne
return paraStyle;
}
-libvisio::VSDParaStyle libvisio::VSDStyles::getParaStyle(unsigned
textStyleIndex) const
-{
- VSDParaStyle paraStyle;
- paraStyle.override(getOptionalParaStyle(textStyleIndex));
- return paraStyle;
-}
-
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/sr
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #107 from Michael Meeks --- Hi John & suokunlong - thanks for the nominations, John you're right that was a very annoying bug :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par2.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 3f1a0a006810f7c9dbd270c7767cf331b1c901f5
Author: Jan Holesovsky
Date: Wed Nov 6 11:05:54 2013 +0100
Related fdo#47802: Bring the 8bit and 16bit .doc on par.
The code expects that sTxt holds both the cbTextBefore and cbTextAfter, so
let's make it so in the 16bit format too.
This fixes assertion in doc/fdo47802-3.doc.
Change-Id: I35cc7c1e80a33f013ab2eaae073b111214245e25
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index efd48e5..829131d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -606,13 +606,11 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum,
WW8_ANLV &rAV,
OUString sTxt;
if (bVer67)
{
-sTxt = OUString( (sal_Char*)pTxt, SVBT8ToByte( rAV.cbTextBefore )
- + SVBT8ToByte( rAV.cbTextAfter ), eCharSet );
+sTxt = OUString((sal_Char*)pTxt, SVBT8ToByte(rAV.cbTextBefore) +
SVBT8ToByte(rAV.cbTextAfter), eCharSet);
}
else
{
-for(sal_Int32 i = SVBT8ToByte(rAV.cbTextBefore);
-i < SVBT8ToByte(rAV.cbTextAfter); ++i, pTxt += 2)
+for(sal_Int32 i = 0; i < SVBT8ToByte(rAV.cbTextBefore) +
SVBT8ToByte(rAV.cbTextAfter); ++i, pTxt += 2)
{
sTxt += OUString(SVBT16ToShort(*(SVBT16*)pTxt));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LICENSE.html packaging on Mac
On 06/11/13 07:20, Norbert Thiebaud wrote: > on Mac we put LICENCE.html in a LICENSEs/ directory at the top level of the > dmg > at the same level than the LibreOffice.app bundle > > I suspect that > http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa424af27 > broke that.. now the packager cannot find LICENSE.html dd08ef89d53831246acefcd7c14d00b3c3da4e0f has "fixed" that with a horrible hack that should be reverted. but if it is now broken again there must be a different problem. perhaps b08f6ca2e1f3d9b393435a137dbd247f3cf20b6d broke it? > cp readlicense_oo/html/LICENSE.html setup_native/source/packinfo/. > worked around the immediate problem > > The thing is I have no idea as to by which magic the installer.pm mess > decide where to look for things... the files are found first by their path in instdir, second by the "include" list in instsetoo_native/util/openoffice.lst.in (which ideally shouldn't contain any path into instdir at all). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/CppunitTest_sd_import_tests.mk sd/qa
sd/CppunitTest_sd_import_tests.mk |2 +
sd/qa/unit/data/fdo71075.odp |binary
sd/qa/unit/import-tests.cxx | 56 ++
3 files changed, 58 insertions(+)
New commits:
commit 3752d67c050f369f683ca60e50e0a30f59166449
Author: Muthu Subramanian
Date: Wed Nov 6 15:37:20 2013 +0530
fdo#71075: Adding unit test for chart import (odp)
diff --git a/sd/CppunitTest_sd_import_tests.mk
b/sd/CppunitTest_sd_import_tests.mk
index 8e0773c..a0f2ad9 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -67,6 +67,8 @@ $(eval $(call gb_CppunitTest_use_ure,sd_import_tests))
$(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
animations/source/animcore/animcore \
basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
diff --git a/sd/qa/unit/data/fdo71075.odp b/sd/qa/unit/data/fdo71075.odp
new file mode 100644
index 000..b418faf
Binary files /dev/null and b/sd/qa/unit/data/fdo71075.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 6581726..2a7de2d 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -24,6 +24,14 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
using namespace ::com::sun::star;
@@ -36,6 +44,7 @@ public:
void testN759180();
void testN778859();
void testFdo64512();
+void testFdo71075();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -43,6 +52,8 @@ public:
CPPUNIT_TEST(testN759180);
CPPUNIT_TEST(testN778859);
CPPUNIT_TEST(testFdo64512);
+CPPUNIT_TEST(testFdo71075);
+
CPPUNIT_TEST_SUITE_END();
};
@@ -227,6 +238,51 @@ void SdFiltersTest::testFdo64512()
xTargetShape != xSvgShape );
}
+// Unit test for importing charts
+void SdFiltersTest::testFdo71075()
+{
+double values[] = { 12.0, 13.0, 14.0 };
+::com::sun::star::uno::Any aAny;
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"));
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( "not in destruction",
!xDocShRef->IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+uno::Reference< drawing::XDrawPagesSupplier >
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+uno::Reference< drawing::XDrawPage >
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0),
uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() );
+
+uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
+aAny = xPropSet->getPropertyValue( OUString("Model") );
+CPPUNIT_ASSERT_MESSAGE( "failed to load shape", aAny.hasValue() );
+
+uno::Reference< chart::XChartDocument > xChartDoc;
+aAny >>= xChartDoc;
+CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChartDoc.is() );
+uno::Reference< chart2::XChartDocument > xChart2Doc( xChartDoc,
uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart2Doc.is() );
+
+uno::Reference< chart2::XCoordinateSystemContainer > xBCooSysCnt(
xChart2Doc->getFirstDiagram(), uno::UNO_QUERY );
+uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq(
xBCooSysCnt->getCoordinateSystems());
+uno::Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[0],
uno::UNO_QUERY );
+
+uno::Reference< chart2::XDataSeriesContainer > xDSCnt(
xCTCnt->getChartTypes()[0], uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "failed to load data series", xDSCnt.is() );
+uno::Sequence< uno::Reference< chart2::XDataSeries > > aSeriesSeq(
xDSCnt->getDataSeries());
+CPPUNIT_ASSERT_MESSAGE( "Invalid Series count", aSeriesSeq.getLength() ==
1);
+uno::Reference< chart2::data::XDataSource > xSource( aSeriesSeq[0],
uno::UNO_QUERY );
+uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >
aSeqCnt(xSource->getDataSequences());
+CPPUNIT_ASSERT_MESSAGE( "Invalid Series count", aSeqCnt.getLength() == 1);
+uno::Reference< chart2::data::XDataSequence > xValueSeq(
aSeqCnt[0]->getValues() );
+CPPUNIT_ASSERT_MESSAGE( "Invalid Data count",
xValueSeq->getData().getLength() == sizeof(values)/(sizeof(double)));
+uno::Reference< chart2::data::XNumericalDataSequence > xNumSeq( xValueSeq,
uno::UNO_QUERY );
+uno::Sequence< double > aValues( xNumSeq->getNumericalData());
+for(sal_Int32 i=0;igetData().getLength();i++)
+CPPUNIT_ASSERT_MESSAGE( "Invalid Series count",
aValues.getConstArray()[i] == values[i]);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTe
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e1/3030cd8cb49b2b0b0549f2dc9faa878cc67cfa
e1/3030cd8cb49b2b0b0549f2dc9faa878cc67cfa |1 + 1 file changed, 1 insertion(+) New commits: commit 90608185a19569a786e8d3cdbbc5383fb36a1297 Author: Caolán McNamara Date: Wed Nov 6 09:48:14 2013 + Notes added by 'git notes add' diff --git a/e1/3030cd8cb49b2b0b0549f2dc9faa878cc67cfa b/e1/3030cd8cb49b2b0b0549f2dc9faa878cc67cfa new file mode 100644 index 000..dfe82fc --- /dev/null +++ b/e1/3030cd8cb49b2b0b0549f2dc9faa878cc67cfa @@ -0,0 +1 @@ +prefer: 223f6b631c1b087754c0f9051fb55f029f2503ce ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65108] Clean-up header includes (global/local)
https://bugs.freedesktop.org/show_bug.cgi?id=65108 --- Comment #15 from Michael Meeks --- Lets decide this finally in the ESC call tomorrow :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65108] Clean-up header includes (global/local)
https://bugs.freedesktop.org/show_bug.cgi?id=65108
--- Comment #14 from Stephan Bergmann ---
(In reply to comment #13)
> A conforming compiler is also allowed to support only 16-bit integers
No.
> I don't really see the point in bringing up
> theoretical restrictions that no real-life compiler that our code would get
> near to has.
This is not about bringing up theoretical restrictions. If we do such a huge
cosmetic clean-up like this, and there's two ways to do it, and one is
standards conforming ("...") while the other is not (<...>): Then if there is
no good reason to deviate from the standard, it only looks natural to me not to
do so.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: WRITER : Extend support for RDF Metadata
Hi, On Thu, Oct 31, 2013 at 02:37:21PM +0100, arkarell wrote: > I would like to extend support for "RDF metadata" in LibreOffice > Writer in order to be able to set metadata > on a lot of elements unsupported today like tables. > Is there anybody that could help me to find what source code are involved ? > For information, I use the API of LibreOffice/OpenOffice for many > years now but it would be my first contribution at the LO code. There are two SfxPoolItems you can use to set metadata on items like paragraphs or tables: - SvXMLAttrContainerItem is used to store unknown XML attributes from ODF (so they survive a roundtrip) - SfxGrabBagItem is a string-any map, so can store nested structures, etc. -- but explicitly runtime-only, so ODF filter intentionally ignores it. See here for more info: https://wiki.documentfoundation.org/Development/Writer#InteropGrabBag Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LICENSE.html packaging on Mac
on Mac we put LICENCE.html in a LICENSEs/ directory at the top level of the dmg at the same level than the LibreOffice.app bundle I suspect that http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa424af27 broke that.. now the packager cannot find LICENSE.html cp readlicense_oo/html/LICENSE.html setup_native/source/packinfo/. worked around the immediate problem The thing is I have no idea as to by which magic the installer.pm mess decide where to look for things... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-11-06
Moin! * Open changes on master for project core changed in the last 25 hours: + Convert ImpSWFDialog.src to ui in https://gerrit.libreoffice.org/6592 from Laurent BP + fdo#54514 - PRINT PREVIEW: Old icon for page left - fixed in https://gerrit.libreoffice.org/6583 from Rolf Koetter + fdo#70345 Reuse XStream for Windows platform create a new one for others. in https://gerrit.libreoffice.org/6580 from matthieu gay * Merged changes on master for project core changed in the last 25 hours: + codesign: fix script to support spaces in the CODESIGN_IDENTITY in https://gerrit.libreoffice.org/6594 from Norbert Thiebaud + fdo#69644 - fix docx export of wrong number and width of columns in https://gerrit.libreoffice.org/6290 from Adam CloudOn + [docx] CustomXml saved in InteropGrabBag and exported customxml when savi in https://gerrit.libreoffice.org/6519 from Sushil Shinde + Resolves: fdo#70588 MultiLineEdits don't need WB_WORDBREAK set in https://gerrit.libreoffice.org/6579 from Niklas Johansson + fdo#60698: Merge all libs of io... in https://gerrit.libreoffice.org/6567 from Marcos Souza + fdo#70393: move external accessories to a subdir of external in https://gerrit.libreoffice.org/6572 from Khaled Hosny + fdo#70393: move libxmlsec to a subdir of external in https://gerrit.libreoffice.org/6571 from Khaled Hosny + fdo#70393: move bluez_bluetooth to a subdir of external in https://gerrit.libreoffice.org/6570 from Khaled Hosny + fdo#70393: move unixODBC to a subdir of external in https://gerrit.libreoffice.org/6569 from Khaled Hosny + fdo#70393: move sane and twain to subdirs of external in https://gerrit.libreoffice.org/6568 from Khaled Hosny + bug in perl installer that make UnixLink entries to be lost in https://gerrit.libreoffice.org/6574 from Norbert Thiebaud * Abandoned changes on master for project core changed in the last 25 hours: + Version 4.2.0.0.alpha1, tag libreoffice-4.2.0.0.alpha1 in https://gerrit.libreoffice.org/6593 from Norbert Thiebaud + windows: check for _WIN32 and _WIN64 in https://gerrit.libreoffice.org/6490 from Thomas Arnhold + Windows: Set minimum Windows SDK to 0x0502 (Windows XP SP2) in https://gerrit.libreoffice.org/6496 from Thomas Arnhold + avoid some spurious -Werror=strict-overflow in https://gerrit.libreoffice.org/6535 from Michael Stahl * Open changes needing tweaks, but being untouched for more than a week: + Respect svg:font-face-format element. in https://gerrit.libreoffice.org/6144 from Brennan T Vincent + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 30/593a684e60e662596935b192a3f72b4dfc237d
30/593a684e60e662596935b192a3f72b4dfc237d |1 + 1 file changed, 1 insertion(+) New commits: commit 1d06378f6f9773bd846c54e32e719d051c6a4e65 Author: Caolán McNamara Date: Wed Nov 6 09:15:28 2013 + Notes added by 'git notes add' diff --git a/30/593a684e60e662596935b192a3f72b4dfc237d b/30/593a684e60e662596935b192a3f72b4dfc237d new file mode 100644 index 000..c04565c --- /dev/null +++ b/30/593a684e60e662596935b192a3f72b4dfc237d @@ -0,0 +1 @@ +prefer: a0c53a961a0af21f69f592b43799cd635c994810 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16c31e90f791c5a690ca1901c0fa40369023658b Author: Caolán McNamara Date: Tue Nov 5 16:47:40 2013 + don't access string out of bounds Change-Id: I562fbdb9eec3af297ea95a0d161721ec345e6a19 diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 4235027..f969e7f 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -347,7 +347,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int3 if (nStartPos < 0) nStartPos = 0; sal_Int32 strLen = Text.getLength(); -if (nStartPos > strLen) +if (nStartPos >= strLen) return -1; sal_Int16 numberOfChange = (ScriptType == getScriptClass(Text.iterateCodePoints(&nStartPos, 0))) ? 2 : 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/inc
shell/inc/internal/contentreader.hxx |1 + shell/inc/internal/metainforeader.hxx |1 + 2 files changed, 2 insertions(+) New commits: commit 9bd00edca5f45b809221197a75a620ff30a8ceb0 Author: Takeshi Abe Date: Wed Nov 6 17:45:04 2013 +0900 include Change-Id: Iedaacd9981a6ca186ab5e1f9715ed4fcf4ff0cb7 diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx index 8a1d7e4..279aea9 100644 --- a/shell/inc/internal/contentreader.hxx +++ b/shell/inc/internal/contentreader.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX #include "internal/basereader.hxx" +#include class ITag; class StreamInterface; diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx index fba67c4..7365d18 100644 --- a/shell/inc/internal/metainforeader.hxx +++ b/shell/inc/internal/metainforeader.hxx @@ -22,6 +22,7 @@ #include "internal/basereader.hxx" #include "internal/types.hxx" +#include class ITag; class CKeywordsTag; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source sfx2/inc shell/inc
scripting/source/vbaevents/eventhelper.cxx |1 - sfx2/inc/bluthsndapi.hxx |1 - shell/inc/internal/types.hxx |1 - 3 files changed, 3 deletions(-) New commits: commit 9c2ab712300c78bdb74ee307fae0a6d118829e5a Author: Takeshi Abe Date: Wed Nov 6 15:15:52 2013 +0900 Drop unnecessary #includes Change-Id: I9659279233067a8946a9e54be2f22439854a961e diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 797d058..990586f 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -76,7 +76,6 @@ #include #include -#include #include #include #define ASYNC 0 diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 90dbe8b..d96228a 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX #define INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX -#include #include #include #include diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index 6823070..b65fb92 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -24,7 +24,6 @@ #include #include #include -#include typedef std::vector StringList_t; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
