[Libreoffice-commits] .: sc/source
sc/source/core/data/dpsdbtab.cxx |2 +-
sc/source/core/data/dpshttab.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5bd33427f73d01d59e6021c7436d98d8c9fffd2
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jan 13 08:57:46 2012 +0100
Fix MinGW build.
Cherry-picked from libreoffice-3-5 branch, probably a bit more helpful fail
message.
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 75dd964..576beb5 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -140,7 +140,7 @@ void ScDatabaseDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-OSL_FAIL(ScDatabaseDPData::CreateCacheTable: NOT GOOD!);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! Cache table should be created with a live
// data cache instance at all times.
return;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index cde9a27..7891eaa 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -192,7 +192,7 @@ void ScSheetDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-OSL_FAIL(ScSheetDPData::CreateCacheTable: NOT GOOD!!!);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! The cache table should be created with a
// live data cache at all times.
return;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/osl/security.h |2 - sal/inc/osl/semaphor.h |2 - sal/inc/osl/socket.h | 80 - sal/inc/osl/time.h | 16 - 4 files changed, 50 insertions(+), 50 deletions(-) New commits: commit 1b8b6ecf5fdf753bd787748d54aaa61964199465 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Jan 13 02:30:20 2012 -0600 suppress doxygen warning in osl diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h index ed9d9b5..85e8abd 100644 --- a/sal/inc/osl/security.h +++ b/sal/inc/osl/security.h @@ -61,7 +61,7 @@ SAL_DLLPUBLIC oslSecurity SAL_CALL osl_getCurrentSecurity(void); /** Deprecated API Create a security handle for the denoted user. Try to log in the user on the local system. -@param[in] strzUserName denotes the name of the user to logg in. +@param[in] strUserName denotes the name of the user to logg in. @param[in] strPasswd the password for this user. @param[out] pSecurity returns the security handle if user could be logged in. @return osl_Security_E_None if user could be logged in, otherwise an error-code. diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h index 0a10a37..fb0cc71 100644 --- a/sal/inc/osl/semaphor.h +++ b/sal/inc/osl/semaphor.h @@ -42,7 +42,7 @@ typedef void* oslSemaphore; @deprecated Must not be used, as unnamed semaphores are not supported on Mac OS X. -@param InitialCount denotes the starting value the semaphore. If you set it to +@param initialCount denotes the starting value the semaphore. If you set it to zero, the first acquire() blocks. Otherwise InitialCount acquire()s are immedeatly successfull. @return 0 if the semaphore could not be created, otherwise a handle to the sem. diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h index 87df672..19554e6 100644 --- a/sal/inc/osl/socket.h +++ b/sal/inc/osl/socket.h @@ -229,7 +229,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isEqualSocketAddr( oslSocketAddr Addr1, oslSocketAddr Addr2); /** Uses the systems name-service interface to find an address for strHostname. -@param strHostname [in] The name for which you search for an address. +@param[in] strHostname The name for which you search for an address. @return The desired address if one could be found, otherwise 0. Don't forget to destroy the address if you don't need it any longer. */ @@ -241,8 +241,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_resolveHostname( in dotted decimal notation as first argument. @seeosl_sendToSocket() @seeoslSocketAddr -@param strDottedAddr [in] dotted decimal internet address, may be 0. -@param Port [in] port number in host byte order. +@param[in] strDottedAddr dotted decimal internet address, may be 0. +@param[in] Port port number in host byte order. @return 0 if address could not be created. */ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( @@ -292,7 +292,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr( /** Sets the Port of Addr. -@param Port [in] is expected in host byte-order. +@param[in] Port is expected in host byte-order. @return codesal_False/code if Addr is not an inet-addr. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setInetPortOfSocketAddr( @@ -337,8 +337,8 @@ typedef struct oslHostAddrImpl * oslHostAddr; /** Create an oslHostAddr from given hostname and socket address. -@param strHostname [in] The hostname to be stored. -@param Addr [in] The socket address to be stored. +@param[in] strHostname The hostname to be stored. +@param[in] Addr The socket address to be stored. @return The created address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddr( @@ -349,7 +349,7 @@ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddr( Successful name resolution should result in the fully qualified domain name (FQDN) and it's address as hostname and socket address members of the resulting oslHostAddr. -@param strHostname [in] The hostname to be resolved. +@param[in] strHostname The hostname to be resolved. @return The resulting address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHostname); @@ -359,7 +359,7 @@ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHost Successful name resolution should result in the fully qualified domain name (FQDN) and it's address as hostname and socket address members of the resulting oslHostAddr. -@param Addr [in] The socket address to be reverse resolved. +@param[in] Addr The socket address to be reverse resolved. @return The resulting address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByAddr(const oslSocketAddr Addr); @@ -447,8 +447,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/jdbc/exports.dxp |1 +
connectivity/source/drivers/jdbc/jservices.cxx | 16 +++-
connectivity/source/drivers/jdbc/makefile.mk |2 --
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit bb59742bcf4883af5876a2ffadcc4a689e414b60
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 13 09:38:07 2012 +0100
Confine JDBC driver to thread-affine apartment for Java 6 performance
... so that the massive number of the JDBC driver's calls to JNI
Attach/Detach-
CurrentThread are guaranteed not to happen on the main thread (where they
are
extremely expensive, see
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6978641 Fix for
6929067
introduces additional overhead in thread creation/termination paths).
diff --git a/connectivity/source/drivers/jdbc/exports.dxp
b/connectivity/source/drivers/jdbc/exports.dxp
index 7003307..f0e1c69 100755
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ b/connectivity/source/drivers/jdbc/exports.dxp
@@ -1 +1,2 @@
+component_getImplementationEnvironment
component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx
b/connectivity/source/drivers/jdbc/jservices.cxx
index 59c73ff..85df771 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -83,7 +83,21 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
-//---
+extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+// Recent Java 6 VMs make calls to JNI Attach/DetachCurrentThread (which
+// this code does extensively) very expensive. A follow-up JVM fix reduced
+// the overhead significantly again for all threads but the main thread.
So
+// a quick hack to improve performance of this component again is to
confine
+// it in the affine apartment (where all code will run on a single,
+// dedicated thread that is guaranteed no to be the main thread). However,
+// a better fix would still be to redesign the code so that it does not
call
+// Attach/DetachCurrentThread so frequently:
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME :affine;
+}
+
extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/jdbc/makefile.mk
b/connectivity/source/drivers/jdbc/makefile.mk
index befdc73..4229c8f 100755
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -78,8 +78,6 @@ SLOFILES=\
$(SLO)$/tools.obj \
$(SLO)$/ContextClassLoader.obj
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
# --- Library ---
SHL1TARGET=$(JDBC_TARGET)$(DLLPOSTFIX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 10 commits - basic/source canvas/source cui/source dbaccess/source desktop/source dtrans/source framework/inc framework/source reportdesign/source svtools/inc svtools/source s
basic/source/sbx/sbxdec.cxx |6
canvas/source/cairo/cairo_win32_cairo.cxx |1
cui/source/dialogs/insrc.cxx | 17 --
cui/source/inc/insrc.hxx |9 -
dbaccess/source/ui/app/AppController.cxx |6
dbaccess/source/ui/app/AppController.hxx |2
desktop/source/app/cmdlinehelp.cxx|2
desktop/source/app/lockfile.hxx | 15 -
desktop/source/app/lockfile2.cxx |8 -
desktop/source/deployment/registry/component/dp_component.cxx |8 -
desktop/source/deployment/registry/package/dp_package.cxx |4
dtrans/source/win32/ftransl/ftransl.cxx |2
framework/inc/helper/shareablemutex.hxx |1
framework/source/fwi/helper/shareablemutex.cxx|5
reportdesign/source/ui/inc/ReportController.hxx |2
reportdesign/source/ui/report/ReportController.cxx|6
svtools/inc/svtools/indexentryres.hxx |4
svtools/source/control/indexentryres.cxx | 25 +--
svx/Library_svx.mk|1
svx/inc/svxempty.hxx | 46 --
svx/source/engine3d/scene3d.cxx |4
svx/source/items/svxempty.cxx | 40 -
tools/inc/tools/stream.hxx|5
tools/source/stream/stream.cxx|3
unusedcode.easy | 12 -
vcl/generic/fontmanager/fontmanager.cxx | 76 --
vcl/inc/vcl/fontmanager.hxx |1
27 files changed, 59 insertions(+), 252 deletions(-)
New commits:
commit 6008c3f547a8cfa5f8c97f4084dfbab8fd263b6f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:04:24 2012 +
WaE: unused i
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx
b/canvas/source/cairo/cairo_win32_cairo.cxx
index 93520cd..ee4aea8 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -291,7 +291,6 @@ namespace cairo
wchar_t unicode[2];
WORD glyph_index;
HDC hdc = NULL;
-int i = 0;
hdc = CreateCompatibleDC (NULL);
commit 26712ff5a60428f94d45b20b8f01900da52f5e4e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:03:06 2012 +
WaE: d shadows another d
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 14833cf..992bff0 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -696,10 +696,12 @@ start:
}
break;
case SbxBYREF | SbxCURRENCY:
+{
double d;
if( !pDec-getDouble( d ) )
SbxBase::SetError( SbxERR_OVERFLOW );
*p-pnInt64 = ImpDoubleToCurrency( d );
+}
break;
case SbxBYREF | SbxSALINT64:
{
@@ -708,8 +710,8 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW );
else
*p-pnInt64 = ImpDoubleToSalInt64( d );
-break;
}
+break;
case SbxBYREF | SbxSALUINT64:
{
double d;
@@ -717,8 +719,8 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW );
else
*p-puInt64 = ImpDoubleToSalUInt64( d );
-break;
}
+break;
case SbxBYREF | SbxSINGLE:
if( !pDec-getSingle( *p-pSingle ) )
{
commit d271080853675dbc0e16b0788410dc5caed21a01
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:00:05 2012 +
WaE: clipformat may be used uninitialized
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx
b/dtrans/source/win32/ftransl/ftransl.cxx
index aa67ce3..7bd6966 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -206,7 +206,7 @@ DataFlavor SAL_CALL
CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
if ( aSysDataType.getValueType( ) == CPPUTYPE_SALINT32 )
{
-sal_Int32 clipformat;
+sal_Int32 clipformat = CF_INVALID;
aSysDataType = clipformat;
if ( CF_INVALID != clipformat )
findDataFlavorForStandardFormatId( clipformat, aFlavor );
commit 5678e845cc58933964729b908d649e10a11c220a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 08:59:03 2012 +
callcatcher: update list, getXLFD is now unused
diff --git a/unusedcode.easy b/unusedcode.easy
index 3c824f0..b906bb9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,6 +4,7 @@
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source
basic/source/sbx/sbxvalue.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 726344abbbec4beab5525c7890a360f9877d1ffa Author: Noel Power noel.po...@novell.com Date: Thu Jan 12 15:46:52 2012 + restore special DATE handling code for SbxValue::Compute fdo#44385 restore code that seemed to be erroneously moved as part of the currency enhancement feature diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index e21234c..6d9d718 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1311,9 +1311,6 @@ Lbl_OpIsDouble: else aL.nDouble /= aR.nDouble; break; case SbxPLUS: aL.nDouble += aR.nDouble; break; -// #45465 Date needs with + a special handling: forces date type -if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) -aL.eType = SbxDATE; case SbxMINUS: aL.nDouble -= aR.nDouble; break; case SbxNEG: @@ -1321,6 +1318,9 @@ Lbl_OpIsDouble: default: SetError( SbxERR_NOTIMP ); } +// #45465 Date needs with + a special handling: forces date type +if( Op == SbxPLUS (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) +aL.eType = SbxDATE; } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xename.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a0b20e1f023dedc849baf68f278c6f6df0660b11
Author: Noel Power noel.po...@novell.com
Date: Thu Jan 12 13:00:55 2012 +
fix definedName corruption for xlsx export ( bnc#741182 )
set symbol for builtin name using rangelist
diff --git a/sc/source/filter/excel/xename.cxx
b/sc/source/filter/excel/xename.cxx
index 08fae59..0c82a08 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -139,7 +139,7 @@ public:
sal_uInt16 InsertName( SCTAB nTab, sal_uInt16 nScNameIdx );
/** Inserts a new built-in defined name. */
-sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn,
XclTokenArrayRef xTokArr, SCTAB nScTab );
+sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn,
XclTokenArrayRef xTokArr, SCTAB nScTab, const ScRangeList aRangeList );
sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn,
XclTokenArrayRef xTokArr, const ScRange aRange );
/** Inserts a new defined name. Sets another unused name, if rName already
exists. */
sal_uInt16 InsertUniqueName( const String rName,
XclTokenArrayRef xTokArr, SCTAB nScTab );
@@ -410,11 +410,14 @@ sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName(
sal_Unicode cBuiltIn, XclTo
return Append( xName );
}
-sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName( sal_Unicode cBuiltIn,
XclTokenArrayRef xTokArr, SCTAB nScTab )
+sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName( sal_Unicode cBuiltIn,
XclTokenArrayRef xTokArr, SCTAB nScTab, const ScRangeList rRangeList )
{
XclExpNameRef xName( new XclExpName( GetRoot(), cBuiltIn ) );
xName-SetTokenArray( xTokArr );
xName-SetLocalTab( nScTab );
+String sSymbol;
+rRangeList.Format( sSymbol, SCR_ABS_3D, GetDocPtr(),
::formula::FormulaGrammar::CONV_XL_A1 );
+xName-SetSymbol( sSymbol );
return Append( xName );
}
@@ -725,7 +728,7 @@ sal_uInt16 XclExpNameManager::InsertBuiltInName(
sal_Unicode cBuiltIn, const ScR
if( !rRangeList.empty() )
{
XclTokenArrayRef xTokArr = GetFormulaCompiler().CreateFormula(
EXC_FMLATYPE_NAME, rRangeList );
-nNameIdx = mxImpl-InsertBuiltInName( cBuiltIn, xTokArr,
rRangeList.front()-aStart.Tab() );
+nNameIdx = mxImpl-InsertBuiltInName( cBuiltIn, xTokArr,
rRangeList.front()-aStart.Tab(), rRangeList );
}
return nNameIdx;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source
basic/source/sbx/sbxvalue.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a3533da32df2217e389c3f7c97cb642427d864b Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jan 13 11:25:49 2012 +0100 Fixed apparent typos. diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 6d9d718..6448158 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1319,7 +1319,7 @@ Lbl_OpIsDouble: SetError( SbxERR_NOTIMP ); } // #45465 Date needs with + a special handling: forces date type -if( Op == SbxPLUS (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) +if( eOp == SbxPLUS (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) ) aL.eType = SbxDATE; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - android/qa bridges/source distro-configs/LibreOfficeAndroid.conf
android/qa/sc/Makefile| 11 ++-
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |7 +++
distro-configs/LibreOfficeAndroid.conf|1 +
3 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 617c8075aca140a09a57a3d9da4fdc80a64998c5
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Jan 13 12:30:46 2012 +0200
Use cacheflush() on Android
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 9869bb5..91b96cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -46,6 +46,9 @@
#include dlfcn.h
+#ifdef ANDROID
+#include unistd.h
+#endif
using namespace ::osl;
using namespace ::rtl;
@@ -551,10 +554,14 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
void bridges::cpp_uno::shared::VtableFactory::flushCode(
unsigned char const *beg, unsigned char const *end)
{
+#ifndef ANDROID
static void (*clear_cache)(unsigned char const*, unsigned char const*)
= (void (*)(unsigned char const*, unsigned char const*))
dlsym(RTLD_DEFAULT, __clear_cache);
(*clear_cache)(beg, end);
+#else
+ cacheflush((long) beg, (long) end, 0);
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6022e3caa12ba762bda7d50dcc540660712a1880
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Jan 13 11:02:29 2012 +0200
Now we need libdb, too
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 04cd88f..3499906 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,6 +60,7 @@ copy-stuff:
bootstrap.uno \
comphelpgcc3 \
configmgr.uno \
+ db-4.7 \
fontconfig \
forlo \
foruilo \
commit 65e9ac63b8b0327c1a39220fa6326bc88f06c62d
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Jan 13 10:58:19 2012 +0200
Use merged libs on Android
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 1b9ac87..04cd88f 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -55,16 +55,11 @@ copy-stuff:
# Libs and UNO components that the tests need.
#
for F in $(strip \
- avmedialo \
basebmplo \
basegfxlo \
bootstrap.uno \
- canvastoolslo \
comphelpgcc3 \
configmgr.uno \
- cppcanvaslo \
- drawinglayerlo \
- editenglo \
fontconfig \
forlo \
foruilo \
@@ -83,11 +78,11 @@ copy-stuff:
icuuclo \
jvmaccessgcc3 \
jvmfwk \
- lnglo \
localedata_en \
localedata_es \
localedata_euro \
localedata_others \
+ mergedlo \
msfilterlo \
reg \
saxlo \
@@ -98,8 +93,6 @@ copy-stuff:
store \
svllo \
svtlo \
- svxcorelo \
- svxlo \
test \
tklo \
tllo \
@@ -120,7 +113,6 @@ copy-stuff:
xcrlo \
xml2 \
xmlreader \
- xolo \
); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
diff --git a/distro-configs/LibreOfficeAndroid.conf
b/distro-configs/LibreOfficeAndroid.conf
index c9bc5ab..fa54534 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -16,6 +16,7 @@
--disable-randr-link
--disable-systray
--disable-xmlsec
+--enable-mergelibs
--enable-python=internal
--without-fonts
--without-junit
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic vcl/inc
vcl/generic/fontmanager/fontconfig.cxx |3
vcl/generic/fontmanager/fontmanager.cxx | 503
vcl/inc/vcl/fontmanager.hxx | 40 --
3 files changed, 5 insertions(+), 541 deletions(-)
New commits:
commit 6bfc9eda7a9171c0fda40c3fee38bb4eec6c9cde
Author: Khaled Hosny khaledho...@eglug.org
Date: Fri Jan 13 13:19:19 2012 +0200
Drop XLFD support from fontmanager
XLFD support was removed in commit 269f91c (#i110171) except for parsing
fonts.dir and fonts.alias. I don't think this makes much sense in
fontconfig era, and dropping it simplifies the font manager a bit (I
don't even think we use server fonts at all).
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 90d59f1..eb0e9b6 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -547,10 +547,9 @@ int PrintFontManager::countFontconfigFonts(
boost::unordered_maprtl::OString, i
#endif
// not known, analyze font file to get attributes
// not described by fontconfig (e.g. alias names, PSName)
-std::list OString aDummy;
if (eFormatRes != FcResultMatch)
format = NULL;
-analyzeFontFile( nDirID, aBase, aDummy, aFonts, (const
char*)format );
+analyzeFontFile( nDirID, aBase, aFonts, (const char*)format );
#if OSL_DEBUG_LEVEL 1
if( aFonts.empty() )
fprintf( stderr, Warning: file \%s\ is unusable to
psprint\n, aOrgPath.getStr() );
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index 450a9ce..5e20b91 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -133,18 +133,6 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8* pBuffer )
return nRet;
}
-static FontItalic parseItalic( const ByteString rItalic )
-{
-FontItalic eItalic = ITALIC_DONTKNOW;
-if( rItalic.EqualsIgnoreCaseAscii( i ) )
-eItalic = ITALIC_NORMAL;
-else if( rItalic.EqualsIgnoreCaseAscii( o ) )
-eItalic = ITALIC_OBLIQUE;
-else
-eItalic = ITALIC_NONE;
-return eItalic;
-}
-
// -
static FontWeight parseWeight( const ByteString rWeight )
@@ -184,169 +172,6 @@ static FontWeight parseWeight( const ByteString rWeight )
return eWeight;
}
-// -
-
-static FontWidth parseWidth( const ByteString rWidth )
-{
-FontWidth eWidth = WIDTH_DONTKNOW;
-if( rWidth.Equals( bold ) ||
-rWidth.Equals( semiexpanded ) )
-eWidth = WIDTH_SEMI_EXPANDED;
-else if( rWidth.Equals( condensed ) ||
- rWidth.Equals( narrow ) )
-eWidth = WIDTH_CONDENSED;
-else if( rWidth.Equals( double wide ) ||
- rWidth.Equals( extraexpanded ) ||
- rWidth.Equals( ultraexpanded ) )
-eWidth = WIDTH_ULTRA_EXPANDED;
-else if( rWidth.Equals( expanded ) ||
- rWidth.Equals( wide ) )
-eWidth = WIDTH_EXPANDED;
-else if( rWidth.Equals( extracondensed ) )
-eWidth = WIDTH_EXTRA_CONDENSED;
-else if( rWidth.Equals( semicondensed ) )
-eWidth = WIDTH_SEMI_CONDENSED;
-else if( rWidth.Equals( ultracondensed ) )
-eWidth = WIDTH_ULTRA_CONDENSED;
-else
-eWidth = WIDTH_NORMAL;
-
-return eWidth;
-}
-
-// -
-bool PrintFontManager::XLFDEntry::operator(const PrintFontManager::XLFDEntry
rRight) const
-{
-sal_Int32 nCmp = 0;
-if( (nMask MaskFamily) (rRight.nMask MaskFamily) )
-{
-nCmp = rtl_str_compareIgnoreAsciiCase_WithLength(
aFamily.pData-buffer,
-
aFamily.pData-length,
-
rRight.aFamily.pData-buffer,
-
rRight.aFamily.pData-length );
-if( nCmp != 0 )
-return nCmp 0;
-}
-
-if( (nMask MaskFoundry) (rRight.nMask MaskFoundry) )
-{
-nCmp = rtl_str_compareIgnoreAsciiCase_WithLength(
aFoundry.pData-buffer,
-
aFoundry.pData-length,
-
rRight.aFoundry.pData-buffer,
-
rRight.aFoundry.pData-length );
-if( nCmp != 0 )
-return nCmp 0;
-}
-
-if( (nMask MaskItalic) (rRight.nMask MaskItalic) )
-{
-if( eItalic != rRight.eItalic )
-return (int)eItalic (int)rRight.eItalic;
-}
-
-if( (nMask MaskWeight) (rRight.nMask MaskWeight) )
-{
-if( eWeight !=
[Libreoffice-commits] .: sal/android
sal/android/lo-bootstrap.c |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 72baf88773286ee9c13984c6bc6bb9ff705cadd4
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Jan 13 14:31:55 2012 +0200
Comment out the verbose logging of code that seems to work fine
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index c827ea9..aaf8237 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1035,7 +1035,7 @@ lo_apk_readdir(lo_apk_dir *dirp)
static struct dirent result;
if (dirp-cur == NULL) {
-LOGI(lo_apk_readdir(%p) = NULL, dirp);
+/* LOGI(lo_apk_readdir(%p) = NULL, dirp); */
return NULL;
}
@@ -1053,7 +1053,7 @@ lo_apk_readdir(lo_apk_dir *dirp)
dirp-cur = dirp-cur-hh.next;
-LOGI(lo_apk_readdir(%p) = %s:%s, dirp, result.d_type == DT_DIR ? DIR :
REG, result.d_name);
+/* LOGI(lo_apk_readdir(%p) = %s:%s, dirp, result.d_type == DT_DIR ?
DIR : REG, result.d_name); */
return result;
}
@@ -1064,7 +1064,7 @@ lo_apk_closedir(lo_apk_dir *dirp)
{
free(dirp);
-LOGI(lo_apk_closedir(%p), dirp);
+/* LOGI(lo_apk_closedir(%p), dirp); */
return 0;
}
@@ -1091,7 +1091,8 @@ new_stat(const char *path,
/* Leave timestamps at zero for now? */
statp-st_ino = fake_ino;
-LOGI(lo_apk_lstat(%s) = { st_mode=%o, st_size=%lld, st_ino=%lld }, path,
statp-st_mode, statp-st_size, statp-st_ino);
+(void) path;
+/* LOGI(lo_apk_lstat(%s) = { st_mode=%o, st_size=%lld, st_ino=%lld },
path, statp-st_mode, statp-st_size, statp-st_ino); */
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Library_sofficeapp.mk desktop/source
desktop/Library_sofficeapp.mk |1
desktop/source/app/appsys.cxx | 68 --
desktop/source/app/appsys.hxx | 45 ---
3 files changed, 114 deletions(-)
New commits:
commit faf862a9d4c18a729c7d25a2a056e01b7447c72c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 13:43:51 2012 +
appsys.* and FATToVFat_Impl appear to be unnecessary
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index cd57646..759f40f 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/app/app \
desktop/source/app/appfirststart \
desktop/source/app/appinit \
-desktop/source/app/appsys \
desktop/source/app/check_ext_deps \
desktop/source/app/cmdlineargs \
desktop/source/app/cmdlinehelp \
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
deleted file mode 100644
index 5cc4fed..000
--- a/desktop/source/app/appsys.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-
-#include appsys.hxx
-
-#ifdef WNT
-
-#include rtl/ustring.hxx
-#include tools/solar.h
-#include tools/urlobj.hxx
-
-#include windows.h
-
-
-#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
-
-namespace desktop
-{
-
-void FATToVFat_Impl( String aName )
-{
-INetURLObject aObj( aName );
-if ( aObj.GetProtocol() == INET_PROT_FILE )
-{
-WIN32_FIND_DATA aData;
-HANDLE h = FindFirstFile( U2S(aName).getStr(), aData );
-if ( h )
-{
-// Change FAT short filename into VFAT long filename
-aObj.removeSegment();
-aObj.insertName( String::CreateFromAscii( aData.cFileName ) );
-aName = aObj.PathToFileName();
-FindClose( h );
-}
-}
-}
-
-}
-
-#endif // WNT
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
deleted file mode 100644
index d2f13ff..000
--- a/desktop/source/app/appsys.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _DESKTOP_APPSYS_HXX_
-#define _DESKTOP_APPSYS_HXX_
-
-#include tools/string.hxx
-
-namespace desktop
-{
-
-#ifdef WNT
-void FATToVFat_Impl( String aName );
-#endif
-
-}
-
-#endif // _DESKTOP_APPSYS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
[Libreoffice-commits] .: 2 commits - vcl/generic
vcl/generic/fontmanager/fontcache.cxx | 39 +-
1 file changed, 20 insertions(+), 19 deletions(-)
New commits:
commit 4e85b537d1229348bef16bb006d9e6b5303bd6c9
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 14:26:03 2012 +
tidy some string types
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 40877fc..616799a 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -267,7 +267,7 @@ void FontCache::read()
OString aLine;
aStream.ReadLine( aLine );
-if( !aLine.equals( rtl::OString(RTL_CONSTASCII_STRINGPARAM( CACHE_MAGIC ))
) )
+if (!aLine.equalsL(RTL_CONSTASCII_STRINGPARAM(CACHE_MAGIC)))
{
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, FontCache::read: cache file %s fails magic test\n,
rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
@@ -277,7 +277,6 @@ void FontCache::read()
int nDir = 0;
FontDirMap* pDir = NULL;
-xub_StrLen nIndex;
bool bKeepOnlyUserOverridden = false;
do
{
@@ -286,12 +285,12 @@ void FontCache::read()
aLine.compareTo( RTL_CONSTASCII_STRINGPARAM(
EmptyFontCacheDirectory: ) ) == 0 )
{
bool bEmpty = (aLine.compareTo( RTL_CONSTASCII_STRINGPARAM
(Empty ) ) == 0);
-xub_StrLen nSearchIndex = bEmpty ? 24 : 19;
+sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
OString aDir;
sal_Int64 nTimestamp = 0;
-xub_StrLen nTEnd = aLine.indexOf( ':', nSearchIndex );
-if( nTEnd != STRING_NOTFOUND )
+sal_Int32 nTEnd = aLine.indexOf( ':', nSearchIndex );
+if( nTEnd != -1 )
{
rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd -
nSearchIndex );
nTimestamp = aTimeStamp.toInt64();
@@ -368,6 +367,8 @@ void FontCache::read()
default: break;
}
+sal_Int32 nIndex;
+
for( nIndex = 0; nIndex nLen pLine[nIndex] != ';';
nIndex++ )
;
@@ -376,7 +377,7 @@ void FontCache::read()
sal_True );
while( nIndex nLen )
{
-xub_StrLen nLastIndex = nIndex+1;
+sal_Int32 nLastIndex = nIndex+1;
for( nIndex = nLastIndex ; nIndex nLen pLine[nIndex]
!= ';'; nIndex++ )
;
if( nIndex - nLastIndex )
commit eed2ad8025fbfd8c8b9ed8d83068700585bf7b13
Author: Christina Rossmanith chrrossman...@web.de
Date: Thu Jan 12 10:52:31 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 9c71963..40877fc 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -265,9 +265,9 @@ void FontCache::read()
}
-ByteString aLine;
+OString aLine;
aStream.ReadLine( aLine );
-if( !aLine.Equals( CACHE_MAGIC ) )
+if( !aLine.equals( rtl::OString(RTL_CONSTASCII_STRINGPARAM( CACHE_MAGIC ))
) )
{
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, FontCache::read: cache file %s fails magic test\n,
rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
@@ -282,20 +282,20 @@ void FontCache::read()
do
{
aStream.ReadLine( aLine );
-if( aLine.CompareTo( FontCacheDirectory:, 19 ) == COMPARE_EQUAL ||
-aLine.CompareTo( EmptyFontCacheDirectory:, 24 ) == COMPARE_EQUAL
)
+if( aLine.compareTo( RTL_CONSTASCII_STRINGPARAM( FontCacheDirectory:
) ) == 0 ||
+aLine.compareTo( RTL_CONSTASCII_STRINGPARAM(
EmptyFontCacheDirectory: ) ) == 0 )
{
-bool bEmpty = (aLine.CompareTo( Empty, 5 ) == COMPARE_EQUAL);
+bool bEmpty = (aLine.compareTo( RTL_CONSTASCII_STRINGPARAM
(Empty ) ) == 0);
xub_StrLen nSearchIndex = bEmpty ? 24 : 19;
OString aDir;
sal_Int64 nTimestamp = 0;
-xub_StrLen nTEnd = aLine.Search( ':', nSearchIndex );
+xub_StrLen nTEnd = aLine.indexOf( ':', nSearchIndex );
if( nTEnd != STRING_NOTFOUND )
{
-rtl::OString aTimeStamp = aLine.Copy( nSearchIndex, nTEnd -
nSearchIndex );
+rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd -
nSearchIndex );
nTimestamp = aTimeStamp.toInt64();
-aDir = aLine.Copy( nTEnd+1 );
+aDir = aLine.copy( nTEnd+1 );
}
else
{
@@ -327,12 +327,12 @@ void FontCache::read()
m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
}
}
-else if( pDir aLine.CompareTo( File:, 5 ) ==
[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk Repository.mk
Repository.mk | 16 extensions/Module_extensions.mk | 21 ++--- np_sdk/Module_np_sdk.mk |3 +++ 3 files changed, 21 insertions(+), 19 deletions(-) New commits: commit ab84770bb61ffb2675548e11a6a45059cb4f6c8e Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jan 13 15:14:57 2012 +0100 Build nsplugin only in with mozilla case. This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21 and 68b08a11babb7274048ef836a078959d126c97b7 with, hopefully, proper one. diff --git a/Repository.mk b/Repository.mk index ac24a61..d781001 100644 --- a/Repository.mk +++ b/Repository.mk @@ -101,13 +101,6 @@ endif endif -ifeq ($(ENABLE_NSPLUGIN),YES) -$(eval $(call gb_Helper_register_executables,OOO,\ -nsplugin \ -)) - -endif - ifeq ($(WITH_MOZILLA),YES) $(eval $(call gb_Helper_register_executables,OOO,\ pluginapp.bin \ @@ -115,6 +108,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pl \ )) +ifeq ($(ENABLE_NSPLUGIN),YES) +$(eval $(call gb_Helper_register_executables,OOO,\ +nsplugin \ +)) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +npsoplugin \ +)) +endif endif # WITH_MOZILLA @@ -324,7 +325,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ log_uno \ mcnttype \ neon \ -npsoplugin \ package2 \ reg \ scriptframe \ diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index a94eee6..1010e63 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -76,16 +76,8 @@ endif # DISABLE_ATL endif # WNT -ifeq ($(ENABLE_NSPLUGIN),YES) -$(eval $(call gb_Module_add_targets,extensions,\ - Executable_nsplugin \ - Library_npsoplugin \ - WinResTarget_npsoplugin \ -)) - -endif - ifeq ($(WITH_MOZILLA),YES) + $(eval $(call gb_Module_add_targets,extensions,\ Library_pl \ )) @@ -95,9 +87,16 @@ ifneq ($(GUIBASE),aqua) $(eval $(call gb_Module_add_targets,extensions,\ Executable_pluginapp.bin \ )) +endif +endif -endif # GUIBASE!=aqua -endif # GUI=UNX +ifeq ($(ENABLE_NSPLUGIN),YES) +$(eval $(call gb_Module_add_targets,extensions,\ + Executable_nsplugin \ + Library_npsoplugin \ + WinResTarget_npsoplugin \ +)) +endif endif # WITH_MOZILLA=YES diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 6c658d2..63393d5 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,np_sdk)) +ifeq ($(WITH_MOZILLA),YES) + $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ )) @@ -35,6 +37,7 @@ ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Module_add_targets,np_sdk,\ StaticLibrary_nputils \ )) +endif endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dptablecache.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 979448ca76591fc8346b7b0e8c24d653d6fec87b
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Jan 13 10:52:56 2012 -0500
Make sure no live ScDPObject instances hold reference to the deleted cache.
diff --git a/sc/source/core/data/dptablecache.cxx
b/sc/source/core/data/dptablecache.cxx
index 57f6ce1..1baec31 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -433,8 +433,22 @@ ScDPCache::ScDPCache(ScDocument* pDoc) :
{
}
+namespace {
+
+struct ClearObjectSource : std::unary_functionScDPObject*, void
+{
+void operator() (ScDPObject* p) const
+{
+p-ClearSource();
+}
+};
+
+}
+
ScDPCache::~ScDPCache()
{
+// Make sure no live ScDPObject instances hold reference to this cache any
more.
+std::for_each(maRefObjects.begin(), maRefObjects.end(),
ClearObjectSource());
}
bool ScDPCache::IsValid() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.12.patch libvisio/libvisio-0.0.13.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.12.patch | 20 libvisio/libvisio-0.0.13.patch | 20 libvisio/makefile.mk |4 ++-- ooo.lst.in |2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 98eda8d975cfaff8ba0d9b6f8b26a779f1bd489f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 13 16:53:24 2012 +0100 Uploading a new fresh shiny libvisio 0.0.13 Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch deleted file mode 100644 index c9e626c..000 --- a/libvisio/libvisio-0.0.12.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.12/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch new file mode 100644 index 000..c93983b --- /dev/null +++ b/libvisio/libvisio-0.0.13.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.13/src/lib/libvisio_utils.h misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index a14fb8d..6d29b7d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.12 -TARFILE_MD5=053a35c244bf132f806e198ac4d960aa +TARFILE_NAME=libvisio-0.0.13 +TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 710402c..4ca5af3 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 +adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source
sc/source/core/data/dptablecache.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 54731b6a25ea7f049a866e9a3c78d0684f7e1bc4
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Jan 13 11:56:35 2012 -0500
Use a copy; the container gets modified during iteration.
diff --git a/sc/source/core/data/dptablecache.cxx
b/sc/source/core/data/dptablecache.cxx
index 1baec31..a65785b 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -447,8 +447,11 @@ struct ClearObjectSource :
std::unary_functionScDPObject*, void
ScDPCache::~ScDPCache()
{
-// Make sure no live ScDPObject instances hold reference to this cache any
more.
-std::for_each(maRefObjects.begin(), maRefObjects.end(),
ClearObjectSource());
+// Make sure no live ScDPObject instances hold reference to this cache any
+// more. We need to use a copied set because the referencing objects will
+// modify the original when clearing their source.
+ObjectSetType aRefs(maRefObjects);
+std::for_each(aRefs.begin(), aRefs.end(), ClearObjectSource());
}
bool ScDPCache::IsValid() const
commit 405cd1b404faaed034b1188806a0f7f3ff899664
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Jan 13 10:52:56 2012 -0500
Make sure no live ScDPObject instances hold reference to the deleted cache.
diff --git a/sc/source/core/data/dptablecache.cxx
b/sc/source/core/data/dptablecache.cxx
index 57f6ce1..1baec31 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -433,8 +433,22 @@ ScDPCache::ScDPCache(ScDocument* pDoc) :
{
}
+namespace {
+
+struct ClearObjectSource : std::unary_functionScDPObject*, void
+{
+void operator() (ScDPObject* p) const
+{
+p-ClearSource();
+}
+};
+
+}
+
ScDPCache::~ScDPCache()
{
+// Make sure no live ScDPObject instances hold reference to this cache any
more.
+std::for_each(maRefObjects.begin(), maRefObjects.end(),
ClearObjectSource());
}
bool ScDPCache::IsValid() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/uiview/view1.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit d83488f9795740857830aaf005e06e30d4e7d70c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Jan 13 18:04:09 2012 +0100
fdo#40438: force calculating layout before Activate to avoid crashes and
loops
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index 23d80f9..79ec899 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -53,6 +53,10 @@ extern int bDocSzUpdated;
void SwView::Activate(sal_Bool bMDIActivate)
{
+// fdo#40438 Update the layout to make sure everything is correct before
showing the content
+pWrtShell-StartAction();
+pWrtShell-EndAction( sal_True );
+
// aktuelle View anmelden an der DocShell
// die View bleibt solange an der DocShell
// aktiv bis Sie zerstoert wird oder durch Activate eine
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/makefile.mk |4 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit aa7e105677017059ab84c4f3bd38b6a511637395 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jan 13 16:02:03 2012 +0100 scp2: install nsplugin only in case it's build diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 04131ec..ed8f3b6 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2 End #endif -#if !defined WITHOUT_MOZILLA (!defined UNX || defined ENABLE_GTK) +#if !defined WITHOUT_MOZILLA defined ENABLE_NSPLUGIN File gid_Brand_File_Lib_Npsoplugin BIN_FILE_BODY; Name = SPECIAL_NAME(npsoplugin); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4876614..5263c11 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -110,7 +110,7 @@ End #ifndef WITHOUT_MOZILLA -#if !defined(UNX) || defined(ENABLE_GTK) +#ifdef ENABLE_NSPLUGIN File gid_File_Exe_Nsplugin BIN_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 96bcb5f..87cc67c 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3 .ENDIF .ENDIF # $(GUI)==UNX +.IF $(ENABLE_NSPLUGIN) == YES +SCPDEFS+=-DENABLE_NSPLUGIN +.ENDIF + .IF $(MERGELIBS) == TRUE SCPDEFS+=-DMERGELIBS .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dptablecache.hxx |2 ++
sc/source/core/data/dptablecache.cxx | 14 +-
2 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit e60b212cc9f02d68ee638106a5881c21ac40ce8d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Jan 13 13:56:34 2012 -0500
Avoid double deletion during data cache object destruction.
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 882f422..dcfc066 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -93,6 +93,8 @@ private:
mutable ScDPItemDataPoolmaAdditionalData;
+bool mbDisposing;
+
public:
void AddReference(ScDPObject* pObj) const;
void RemoveReference(ScDPObject* pObj) const;
diff --git a/sc/source/core/data/dptablecache.cxx
b/sc/source/core/data/dptablecache.cxx
index a65785b..ed45647 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -429,7 +429,8 @@ bool ScDPCache::operator== ( const ScDPCache r ) const
ScDPCache::ScDPCache(ScDocument* pDoc) :
mpDoc( pDoc ),
-mnColumnCount ( 0 )
+mnColumnCount ( 0 ),
+mbDisposing(false)
{
}
@@ -448,10 +449,9 @@ struct ClearObjectSource :
std::unary_functionScDPObject*, void
ScDPCache::~ScDPCache()
{
// Make sure no live ScDPObject instances hold reference to this cache any
-// more. We need to use a copied set because the referencing objects will
-// modify the original when clearing their source.
-ObjectSetType aRefs(maRefObjects);
-std::for_each(aRefs.begin(), aRefs.end(), ClearObjectSource());
+// more.
+mbDisposing = true;
+std::for_each(maRefObjects.begin(), maRefObjects.end(),
ClearObjectSource());
}
bool ScDPCache::IsValid() const
@@ -1010,6 +1010,10 @@ void ScDPCache::AddReference(ScDPObject* pObj) const
void ScDPCache::RemoveReference(ScDPObject* pObj) const
{
+if (mbDisposing)
+// Object being deleted.
+return;
+
maRefObjects.erase(pObj);
if (maRefObjects.empty())
mpDoc-GetDPCollection()-RemoveCache(this);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/source
vcl/source/glyphs/graphite_layout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1bdf3ff2b4499a08c62c43e7698038c07489a9d0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Sep 22 17:25:00 2011 +0100
WaE: signed/unsigned error
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 5238609..4123414 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -329,7 +329,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment,
ImplLayoutArgs rArgs, float fSc
float leftBoundary = gr_slot_origin_X(clusterFirst);
float rightBoundary = (clusterAfter)?
gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment);
-size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment,
nFirstCharInCluster));
+int bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment,
nFirstCharInCluster));
if (mnSegCharOffset + bFirstChar = mnMinCharPos
mnSegCharOffset + bFirstChar mnEndCharPos)
{
@@ -339,7 +339,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment,
ImplLayoutArgs rArgs, float fSc
{
for (int i = nFirstCharInCluster; i = nLastCharInCluster;
i++)
{
-size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment,
i));
+int ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
if (mnSegCharOffset + ibase = mnEndCharPos)
break;
// from the point of view of the dx array, the xpos is
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - dbaccess/Library_dbui.mk i18npool/source solenv/gbuild svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svx/Library_svx.mk xmloff/Libra
dbaccess/Library_dbui.mk |2 +- i18npool/source/localedata/data/it_IT.xml |1 + i18npool/source/localedata/data/pt_AO.xml |1 + i18npool/source/localedata/data/pt_BR.xml |1 + i18npool/source/localedata/data/pt_PT.xml |1 + i18npool/source/localedata/data/sl_SI.xml |2 ++ solenv/gbuild/platform/com_GCC_defs.mk|2 +- svl/Library_fsstorage.mk |2 +- svl/Library_passwordcontainer.mk |2 +- svl/Library_svl.mk|2 +- svx/Library_svx.mk|2 +- xmloff/Library_xo.mk |2 +- 12 files changed, 13 insertions(+), 7 deletions(-) New commits: commit 92bf1c3f605f837214013d25396b3d3a34005e9c Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 22:41:21 2012 +0100 use INCLUDE instead of SOLARINC, and after local includes diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index a5e021b..f17a8b7 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\ -I$(SRCDIR)/dbaccess/source/ui/inc \ -I$(SRCDIR)/dbaccess/source/ui/dlg \ -I$(SRCDIR)/dbaccess/source/inc \ - $$(SOLARINC) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,dbui,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 29b4653..2247c9a 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage)) $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ -$$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,fsstorage,\ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d1a740c..6b577b6 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer)) $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ -$$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,passwordcontainer,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 216a80d..337e4ed 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc)) $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ -$$(SOLARINC) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svl,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index d81363a..97db17f 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) $(eval $(call gb_Library_set_include,svx,\ -I$(realpath $(SRCDIR)/svx/inc) \ -I$(realpath $(SRCDIR)/svx/source/inc) \ -$$(SOLARINC) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svx,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 11173d9..558b5f3 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) $(eval $(call gb_Library_set_include,xo,\ -$$(SOLARINC) \ -I$(realpath $(SRCDIR)/xmloff/inc) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_defs,xo,\ commit 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4 Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 22:41:20 2012 +0100 ensure that /usr/include is _appended_ to INCLUDE At least with gcc 4.6.2 the situation was that if /usr/include was missing from the -I... includes, header files were pulled from /usr/include/ instead of solver/$INPATH/inc/external/ This clearly makes a difference for not --with-system-... libs where the internal version is to be used. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 33aa936..7dddcbb 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,7 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 -gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) +gb_LinkTarget_INCLUDE := $(filter-out %/stl,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/Library_dbui.mk solenv/gbuild svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svx/Library_svx.mk x
dbaccess/Library_dbui.mk |2 +- solenv/gbuild/platform/com_GCC_defs.mk |2 +- svl/Library_fsstorage.mk |2 +- svl/Library_passwordcontainer.mk |2 +- svl/Library_svl.mk |2 +- svx/Library_svx.mk |2 +- xmloff/Library_xo.mk |2 +- 7 files changed, 7 insertions(+), 7 deletions(-) New commits: commit f1d713a1a768c77bfa287e7c6a3ac0fa7053c882 Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 22:43:35 2012 +0100 use INCLUDE instead of SOLARINC, and after local includes diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index a5e021b..f17a8b7 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\ -I$(SRCDIR)/dbaccess/source/ui/inc \ -I$(SRCDIR)/dbaccess/source/ui/dlg \ -I$(SRCDIR)/dbaccess/source/inc \ - $$(SOLARINC) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,dbui,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 29b4653..2247c9a 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage)) $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ -$$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,fsstorage,\ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d1a740c..6b577b6 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer)) $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ -$$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,passwordcontainer,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 216a80d..337e4ed 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc)) $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ -$$(SOLARINC) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svl,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 9165c9e..0e338b3 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) $(eval $(call gb_Library_set_include,svx,\ -I$(realpath $(SRCDIR)/svx/inc) \ -I$(realpath $(SRCDIR)/svx/source/inc) \ -$$(SOLARINC) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svx,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 11173d9..558b5f3 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) $(eval $(call gb_Library_set_include,xo,\ -$$(SOLARINC) \ -I$(realpath $(SRCDIR)/xmloff/inc) \ +$$(INCLUDE) \ )) $(eval $(call gb_Library_add_defs,xo,\ commit f212a2a7c4380a107785a3fba7b48bf38937842e Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 22:43:34 2012 +0100 ensure that /usr/include is _appended_ to INCLUDE At least with gcc 4.6.2 the situation was that if /usr/include was missing from the -I... includes, header files were pulled from /usr/include/ instead of solver/$INPATH/inc/external/ This clearly makes a difference for not --with-system-... libs where the internal version is to be used. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 33aa936..7dddcbb 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,7 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 -gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) +gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: sc/source sd/source svx/inc svx/source sw/source
sc/source/ui/view/prevwsh.cxx |7 +++
sc/source/ui/view/tabview.cxx |9 -
sd/source/ui/view/viewshel.cxx |8
svx/inc/svx/zoom_def.hxx |3 +++
svx/source/stbctrls/zoomsliderctrl.cxx |6 --
sw/source/ui/uiview/viewport.cxx |6 --
6 files changed, 22 insertions(+), 17 deletions(-)
New commits:
commit 022ce7d362f146ed69f54aae20cf2b8c582e9f8d
Author: Tim Hardeck thard...@suse.com
Date: Fri Jan 13 18:22:46 2012 +0100
fdo#44173: use a geometric progression for zooming
Zooming does now base on a geometric progression instead of an
arithmetic one.
Since the zoom factor is not only used in Draw but for all other
applications 1.2 seems like a good choice.
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index d76622a..b25a464 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -79,8 +79,7 @@
#include sc.hrc
#include scabstdlg.hxx
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
+// for mouse wheel
#define MINZOOM_SLIDER 10
#define MAXZOOM_SLIDER 400
@@ -449,9 +448,9 @@ sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent
rCEvt )
long nOld = pPreview-GetZoom();
long nNew = nOld;
if ( pData-GetDelta() 0 )
-nNew = Max( (long) MINZOOM, (long)( nOld - SC_DELTA_ZOOM ) );
+nNew = Max( (long) MINZOOM, (long)round( nOld / ZOOM_FACTOR ));
else
-nNew = Min( (long) MAXZOOM, (long)( nOld + SC_DELTA_ZOOM ) );
+nNew = Min( (long) MAXZOOM, (long)round( nOld * ZOOM_FACTOR ));
if ( nNew != nOld )
{
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index a5fdf31..738aeec 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -149,15 +149,14 @@
#include string
#include algorithm
+#include svx/zoom_def.hxx
+
#define SPLIT_MARGIN30
#define SC_ICONSIZE 36
#define SC_SCROLLBAR_MIN30
#define SC_TABBAR_MIN 6
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
-
using namespace ::com::sun::star;
// STATIC DATA ---
@@ -1060,9 +1059,9 @@ bool ScTabView::ScrollCommand( const CommandEvent rCEvt,
ScSplitPos ePos )
long nOld = (long)(( rOldY.GetNumerator() * 100 ) /
rOldY.GetDenominator());
long nNew = nOld;
if ( pData-GetDelta() 0 )
-nNew = Max( (long) MINZOOM, (long)( nOld - SC_DELTA_ZOOM ) );
+nNew = Max( (long) MINZOOM, (long)round( nOld / ZOOM_FACTOR ));
else
-nNew = Min( (long) MAXZOOM, (long)( nOld + SC_DELTA_ZOOM ) );
+nNew = Min( (long) MAXZOOM, (long)round( nOld * ZOOM_FACTOR ));
if ( nNew != nOld )
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 68ebe72..6c79ec2 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -82,6 +82,8 @@
#include sfx2/request.hxx
#include SpellDialogChildWindow.hxx
+#include svx/zoom_def.hxx
+
#include Window.hxx
#include fupoor.hxx
@@ -125,8 +127,6 @@ private:
namespace sd {
-static const int DELTA_ZOOM = 10;
-
sal_Bool ViewShell::IsPageFlipMode(void) const
{
return this-ISA(DrawViewShell) mpContentWindow.get() != NULL
@@ -718,9 +718,9 @@ bool ViewShell::HandleScrollCommand(const CommandEvent
rCEvt, ::sd::Window* pWi
longnNewZoom;
if( pData-GetDelta() 0L )
-nNewZoom = Max( (long) pWin-GetMinZoom(),
(long)(nOldZoom - DELTA_ZOOM) );
+nNewZoom = Max( (long) pWin-GetMinZoom(),
(long)round( nOldZoom / ZOOM_FACTOR ));
else
-nNewZoom = Min( (long) pWin-GetMaxZoom(),
(long)(nOldZoom + DELTA_ZOOM) );
+nNewZoom = Min( (long) pWin-GetMaxZoom(),
(long)round( nOldZoom * ZOOM_FACTOR ));
SetZoom( nNewZoom );
Invalidate( SID_ATTR_ZOOM );
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 0a24476..e194493 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
@@ -8,4 +8,7 @@
#endif
+// zoom factor for Calc, Writer, Draw and Impress
+#define ZOOM_FACTOR1.2
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index aa8ae8a..b270480 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -36,6 +36,8 @@
#include svx/dialmgr.hxx
#include svx/dialogs.hrc
+#include svx/zoom_def.hxx
+
#include set
// ---
@@ -357,11 +359,11 @@ sal_Bool
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 5ee2cb58eb8cd3a29ca910bd57eda23aa04d1778 Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 23:47:35 2012 +0100 make MacOSX happy again and have no /usr/include there Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7dddcbb..847ef0f 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 + +# At least with gcc 4.6.2 the situation was that if /usr/include was missing +# from the -I... includes, header files were pulled from /usr/include/ instead +# of solver/$INPATH/inc/external/ +# One should not add /usr/include, but ... have this as workaround now. +# However, MacOSX would bail out with lots of deprecated methods as +# /usr/include is not what's used on Mac. +ifeq ($(OS_FOR_BUILD),MACOSX) +gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) +else gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include +endif gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk | 11 +++ 1 file changed, 11 insertions(+) New commits: commit ebb95b5a20f88ae422292fcfbbf7781a347b9ce8 Author: Eike Rathke er...@redhat.com Date: Fri Jan 13 23:45:29 2012 +0100 make MacOSX happy again and have no /usr/include there Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7dddcbb..847ef0f 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 + +# At least with gcc 4.6.2 the situation was that if /usr/include was missing +# from the -I... includes, header files were pulled from /usr/include/ instead +# of solver/$INPATH/inc/external/ +# One should not add /usr/include, but ... have this as workaround now. +# However, MacOSX would bail out with lots of deprecated methods as +# /usr/include is not what's used on Mac. +ifeq ($(OS_FOR_BUILD),MACOSX) +gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) +else gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include +endif gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk | 11 --- 1 file changed, 11 deletions(-) New commits: commit 91d3c4a75f1f28b3f674e97b8c85948d5d9c Author: Eike Rathke er...@redhat.com Date: Sat Jan 14 01:02:27 2012 +0100 grml.. back to the drawing board Reverted 80f60ef540528ec5304b9fb9624a7ff1b077f108 cf1f87948bcf9b8edf8487fa7938a928cfed8f2f as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty behavior and hope for the best until solved. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 847ef0f..33aa936 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,18 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 - -# At least with gcc 4.6.2 the situation was that if /usr/include was missing -# from the -I... includes, header files were pulled from /usr/include/ instead -# of solver/$INPATH/inc/external/ -# One should not add /usr/include, but ... have this as workaround now. -# However, MacOSX would bail out with lots of deprecated methods as -# /usr/include is not what's used on Mac. -ifeq ($(OS_FOR_BUILD),MACOSX) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -else -gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include -endif gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk | 11 --- 1 file changed, 11 deletions(-) New commits: commit 26e2705b90952ec2d736a97b28de205e1cf9da7e Author: Eike Rathke er...@redhat.com Date: Sat Jan 14 01:02:44 2012 +0100 grml.. back to the drawing board Reverted 80f60ef540528ec5304b9fb9624a7ff1b077f108 cf1f87948bcf9b8edf8487fa7938a928cfed8f2f as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty behavior and hope for the best until solved. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 847ef0f..33aa936 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,18 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 - -# At least with gcc 4.6.2 the situation was that if /usr/include was missing -# from the -I... includes, header files were pulled from /usr/include/ instead -# of solver/$INPATH/inc/external/ -# One should not add /usr/include, but ... have this as workaround now. -# However, MacOSX would bail out with lots of deprecated methods as -# /usr/include is not what's used on Mac. -ifeq ($(OS_FOR_BUILD),MACOSX) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -else -gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include -endif gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 8 commits - sw/inc sw/source
sw/inc/authfld.hxx |3 -
sw/inc/docstyle.hxx|3 -
sw/inc/editsh.hxx |1
sw/inc/fldbas.hxx |5 -
sw/inc/shellres.hxx|9 +--
sw/inc/swmodule.hxx|3 -
sw/source/core/edit/autofmt.cxx|4 -
sw/source/core/fields/authfld.cxx |5 -
sw/source/core/fields/docufld.cxx |4 -
sw/source/core/fields/fldbas.cxx |8 +-
sw/source/filter/html/htmlform.cxx | 99 +
sw/source/filter/html/swhtml.hxx |5 -
sw/source/ui/app/docstyle.cxx | 41 ++-
sw/source/ui/app/swmodul1.cxx | 14 ++---
sw/source/ui/app/swmodule.cxx |2
sw/source/ui/config/optpage.cxx| 14 +
sw/source/ui/fldui/fldmgr.cxx | 11 ++--
sw/source/ui/inc/optpage.hxx |3 -
sw/source/ui/index/swuiidxmrk.cxx | 12 ++--
sw/source/ui/utlui/initui.cxx |5 -
20 files changed, 113 insertions(+), 138 deletions(-)
New commits:
commit e4aecbdbe4e12b241da39d8e7b23dbb8db20bd2f
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 18:48:31 2012 -0500
SvStringsDtor-std::vector
diff --git a/sw/source/filter/html/htmlform.cxx
b/sw/source/filter/html/htmlform.cxx
index 2cb105b..d12ee91 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -26,8 +26,6 @@
*
/
-
-
#include hintids.hxx
#include comphelper/string.hxx
#include vcl/svapp.hxx
@@ -205,8 +203,8 @@ class SwHTMLForm_Impl
uno::Reference drawing::XShapexShape;
String sText;
-SvStringsDtor aStringList;
-SvStringsDtor aValueList;
+std::vectorString aStringList;
+std::vectorString aValueList;
std::vectorsal_uInt16 aSelectedList;
public:
@@ -256,16 +254,16 @@ public:
String GetText() { return sText; }
void EraseText() { sText = aEmptyStr; }
-SvStringsDtor GetStringList() { return aStringList; }
+std::vectorString GetStringList() { return aStringList; }
void EraseStringList()
{
-aStringList.DeleteAndDestroy( 0, aStringList.Count() );
+aStringList.clear();
}
-SvStringsDtor GetValueList() { return aValueList; }
+std::vectorString GetValueList() { return aValueList; }
void EraseValueList()
{
-aValueList.DeleteAndDestroy( 0, aValueList.Count() );
+aValueList.clear();
}
std::vectorsal_uInt16 GetSelectedList() { return aSelectedList; }
@@ -818,8 +816,8 @@ void SwHTMLParser::SetControlSize( const uno::Reference
drawing::XShape rSha
static void lcl_html_setEvents(
const uno::Reference script::XEventAttacherManager rEvtMn,
sal_uInt32 nPos, const SvxMacroTableDtor rMacroTbl,
-const SvStringsDtor rUnoMacroTbl,
-const SvStringsDtor rUnoMacroParamTbl,
+const std::vectorString rUnoMacroTbl,
+const std::vectorString rUnoMacroParamTbl,
const String rType )
{
// Erstmal muss die Anzahl der Events ermittelt werden ...
@@ -834,9 +832,9 @@ static void lcl_html_setEvents(
if( pMacro aEventListenerTable[i] )
nEvents++;
}
-for( i=0; i rUnoMacroTbl.Count(); i++ )
+for( i=0; i rUnoMacroTbl.size(); i++ )
{
-const String rStr = *rUnoMacroTbl[i];
+const String rStr(rUnoMacroTbl[i]);
xub_StrLen nIndex = 0;
if( !rStr.GetToken( 0, '-', nIndex ).Len() || STRING_NOTFOUND ==
nIndex )
continue;
@@ -867,9 +865,9 @@ static void lcl_html_setEvents(
}
}
-for( i=0; i rUnoMacroTbl.Count(); i++ )
+for( i=0; i rUnoMacroTbl.size(); ++i )
{
-const String rStr = *rUnoMacroTbl[i];
+const String rStr = rUnoMacroTbl[i];
xub_StrLen nIndex = 0;
String sListener( rStr.GetToken( 0, '-', nIndex ) );
if( !sListener.Len() || STRING_NOTFOUND == nIndex )
@@ -890,16 +888,16 @@ static void lcl_html_setEvents(
rDesc.ScriptCode = sCode;
rDesc.AddListenerParam = OUString();
-if( rUnoMacroParamTbl.Count() )
+if(!rUnoMacroParamTbl.empty())
{
String sSearch( sListener );
sSearch += '-';
sSearch += sMethod;
sSearch += '-';
xub_StrLen nLen = sSearch.Len();
-for( sal_uInt16 j=0; j rUnoMacroParamTbl.Count(); j++ )
+for(size_t j = 0; j rUnoMacroParamTbl.size(); ++j)
{
-const String rParam = *rUnoMacroParamTbl[j];
+const String rParam = rUnoMacroParamTbl[j];
if( rParam.CompareTo( sSearch, nLen ) == COMPARE_EQUAL
rParam.Len() nLen )
{
@@ -913,25 +911,24 @@ static void lcl_html_setEvents(
}
static void lcl_html_getEvents( const String
[Libreoffice-commits] .: sw/source
sw/source/ui/utlui/initui.cxx | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit cad9afa15f53d547733fa55f1353772f6d696611
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 22:41:12 2012 -0500
SvStringsDtor-std::vector
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index dacbb6e..1a3e6d4 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -233,37 +233,38 @@ SwGlossaryList* GetGlossaryList()
struct ImpAutoFmtNameListLoader : public Resource
{
-ImpAutoFmtNameListLoader( SvStringsDtor rLst );
+ImpAutoFmtNameListLoader( std::vectorString rLst );
};
void ShellResource::_GetAutoFmtNameLst() const
{
-SvStringsDtor** ppLst = (SvStringsDtor**)pAutoFmtNameLst;
-*ppLst = new SvStringsDtor( STR_AUTOFMTREDL_END );
-ImpAutoFmtNameListLoader aTmp( **ppLst );
+std::vectorString* pLst(pAutoFmtNameLst);
+pLst = new std::vectorString;
+pLst-reserve(STR_AUTOFMTREDL_END);
+ImpAutoFmtNameListLoader aTmp( *pLst );
}
-ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor rLst )
+ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vectorString rLst )
: Resource( ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr) )
{
for( sal_uInt16 n = 0; n STR_AUTOFMTREDL_END; ++n )
{
-String* p = new String( ResId( n + 1, *pSwResMgr) );
+String p(ResId(n + 1, *pSwResMgr));
if(STR_AUTOFMTREDL_TYPO == n)
{
#ifdef WNT
//fuer Windows Sonderbehandlung, da MS hier ein paar Zeichen im
Dialogfont vergessen hat
-p-SearchAndReplace(C2S(%1), C2S(,,));
-p-SearchAndReplace(C2S(%2), C2S(''));
+p.SearchAndReplace(C2S(%1), C2S(,,));
+p.SearchAndReplace(C2S(%2), C2S(''));
#else
const SvtSysLocale aSysLocale;
const LocaleDataWrapper rLclD = aSysLocale.GetLocaleData();
//unter richtigen Betriebssystemen funktioniert es auch so
-p-SearchAndReplace(C2S(%1),
rLclD.getDoubleQuotationMarkStart());
-p-SearchAndReplace(C2S(%2), rLclD.getDoubleQuotationMarkEnd());
+p.SearchAndReplace(C2S(%1), rLclD.getDoubleQuotationMarkStart());
+p.SearchAndReplace(C2S(%2), rLclD.getDoubleQuotationMarkEnd());
#endif
}
-rLst.Insert( p, n );
+rLst.insert(rLst.begin() + n, p);
}
FreeResource();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/filter/html/htmlftn.cxx | 16 +++-
sw/source/filter/xml/xmltbli.cxx | 19 +--
sw/source/filter/xml/xmltbli.hxx |2 +-
3 files changed, 17 insertions(+), 20 deletions(-)
New commits:
commit ffaa6ae12d40419ec043607c9a34fb80677683dd
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 22:53:06 2012 -0500
SvStringsDtor-std::vector
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 61e19c8..978e5e1 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1538,16 +1538,16 @@ void SwXMLTableContext::InsertColumn( sal_Int32
nWidth2, sal_Bool bRelWidth2,
{
if( !pColumnDefaultCellStyleNames )
{
-pColumnDefaultCellStyleNames = new SvStringsDtor;
+pColumnDefaultCellStyleNames = new std::vectorString;
sal_uLong nCount = aColumnWidths.size() - 1;
while( nCount-- )
-pColumnDefaultCellStyleNames-Insert( new String,
-pColumnDefaultCellStyleNames-Count() );
+pColumnDefaultCellStyleNames-push_back(String());
}
-pColumnDefaultCellStyleNames-Insert(
-pDfltCellStyleName ? new String( *pDfltCellStyleName ) : new
String,
-pColumnDefaultCellStyleNames-Count() );
+if(pDfltCellStyleName)
+pColumnDefaultCellStyleNames-push_back(*pDfltCellStyleName);
+else
+pColumnDefaultCellStyleNames-push_back(String());
}
}
@@ -1567,11 +1567,10 @@ sal_Int32 SwXMLTableContext::GetColumnWidth( sal_uInt32
nCol,
OUString SwXMLTableContext::GetColumnDefaultCellStyleName( sal_uInt32 nCol )
const
{
-OUString sRet;
-if( pColumnDefaultCellStyleNames )
-sRet = *(*pColumnDefaultCellStyleNames)[(sal_uInt16)nCol];
+if( pColumnDefaultCellStyleNames nCol
pColumnDefaultCellStyleNames-size())
+return (*pColumnDefaultCellStyleNames)[static_castsize_t(nCol)];
-return sRet;
+return OUString();
}
void SwXMLTableContext::InsertCell( const OUString rStyleName,
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index ea94139..c83d26b 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -70,7 +70,7 @@ class SwXMLTableContext : public XMLTextTableContext
inline ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth),
isRelative(isRel) {};
};
std::vectorColumnWidthInfo aColumnWidths;
-SvStringsDtor *pColumnDefaultCellStyleNames;
+std::vectorString *pColumnDefaultCellStyleNames;
::com::sun::star::uno::Reference
::com::sun::star::text::XTextCursor xOldCursor;
commit a93df89c4b7f68a079544d9490de552ff0aae2fb
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 22:46:38 2012 -0500
SvStringsDtor-std::vector
diff --git a/sw/source/filter/html/htmlftn.cxx
b/sw/source/filter/html/htmlftn.cxx
index 39f9a89..f10de6e 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -46,7 +46,7 @@ SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1, 1 )
struct SwHTMLFootEndNote_Impl
{
SwHTMLTxtFtns aTxtFtns;
-SvStringsDtor aNames;
+std::vectorString aNames;
String sName;
String sContent;// Infos fuer die letzte Fussnote
@@ -229,8 +229,7 @@ void SwHTMLParser::FinishFootEndNote()
pFootEndNoteImpl-aTxtFtns.Insert( pTxtFtn,
pFootEndNoteImpl-aTxtFtns.Count()
);
-pFootEndNoteImpl-aNames.Insert( new String(pFootEndNoteImpl-sName),
- pFootEndNoteImpl-aNames.Count() );
+pFootEndNoteImpl-aNames.push_back(pFootEndNoteImpl-sName);
}
pFootEndNoteImpl-sName = aEmptyStr;
pFootEndNoteImpl-sContent = aEmptyStr;
@@ -256,18 +255,17 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const
String rName )
if( pFootEndNoteImpl )
{
String aName( rName );
-// TODO: ToUpperAscii
aName.ToUpperAscii();
-sal_uInt16 nCount = pFootEndNoteImpl-aNames.Count();
-for( sal_uInt16 i=0; inCount; i++ )
+size_t nCount = pFootEndNoteImpl-aNames.size();
+for(size_t i = 0; i nCount; ++i)
{
-if( *pFootEndNoteImpl-aNames[i] == aName )
+if(pFootEndNoteImpl-aNames[i] == aName)
{
pStartNodeIdx = pFootEndNoteImpl-aTxtFtns[i]-GetStartNode();
-pFootEndNoteImpl-aNames.DeleteAndDestroy( i, 1 );
+
pFootEndNoteImpl-aNames.erase(pFootEndNoteImpl-aNames.begin() + i);
pFootEndNoteImpl-aTxtFtns.Remove( i, 1 );
-if( !pFootEndNoteImpl-aNames.Count() )
+if(pFootEndNoteImpl-aNames.empty())
{
delete pFootEndNoteImpl;
pFootEndNoteImpl = 0;
[Libreoffice-commits] .: sw/source
sw/source/filter/html/htmlfly.cxx |7 +++
sw/source/filter/html/wrthtml.cxx |4 ++--
sw/source/filter/html/wrthtml.hxx |2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 900e35045fee950f3f7d10f9fe863d0f51854699
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 23:01:33 2012 -0500
SvStringsDtor-std::vector
diff --git a/sw/source/filter/html/htmlfly.cxx
b/sw/source/filter/html/htmlfly.cxx
index 46dc171..7742f20 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -885,11 +885,11 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt
rFrmFmt,
do
{
bFound = sal_False;
-for( sal_uInt16 i=0; irHTMLWrt.aImgMapNames.Count(); i++ )
+for(size_t i = 0; i rHTMLWrt.aImgMapNames.size(); ++i)
{
// TODO: Unicode: Comparison is case insensitive for ASCII
// characters only now!
-if( aIMapName.EqualsIgnoreCaseAscii(*rHTMLWrt.aImgMapNames[i])
)
+if( aIMapName.EqualsIgnoreCaseAscii(rHTMLWrt.aImgMapNames[i]) )
{
bFound = sal_True;
break;
@@ -944,8 +944,7 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt
rFrmFmt,
}
}
-rHTMLWrt.aImgMapNames.Insert( new String(aIMapName),
- rHTMLWrt.aImgMapNames.Count() );
+rHTMLWrt.aImgMapNames.push_back(aIMapName);
rtl::OString aIndMap, aIndArea;
const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0;
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 40d26c6..32c2611 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -392,8 +392,8 @@ sal_uLong SwHTMLWriter::WriteStream()
if( aTxtCollInfos.Count() )
aTxtCollInfos.DeleteAndDestroy( sal_uInt16(0), aTxtCollInfos.Count() );
-if( aImgMapNames.Count() )
-aImgMapNames.DeleteAndDestroy( sal_uInt16(0), aImgMapNames.Count() );
+if(!aImgMapNames.empty())
+aImgMapNames.clear();
aImplicitMarks.clear();
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index 71082c7..4ceb9b5 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -224,7 +224,7 @@ public:
static const sal_Char sNewLine[]; // \015\012
#endif
-SvStringsDtor aImgMapNames; // geschriebene Image Maps
+std::vectorString aImgMapNames; // geschriebene Image Maps
std::setString aImplicitMarks;// implizite Stprungmarken
std::setString aNumRuleNames;// Names of exported num rules
std::setString aScriptParaStyles;// script dependent para styles
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/doctxm.cxx |6 +-
sw/source/core/inc/doctxm.hxx |3 ---
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit fdb6e4171c7ab9620b739e1a1c3cbba51ba81544
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 23:14:30 2012 -0500
Remove unused member variable
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 4471457..010e3a8 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -963,14 +963,11 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( _Head ));
// sortierte Liste aller Verzeichnismarken und Verzeichnisbereiche
void* p = 0;
-String* pStr = 0;
sal_uInt16 nCnt = 0, nFormMax = GetTOXForm().GetFormMax();
-SvStringsDtor aStrArr( (sal_uInt8)nFormMax );
SvPtrarr aCollArr( (sal_uInt8)nFormMax );
for( ; nCnt nFormMax; ++nCnt )
{
aCollArr.Insert( p, nCnt );
-aStrArr.Insert( pStr, nCnt );
}
SwNodeIndex aInsPos( *pFirstEmptyNd, 1 );
@@ -1015,7 +1012,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( _Head ));
}
// pass node index of table-of-content section and default page
description
// to method GenerateText(..).
-GenerateText( nCnt, nRange, aStrArr, pSectNd-GetIndex(),
pDefaultPageDesc );
+GenerateText( nCnt, nRange, pSectNd-GetIndex(), pDefaultPageDesc );
nCnt += nRange - 1;
}
@@ -1592,7 +1589,6 @@ String lcl_GetNumString( const SwTOXSortTabBase rBase,
sal_Bool bUsePrefix, sal
// which page description is used, no appropriate one is found.
void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
sal_uInt16 nCount,
- SvStringsDtor ,
const sal_uInt32 _nTOXSectNdIdx,
const SwPageDesc* _pDefaultPageDesc )
{
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index fe0daa1..afcdb2c 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -28,14 +28,12 @@
#ifndef _DOCTXM_HXX
#define _DOCTXM_HXX
-
#include svl/svarray.hxx
#include tools/gen.hxx
#include tox.hxx
#include section.hxx
class SwTOXInternational;
-class SvStringsDtor;
class SvPtrarr;
class SwPageDesc;
class SwTxtNode;
@@ -76,7 +74,6 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
// add parameter _TOXSectNdIdx and _pDefaultPageDesc
void GenerateText( sal_uInt16 nArrayIdx,
sal_uInt16 nCount,
- SvStringsDtor,
const sal_uInt32 _nTOXSectNdIdx,
const SwPageDesc* _pDefaultPageDesc );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx | 12 ++--
sw/source/core/doc/poolfmt.cxx | 17 -
2 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit 169f3b47c0ad339c6983de2e19d94627c9e567d3
Author: August Sodora aug...@gmail.com
Date: Fri Jan 13 23:48:59 2012 -0500
SvStringsDtor-boost::ptr_vector
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 47b55ec..edf59c3 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -88,6 +88,7 @@ class SwList;
#include memory
#include boost/scoped_ptr.hpp
+#include boost/ptr_container/ptr_vector.hpp
namespace editeng { class SvxBorderLine; }
@@ -288,7 +289,7 @@ class SW_DLLPUBLIC SwDoc :
SwDBDataaDBData;// database descriptor
::com::sun::star::uno::Sequence sal_Int8 aRedlinePasswd;
String sTOIAutoMarkURL;// ::com::sun::star::util::URL of
table of index AutoMark file
-SvStringsDtor aPatternNms; // Array for names of
document-templates
+boost::ptr_vector boost::nullableString aPatternNms; //
Array for names of document-templates
com::sun::star::uno::Referencecom::sun::star::container::XNameContainer
xXForms;// container with XForms models
mutable com::sun::star::uno::Reference
com::sun::star::linguistic2::XProofreadingIterator m_xGCIterator;
@@ -1300,7 +1301,14 @@ public:
sal_uInt16 SetDocPattern( const String rPatternName );
// Return name of document template. Can be 0!
-String* GetDocPattern( sal_uInt16 nPos ) const { return aPatternNms[nPos];
}
+const String* GetDocPattern( sal_uInt16 nPos ) const
+{
+if(nPos = aPatternNms.size())
+return NULL;
+if(boost::is_null(aPatternNms.begin() + nPos))
+return NULL;
+return (aPatternNms[nPos]);
+}
// Delete all unreferenced field types.
void GCFieldTypes();// impl. in docfld.cxx
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 25fae85..6b5868a 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2125,21 +2125,20 @@ sal_uInt16 SwDoc::SetDocPattern( const String
rPatternName )
{
OSL_ENSURE( rPatternName.Len(), no Document Template name );
-sal_uInt16 nNewPos = aPatternNms.Count();
-for( sal_uInt16 n = 0; n aPatternNms.Count(); ++n )
-if( !aPatternNms[n] )
+size_t nNewPos = aPatternNms.size();
+for(size_t n = 0; n aPatternNms.size(); ++n)
+if( boost::is_null(aPatternNms.begin() + n) )
{
-if( nNewPos == aPatternNms.Count() )
+if( nNewPos == aPatternNms.size() )
nNewPos = n;
}
-else if( rPatternName == *aPatternNms[n] )
+else if( rPatternName == aPatternNms[n] )
return n;
-if( nNewPos aPatternNms.Count() )
-aPatternNms.Remove( nNewPos ); // Free space again
+if( nNewPos aPatternNms.size() )
+aPatternNms.erase(aPatternNms.begin() + nNewPos); // Free space again
-String* pNewNm = new String( rPatternName );
-aPatternNms.Insert( pNewNm, nNewPos );
+aPatternNms.insert(aPatternNms.begin() + nNewPos, new
String(rPatternName));
SetModified();
return nNewPos;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svl/inc svl/source sw/inc sw/source
svl/inc/svl/svarray.hxx |1 svl/inc/svl/svstdarr.hxx |6 - svl/source/memtools/svarray.cxx |2 sw/inc/SwStyleNameMapper.hxx | 56 sw/inc/docstyle.hxx |3 sw/source/core/doc/SwStyleNameMapper.cxx | 108 +++ sw/source/core/unocore/unofield.cxx |4 - sw/source/ui/app/docsh2.cxx |4 - sw/source/ui/app/docst.cxx |2 sw/source/ui/app/docstyle.cxx| 28 sw/source/ui/uiview/view2.cxx|6 - 11 files changed, 107 insertions(+), 113 deletions(-) New commits: commit 94b1b36ee53176276a65436a17fbb75987fc9a33 Author: August Sodora aug...@gmail.com Date: Sat Jan 14 00:39:07 2012 -0500 Remove SvStringsDtor diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 47b8063..7fe833d 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -81,7 +81,6 @@ * Sortierung mit Hilfe der Object-operatoren und == * * JP 09.10.96: vordefinierte Arrays: -* PtrArr: SvStringsDtor * SortArr:SvStringsSort, SvStringsSortDtor, * SvStringsISort, SvStringsISortDtor ***/ diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index 1533e47..4f3793f 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -32,7 +32,6 @@ * (die defines setzen sich aus _SVSTDARR_ und dem Namen des Array *ohne Sv zusammen) * -* PtrArr: SvStringsDtor * SortArr:SvStringsSort, SvStringsSortDtor, * SvStringsISort, SvStringsISortDtor, ***/ @@ -45,11 +44,6 @@ typedef String* StringPtr; -#ifndef _SVSTDARR_STRINGSDTOR_DECL -SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 1, SVL_DLLPUBLIC ) -#define _SVSTDARR_STRINGSDTOR_DECL -#endif - #ifndef _SVSTDARR_STRINGSISORTDTOR_DECL SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSISORTDTOR_DECL diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index a8bbb68..3d01bea 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -40,8 +40,6 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr aElement ) const return ( n = nA ? USHRT_MAX : n ); } -SV_IMPL_PTRARR( SvStringsDtor, StringPtr ) - // strings - // Array with different Seek method commit e1df68d79b50148078a13436b2b913f28ddf84e4 Author: August Sodora aug...@gmail.com Date: Sat Jan 14 00:33:41 2012 -0500 SvStringsDtor-boost::ptr_vector diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 3627d0b..339f265 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -39,6 +39,8 @@ #endif #include stringhash.hxx +#include boost/ptr_container/ptr_vector.hpp + /** This class holds all data about the names of styles used in the user * interface (UI names...these are localised into different languages). * These UI names are loaded from the resource files on demand. @@ -83,11 +85,9 @@ * (user), we simply remove it. */ -class SvStringsDtor; class String; struct SwTableEntry; - typedef ::boost::unordered_map const String*, sal_uInt16, StringHash, StringEq NameToIdHash; class SwStyleNameMapper @@ -97,7 +97,7 @@ class SwStyleNameMapper protected: // UI Name tables -static SvStringsDtor*pTextUINameArray, +static boost::ptr_vectorString *pTextUINameArray, *pListsUINameArray, *pExtraUINameArray, *pRegisterUINameArray, @@ -133,11 +133,11 @@ protected: *pFrameProgMap, *pNumRuleProgMap; -static SvStringsDtor* NewUINameArray( SvStringsDtor*, +static boost::ptr_vectorString* NewUINameArray( boost::ptr_vectorString*, sal_uInt16 nStt, sal_uInt16 nEnd ); -static SvStringsDtor* NewProgNameArray( SvStringsDtor*, +static boost::ptr_vectorString* NewProgNameArray( boost::ptr_vectorString*, const SwTableEntry *pTable, sal_uInt8 nCount); @@ -178,29 +178,29 @@ public: SW_DLLPUBLIC static const String GetSpecialExtraProgName( const String rExtraUIName ); static const String GetSpecialExtraUIName( const String rExtraProgName ); -static const SvStringsDtor GetTextUINameArray(); -static const SvStringsDtor GetListsUINameArray(); -static const SvStringsDtor GetExtraUINameArray(); -static const SvStringsDtor GetRegisterUINameArray(); -static const SvStringsDtor
Re: [Libreoffice] prevent the creation of lockfiles during unit tests
On 01/13/2012 05:08 AM, Markus Mohrhard wrote:
I did not push that patch directly because I'm not sure if we really
want to introduce another registry entry for this.
No idea about that either (I think Michael Stahl has previously been
exposed heavily to locking, maybe he has some input), just two comments
on the patch:
+bool IsLockingUsed()
+{
+bool bLocking = true;
+try
+{
+
+uno::Reference uno::XInterface xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
+::comphelper::getProcessServiceFactory(),
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
/org.openoffice.Office.Common ) ),
+::comphelper::ConfigurationHelper::E_STANDARD );
+if ( !xCommonConfig.is() )
+throw uno::RuntimeException();
+
+::comphelper::ConfigurationHelper::readRelativeKey(
+xCommonConfig,
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Misc/ ) ),
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UseLocking ) ) )
= bLocking;
+}
+catch( const uno::Exception )
+{
+}
+
+return bLocking;
+}
can be reduced to
#include officecfg/Office/Common.hxx
bool IsLockingUsed()
{
return officecfg::Office::Common::Misc::UseLocking::get(
comphelper::getProcessComponentContext());
}
(I haven't announced this new C++ API yet, as some issues about
change-notification are not yet completely thought out for it. Shame on
me, should really do that soon.)
And
+ oor:component-data oor:name=Common oor:package=org.openoffice.Office
+ node oor:name=Misc
+prop oor:name=UseDocumentSystemFileLocking
+ valuefalse/value
+/prop
+prop oor:name=UseDocumentOOoLockFile
+ valuefalse/value
+/prop
+ /node
+ /oor:component-data
should instead set UseLocking to false, right?
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Dumping to valgrind.log from soffice shell script needed?
On 01/12/2012 05:46 PM, Petr Mladek wrote: Ah, I am sorry for the troubles. I have somehow missed this mail. You probably did not keep me in CC and I overlooked it on the mailing list :-( Sorry, likely I accidentally used Reply List instead of Reply All. I think that the main problem is that valgrind is invoked two ways, either by exporting the variable VALGRIND or using the --valgrind option The variable was introduced to make debugging easier when running unit- and subsequent-test. The option was introduced for normal users. Ah, right, had somehow managed to not notice this. What about the following solution: + print log on the standart output when invoking via the variable + print to valgrind.log when using the --valgrind option Perfect. :) Pushed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=7a00472067403ebe1cfbedbfabfde03cc19c9c34. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Trying to diagnose base running extremely slowly
On 01/12/2012 02:18 PM, Michael Meeks wrote: On Thu, 2012-01-12 at 10:44 +0100, Stephan Bergmann wrote: One drawback of using the thread-affine apartment is that all code related to the JDBC driver is effectively serialized, removing any potential performance advantage from accessing the driver from multiple treads. I do not know whether that is acceptable or not. Given the generally tangled locking everywhere I would expect that virtually everything is serialised anyway ;-) so ... It'd be great to have a fix for the base guys I guess. Yeah, probably not worth it bothering about MT-performance here. Anyway, pushed now to libreoffice-3-5 and master. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Trying to diagnose base running extremely slowly
Surely now that it's confined to a single thread, it can just call AttachThread() once at startup, and never need to call DetachThread() ? -- Noel Grandin On 2012-01-13 10:54, Stephan Bergmann wrote: On 01/12/2012 02:18 PM, Michael Meeks wrote: On Thu, 2012-01-12 at 10:44 +0100, Stephan Bergmann wrote: One drawback of using the thread-affine apartment is that all code related to the JDBC driver is effectively serialized, removing any potential performance advantage from accessing the driver from multiple treads. I do not know whether that is acceptable or not. Given the generally tangled locking everywhere I would expect that virtually everything is serialised anyway ;-) so ... It'd be great to have a fix for the base guys I guess. Yeah, probably not worth it bothering about MT-performance here. Anyway, pushed now to libreoffice-3-5 and master. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 35023, which changed state. Bug 35023 Summary: FILEOPEN Base functions extremely slowly with Java 1.6.0_20 and 1.6.0_24 https://bugs.freedesktop.org/show_bug.cgi?id=35023 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [Libreoffice] Trying to diagnose base running extremely slowly
On 01/13/2012 09:59 AM, Noel Grandin wrote: Surely now that it's confined to a single thread, it can just call AttachThread() once at startup, and never need to call DetachThread() ? Yes, one could improve it further based on the fact that it is confied now (it also internally uses some mutices that could go now). But: However, a better fix would still be to redesign the code so that it does not call Attach/DetachCurrentThread so frequently [and confinement to the thread-affine apartment can be undone again.], http://cgit.freedesktop.org/libreoffice/core/tree/connectivity/source/drivers/jdbc/jservices.cxx?id=bb59742bcf4883af5876a2ffadcc4a689e414b60#n95. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Trying to diagnose base running extremely slowly
Yeah, but given that such a re-design is probably a long way off, and that other drivers seem are confined to a single-thread, and seem to have acceptable performance, perhaps we should just live with this limitation, and optimise the easy-case? On 2012-01-13 11:18, Stephan Bergmann wrote: On 01/13/2012 09:59 AM, Noel Grandin wrote: Surely now that it's confined to a single thread, it can just call AttachThread() once at startup, and never need to call DetachThread() ? Yes, one could improve it further based on the fact that it is confied now (it also internally uses some mutices that could go now). But: However, a better fix would still be to redesign the code so that it does not call Attach/DetachCurrentThread so frequently [and confinement to the thread-affine apartment can be undone again.], http://cgit.freedesktop.org/libreoffice/core/tree/connectivity/source/drivers/jdbc/jservices.cxx?id=bb59742bcf4883af5876a2ffadcc4a689e414b60#n95. Stephan Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unit test concept for draw/impress
On Fri, 2012-01-13 at 06:10 +0100, Markus Mohrhard wrote: The advantage of the svg file is that it represents the visual representation extremely good and we ca easily compare it againts an reference svg file. How about pdf ? which has the advantage that all the apps can print to pdf, so can be generic across apps ? Though probably using reference pdfs might highlight that we may have some platform dependant glyph placement differences ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ScColumn - convert array to vector
I forgot to say that the patch passes the unit tests, and a valgrind run (I love that tool). On 2012-01-13 09:06, Noel Grandin wrote: Hi This patch converts open-coded array management to std::vector in ScColumn Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-4] date change regression fdo#44385
On 12/01/12 22:27, Michael Stahl wrote: looking at the change, i notice that now it is independent of the operation being performed, while the code that was originally removed in adcba12537d047f5ad65334b65512615311cf872 checked for addition only (as the comment says): -// #45465 Date needs with + a special handling -if( eOp == SbxPLUS (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) ) -aL.eType = SbxDATE; is that intentional? thank you thank you!!! no it wasn't intentional, I intended to put back the orig code here ( in 3.4 ) i'm +1 for putting the original change back, and perhaps also for your changed variant if you have a good explanation :) this change ( the variant ) is what is on master, here the intention is as Andrew pointed out ( in a previous mail discussing the regression ) to allow operations on date types return dates ( regardless of the operation ) which seems reasonable. I didn't intend to commit this variant to 3.4, just restore the orig code, seems though I copied the wrong part of the the diff output from adcba12537d047f5ad65334b65512615311cf872 I will commit the orig fix, thanks for spotting that Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Trying to diagnose base running extremely slowly
On 01/13/2012 10:36 AM, Noel Grandin wrote: Yeah, but given that such a re-design is probably a long way off, and that other drivers seem are confined to a single-thread, and seem to have acceptable performance, perhaps we should just live with this limitation, and optimise the easy-case? IIUC, the ADO driver is confined because the Windows API it interfaces with demands that, not because of a poor design on the LO side. But anyway, I'll keep this in the back of my head, and if QA does not find any horrible problems with confining the JDBC driver in LO 3.5, we can probably simplify the code on master. (Would you be interested?) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unit test concept for draw/impress
On Fri, 2012-01-13 at 06:10 +0100, Markus Mohrhard wrote: I finally found some time working on a unit test concept for draw/impress as promised to Thorsten in Paris. (see [1]) Looks lovely :-) The attached patch enables the new test concept in sd. The test is based on calc's filters-test concept but needs to do some additional steps. We take a import file (e.g. an ppt file) and import it into impress, and in the next step export it to svg. The advantage of the svg file is that it represents the visual representation extremely good and we ca easily compare it againts an reference svg file. I guess the svg is also pretty-printable XML (if not we should presumably default to this in whatever export we do) so hopefully those containing real text instead of fugly glyph data, and can be 'diff -u'd by a hacker to see what changed quite easily, and the git diff will be small pretty too :-) IMHO the changes to the SVG filter will break this is no huge problem, hopefully the SVG changes will be self contained and not affect the visual display of features, and so we can simply re-generate the output there over changes. Having a pretty XML diff tool might be nice of course, but diff -u is fine for hackers if the XML is pretty printed :-) Great work ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Trying to diagnose base running extremely slowly
But anyway, I'll keep this in the back of my head, and if QA does not find any horrible problems with confining the JDBC driver in LO 3.5, we can probably simplify the code on master. (Would you be interested?) Got something else on my plate right now (moving notes out of ScCell), but once I'm over that hump, I'll take a look at it. -- Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] prevent the creation of lockfiles during unit tests
Hi guys,
Markus - nice catch - really cool to get that nailed :-)
On Fri, 2012-01-13 at 09:05 +0100, Stephan Bergmann wrote:
bool IsLockingUsed()
{
return officecfg::Office::Common::Misc::UseLocking::get(
comphelper::getProcessComponentContext());
}
(I haven't announced this new C++ API yet, as some issues about
change-notification are not yet completely thought out for it.
Oooh ! :-) it looks really rather nice; how efficient is the compiled
representation ? hopefully much more so than the big chunks of in-lined
UNO-ness that existing code uses :-)
Shame on me, should really do that soon.)
I'm excited. Re-thinking my annoyance with getting VCL bootstrapped,
and seeing the level of build parallelism that gnumake exposes - it is
not clear to me that we need to use UNO APIs as a tool to expose more of
that, though clearly some level of circular dependency breaking via
interfaces is useful.
What do I mean ? - I'd like us to consider building configmgr rather
early in the build, and simply linking VCL above to it, leaving the
UNO API in place for back-compat extensions, but using a native API
for new code.
If we could combine that with avoiding the need to load types.rdb to do
struct - Any handling for PropertyValues - perhaps we could make our
bootstrapping logic, code structure etc. rather simpler for unit tests
simple test apps in the tree.
Anyhow - fun :-)
Regards,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] FATToVFat_Impl: desktop/source/app/appsys.*: windows
On Thu, 2012-01-12 at 22:22 +, Caolán McNamara wrote: These can be removed right ?, I mean, I don't see any use of them anywhere or anything using appsys.hxx, so appsys.hxx and appsys.cxx could be completely removed as far as I can see. Looks entirely unused and pointless to me too :-) header never included, great gazoogle says it's not some magic system/symbol looks like it deserves sudden death to me ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unit test concept for draw/impress
Caolan McNamara wrote: How about pdf ? which has the advantage that all the apps can print to pdf, so can be generic across apps ? Well, I had proposed svg, because they're much easier to diff - I had something in mind like sdext/source/pdfimport/test/testdocs/makefile.mk (and disabling glyph export in svg for reduced test brittleness). And lovely work Markus, thanks so much for getting sd (almost) to the level of sc for automated testing. :) Cheers, -- Thorsten pgpMNfIBYvhP7.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] fdo 44516 label printing misplaced; advise asked
Hi, I am adding sheet-dimensions to the label-definitions (Labels.xcu) used in label wizard and business card wizard. Of the 1790 definitions, there are now only 199 to be checked. Unfortunately, these can only be checked manually : ( Some labels on pinfeed sheets are discontinued, no longer available, no support/templates available from manufacturer (e.g. Averay letter Size, 4043 Shipping). I would like to remove these from Labels.xcu, as I cannot determine the sheet width with any certainty. Is there anyone/anything against removing these definitions? Another thing is new labels, that are not yet in Labels.xcu. I do not like to collect new label definitions and add them. Updating the existing list is quite enouggh for me. Any volunteers? If not, I intend to open a new bug (enhancement) for this. It'll be an easyhack, you'll just need perseverance ; ) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Drop XLFD support from fontmanager
XLFD support was removed in commit 269f91c (#i110171) except for parsing
fonts.dir and fonts.alias. I don't think this makes much sense in
fontconfig era, and dropping it simplifies the font manager a bit (I
don't even think we use server fonts at all).
---
vcl/generic/fontmanager/fontconfig.cxx |3 +-
vcl/generic/fontmanager/fontmanager.cxx | 503 +--
vcl/inc/vcl/fontmanager.hxx | 40 +---
3 files changed, 5 insertions(+), 541 deletions(-)
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 90d59f1..eb0e9b6 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -547,10 +547,9 @@ int PrintFontManager::countFontconfigFonts(
boost::unordered_maprtl::OString, i
#endif
// not known, analyze font file to get attributes
// not described by fontconfig (e.g. alias names, PSName)
-std::list OString aDummy;
if (eFormatRes != FcResultMatch)
format = NULL;
-analyzeFontFile( nDirID, aBase, aDummy, aFonts, (const
char*)format );
+analyzeFontFile( nDirID, aBase, aFonts, (const char*)format );
#if OSL_DEBUG_LEVEL 1
if( aFonts.empty() )
fprintf( stderr, Warning: file \%s\ is unusable to
psprint\n, aOrgPath.getStr() );
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index 450a9ce..5e20b91 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -133,18 +133,6 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8* pBuffer )
return nRet;
}
-static FontItalic parseItalic( const ByteString rItalic )
-{
-FontItalic eItalic = ITALIC_DONTKNOW;
-if( rItalic.EqualsIgnoreCaseAscii( i ) )
-eItalic = ITALIC_NORMAL;
-else if( rItalic.EqualsIgnoreCaseAscii( o ) )
-eItalic = ITALIC_OBLIQUE;
-else
-eItalic = ITALIC_NONE;
-return eItalic;
-}
-
// -
static FontWeight parseWeight( const ByteString rWeight )
@@ -184,169 +172,6 @@ static FontWeight parseWeight( const ByteString rWeight )
return eWeight;
}
-// -
-
-static FontWidth parseWidth( const ByteString rWidth )
-{
-FontWidth eWidth = WIDTH_DONTKNOW;
-if( rWidth.Equals( bold ) ||
-rWidth.Equals( semiexpanded ) )
-eWidth = WIDTH_SEMI_EXPANDED;
-else if( rWidth.Equals( condensed ) ||
- rWidth.Equals( narrow ) )
-eWidth = WIDTH_CONDENSED;
-else if( rWidth.Equals( double wide ) ||
- rWidth.Equals( extraexpanded ) ||
- rWidth.Equals( ultraexpanded ) )
-eWidth = WIDTH_ULTRA_EXPANDED;
-else if( rWidth.Equals( expanded ) ||
- rWidth.Equals( wide ) )
-eWidth = WIDTH_EXPANDED;
-else if( rWidth.Equals( extracondensed ) )
-eWidth = WIDTH_EXTRA_CONDENSED;
-else if( rWidth.Equals( semicondensed ) )
-eWidth = WIDTH_SEMI_CONDENSED;
-else if( rWidth.Equals( ultracondensed ) )
-eWidth = WIDTH_ULTRA_CONDENSED;
-else
-eWidth = WIDTH_NORMAL;
-
-return eWidth;
-}
-
-// -
-bool PrintFontManager::XLFDEntry::operator(const PrintFontManager::XLFDEntry
rRight) const
-{
-sal_Int32 nCmp = 0;
-if( (nMask MaskFamily) (rRight.nMask MaskFamily) )
-{
-nCmp = rtl_str_compareIgnoreAsciiCase_WithLength(
aFamily.pData-buffer,
-
aFamily.pData-length,
-
rRight.aFamily.pData-buffer,
-
rRight.aFamily.pData-length );
-if( nCmp != 0 )
-return nCmp 0;
-}
-
-if( (nMask MaskFoundry) (rRight.nMask MaskFoundry) )
-{
-nCmp = rtl_str_compareIgnoreAsciiCase_WithLength(
aFoundry.pData-buffer,
-
aFoundry.pData-length,
-
rRight.aFoundry.pData-buffer,
-
rRight.aFoundry.pData-length );
-if( nCmp != 0 )
-return nCmp 0;
-}
-
-if( (nMask MaskItalic) (rRight.nMask MaskItalic) )
-{
-if( eItalic != rRight.eItalic )
-return (int)eItalic (int)rRight.eItalic;
-}
-
-if( (nMask MaskWeight) (rRight.nMask MaskWeight) )
-{
-if( eWeight != rRight.eWeight )
-return (int)eWeight (int)rRight.eWeight;
-}
-
-if( (nMask MaskWidth) (rRight.nMask MaskWidth) )
-{
-if( eWidth != rRight.eWidth )
-return
Re: [Libreoffice] [PATCH] Drop XLFD support from fontmanager
I don't even think we use server fonts at all). Funnily enough, we have a type called ServerFont... vcl/inc/generic/glyphcache.hxx , but that name is probably historical, and what it actually means nowadays is the exact opposite;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
Hi Winfried, On Fri, 2012-01-13 at 11:55 +0100, Winfried Donkers wrote: I am adding sheet-dimensions to the label-definitions (Labels.xcu) used in label wizard and business card wizard. Lovely :-) Of the 1790 definitions, there are now only 199 to be checked. Unfortunately, these can only be checked manually : ( Wow - you've been working hard. Some labels on pinfeed sheets are discontinued, no longer available, no support/templates available from manufacturer (e.g. Averay letter Size, 4043 Shipping). ... I would like to remove these from Labels.xcu, as I cannot determine the sheet width with any certainty. Sounds fine in principle to me; if people complain then they obviously have the sheets and can help verify / update / replace the information :-) If we were paranoid we could add a boolean flag to hide these and complicate the UI to allow them to be shown: but prolly better to remove. Is there anyone/anything against removing these definitions? ... Another thing is new labels, that are not yet in Labels.xcu. I do not like to collect new label definitions and add them. Updating the existing list is quite enouggh for me. Right; Any volunteers? If not, I intend to open a new bug (enhancement) for this. It'll be an easyhack, you'll just need perseverance ; ) Sounds like a great approach, it'd be great to link a wiki page with a description of how to create verify such things. Another thing that interests me is that parsing the configuration, despite all Stephan's good work in configmgr to speed it up, still takes real time and space: say 4% of our startup and a chunk of RAM. If we look at the sizes of our config using a simple: du -k -a | sort -n ... 64 ./officecfg/registry/data/org/openoffice/Office/WebWizard.xcu 76 ./officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 84 ./officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 92 ./officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu 112 ./officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 252 ./officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 276 ./officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 360 ./officecfg/registry/data/org/openoffice/VCL.xcu 428 ./officecfg/registry/data/org/openoffice/Office/TableWizard.xcu 560 ./officecfg/registry/data/org/openoffice/Office/Labels.xcu We can see that the Labels.xcu is the single largest blob of data that we have installed ;-) and consumes 390Kb (around 20%) of our 1.8Mb of main.xcd that we parse during startup. That makes me wonder whether either: a) we can/should split out the Labels tree until it is actually needed / used with some configmgr trick or b) use a different format / chunk of code for label descriptions Longer term thoughts on that much appreciated :-) [ I can just imagine an android device belting it's little mind out parsing all that stuff just to get rid of it again ;-]. Nice work ! Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Drop XLFD support from fontmanager
On Fri, Jan 13, 2012 at 01:26:20PM +0200, Tor Lillqvist wrote: I don't even think we use server fonts at all). Funnily enough, we have a type called ServerFont... vcl/inc/generic/glyphcache.hxx , but that name is probably historical, and what it actually means nowadays is the exact opposite;) Yup, I noticed that a while ago, and it confused me for a while :) Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Felice lcc...@infinito.it changed: What|Removed |Added Platform|Other |x86-64 (AMD64) OS/Version|All |Linux (All) Priority|medium |highest Version|unspecified |LibO 3.5.0 Beta3 --- Comment #93 from Felice lcc...@infinito.it 2012-01-13 03:42:20 PST --- Version LOdev 3.5 beta3 S.O. Ubuntu 10.04 and Debian Testing. Leaflet 'writer' with inserted OLE object (Calc). Opens the object Calc to modify the cells. No change is possible because the sheet Calc is protected. Even if 'format cells' eliminates the tick on 'protection' remains the fact that it is impossible to modify any cell. In my similar models very old (made with OOo 2.x in years 2003, 2004 or 2005) the elimination of protection works very well and the cells are modified and saved correctly. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [Libreoffice] fdo 44516 label printing misplaced; advise asked
On Fri, 2012-01-13 at 11:26 +, Michael Meeks wrote: Another thing that interests me is that parsing the configuration, despite all Stephan's good work in configmgr to speed it up, still takes real time and space: say 4% of our startup and a chunk of RAM. If we look at the sizes of our config using a simple: I just dug a number for that out of cachegrind - in 3.5 the first method to hit configmgr is enableExperimenatFeatures in vcl; that does only one configmgr fetch. The inclusive instruction count for that is 15.5% of startup. So of course, saving 20% of that is a 3% CPU cycle / startup win, which is quite respectable ;-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] prevent the creation of lockfiles during unit tests
Hello Stephan
No idea about that either (I think Michael Stahl has previously been exposed
heavily to locking, maybe he has some input), just two comments on the
patch:
+bool IsLockingUsed()
+{
+ bool bLocking = true;
+ try
+ {
+
+ uno::Reference uno::XInterface xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
+ ::comphelper::getProcessServiceFactory(),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
/org.openoffice.Office.Common ) ),
+ ::comphelper::ConfigurationHelper::E_STANDARD
);
+ if ( !xCommonConfig.is() )
+ throw uno::RuntimeException();
+
+ ::comphelper::ConfigurationHelper::readRelativeKey(
+ xCommonConfig,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Misc/ )
),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UseLocking ) ) ) = bLocking;
+ }
+ catch( const uno::Exception )
+ {
+ }
+
+ return bLocking;
+}
can be reduced to
#include officecfg/Office/Common.hxx
bool IsLockingUsed()
{
return officecfg::Office::Common::Misc::UseLocking::get(
comphelper::getProcessComponentContext());
}
Wow that looks much better.
(I haven't announced this new C++ API yet, as some issues about
change-notification are not yet completely thought out for it. Shame on me,
should really do that soon.)
And
+ oor:component-data oor:name=Common
oor:package=org.openoffice.Office
+ node oor:name=Misc
+ prop oor:name=UseDocumentSystemFileLocking
+ valuefalse/value
+ /prop
+ prop oor:name=UseDocumentOOoLockFile
+ valuefalse/value
+ /prop
+ /node
+ /oor:component-data
should instead set UseLocking to false, right?
Oh yes of course. That happens if you're editing both the file in test
and the copy in solver ;)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] Drop XLFD support from fontmanager
Hi Khaled, On Fri, 2012-01-13 at 13:19 +0200, Khaled Hosny wrote: XLFD support was removed in commit 269f91c (#i110171) except for parsing fonts.dir and fonts.alias. I don't think this makes much sense in fontconfig era, and dropping it simplifies the font manager a bit (I don't even think we use server fonts at all). Looks lovely ;-) We are well rid of X fonts IMHO, they only confuse and tangle the code-paths in today's world of client-side everything. Thanks for the nice cleanup, ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44147, which changed state. Bug 44147 Summary: inserted calcs in writer accept no more input https://bugs.freedesktop.org/show_bug.cgi?id=44147 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [Libreoffice] unit test concept for draw/impress
Hello Caolan, 2012/1/13 Caolán McNamara caol...@redhat.com: On Fri, 2012-01-13 at 06:10 +0100, Markus Mohrhard wrote: The advantage of the svg file is that it represents the visual representation extremely good and we ca easily compare it againts an reference svg file. How about pdf ? which has the advantage that all the apps can print to pdf, so can be generic across apps ? I think that using svg for draw/impress is a good idea. BUt it should be no big problem to use export to pdf for writer and if I use this concept in calc a totally different approach. The only needed changes are to find the missing component files for pdf export and to use the correct argument to the saveToURL method. If wisehd for writer I can easily add a test based on this concept exporting to pdf. Though probably using reference pdfs might highlight that we may have some platform dependant glyph placement differences ? For draw/impress Thorsten suggested to prevent the export of glyphs. I will commit a patch for that soon. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
Another thing that interests me is that parsing the configuration, despite all Stephan's good work in configmgr to speed it up, still takes real time and space: say 4% of our startup and a chunk of RAM. If we look at the sizes of our config using a simple: As the contents of Labels.xcu are only used when starting the label wizard or business card wizard, woul dit be better if this file is read when starting the wizard, and not when starting LibreOffice? Can't this file be included in the installation as Labels.xcu? It will not be the only .xcu file in the share directory, it will save startup time (except when starting the wizard, of course) and build time. (BTW: I reckon this will beyond my capabilities) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44147, which changed state. Bug 44147 Summary: inserted calcs in writer accept no more input https://bugs.freedesktop.org/show_bug.cgi?id=44147 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [Libreoffice] fdo 44516 label printing misplaced; advise asked
On 01/13/2012 12:26 PM, Michael Meeks wrote: Another thing that interests me is that parsing the configuration, despite all Stephan's good work in configmgr to speed it up, still takes real time and space: say 4% of our startup and a chunk of RAM. If we look at the sizes of our config using a simple: That makes me wonder whether either: a) we can/should split out the Labels tree until it is actually needed / used with some configmgr trick or b) use a different format / chunk of code for label descriptions The decision to read in *all* data upfront in the new configmgr design was kind of a gamble. It significantly simplified the code and data layout, while appearing fast enough for contemporary desktop hardware to be acceptable. There is no easy configmgr trick to split out a chunk of data to be only read on demand. If we would need such a feature, it would be some work to add it. (And a 3% CPU cycle / startup win does not sound too exciting to me, being rather fine with the start up performance of LO from a user's perspective, at least on Linux and Mac OS X.) However, I would prefer improving configmgr (if need be) over switching the label data to yet another format. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
On 01/13/2012 01:56 PM, Winfried Donkers wrote: As the contents of Labels.xcu are only used when starting the label wizard or business card wizard, woul dit be better if this file is read when starting the wizard, and not when starting LibreOffice? Can't this file be included in the installation as Labels.xcu? It will not be the only .xcu file in the share directory, it will save startup time (except when starting the wizard, of course) and build time. No, even if it were included as a plain Labels.xcu (instead of being included in main.xcd) it would be read in at start up (and would only increase start up costs, as an additional file would need to be read). Modifications to configmgr would be necessary to allow individual data to only be read in on demand. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] prevent the creation of lockfiles during unit tests
On 01/13/2012 11:23 AM, Michael Meeks wrote:
Oooh ! :-) it looks really rather nice; how efficient is the compiled
representation ? hopefully much more so than the big chunks of in-lined
UNO-ness that existing code uses :-)
It still uses UNO to access configmgr, but through a simplified
interface (new com.sun.star.configuration.{ReadOnly,ReadWrite}Access
singletons). The main benefit (besides shorter client code) is type
safety -- neither can there be misspellings in the paths of
configuration nodes nor confusion in the values that can be read or
written for those nodes.
I'm excited. Re-thinking my annoyance with getting VCL bootstrapped,
and seeing the level of build parallelism that gnumake exposes - it is
not clear to me that we need to use UNO APIs as a tool to expose more of
that, though clearly some level of circular dependency breaking via
interfaces is useful.
UNO *is* the tool to make functionality available to different
languages, to extensions, and to scripting facilities.
What do I mean ? - I'd like us to consider building configmgr rather
early in the build, and simply linking VCL above to it, leaving the
UNO API in place for back-compat extensions, but using a native API
for new code.
If we could combine that with avoiding the need to load types.rdb to do
struct- Any handling for PropertyValues - perhaps we could make our
bootstrapping logic, code structure etc. rather simpler for unit tests
simple test apps in the tree.
I'd prefer to stick to a single configmgr API, and instead make sure
that bootstrapping of tests and workbench applications is sufficiently
simple. (And yes, having a look at the latter is still on my todo list.)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Drop XLFD support from fontmanager
On Fri, 2012-01-13 at 13:19 +0200, Khaled Hosny wrote: XLFD support was removed in commit 269f91c (#i110171) except for parsing fonts.dir and fonts.alias. I don't think this makes much sense in fontconfig era, and dropping it simplifies the font manager a bit (I don't even think we use server fonts at all). Excellent, I had noticed recently that we were switching on a supportFontconfig variable to show/hide a bunch of stuff in spadmin to handle installing fonts in a pre-fontconfig X based environment and removed a massive whack of stuff which is never enabled for use off that. I noticed some of that stuff in passing, good to see it gone too. With a bit of luck we can continue simplifying the X text and font stuff. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Doxygen for IDL? (was: Doxygen for C/C++ URE Documentation)
On 01/06/2012 12:12 PM, Stephan Bergmann wrote:
Yeah, next step I plan to do is get rid of autodoc for IDL, too (after
this topic has finally been forced upon me via URE gbuildification),
and then rid the code base from all that nonsense in one step.
Just a quick update on this rather low-prio thing (in case anybody wants
to step in with good ideas):
Turns out there is too big an impedance mismatch between our UNOIDL
syntax and doxygen, so that at least a naive attempt at replacing
autodoc with doxygen for creation of the UNOIDL reference documentation
(see attached doxyidl.patch) produces unacceptable results:
Services, singletons, and typedefs are mapped as variables, and
services constructors are described as functions detached from the
services. Constants groups seem to be missing completely.
And its not obvious to me that this could be improved with some macro
trickery or post processing.
:(
Stephan
diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css
deleted file mode 100644
index ab94520..000
--- a/odk/docs/common/ref/idl.css
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Autodoc css file for IDL documentation */
-
-
-/*See bottom of file for explanations.*/
-
-body { background-color:#ff; }
-
-#adc-idlref a { color: #00; text-decoration: none; }
-#adc-idlref a:link { color: #18A303; text-decoration: none; }
-#adc-idlref a:hover { text-decoration: underline; }
-#adc-idlref a:visited { color: #106802; }
-
-#adc-idlref h3
- { font-size:13pt; font-weight:bold;
- margin-top:3pt; margin-bottom:1pt; }
-
-#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre
- { font-size:11pt;
- margin-top:3pt; margin-bottom:1pt; }
-
-#adc-idlref pre{ font-family:monospace; }
-
-#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }
-
-#adc-idlref td { font-size:11pt; }
-#adc-idlref td.title
- { font-family: Arial; font-size:19pt; font-weight:bold;
- line-height:30pt;
- background-color:#18a303;
- text-align:center; }
-
-#adc-idlref td.subtitle
- { font-family: Arial; font-size:13pt;
- line-height:20pt;
- background-color:#18a303; }
-
-#adc-idlref td.crosstitle
- { font-size:12pt; font-weight:bold;
- line-height:15pt; background-color:#ff; }
-
-#adc-idlref td.imdetail
- { width:100%;
- background-color:#c2f6ba; }
-
-#adc-idlref td.imsum_left { width:30%; }
-#adc-idlref td.imsum_right { width:70%; }
-
-#adc-idlref table.navimain { background-color:#18a303; }
-
-#adc-idlref td.navimain
- { background-color:#18a303;
- text-align:center;
- font-family: Arial; font-size:12pt; font-weight:bold;
- padding-left:7pt; padding-right:7pt; }
-
-#adc-idlref td.navimainself
- { text-align:center;
- font-family: Arial; font-size:12pt; font-weight:bold;
- color:#ff; background-color:#106802;}
-
-#adc-idlref td.navimainnone
- { text-align:center;
- font-family: Arial; font-size:12pt;
- color:#ff; }
-
-#adc-idlref td.navisub
- { text-align:center;
- font-family: Arial; font-size:9pt; font-variant:small-caps;
- padding-left:7pt; padding-right:7pt; }
-
-#adc-idlref a.navimain
- { text-align:center;
- font-family: Arial; font-size:12pt; font-weight:bold;
- color:#C44B01; }
-
-#adc-idlref a.navisub
- { text-align:center;
- font-family: Arial; font-size:9pt; font-variant:small-caps;
- color:#C44B01; }
-
-#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }
-
-#adc-idlref a:link.navisub { color:#18a303; }
-#adc-idlref a:visited.navisub { color: #106802; }
-#adc-idlref a:hover.navisub { color: #106802; text-decoration: underline; }
-
-#adc-idlref a:link.navimain { color:#ff; }
-#adc-idlref a:visited.navimain { color: #ff; }
-#adc-idlref a:hover.navimain { color: #ff; text-decoration: underline; }
-
-#adc-idlref .dt{ font-weight:bold; }
-#adc-idlref .namechain { font-size:13pt; font-weight:bold; margin-top:3pt; margin-bottom:6pt; }
-#adc-idlref .title2{ font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }
-
-#adc-idlref table { empty-cells:show; }
-
-#adc-idlref .childlist td,
-#adc-idlref .commentedlinks td,
-#adc-idlref .memberlist td,
-#adc-idlref .subtitle td,
-#adc-idlref .crosstitle td { border: .1pt solid grey; }
-
-#adc-idlref .flag-table td { border: .1pt solid #cc; }
-
-#adc-idlref .title-table td,
-#adc-idlref .table-in-method td,
-#adc-idlref .table-in-data td,
-#adc-idlref .navimain td,
-#adc-idlref .navisub td,
-#adc-idlref .expl-table td,
-#adc-idlref .param-table td { border: none; }
-
-
-/* Explanation of CSS classes:
-
-table.lightbg Background of navigation bar.
-.navimain Text in main navigation bar.
-.navisub Text in lower navigation bar.
-td.navimainselfCell in main navigation bar with selected shadow: You are here.
[Libreoffice] [POLL] Find a date for the next LibreOffice hackfest
Hi folks, as promised to some of you, we're organizing the next HackFest here in Hamburg. We were able to secure support from Attraktor e.V. again, operators of the Hamburg Hackerspace facilities - a really rather suitable place for our next meet-up: http://www.youtube.com/user/AttraktorHH Travel bursaries, coach surfing and other sponsorings are not really sorted out yet, please stay tuned for a bit - first of all, we need to find a date that suits as many people as possible: http://moreganize.com/btJzN0BYZw7 If you'd like to attend, please vote for one of the tree weekends ASAP (we'll intend to have the poll run for a week or two). Happy hacking, -- Thorsten Eike pgpM8atvEVWU0.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] New Tinderbox Linux-RHEL6-x86_64-check
On 01/12/2012 02:52 PM, Michael Stahl wrote:
On 12/01/12 14:44, Stephan Bergmann wrote:
#12 in SdrPageView::DrawLayer at svx/source/svdraw/svdpagv.cxx:398
#13 in SwViewImp::PaintLayer at sw/source/core/view/vdraw.cxx:148
#14 in SwRootFrm::Paint at sw/source/core/layout/paintfrm.cxx:2976
#15 in ViewShell::Paint at sw/source/core/view/viewsh.cxx:1678
#16 in SwCrsrShell::Paint at sw/source/core/crsr/crsrsh.cxx:1165
#17 in SwEditWin::Paint at sw/source/ui/docvw/edtwin2.cxx:535
#18 in Window::ImplCallPaint at vcl/source/window/window.cxx:2417
#19 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#20 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#21 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#22 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#23 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#24 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#25 in Window::ImplCallOverlapPaint at vcl/source/window/window.cxx:2477
#26 in Window::ImplHandlePaintHdl at vcl/source/window/window.cxx:2497
#27 in Window::LinkStubImplHandlePaintHdl at vcl/source/window/window.cxx:2491
#28 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
#29 in Timer::Timeout at vcl/source/app/timer.cxx:256
[...]
on the main thread while an URP thread is simultaneously executing
SwXTextDocument::close. Looks like SwXTextDocument::close destroys data
that is still accessed within SwEditWin::Paint, but I haven't yet come
around to find the cause here. (Problem can only be observed
sporadically, and valgrind didn't help yet.) I plan to follow up on
this, however. Please ignore tinderbox failure mails that are due to
this crash in the meantime.
sounds bad; that looks like a SolarMutex guard is missing somewhere...
Given that SwXTextDocument::close is just
void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw(
util::CloseVetoException, RuntimeException )
{
if(IsValid() m_pHiddenViewFrame)
lcl_DisposeView( m_pHiddenViewFrame, pDocShell);
SfxBaseModel::close(bDeliverOwnership);
}
and that SfxBaseModel::close has its complete body protected by a
SolarMutexGuard, would including the first two lines of close's body in
the guarded region (or spanning an additional region around just part of
that) look correct?
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Bug 33794 - The Open... button of the initial screen needs more room for localization fdo#33794
Hi,
Bug 33794 solved.
I confirm that this and all my future contributions are under
MPL/LGPLv3+ licenses.
Bence Tomcsik
From 5dacbe2539f17dd23e78caada8264a062d8dfa41 Mon Sep 17 00:00:00 2001
From: Tomcsik Bence tomcsikbe...@gmail.com
Date: Fri, 13 Jan 2012 14:50:06 +0100
Subject: [PATCH] The Open... button's more room problem solved fdo#33794
I implemented the maximum search of the initial screen's buttons.
mnTextColumnWidth[] and mnColumnWidth[] are equal to the widest
button's width, considering that the open button contains a black
triangle.
---
framework/source/services/backingwindow.cxx | 31 --
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index a28f80f..bd8e001 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -607,19 +607,26 @@ void BackingWindow::initControls()
if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 maControlRect.GetWidth() )
maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20;
-mnTextColumnWidth[0] = mnColumnWidth[0];
-mnTextColumnWidth[1] = mnColumnWidth[1];
+long nTextWidthMax = maWriterButton.GetTextWidth( maWriterButton.GetText() ) + maButtonImageSize.Width() + 8;
+
+if( nTextWidthMax maDrawButton.GetTextWidth( maDrawButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maDrawButton.GetTextWidth( maDrawButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( nTextWidthMax maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( nTextWidthMax maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( nTextWidthMax maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( nTextWidthMax maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( nTextWidthMax maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26 )
+nTextWidthMax = maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26;
+if( nTextWidthMax maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8 )
+nTextWidthMax = maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8;
+
+mnTextColumnWidth[0] = mnColumnWidth[0] = nTextWidthMax;
+mnTextColumnWidth[1] = mnColumnWidth[1] = nTextWidthMax;
-if( mnTextColumnWidth[1] mnTextColumnWidth[0] )
-{
-mnColumnWidth[0] = mnColumnWidth[1];
-mnTextColumnWidth[0] = mnTextColumnWidth[1];
-}
-else
-{
-mnColumnWidth[1] = mnColumnWidth[0];
-mnTextColumnWidth[1] = mnTextColumnWidth[0];
-}
if( maControlRect.GetWidth() maControlRect.GetHeight() * 3 / 2 )
{
maControlRect.Right() = maControlRect.Left() + maControlRect.GetHeight() * 3 / 2;
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED][PATCH] Replace (Byte)String with rtl::O(U)String
On Thu, 2012-01-12 at 15:25 +0100, Chr. Rossmanith wrote: Hi, another bit of replacements for reviewing. Looks fine to me, pushed now. Could quibble about not converting converting xub_StrLen to sal_Int32 while you're at it. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] New Tinderbox Linux-RHEL6-x86_64-check
On 13/01/12 15:14, Stephan Bergmann wrote:
On 01/12/2012 02:52 PM, Michael Stahl wrote:
On 12/01/12 14:44, Stephan Bergmann wrote:
#12 in SdrPageView::DrawLayer at svx/source/svdraw/svdpagv.cxx:398
#13 in SwViewImp::PaintLayer at sw/source/core/view/vdraw.cxx:148
#14 in SwRootFrm::Paint at sw/source/core/layout/paintfrm.cxx:2976
#15 in ViewShell::Paint at sw/source/core/view/viewsh.cxx:1678
#16 in SwCrsrShell::Paint at sw/source/core/crsr/crsrsh.cxx:1165
#17 in SwEditWin::Paint at sw/source/ui/docvw/edtwin2.cxx:535
#18 in Window::ImplCallPaint at vcl/source/window/window.cxx:2417
#19 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#20 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#21 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#22 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#23 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#24 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#25 in Window::ImplCallOverlapPaint at vcl/source/window/window.cxx:2477
#26 in Window::ImplHandlePaintHdl at vcl/source/window/window.cxx:2497
#27 in Window::LinkStubImplHandlePaintHdl at
vcl/source/window/window.cxx:2491
#28 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
#29 in Timer::Timeout at vcl/source/app/timer.cxx:256
[...]
on the main thread while an URP thread is simultaneously executing
SwXTextDocument::close. Looks like SwXTextDocument::close destroys data
that is still accessed within SwEditWin::Paint, but I haven't yet come
around to find the cause here. (Problem can only be observed
sporadically, and valgrind didn't help yet.) I plan to follow up on
this, however. Please ignore tinderbox failure mails that are due to
this crash in the meantime.
sounds bad; that looks like a SolarMutex guard is missing somewhere...
Given that SwXTextDocument::close is just
void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw(
util::CloseVetoException, RuntimeException )
{
if(IsValid() m_pHiddenViewFrame)
lcl_DisposeView( m_pHiddenViewFrame, pDocShell);
SfxBaseModel::close(bDeliverOwnership);
}
and that SfxBaseModel::close has its complete body protected by a
SolarMutexGuard, would including the first two lines of close's body in
the guarded region (or spanning an additional region around just part of
that) look correct?
i already have a patch to do that, but i'm afraid that it won't help
because when i run forms_unoapi lcl_DisposeView is never called (and
IsValid just reads a boolean member, that is unlikely to cause trouble).
also, when the main thread fires its timer it has the SolarMutex locked
in (i don't have the stack anymore) SalInstance::Yield or something like
that.
so it doesn't seem to be anything obvious...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Drop XLFD support from fontmanager
On Fri, Jan 13, 2012 at 01:42:03PM +, Caolán McNamara wrote: On Fri, 2012-01-13 at 13:19 +0200, Khaled Hosny wrote: XLFD support was removed in commit 269f91c (#i110171) except for parsing fonts.dir and fonts.alias. I don't think this makes much sense in fontconfig era, and dropping it simplifies the font manager a bit (I don't even think we use server fonts at all). Excellent, I had noticed recently that we were switching on a supportFontconfig variable to show/hide a bunch of stuff in spadmin to handle installing fonts in a pre-fontconfig X based environment and removed a massive whack of stuff which is never enabled for use off that. I noticed some of that stuff in passing, good to see it gone too. That patch was inspired by your recent cleanup work :) Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #95 from Philipp Gassmann phi...@phiphi.ch 2012-01-13 06:42:10 PST --- Hi Kohei Why did you remove that bug from the list? Shouldn't I have it added to 3.4 and 3.5, or what's the reason? Regards Philipp Am 12.01.2012 20:13, schrieb bugzilla-dae...@freedesktop.org: https://bugs.freedesktop.org/show_bug.cgi?id=37361 Kohei Yoshida kohei.yosh...@gmail.com changed: What|Removed |Added Depends on|37860 | -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] new configmgr access API ...
On Fri, 2012-01-13 at 14:15 +0100, Stephan Bergmann wrote:
On 01/13/2012 11:23 AM, Michael Meeks wrote:
Oooh ! :-) it looks really rather nice; how efficient is the compiled
representation ? hopefully much more so than the big chunks of in-lined
UNO-ness that existing code uses :-)
It still uses UNO to access configmgr, but through a simplified
interface (new com.sun.star.configuration.{ReadOnly,ReadWrite}Access
singletons). The main benefit (besides shorter client code) is type
safety
Yep - it's pretty awesome - it's also far less verbose than many of the
configmgr access sites I've seen:
officecfg::Office::Common::AsianLayout::CompressCharacterDistance::get(comphelper::getProcessComponentContext());
vs.
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/)),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Misc)),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MaxOpenDocuments)),
::comphelper::ConfigurationHelper::E_READONLY);
sal_Int32 nCount;
aVal = nCount;
etc.
So really nice - and has no visible operator overload too; I love
it :-)
-- neither can there be misspellings in the paths of
configuration nodes nor confusion in the values that can be read or
written for those nodes.
Sure - and I imagine there is a really serious error if the key is not
there or we get an exception reading it, that we can un-conditionally
dump something nice out for to the console when we get to it :-)
UNO *is* the tool to make functionality available to different
languages, to extensions, and to scripting facilities.
Sure - of course. This API, on the other hand, is a C++ syntactic
sugar, so surely we can do things better in our native language
perhaps ? at least I think taking an efficiency hit to allow the
possibility of a later non-C++ configmgr implementation is unlikely to
pay dividends.
I'd not seen any of this, so I'm just looking for the first time; I
have a number of queries (given that this will/should be used
everywhere).
* reading:
workdir/unxlngi6.pro/CustomTarget/officecfg/registry/Office/Common.hxx
I love the:
namespace officecfg { namespace Office { namespace Common {
ie. we skipped the org and the OpenOffice - which is cool; good
to get over the over-namespacing legacy. My question would be -
do we even need the 'Office' ? ;-) but ... it's prolly fine for
now.
* optimising
Did I mention that I love the ability to transparently optimise
this later as a major feature of this :-)
* string construction:
struct UseOldExport: public
unotools::ConfigurationPropertyUseOldExport, bool {
static rtl::OUString path() { return
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/org.openoffice.Office.Common/InternalMSExport/UseOldExport));
}
Since we're going to get a lot of these inserted, it might be
rather a good plan to split a path() method from a key()
method so the compiler can share the:
/org.openoffice.Office.Common/.../
for all the keys; that makes the call site slightly larger, but
the resulting binary potentially rather smaller :-)
it'd of course also be rather nice to keep the strings
as const char *'s until we get them into some non-inlined code
hiding that construction stuff inside some
static ConfigurationWrapper::getPropertyValue(...) type method ?
That way we get a single string (buffer) construction to build
the path instead of one per call-site.
* XComponentContext-age ...
static ConfigurationWrapper const get(
com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext
const context);
Do we really need to pass this parameter to these methods ?
We have a single configmr instance, it seems unlikely that we
really need anything to help us find it surely ? either
configmgr is there, or the world goes bang :-)
If we're desparate to have it (it'd be nice to know what for),
then we could we have a default-to-NULL pointer to a reference
there ?
And that's about it at first glance. Most of these details can be
hammered out later though, so it's mainly the API that's interesting -
so - just the XComponentContext clutter (?).
Personally, I'd love to see direct linking to configmgr so we don't
need the component context, and also some punch-throughs, so we don't
need the UNO API bits that force us to allocate OUStrings and Any's etc.
Anyhow - we should clearly create an EasyHack to drive this goodness
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 38515, which changed state. Bug 38515 Summary: LibreOffice crashes in Bibliography dialog when pressing Enter https://bugs.freedesktop.org/show_bug.cgi?id=38515 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [Libreoffice] [PATCH] ScColumn - convert array to vector
On Fri, 2012-01-13 at 09:06 +0200, Noel Grandin wrote: Hi This patch converts open-coded array management to std::vector in ScColumn Hello Noel, I just took a quick look at your patch, and it looks good I'm more than willing to push this change verbatim. The only thing I'd like to check is that, I believe we had some sort of column array resizing policy which controls whether we should increase its size only to the minimum necessary size or increase it to a size larger than necessary to avoid future reallocation. We do change this policy sometimes during import which reduces import performance quite a bit. Once I check that bit, and if nothing else is wrong, I'll commit this to master. Thanks a lot for your patch. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
On 01/13/2012 04:35 PM, Winfried Donkers wrote: However, I would prefer improving configmgr (if need be) over switching the label data to yet another format. What format are you thinking of? As I am doing a lot of rework on the file (the diff file is 1.2MB), it may the the right moment to change the format. The current format does not look efficient to me. Note that it was Micheal who brought up the idea of another format (use a different format / chunk of code for label descriptions), not me. I rather argue not to bring in another format (i.e., something different from the current XML .xcu format that is made available to LO via configmgr). What do you mean with The current format does not look efficient to me. Efficient in terms of what? And with format, do you mean the specific .xcs schema to describe labels in the XML .xcu format, or using the XML .xcu format at all for those labels? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
What do you mean with The current format does not look efficient to me. Efficient in terms of what? Just that the file size caused by the xml-tags exceeds the file size caused by the data itself. I have nothing against xml and I am no expert. For me there is no need to change it, it's purely that if there is a preference to change the format, now is a good time. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH][3-5] make building and installing of nsplugin more consistent
Hi, I was now playing with nsplugin in master, so I created also patch for 3-5. It was installed only in without mozilla case but compiled also in the other case. So now in master and in the patch nsplugin is only for with mozilla case. But be aware that we don't need mozilla for this. (It was built also in without mozilla case until now.) Only headers from np_sdk. And we also have --disable-nsplugin option. So I'm not sure which makefile was right (scp2's or nsplugin'). I chose scp2. Feel free to comment, push or ignore. Matus From 9241b5e7dcc2d72b30084f42c2c463ac7f4c381d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= matus.ku...@gmail.com Date: Fri, 13 Jan 2012 16:02:03 +0100 Subject: [PATCH] make building and installing of nsplugin more consistent --- extensions/source/nsplugin/source/makefile.mk |4 scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/makefile.mk |4 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 5b74764..3d52234 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -36,6 +36,8 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +.IF $(WITH_MOZILLA) != NO + .IF $(SYSTEM_MOZILLA_HEADERS) == YES INCPRE+=$(MOZILLA_HEADERS_CFLAGS) .ELSE @@ -158,6 +160,8 @@ DEF2EXPORTFILE=exports.dxp DEF2EXPORTFILE=exports_wnt.dxp .ENDIF +.ENDIF # $(WITH_MOZILLA) != NO + # --- Targets -- .INCLUDE : target.mk diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 04131ec..ed8f3b6 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2 End #endif -#if !defined WITHOUT_MOZILLA (!defined UNX || defined ENABLE_GTK) +#if !defined WITHOUT_MOZILLA defined ENABLE_NSPLUGIN File gid_Brand_File_Lib_Npsoplugin BIN_FILE_BODY; Name = SPECIAL_NAME(npsoplugin); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a3dd222..7ad5a9d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -110,7 +110,7 @@ End #ifndef WITHOUT_MOZILLA -#if !defined(UNX) || defined(ENABLE_GTK) +#ifdef ENABLE_NSPLUGIN File gid_File_Exe_Nsplugin BIN_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index be79403..112eed7 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3 .ENDIF .ENDIF # $(GUI)==UNX +.IF $(ENABLE_NSPLUGIN) == YES +SCPDEFS+=-DENABLE_NSPLUGIN +.ENDIF + .IF $(MERGELIBS) == TRUE SCPDEFS+=-DMERGELIBS .ENDIF -- 1.7.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Bug 33794 - The Open... button of the initial screen needs more room for localization fdo#33794
Hello, 13.01.2012 18:15, Tomcsik Bence Tibor пишет: Hi, Bug 33794 solved. IMHO it's better to pass some additional parameter to the layoutButton function ( e.g. int i_nExtraWidth = 0 ) and change: nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side to: nTextWidth += maButtonImageSize.Width() + 8 + i_nExtraWidth; ; then use i_nExtraWidth = 18 (as you suggested in the patch: 26 - 8 = 18) for the Open... button. What do you think? Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] New Tinderbox Linux-RHEL6-x86_64-check
On 01/13/2012 03:33 PM, Michael Stahl wrote:
On 13/01/12 15:14, Stephan Bergmann wrote:
Given that SwXTextDocument::close is just
void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw(
util::CloseVetoException, RuntimeException )
{
if(IsValid() m_pHiddenViewFrame)
lcl_DisposeView( m_pHiddenViewFrame, pDocShell);
SfxBaseModel::close(bDeliverOwnership);
}
and that SfxBaseModel::close has its complete body protected by a
SolarMutexGuard, would including the first two lines of close's body in
the guarded region (or spanning an additional region around just part of
that) look correct?
i already have a patch to do that, but i'm afraid that it won't help
because when i run forms_unoapi lcl_DisposeView is never called (and
IsValid just reads a boolean member, that is unlikely to cause trouble).
also, when the main thread fires its timer it has the SolarMutex locked
in (i don't have the stack anymore) SalInstance::Yield or something like
that.
so it doesn't seem to be anything obvious...
Ha, one of the crashes that I saved finally gives it away:
Thread 1:
#0 in com::sun::star::uno::BaseReference::is at
solver/unxlngx6/inc/com/sun/star/uno/Reference.h:103
#1 in sdr::contact::ControlHolder::is at
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:204
#2 in sdr::contact::ViewObjectContactOfUnoControl_Impl::hasControl at
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:642
#3 in sdr::contact::ViewObjectContactOfUnoControl::isPrimitiveVisible at
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:1815
#4 in sdr::contact::ViewObjectContact::getPrimitive2DSequenceHierarchy at
svx/source/sdr/contact/viewobjectcontact.cxx:396
#5 in sdr::contact::ViewObjectContact::getPrimitive2DSequenceSubHierarchy at
svx/source/sdr/contact/viewobjectcontact.cxx:428
#6 in
sdr::contact::ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy
at svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx:450
#7 in sdr::contact::ViewObjectContact::getPrimitive2DSequenceSubHierarchy at
svx/source/sdr/contact/viewobjectcontact.cxx:428
#8 in
sdr::contact::ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy at
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx:699
#9 in sdr::contact::ObjectContactOfPageView::DoProcessDisplay at
svx/source/sdr/contact/objectcontactofpageview.cxx:248
#10 in sdr::contact::ObjectContactOfPageView::ProcessDisplay at
svx/source/sdr/contact/objectcontactofpageview.cxx:132
#11 in SdrPageWindow::RedrawLayer at svx/source/svdraw/sdrpagewindow.cxx:391
#12 in SdrPageView::DrawLayer at svx/source/svdraw/svdpagv.cxx:398
#13 in SwViewImp::PaintLayer at sw/source/core/view/vdraw.cxx:148
#14 in SwRootFrm::Paint at sw/source/core/layout/paintfrm.cxx:2976
#15 in ViewShell::Paint at sw/source/core/view/viewsh.cxx:1678
#16 in SwCrsrShell::Paint at sw/source/core/crsr/crsrsh.cxx:1165
#17 in SwEditWin::Paint at sw/source/ui/docvw/edtwin2.cxx:535
#18 in Window::ImplCallPaint at vcl/source/window/window.cxx:2417
#19 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#20 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#21 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#22 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#23 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#24 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
#25 in Window::ImplCallOverlapPaint at vcl/source/window/window.cxx:2477
#26 in Window::ImplHandlePaintHdl at vcl/source/window/window.cxx:2497
#27 in Window::LinkStubImplHandlePaintHdl at vcl/source/window/window.cxx:2491
#28 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
#29 in Timer::Timeout at vcl/source/app/timer.cxx:256
#30 in Timer::ImplTimerCallbackProc at vcl/source/app/timer.cxx:144
#31 in SalTimer::CallCallback at vcl/inc/saltimer.hxx:66
#32 in SvpSalInstance::CheckTimeout at vcl/headless/svpinst.cxx:199
#33 in SvpSalInstance::Yield at vcl/headless/svpinst.cxx:310
#34 in ImplYield at vcl/source/app/svapp.cxx:455
#35 in Application::Reschedule at vcl/source/app/svapp.cxx:482
#36 in SolarMutexReleaser::~SolarMutexReleaser at
solver/unxlngx6/inc/vcl/svapp.hxx:551
#37 in VCLXWindowImpl::OnProcessCallbacks at
toolkit/source/awt/vclxwindow.cxx:320
#38 in VCLXWindowImpl::LinkStubOnProcessCallbacks at
toolkit/source/awt/vclxwindow.cxx:291
#39 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
#40 in ImplHandleUserEvent at vcl/source/window/winproc.cxx:1999
#41 in ImplWindowFrameProc at vcl/source/window/winproc.cxx:2571
#42 in SalFrame::CallCallback at vcl/inc/salframe.hxx:294
#43 in SvpSalInstance::Yield at vcl/headless/svpinst.cxx:299
#44 in ImplYield at vcl/source/app/svapp.cxx:455
#45 in Application::Yield at vcl/source/app/svapp.cxx:489
#46 in Application::Execute at vcl/source/app/svapp.cxx:432
#47 in desktop::Desktop::Main at desktop/source/app/app.cxx:1824
#48 in ImplSVMain at vcl/source/app/svmain.cxx:178
#49 in
[Libreoffice] [PUSHED, partial][PATCH] Replace getLength() with isEmpty() in vcl/generic/fontmanager
On Thu, 2012-01-12 at 15:29 +0100, Chr. Rossmanith wrote: Hi, while replacing ByteString with OString I came across some getLength() calls which might be replaced with isEmpty() Pushed the bits which aren't OUStringBuffers. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 40438, which changed state. Bug 40438 Summary: CRASH in OLE object EDITING https://bugs.freedesktop.org/show_bug.cgi?id=40438 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] [REVIEW][3.5] Writer layout fix for fdo#40438
Hi all, Could some of the other Writer gurus have a look at this patch: it should fix the crasher though it may not be perfect. I'ld prefer a peer review before cherry-picking it to 3.5 http://cgit.freedesktop.org/libreoffice/core/commit/?id=d83488 Thanks, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Advice needed about some 3.4 named range related problem
Hi Guys,
We have a bug here in the suse system that highlights a regression
attempting to resolve a range by name. Note: this is not a problem on
master.
the failing macro code is something like so;
Sub test
ProjectPlanSheet = ThisComponent.Sheets.getByName( ProjectPlan )
chkCellControl = ProjectPlanSheet.getCellRangeByName( TASK3_ON )
End Sub
where TASK3_ON is a document global rangename
after some digging the commits on master that seem to be involved are
e9159d142a4f25bff88da3dd90e163135ae0bdfa
9e8ae1d56076474e4673a953d8ebd726cb5daa18
I attach a backport of these patches ( in so far as I could backport
them with at times quite different code base )
Note: for this bug the patch to rangeutl.cxx seems sufficient, I
backported the rest for completeness. I want to sound you both out about
applying the patch either partially ( e.g. just the rangeutl.cxx part )
or even completely to 3.4 or... even find out if ye considered either
version too risky.
thanks,
Noel
diff --git sc/inc/rangenam.hxx sc/inc/rangenam.hxx
index fdff278..7417094 100644
--- sc/inc/rangenam.hxx
+++ sc/inc/rangenam.hxx
@@ -202,8 +202,8 @@ public:
SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange rRange) const;
SC_DLLPUBLIC ScRangeData* findByName(const rtl::OUString rName);
SC_DLLPUBLIC const ScRangeData* findByName(const rtl::OUString rName) const;
-ScRangeData* findByUpperName(const rtl::OUString rName);
-const ScRangeData* findByUpperName(const rtl::OUString rName) const;
+SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString rName);
+SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString rName) const;
SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i);
void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange rRange,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
index 97292ca..5720e63 100644
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
@@ -991,7 +991,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
bool bInUse = ( aUsedNames.find(nOldIndex) != aUsedNames.end() );
if (bInUse)
{
-const ScRangeData* pExistingData = GetRangeName()-findByName(itr-GetName());
+const ScRangeData* pExistingData = GetRangeName()-findByUpperName(itr-GetUpperName());
if (pExistingData)
{
// the name exists already in the destination document
diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
index 48cf99b..e85ba1f 100644
--- sc/source/core/data/document.cxx
+++ sc/source/core/data/document.cxx
@@ -1867,7 +1867,7 @@ void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameDat
A proper solution would ask the user how to proceed.
The adjustment of the indices in the formulas is done later.
*/
-const ScRangeData* pExistingData = GetRangeName()-findByName(itr-GetName());
+const ScRangeData* pExistingData = GetRangeName()-findByUpperName(itr-GetUpperName());
if (pExistingData)
{
sal_uInt16 nOldIndex = itr-GetIndex();
diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
index 3614896..eb5ab56 100644
--- sc/source/core/tool/interpr1.cxx
+++ sc/source/core/tool/interpr1.cxx
@@ -6628,7 +6628,7 @@ void ScInterpreter::ScIndirect()
if (!pNames)
break;
-ScRangeData* pData = pNames-findByName(sRefStr);
+ScRangeData* pData = pNames-findByUpperName(ScGlobal::pCharClass-upper(sRefStr));
if (!pData)
break;
diff --git sc/source/core/tool/rangenam.cxx sc/source/core/tool/rangenam.cxx
index 35c00dc..b648d1a 100644
--- sc/source/core/tool/rangenam.cxx
+++ sc/source/core/tool/rangenam.cxx
@@ -682,17 +682,6 @@ public:
}
};
-class MatchByName : public unary_functionScRangeData, bool
-{
-const OUString mrName;
-public:
-MatchByName(const OUString rName) : mrName(rName) {}
-bool operator() (const ScRangeData r) const
-{
-return mrName.equals(r.GetName());
-}
-};
-
class MatchByUpperName : public unary_functionScRangeData, bool
{
const OUString mrName;
@@ -760,20 +749,6 @@ const ScRangeData* ScRangeName::findByRange(const ScRange rRange) const
return itr == maData.end() ? NULL : (*itr);
}
-ScRangeData* ScRangeName::findByName(const OUString rName)
-{
-DataType::iterator itr = std::find_if(
-maData.begin(), maData.end(), MatchByName(rName));
-return itr == maData.end() ? NULL : (*itr);
-}
-
-const ScRangeData* ScRangeName::findByName(const OUString rName) const
-{
-DataType::const_iterator itr = std::find_if(
-
[Libreoffice] [REVIEW][3.4.x]fdo#38515 annoying crasher fix
Hello people, Could someone review / cherry-pick this patch for the 3.4.x branches? http://cgit.freedesktop.org/libreoffice/core/commit/?id=4914b23e7e91b184d69eb00a74ce1c463c5754a7 Thanks, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fdo#43932: try to fix paper tray settings
Hi there,
https://bugs.freedesktop.org/show_bug.cgi?id=43932
this patch partially reverts
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4cc5448ed82f13bb107695b65f39589df1e46cb9
because the following change made the option
[ ] Use only paper tray from printer preferences useless:
@@ -1147,8 +1156,13 @@ void PrinterController::printFilteredPage( int
i_nPage )
mpImplData-mpPrinter-SetMapMode( MAP_100TH_MM );
// aPageSize was filtered through mpImplData-getRealPaperSize already
by getFilteredPageFile()
mpImplData-mpPrinter-SetPaperSizeUser( aPageSize.aSize, !
mpImplData-isFixedPageSize() );
+ if( mpImplData-mnFixedPaperBin != -1
+ mpImplData-mpPrinter-GetPaperBin() != mpImplData-mnFixedPaperBin )
+ {
+ mpImplData-mpPrinter-SetPaperBin( mpImplData-mnFixedPaperBin );
+ }
Instead, the mnPaperBin value now keeps the user's choice of paper tray,
and it is used in the modifyJobSetup function as default and can be
overridden there by a page's own paper tray (only in sw and sd AFAIK).
Apprehensions:
1. I haven't got a multitray printer to test this. (However, the added
printf shows that it works for the normal layout and don't work for the
brochure layout.)
2. Frankly speaking I don't comprehend how the printing code works :(
Any help would be appreciated. :)
Best Regards,
Ivan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fdo#43932: try to fix paper tray settings
forgot to attach the patch.
From bae6b73a56cf4fcfffe21aa9f3f9ccce87e890cd Mon Sep 17 00:00:00 2001
From: Ivan Timofeev timofeev@gmail.com
Date: Fri, 13 Jan 2012 21:50:55 +0400
Subject: [PATCH] fdo#43932: try to fix paper tray settings
---
vcl/source/gdi/print3.cxx | 25 ++---
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index d85321b..3dbee8b 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -172,8 +172,7 @@ public:
// set by user through printer config dialog
// if set, pages are centered and trimmed onto the fixed page
SizemaFixedPageSize;
-sal_Int32 mnDefaultPaperBin;
-sal_Int32 mnFixedPaperBin;
+sal_Int32 mnPaperBin;
ImplPrinterControllerData() :
mbFirstPage( sal_True ),
@@ -181,8 +180,7 @@ public:
mbReversePageOrder( sal_False ),
meJobState( view::PrintableState_JOB_STARTED ),
mpProgress( NULL ),
-mnDefaultPaperBin( -1 ),
-mnFixedPaperBin( -1 )
+mnPaperBin( -1 )
{}
~ImplPrinterControllerData() { delete mpProgress; }
@@ -723,8 +721,7 @@ void PrinterController::setPrinter( const boost::shared_ptrPrinter i_rPrinter
mpImplData-mpPrinter = i_rPrinter;
setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Name ) ),
makeAny( rtl::OUString( i_rPrinter-GetName() ) ) );
-mpImplData-mnDefaultPaperBin = mpImplData-mpPrinter-GetPaperBin();
-mpImplData-mnFixedPaperBin = -1;
+mpImplData-mnPaperBin = mpImplData-mpPrinter-GetPaperBin();
}
void PrinterController:: resetPrinterOptions( bool i_bFileOutput )
@@ -742,8 +739,9 @@ bool PrinterController::setupPrinter( Window* i_pParent )
// get old data
Size aPaperSize( mpImplData-mpPrinter-PixelToLogic(
mpImplData-mpPrinter-GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
-sal_uInt16 nPaperBin = mpImplData-mpPrinter-GetPaperBin();
+// reset paper bin to the value that was set during the last setup call
+mpImplData-mpPrinter-SetPaperBin(mpImplData-mnPaperBin);
// call driver setup
bRet = mpImplData-mpPrinter-Setup( i_pParent );
if( bRet )
@@ -752,7 +750,7 @@ bool PrinterController::setupPrinter( Window* i_pParent )
Size aNewPaperSize( mpImplData-mpPrinter-PixelToLogic(
mpImplData-mpPrinter-GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
sal_uInt16 nNewPaperBin = mpImplData-mpPrinter-GetPaperBin();
-if( aNewPaperSize != aPaperSize || nNewPaperBin != nPaperBin )
+if( aNewPaperSize != aPaperSize || nNewPaperBin != mpImplData-mnPaperBin )
{
mpImplData-maFixedPageSize = aNewPaperSize;
mpImplData-maPageCache.invalidate();
@@ -761,7 +759,7 @@ bool PrinterController::setupPrinter( Window* i_pParent )
aOverrideSize.Height = aNewPaperSize.Height();
setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OverridePageSize ) ),
makeAny( aOverrideSize ) );
-mpImplData-mnFixedPaperBin = nNewPaperBin;
+mpImplData-mnPaperBin = nNewPaperBin;
}
}
}
@@ -773,7 +771,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
PrinterController::PageSize aPageSize;
aPageSize.aSize = mpPrinter-GetPaperSize();
awt::Size aSetSize, aIsSize;
-sal_Int32 nPaperBin = mnDefaultPaperBin;
+sal_Int32 nPaperBin = mnPaperBin;
for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty nPropertyCount; ++nProperty )
{
if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( PreferredPageSize ) ) )
@@ -1180,11 +1178,6 @@ void PrinterController::printFilteredPage( int i_nPage )
mpImplData-mpPrinter-SetMapMode( MAP_100TH_MM );
// aPageSize was filtered through mpImplData-getRealPaperSize already by getFilteredPageFile()
mpImplData-mpPrinter-SetPaperSizeUser( aPageSize.aSize, ! mpImplData-isFixedPageSize() );
-if( mpImplData-mnFixedPaperBin != -1
-mpImplData-mpPrinter-GetPaperBin() != mpImplData-mnFixedPaperBin )
-{
-mpImplData-mpPrinter-SetPaperBin( mpImplData-mnFixedPaperBin );
-}
// if full paper is meant to be used, move the output to accomodate for pageoffset
if( aPageSize.bFullPaper )
@@ -1199,6 +1192,7 @@ void PrinterController::printFilteredPage( int i_nPage )
mpImplData-mpPrinter-EnableOutput( sal_True );
+printf(page %d, bin %d\n, i_nPage, mpImplData-mpPrinter-GetPaperBin());
// actually print the page
mpImplData-mpPrinter-ImplStartPage();
@@
Re: [Libreoffice] Advice needed about some 3.4 named range related problem
Hello Noel, 2012/1/13 Noel Power nopo...@suse.com: Hi Guys, We have a bug here in the suse system that highlights a regression attempting to resolve a range by name. Note: this is not a problem on master. the failing macro code is something like so; Sub test ProjectPlanSheet = ThisComponent.Sheets.getByName( ProjectPlan ) chkCellControl = ProjectPlanSheet.getCellRangeByName( TASK3_ON ) End Sub where TASK3_ON is a document global rangename after some digging the commits on master that seem to be involved are e9159d142a4f25bff88da3dd90e163135ae0bdfa 9e8ae1d56076474e4673a953d8ebd726cb5daa18 I attach a backport of these patches ( in so far as I could backport them with at times quite different code base ) Note: for this bug the patch to rangeutl.cxx seems sufficient, I backported the rest for completeness. I want to sound you both out about applying the patch either partially ( e.g. just the rangeutl.cxx part ) or even completely to 3.4 or... even find out if ye considered either version too risky. I think it makes sense to remove the findByName and replace them with findByUpperName. The findByName is error-prone and therefore I removed it for 3-5, internally we only use upper name (and in 3.5 we use it even to store the range name). I will clean-up your patch a bit because some changes to rangeutl.cxx only make sense with other changes in master/3.5. But before we push this changes to a stable branch I want to check with backporting the tests from 3.5 to 3.4 and check my other range name commits from my rework that I did not adjust one of these patches. Just to make it clear, I don't think that this patch will create any problems and is safe but I don't feel comfortable changing such an important part without the tests. Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ScColumn - convert array to vector
Hi Oh no!, I was testing some stuff and accidentally commented out the critical line in ScColumn::Append(). This line +//aItems.resize(nSize); should be +aItems.resize(nSize); We could call reserve() on the vector to allocate extra capacity, but I don't think there is any way to get exactly the same behaviour as before in the ScColumn::Append() method. I could add an extra method on ScColumn to reserve capacity, which would be a more explicit way for the import process to prevent extra re-allocation. On Fri, Jan 13, 2012 at 17:54, Kohei Yoshida kohei.yosh...@suse.com wrote: On Fri, 2012-01-13 at 10:39 -0500, Kohei Yoshida wrote: The only thing I'd like to check is that, I believe we had some sort of column array resizing policy which controls whether we should increase its size only to the minimum necessary size or increase it to a size larger than necessary to avoid future reallocation. We do change this policy sometimes during import which reduces import performance quite a bit. Yup, your change in ScColumn::Append() removes that policy. Let me think about how we can preserve that behavior... Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ScColumn - convert array to vector
On Fri, 2012-01-13 at 20:36 +0200, Noel Grandin wrote: Hi Oh no!, I was testing some stuff and accidentally commented out the critical line in ScColumn::Append(). This line +//aItems.resize(nSize); should be +aItems.resize(nSize); I guess you meant ScColumn::Resize()? Yup, I'll fix that. We could call reserve() on the vector to allocate extra capacity, but I don't think there is any way to get exactly the same behaviour as before in the ScColumn::Append() method. Yeah that's fine. The double allocation behavior doesn't have to be identical before and after the change, as long as the import performance is comparable to what it was prior to the change. Indeed, I just ran a quick test, and the test ods file I used which opens in 6.5 seconds on my machine opens in 6.6 seconds after your change. I believe std::vector's push_back already does double allocation of sort, in which case we are safe, performance-wise. As a comparison, in the old code, when ScColumn::bDoubleAlloc is set to false, the same file opens so slow that you need to kill the process. That's how much difference doing double allocation makes. Now, the only issue we need to be concerned about is that, if we decide to always perform double allocation whether it's import or run-time (which your change will do), we may end up allocating larger array than necessary even when we are accepting user's input. But I'm willing to accept that for the time being, and maybe later re-work it if that proves to cause memory footprint issue later on. There are two minor changes I'd like to make. One is to rename the structure from aItems to maItems, to make it explicit that it's a data member. A bunch of existing code doesn't follow this convention, but I'd like us to start using this convention in our new code. Two is to use back() method to access the last item of the array. So, instead of aItems[aItems.size()-1] to access the last array item, you can simply do aItems.back() which is much simpler. I'll make these changes for you. Let me do a thorough review of your patch one more time, and I'll push to master. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo 44516 label printing misplaced; advise asked
On Fri, 2012-01-13 at 17:06 +0100, Winfried Donkers wrote: What do you mean with The current format does not look efficient to me. Efficient in terms of what? Just that the file size caused by the xml-tags exceeds the file size caused by the data itself. I have nothing against xml and I am no expert. For me there is no need to change it, it's purely that if there is a preference to change the format, now is a good time. Heh - well, I've nothing against re-using the format, parsing it etc. there are real costs to new formats whenever they are used. I would just ignore my rather vague (and unrelated) worries wrt. performance - and get your changes in (they sound great). Later we'll need to re-work the configmgr code / parser to cope with different hierarchies separately (or something). IMHO there is no need for some layering scheme for label dimensions eg. ;-) It's work for the future. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unit test concept for draw/impress
Hi Markus, Markus Mohrhard wrote (13-01-12 06:10) I finally found some time working on a unit test concept for draw/impress as promised to Thorsten in Paris. (see [1]) [...] No useful technical comment from me here, just a \\0// ! -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ScColumn - convert array to vector
On Fri, 2012-01-13 at 15:27 -0500, Kohei Yoshida wrote: Let me do a thorough review of your patch one more time, and I'll push to master. Unfortunately one of the filters-test fails on master, after applying the patch. The crash occurs in ScColumn::CloneCell, at line 824 which is switch (rSource.GetCellType()) Hmm Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||41054 --- Comment #247 from Cor Nouws c...@nouenoff.nl 2012-01-13 14:17:58 PST --- pls fix issue fdo#41054 in the 3.4.6 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||39118 --- Comment #248 from Cor Nouws c...@nouenoff.nl 2012-01-13 14:19:36 PST --- pls fix fod#39118 in 3.4.6 too -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 41054, which changed state. Bug 41054 Summary: FILESAVE odf file corrupted - cannot save after inserting new sheet https://bugs.freedesktop.org/show_bug.cgi?id=41054 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 39118, which changed state. Bug 39118 Summary: Charts with anchor to cell do not update automatically https://bugs.freedesktop.org/show_bug.cgi?id=39118 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
