[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
