[Libreoffice-commits] .: Branch 'feature/opengl-canvas' - basegfx/source
basegfx/source/tools/numbertools.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d3079ed6be3129c0f6c697a3b31d8f69997fec3c
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Feb 6 09:18:00 2012 +0100
Stick suitable int type to std::max
This didn't compile on mac.
diff --git a/basegfx/source/tools/numbertools.cxx
b/basegfx/source/tools/numbertools.cxx
index bd4c985..2f86fc9 100644
--- a/basegfx/source/tools/numbertools.cxx
+++ b/basegfx/source/tools/numbertools.cxx
@@ -55,7 +55,8 @@ namespace basegfx { namespace tools
B2DPolyPolygon aRes;
B2DHomMatrix aMat;
-double fCurrX=std::max(nTotalDigits-aNum.getLength(), 0) *
(1.0+fSpace);
+double fCurrX=std::max(nTotalDigits-aNum.getLength(),
+ sal_Int32(0)) * (1.0+fSpace);
for( sal_Int32 i=0; iaNum.getLength(); ++i )
{
B2DPolyPolygon aCurr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cross_toolset/Makefile
cross_toolset/Makefile |8 1 file changed, 8 insertions(+) New commits: commit fcc56e8a894dfeb8885f663f33f364becec5d176 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Feb 6 02:42:38 2012 -0600 again with bootstrap, but for cross-compile this time diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile index 271c83a..5b80d7b 100644 --- a/cross_toolset/Makefile +++ b/cross_toolset/Makefile @@ -6,6 +6,14 @@ SHELL=/usr/bin/env bash include ../config_build.mk +# +# Bootstap +# +$(WORKDIR)/bootstrap: + @cd $(SRC_ROOT) ./bootstrap + @mkdir -p $(dir $@) touch $@ + +bootstrap: $(WORKDIR)/bootstrap .PHONY : build ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/lngex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c1a3961b4582e47ebcee84b3acc2a808651bcd07
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Mon Feb 6 13:01:02 2012 +1030
Single-line bugfix in l10n tools to fix compile on GCC 4.4.3 (Ubuntu)
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index e921a74..73d7221 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -74,7 +74,7 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
// parse command line
for( int i = 1; i argc; i++ ) {
-rtl::OString sSwitch(rtl::OString(argv[i]).toAsciiUpperCase());
+rtl::OString sSwitch = rtl::OString(argv[i]).toAsciiUpperCase();
if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM(-I)))
nState = STATE_INPUT; // next tokens specifies source files
else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM(-O)))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cli_ure/source extensions/source hwpfilter/source
cli_ure/source/uno_bridge/cli_proxy.cxx |1 -
extensions/source/ole/unoobjw.cxx |2 +-
hwpfilter/source/hbox.cxx | 12 ++--
hwpfilter/source/hbox.h |2 +-
hwpfilter/source/hwpfile.cxx| 14 +++---
5 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 664b22c56b7e37006e07ad194fe2ab98980cb8f0
Author: PKEuS philipp.kl...@web.de
Date: Mon Feb 6 09:44:32 2012 +0100
Fixed some cppcheck messages
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx
b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 9be5afe..4672dd5 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -497,7 +497,6 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage*
callmsg)
method_td-pParams, args, argTypes, pExc);
return constructReturnMessage(cli_ret, args, method_td,
callmsg, pExc);
-break;
}
}
else
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index 4e81a8f..641e643 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1007,7 +1007,7 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty(
DISPPARAMS * /*pdispparams*/, V
if (pvarResult)
anyToVariant(pvarResult, returnValue);
}
-catch(const UnknownPropertyException e) //XInvocation::getValue
+catch(const UnknownPropertyException e) //XInvocation::getValue
{
writeExcepinfo(pexcepinfo, e.Message);
ret = DISP_E_MEMBERNOTFOUND;
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index fcdd706..fdecbdf 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -335,12 +335,12 @@ TxtBox::~TxtBox(void)
for (int ii = 0; ii nCell; ++ii)
{
LinkedListIterator HWPPara it(plists[ii]);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
}
LinkedListIterator HWPPara it(caption);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
delete[]plists;
@@ -369,7 +369,7 @@ Picture::~Picture(void)
delete (HWPDrawingObject *) picinfo.picdraw.hdo;
LinkedListIterator HWPPara it(caption);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
}
@@ -391,7 +391,7 @@ hunit Picture::Height(CharShape * sty)
Hidden::~Hidden(void)
{
LinkedListIterator HWPPara it(plist);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
}
@@ -400,7 +400,7 @@ Hidden::~Hidden(void)
HeaderFooter::~HeaderFooter(void)
{
LinkedListIterator HWPPara it(plist);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
}
@@ -409,7 +409,7 @@ HeaderFooter::~HeaderFooter(void)
Footnote::~Footnote(void)
{
LinkedListIterator HWPPara it(plist);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
}
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index ea4bd26..bbd5a37 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -537,7 +537,7 @@ struct Table
Table(){};
~Table(){
LinkedListIteratorTCell it(cells);
- for( ; it.current(); it++)
+ for( ; it.current(); ++it)
delete it.current();
};
Columns columns;
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 66e0eb9..6de5198 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -76,19 +76,19 @@ HWPFile::~HWPFile()
delete hiodev;
LinkedListIterator ColumnInfo it_column(columnlist);
-for (; it_column.current(); it_column++)
+for (; it_column.current(); ++it_column)
delete it_column.current();
LinkedListIterator HWPPara it(plist);
-for (; it.current(); it++)
+for (; it.current(); ++it)
delete it.current();
LinkedListIterator Table tbl(tables);
-for (; tbl.current(); tbl++)
+for (; tbl.current(); ++tbl)
delete tbl.current();
LinkedListIterator HyperText hyp(hyperlist);
-for (; hyp.current(); hyp++)
+for (; hyp.current(); ++hyp)
{
delete hyp.current();
}
@@ -390,7 +390,7 @@ int HWPFile::GetPageMasterNum(int page)
ColumnInfo *now = 0;
int i;
-for( i = 1 ; it.current() ; it++, i++){
+for( i = 1 ; it.current() ; ++it, i++){
now = it.current();
if( page now-start_page )
return i-1;
@@ -412,7 +412,7 @@ EmPicture *HWPFile::GetEmPicture(Picture * pic)
name[2] = 'P';
LinkedListIterator EmPicture it(emblist);
-for (; it.current(); it++)
+for (; it.current(); ++it)
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 11897d4ddb50539c6351ccf6dce3cdb2f768fe27
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Dec 9 17:04:13 2011 +0100
rtf import: Check for the first run even when getting \par
(cherry picked from commit 1d1f049859e080b403c743f7e0604bd72475a824)
Signed-off-by: Miklos Vajna vmik...@frugalware.org
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e23a25f..a96d821 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1308,6 +1308,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
break;
case RTF_PAR:
{
+checkFirstRun();
checkNeedPap();
if (!m_pCurrentBuffer)
parBreak();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/semaphor.c | 181 -
1 file changed, 181 deletions(-)
New commits:
commit b61ddcbad769ee18f78ff4003d1cd6047e0a12fc
Author: François Tigeot ftig...@wolfpond.org
Date: Sun Feb 5 19:04:46 2012 +0100
OSL_USE_SYS_V_SEMAPHORE is never defined
* Remove the System V semaphore implementation variant
* POSIX thread-local code was always used for synchronization
primitives anyway
diff --git a/sal/osl/unx/semaphor.c b/sal/osl/unx/semaphor.c
index 7cb375f..b38113b 100644
--- a/sal/osl/unx/semaphor.c
+++ b/sal/osl/unx/semaphor.c
@@ -32,8 +32,6 @@
#include osl/semaphor.h
#include osl/diagnose.h
-#ifndef OSL_USE_SYS_V_SEMAPHORE
-
/* This is the (default) POSIX thread-local semaphore variant */
/*
@@ -134,183 +132,4 @@ sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore
Semaphore) {
return sal_False;
}
-#else /* OSL_USE_SYS_V_SEMAPHORE */
-
-/***/
-
-/* This is the SYS V private semaphore variant */
-
-/*
-Implemetation notes:
-The void* represented by oslSemaphore is used
-as a pointer to an osl_TSemImpl struct
-*/
-
-
-#if defined(NETBSD)
-union semun {
-int val;/* value for SETVAL */
-struct semid_ds *buf; /* buffer for IPC_STAT IPC_SET */
-u_short *array; /* array for GETALL SETALL */
-};
-#endif
-
-typedef struct _osl_TSemImpl
-{
- int m_Id;
-
-} osl_TSemImpl;
-
-/*/
-/* osl_createSemaphore */
-/*/
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
-{
-union semun arg;
-
-oslSemaphore Semaphore;
-osl_TSemImpl* pSem;
-
-Semaphore= malloc(sizeof(osl_TSemImpl));
-OSL_POSTCOND(Semaphore, malloc failed\n); /* ptr valid? */
-
-pSem= (osl_TSemImpl*)Semaphore;
-
-
-/* unnamed (private) semaphore */
-
- pSem-m_Id= semget(IPC_PRIVATE, 1, 0666 | IPC_CREAT);
-
-
-/* create failed? */
-if (pSem-m_Id 0)
-{
-OSL_TRACE(osl_createSemaphore failed (semget). Errno: %d; %s\n,
- errno,
- strerror(errno));
-
-free(Semaphore);
-return 0;
-}
-
-/* set initial count */
-
-arg.val= initialCount;
-
-if(semctl(pSem-m_Id, 0, SETVAL, arg) 0)
-{
-OSL_TRACE(osl_createSemaphore failed (semctl(SETVAL)). Errno: %d;
%s\n,
- errno,
- strerror(errno));
-
-if(semctl(pSem-m_Id, 0, IPC_RMID, arg) 0)
-{
-OSL_TRACE(semctl(IPC_RMID) failed. Errno: %d; %s, errno,
strerror(errno));
-}
-
-free(Semaphore);
-return 0;
-}
-
-
-return Semaphore;
-}
-
-/*/
-/* osl_destroySemaphore */
-/*/
-void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore) {
-
-if(Semaphore) /* ptr valid? */
-{
-union semun arg;
-
-osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
-
-if(semctl(pSem-m_Id, 0, IPC_RMID, arg) 0)
-
-{
-OSL_TRACE(osl_destroySemaphore failed. (semctl(IPC_RMID)). Errno:
%d; %s\n,
- errno,
- strerror(errno));
-}
-
-free(Semaphore);
-}
-}
-
-/*/
-/* osl_acquireSemaphore */
-/*/
-sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) {
-
-/* abort in debug mode */
-OSL_PRECOND(Semaphore != 0, Semaphore not created\n);
-
-
-if (Semaphore != 0) /* be tolerant in release mode */
-{
-struct sembuf op;
-osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
-
-op.sem_num= 0;
-op.sem_op= -1;
-op.sem_flg= SEM_UNDO;
-
-return semop(pSem-m_Id, op, 1) = 0;
-
-}
-
-return sal_False;
-}
-
-/*/
-/* osl_tryToAcquireSemaphore */
-/*/
-sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore) {
-
-/* abort in debug mode */
-OSL_PRECOND(Semaphore != 0, Semaphore not created\n);
-
-if (Semaphore != 0) /* be tolerant in release mode */
-{
-struct sembuf op;
-osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
-
-op.sem_num= 0;
-op.sem_op= -1;
-op.sem_flg= SEM_UNDO | IPC_NOWAIT;
-
-return semop(pSem-m_Id, op, 1) = 0;
-}
-
-return sal_False;
-}
-
-/*/
-/*
[Libreoffice-commits] .: cross_toolset/Makefile solenv/gbuild
cross_toolset/Makefile |9 - solenv/gbuild/extensions/post_BuildplTargets.mk |2 +- 2 files changed, 1 insertion(+), 10 deletions(-) New commits: commit 96ae2271ebc8fafd5a2454705c128725070ca7c3 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Feb 6 03:58:55 2012 -0600 fix mingw build, still bootstrap issues. diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile index 5b80d7b..2448493 100644 --- a/cross_toolset/Makefile +++ b/cross_toolset/Makefile @@ -6,15 +6,6 @@ SHELL=/usr/bin/env bash include ../config_build.mk -# -# Bootstap -# -$(WORKDIR)/bootstrap: - @cd $(SRC_ROOT) ./bootstrap - @mkdir -p $(dir $@) touch $@ - -bootstrap: $(WORKDIR)/bootstrap - .PHONY : build build: diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 58f12e8..1aba6f2 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -177,7 +177,7 @@ dev-install: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD build: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) -cross_toolset: bootstrap $(SRCDIR)/src.downloaded +cross_toolset: $(SRCDIR)/src.downloaded findunusedcode: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 75378a82e1a9e921cebe221427baca24cad47baf
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Feb 6 10:58:12 2012 +0100
n#228839 an empty table grid can't have implicit merges
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d7060b4..17b48da 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -477,7 +477,7 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
-else if (m_bImplicitMerges)
+else if (m_bImplicitMerges pTableGrid-size())
{
// More grid than cells definitions? Then take the last ones.
// This feature is used by the RTF implicit horizontal cell merges.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: smoketest/losmoketest.py
smoketest/losmoketest.py | 27 --- 1 file changed, 24 insertions(+), 3 deletions(-) New commits: commit 79b6311d057d3362cb9ff8f5ac75f7eefd35364b Author: Yifan J yfji...@novell.com Date: Mon Feb 6 17:39:22 2012 +0800 bug fixing for test initializing diff --git a/smoketest/losmoketest.py b/smoketest/losmoketest.py index 4c86997..dfb86ec 100755 --- a/smoketest/losmoketest.py +++ b/smoketest/losmoketest.py @@ -74,7 +74,7 @@ SERVER_URL = http://dev-builds.libreoffice.org; root_dir = os.getcwd() DOWNLOAD_DIR = os.path.join(root_dir, _download) USR_DIR = os.path.join(root_dir, _libo_smoke_user) -LOCAL_BUILD_INFO_FILE = build.cfg +LOCAL_BUILD_INFO_FILE = os.path.join(root_dir, build.cfg) ROOT_DIR_LIB = os.path.join(root_dir, 'lib') ROOT_DIR_LIB32 = os.path.join(root_dir, 'lib32') @@ -324,7 +324,6 @@ def download(url_reg, build_type): return True - def fetch_build(url, filename): ''' Download a build from address url/filename ''' @@ -335,8 +334,11 @@ def fetch_build(url, filename): try: f = open(DOWNLOAD_DIR + '/' + filename, 'wb') f.write(u.read()) -finally: f.close() +except urllib2.HTTPError, e: +print HTTP Error:,e.code , url +except urllib2.URLError, e: +print URL Error:,e.reason , url return True @@ -404,6 +406,24 @@ def init_testing(): if not os.path.exists(USR_DIR): os.mkdir(USR_DIR) + + +if not os.path.exists(LOCAL_BUILD_INFO_FILE): + +init_build_cfg = '[daily_branch]' + os.linesep\ + + 'build_name =' + os.linesep\ + + 'build_time =' + os.linesep\ + + '[daily_master]' + os.linesep\ + + 'build_name =' + os.linesep\ + + 'build_time =' + os.linesep\ + + '[pre-releases]' + os.linesep\ + + 'build_name =' + os.linesep\ + + 'build_time =' + os.linesep + +with open(LOCAL_BUILD_INFO_FILE, 'w+') as f: +f.write(init_build_cfg) +f.close() + # create set up links try: if platform.system() == Linux: @@ -588,6 +608,7 @@ def main(): uninstall() sys.exit() elif o in (-d, --download): +init_testing() download(url_reg, build_type) sys.exit() elif o in (-l, --loop): ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: smoketest/losmoketest.py
smoketest/losmoketest.py | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit bcb9328d8aef6dfcc7e6aecc44888a796ff5551f Author: Yifan J yfji...@suse.com Date: Mon Feb 6 18:22:00 2012 +0800 update losmoketest fetching path diff --git a/smoketest/losmoketest.py b/smoketest/losmoketest.py index dfb86ec..7c8e6af 100755 --- a/smoketest/losmoketest.py +++ b/smoketest/losmoketest.py @@ -105,28 +105,28 @@ PR_MAC_PPC_PATH = pre-releases/mac/ppc/ PR_WIN_X86_PATH = pre-releases/win/x86/ ## daily_master -DAILY_MASTER_RPM_X86_PATH = daily/Linux_x86_Release_Configuration/master/current -DAILY_MASTER_RPM_X86_64_PATH = daily/Linux_x86_64_Release_Configuration/master/current +DAILY_MASTER_RPM_X86_PATH = daily/Linux-x86_10-Release_Configuration/master/current +DAILY_MASTER_RPM_X86_64_PATH = daily/Linux-x86_64_11-Release_Configuration/master/current -DAILY_MASTER_DEB_X86_PATH = daily/Linux_x86_Release_Configuration/master/current -DAILY_MASTER_DEB_X86_64_PATH = daily/Linux_x86_64_Release_Configuration/master/current # No build yet +DAILY_MASTER_DEB_X86_PATH = daily/Linux-x86_10-Release_Configuration/master/current +DAILY_MASTER_DEB_X86_64_PATH = daily/Linux-x86_64_11-Release_Configuration/master/current -DAILY_MASTER_MAC_X86_PATH = daily/MacOSX_10.6.7_Intel_no-moz/master/current -DAILY_MASTER_MAC_PPC_PATH =^$ # No build yet +DAILY_MASTER_MAC_X86_PATH = daily/MacOSX-Intel@3-OSX_10.6.0-gcc_4.0.1/master/current +DAILY_MASTER_MAC_PPC_PATH = daily/MacOSX-PPC@12-OSX_10.5.0-gcc_4.0.1/master/current # No build yet -DAILY_MASTER_WIN_X86_PATH = daily/Windows_Release_Configuration/master/current +DAILY_MASTER_WIN_X86_PATH =daily/Win-x86@7-MinGW/master/current # cross compling build ## daily_branch -DAILY_BRANCH_RPM_X86_PATH = daily/Linux_x86_Release_Configuration/libreoffice- + tag_version + /current -DAILY_BRANCH_RPM_X86_64_PATH = daily/Linux_x86_64_Release_Configuration/libreoffice- + tag_version + /current +DAILY_BRANCH_RPM_X86_PATH = daily/Linux-x86_10-Release_Configuration/libreoffice- + tag_version + /current +DAILY_BRANCH_RPM_X86_64_PATH = daily/Linux-x86_64_11-Release_Configuration/libreoffice- + tag_version + /current -DAILY_BRANCH_DEB_X86_PATH = daily/Linux_x86_Release_Configuration/libreoffice- + tag_version + /current -DAILY_BRANCH_DEB_X86_64_PATH = daily/Linux_x86_64_Release_Configuration/libreoffice- + tag_version + /current +DAILY_BRANCH_DEB_X86_PATH = daily/Linux-x86_10-Release_Configuration/libreoffice- + tag_version + /current +DAILY_BRANCH_DEB_X86_64_PATH = daily/Linux-x86_64_11-Release_Configuration/libreoffice- + tag_version + /current -DAILY_BRANCH_MAC_X86_PATH =daily/MacOSX_10.6.7_Intel_no-moz/libreoffice- + tag_version + /current -DAILY_BRANCH_MAC_PPC_PATH =^$ # No build yet +DAILY_BRANCH_MAC_X86_PATH = daily/MacOSX-Intel@3-OSX_10.6.0-gcc_4.0.1/libreoffice- + tag_version + /current +DAILY_BRANCH_MAC_PPC_PATH = daily/MacOSX-PPC@12-OSX_10.5.0-gcc_4.0.1/libreoffice- + tag_version + /current -DAILY_BRANCH_WIN_X86_PATH = daily/Windows_Release_Configuration/libreoffice- + tag_version + /current +DAILY_BRANCH_WIN_X86_PATH =daily/Win-x86@7-MinGW/libreoffice- + tag_version + /current ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |1 - 1 file changed, 1 deletion(-) New commits: commit 04f6c5e4d277c038c69e06eaf5fa2d0bc0faeeda Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 6 14:03:28 2012 +0200 No set_soenv.in any more diff --git a/configure.in b/configure.in index a44f2d7..eeda25e 100644 --- a/configure.in +++ b/configure.in @@ -3099,7 +3099,6 @@ if test $cross_compiling = yes; then ooo.lst.in \ oowintool \ post_download.in \ -set_soenv.in \ solenv/inc/langlist.mk \ solenv/inc/postset.mk \ | (cd CONF-FOR-BUILD tar xf -) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/makefile.mk | 43 ++-- 1 file changed, 28 insertions(+), 15 deletions(-) New commits: commit 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 14:45:46 2012 +0100 Reintroduce pyuno.so wrapper around libpyuno.so ...it was cleaned away by a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port PyUno to support Python 3 but is still needed to make sure libpyuno.so is loaded RTLD_GLOBAL (Python apparently loads its modules RTLD_LOCAL). At least with pre 4.5 GCC this can cause problems with C++ exception handling, see the mail thread starting at http://lists.freedesktop.org/archives/libreoffice/2012-February/025166.html LibO 3.5RC2: terminate called after throwing an instance of 'com::sun::star::registry::InvalidRegistryException' for details. diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index f72e1c3..714a120 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -50,6 +50,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python .ENDIF # .IF $(EXTRA_CFLAGS)!= .IF $(GUI) == UNX +# python expects modules without the lib prefix +# pyuno.so even on Mac OS X, because it is a python module +PYUNO_MODULE=$(DLLDEST)$/pyuno.so PYUNORC=pyunorc .ELSE .IF $(CROSS_COMPILING) != YES @@ -109,6 +112,7 @@ DEFLIB1NAME=$(TARGET) ALLTAR : \ $(DLLDEST)/uno.py \ $(DLLDEST)/unohelper.py \ +$(PYUNO_MODULE) \ $(MISC)/$(PYUNORC) \ $(LB)/lib$(TARGET).a @@ -116,17 +120,10 @@ $(LB)/lib$(TARGET).a: $(MISC)/$(TARGET).def $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)/$(TARGET).def --kill-at --output-lib=$(LB)/lib$(TARGET).a .ELSE -.IF $(GUI)!=WNT -# For some reason the build breaks on Windows if this is listed in the -# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go -# figure. But we need it on non-Windows. -targetdll=$(LB)/$(TARGET)$(DLLPOST) -.ENDIF - ALLTAR : \ $(DLLDEST)/uno.py \ $(DLLDEST)/unohelper.py \ -$(targetdll) \ +$(PYUNO_MODULE) \ $(MISC)/$(PYUNORC) .ENDIF .ENDIF @@ -141,6 +138,29 @@ $(MISC)/framework_link : $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework @touch $@ +.IF $(GUI) == UNX +$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj +.IF $(OS) == LINUX +@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == SOLARIS +@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == FREEBSD +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == NETBSD +@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == OPENBSD +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == DRAGONFLY +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == MACOSX +@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) $(MISC)$/$(@:b).cmd +.ELSE +@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ENDIF +cat $(MISC)$/$(@:b).cmd +@+source $(MISC)$/$(@:b).cmd +.ENDIF + $(MISC)/$(PYUNORC) : pyuno -rm -f $@ cat pyuno $@ @@ -149,11 +169,4 @@ $(MISC)/pyuno.flt : pyuno.flt -rm -f $@ cat $? $@ -.IF $(DLLPRE)!= -# python does not accept the lib prefix in the module library -$(LB)/$(TARGET)$(DLLPOST) : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST) - -rm -f $@ - ln -s $? $@ -.ENDIF - .ENDIF # L10N_framework ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postgresql/libpq-parallel-build.patch postgresql/makefile.mk
postgresql/libpq-parallel-build.patch | 11 +++ postgresql/makefile.mk|1 + 2 files changed, 12 insertions(+) New commits: commit f33038cf6a5f86a619a5860a4f95d337f0c87ae5 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 6 15:17:20 2012 +0100 fix postgresql massive-parallel build diff --git a/postgresql/libpq-parallel-build.patch b/postgresql/libpq-parallel-build.patch new file mode 100644 index 000..237a483 --- /dev/null +++ b/postgresql/libpq-parallel-build.patch @@ -0,0 +1,11 @@ +diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile +--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2012-02-06 15:11:19.0 +0100 misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile 2012-02-06 15:02:51.0 +0100 +@@ -109,6 +109,7 @@ + libpq.rc: $(top_builddir)/src/Makefile.global + + fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h ++fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h + + $(top_builddir)/src/port/pg_config_paths.h: + $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 340a6a8..75c1e62 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -41,6 +41,7 @@ TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 PATCH_FILES=\ postgresql-moz-ldap.patch \ postgresql-libs-leak.patch \ + libpq-parallel-build.patch \ $(TARFILE_NAME)-libreoffice.patch \ $(TARFILE_NAME)-autoreconf.patch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/python/file_python.scp |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 2ea723e8ce4077c7efa957d278637c4d9f32cf14 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 15:51:52 2012 +0100 Revert Mac OS X uses .dylib and not .so for python modules. This reverts commit b53a86a5676d5bcb88ed6e3ac524a3560e713c22. Conflicts: scp2/source/python/file_python.scp I assume that the file *shall* be named .so on Mac OS X after all, and that it actually being named .dylib was a mistake introduced with a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe and reverted with 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290. diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index cdcd744..194394d 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -284,14 +284,10 @@ End #ifdef UNX +// pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno LIB_FILE_BODY; -#ifdef MACOSX -// note: Mac OS X use .dylib, even for python modules -Name = pyuno.dylib; -#else Name = pyuno.so; -#endif Dir = gid_Brand_Dir_Program; Styles = (PACKED); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |1 - 1 file changed, 1 deletion(-) New commits: commit 0caced5cd1cf537c6576ec6c147f40373b2eac6a Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 6 15:52:00 2012 +0200 libpackage2 is also in libmergedlo diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index a657fe1..efe0040 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -144,7 +144,6 @@ copy-stuff: buildrcs mergedlo \ msfilterlo \ ooxlo \ - package2 \ reflection.uno \ reg \ saxlo \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/about.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 66e4c5851b7ef27d375e2bdb482e723f6e0ce1f0
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 6 18:50:58 2012 +0400
correct TDF link
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index ddbd25e..fe06366 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -112,7 +112,7 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_TDF_LINK
{
-Text[ en-US ] = http://http://www.documentfoundation.org/;;
+Text[ en-US ] = http://www.documentfoundation.org/;;
};
String ABOUT_FEATURESSTR_LINK
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in dbaccess/Module_dbaccess.mk reportdesign/Module_reportdesign.mk svx/prj sw/prj tail_build/prj
configure.in| 54 +--- dbaccess/Module_dbaccess.mk |4 ++ reportdesign/Module_reportdesign.mk |4 ++ svx/prj/build.lst |2 - sw/prj/build.lst|2 - tail_build/prj/build.lst|2 - 6 files changed, 37 insertions(+), 31 deletions(-) New commits: commit f8d30ec82d55f85a80ceda798a9e1a7ce0750035 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 6 14:29:18 2012 +0200 Attempt to disable database connectivity for iOS for now diff --git a/configure.in b/configure.in index 33facd8..f14d675 100644 --- a/configure.in +++ b/configure.in @@ -389,6 +389,11 @@ AC_ARG_ENABLE(ext-barcode, [Enable the Barcode extension.]) ) +AC_ARG_ENABLE(database-connectivity, +AS_HELP_STRING([--disable-database-connectivity], +[Disable various database connectivity.]) +) + AC_ARG_ENABLE(ext-diagram, AS_HELP_STRING([--enable-ext-diagram], [Enable the SmART Gallery (Diagram) extension.]) @@ -1996,6 +2001,22 @@ if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP fi +dnl Decide whether to build database connectivity stuff (including +dnl Base) or not. We probably don't want to on non-desktop OSes. + +if test -z $enable_database_connectivity; then +# Do enable database connectivity for Android for now as otherwise +# we presumably will get linking errors... We are not as far in +# the work for iOS, so we might as well disable it for iOS already. +if test $_os != iOS; then +enable_database_connectivity=yes +fi +fi + +if test $enable_database_connectivity = yes; then +BUILD_TYPE=$BUILD_TYPE DBCONNECTIVITY +fi + dnl === dnl Extra check for Windows. Cygwin builds need gcc to build dmake dnl although MSVC is used to build other build-time tools and @@ -6737,6 +6758,8 @@ if test $with_system_odbc = yes; then AC_CHECK_HEADER(sqlext.h, [], [AC_MSG_ERROR(odbc not found. install odbc)], []) +elif test $enable_database_connectivity != yes; then +AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_ODBC_HEADERS=NO diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index b7788c1..88760ae 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Module_Module,dbaccess)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,dbaccess,\ AllLangResTarget_dba \ AllLangResTarget_dbmm \ @@ -48,4 +50,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_unoapi \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index e72e430..854a822 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,reportdesign)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,reportdesign,\ AllLangResTarget_rpt \ AllLangResTarget_rptui \ @@ -42,4 +44,6 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 6bdebb6..915bcc5 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,2 +1,2 @@ -sx svx : sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL +sx svx : sfx2 TRANSLATIONS:translations oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL sx svx\prj nmake - all sx_prj NULL diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 42986b8..0ff450f 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw :filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL +sw sw :filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ea551d5..5861359 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/ui/dialog/wordcountdialog.src |2 ++
sw/source/ui/dialog/wordcountwrapper.cxx |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5f261a0db51621fbab37cc0f991bc8c9106dda01
Author: Andras Timar ati...@suse.com
Date: Mon Feb 6 16:02:43 2012 +0100
fdo#45045 fox context sensitive help for Word Count dialog
diff --git a/sw/source/ui/dialog/wordcountdialog.src
b/sw/source/ui/dialog/wordcountdialog.src
index 7c4a5f9..1b8b1a1 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -131,11 +131,13 @@ ModelessDialog DLG_WORDCOUNT
};
HelpButton PB_HELP
{
+HelpID = HID_DLG_WORDCOUNT ;
Pos = MAP_APPFONT ( 5 , 114 ) ;
Size = MAP_APPFONT ( 50 , 15 ) ;
};
OKButtonPB_OK
{
+HelpID = HID_DLG_WORDCOUNT ;
Pos = MAP_APPFONT ( 115 , 114 ) ;
Size = MAP_APPFONT ( 50 , 15 ) ;
DefButton = TRUE ;
commit 3db0da5c0bc11c989460aeb7a21ba973a76f3e29
Author: Andras Timar ati...@suse.com
Date: Mon Feb 6 15:51:30 2012 +0100
typo
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx
b/sw/source/ui/dialog/wordcountwrapper.cxx
index 9052448..63f262d 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -42,7 +42,7 @@ SwWordCountWrapper::SwWordCountWrapper( Window
*pParentWindow,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, SwAbstractDialogFactory fail!);
pAbstDlg = pFact-CreateSwWordCountDialog( DLG_WORDCOUNT, pBindings, this,
pParentWindow, pInfo );
-OSL_ENSURE(pAbstDlg, Dialog contruction faiedl!);
+OSL_ENSURE(pAbstDlg, Dialog contruction failed!);
pWindow = pAbstDlg-GetWindow();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfsdrexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8411534883e960a8404d24937f813eb20accecdd
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 16:09:49 2012 +0100
RtfSdrExport::StartShape: replace 75
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index f0c8d68..8d9644c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -464,7 +464,7 @@ sal_Int32 RtfSdrExport::StartShape()
return -1;
m_aShapeProps.insert(std::pairOString,OString(OString(shapeType),
OString::valueOf(sal_Int32(m_nShapeType;
-if (m_nShapeType == 75)
+if (ESCHER_ShpInst_PictureFrame == m_nShapeType)
impl_writeGraphic();
m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHP);
___
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 - sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 14 +-
sw/source/filter/ww8/rtfattributeoutput.hxx |5 +++
sw/source/filter/ww8/rtfsdrexport.cxx | 36
sw/source/filter/ww8/rtfsdrexport.hxx |3 ++
4 files changed, 51 insertions(+), 7 deletions(-)
New commits:
commit d2e2e3817376787f1804ee808bd37cc99815799a
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 16:09:49 2012 +0100
RtfSdrExport::StartShape: replace 75
(cherry picked from commit 8411534883e960a8404d24937f813eb20accecdd)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9ba99a4..e78d73c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -480,7 +480,7 @@ sal_Int32 RtfSdrExport::StartShape()
return -1;
m_aShapeProps.insert(std::pairOString,OString(OString(shapeType),
OString::valueOf(sal_Int32(m_nShapeType;
-if (m_nShapeType == 75)
+if (ESCHER_ShpInst_PictureFrame == m_nShapeType)
impl_writeGraphic();
m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHP);
commit ec0f75dffbdea7b508f1476fde90d1aeab6afde5
Author: Miklos Vajna vmik...@frugalware.org
Date: Sun Feb 5 00:24:08 2012 +0100
fdo#42656 fix RTF export of picture frame shape type
(cherry picked from commit 32fa7e9208b2053d2ff7743b88b0c0edacb8a7e7)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9ade064..b66f84f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3139,7 +3139,7 @@ static bool StripMetafileHeader(const sal_uInt8
*rpGraphicAry, unsigned long r
return false;
}
-static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, sal_uInt32
nLimit = 64)
+OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize,
sal_uInt32 nLimit)
{
OStringBuffer aRet;
@@ -3160,17 +3160,17 @@ static OString WriteHex(const sal_uInt8* pData,
sal_uInt32 nSize, sal_uInt32 nLi
return aRet.makeStringAndClear();
}
-static OString WriteHex(sal_Int32 nNum)
+OString RtfAttributeOutput::WriteHex(sal_Int32 nNum)
{
-return WriteHex((sal_uInt8*)nNum, sizeof(sal_Int32));
+return RtfAttributeOutput::WriteHex((sal_uInt8*)nNum, sizeof(sal_Int32));
}
-static OString WriteHex(OString sString)
+OString RtfAttributeOutput::WriteHex(OString sString)
{
OStringBuffer aRet;
aRet.append(WriteHex(sString.getLength()+1));
-aRet.append(WriteHex((sal_uInt8*)sString.getStr(), sString.getLength()+1));
+aRet.append(RtfAttributeOutput::WriteHex((sal_uInt8*)sString.getStr(),
sString.getLength()+1));
return aRet.makeStringAndClear();
}
@@ -3253,7 +3253,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt,
const Size rOrig, con
StripMetafileHeader(pGraphicAry, nSize);
}
aRet.append(RtfExport::sNewLine);
-aRet.append(WriteHex(pGraphicAry, nSize));
+aRet.append(RtfAttributeOutput::WriteHex(pGraphicAry, nSize));
aRet.append('}');
}
return aRet.makeStringAndClear();
@@ -3286,7 +3286,7 @@ void RtfAttributeOutput::FlyFrameOLEData( SwOLENode
rOLENode )
const sal_uInt8* pNativeData = (sal_uInt8*)pStream-GetData();
m_aRunText.append(WriteHex(nNativeDataSize));
m_aRunText.append(RtfExport::sNewLine);
-m_aRunText.append(WriteHex(pNativeData, nNativeDataSize, 126));
+m_aRunText.append(RtfAttributeOutput::WriteHex(pNativeData,
nNativeDataSize, 126));
m_aRunText.append(RtfExport::sNewLine);
delete pStream;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index c96de2c..8766c5a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -561,6 +561,11 @@ public:
/// Font pitch.
void FontPitchType( FontPitch ePitch ) const;
+
+/// Writes binary data as a hex dump.
+static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize,
sal_uInt32 nLimit = 64);
+static rtl::OString WriteHex(sal_Int32 nNum);
+static rtl::OString WriteHex(rtl::OString sString);
};
#endif // _RTFATTRIBUTEOUTPUT_HXX_
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index badda4e..9ba99a4 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -29,10 +29,13 @@
#include rtfsdrexport.hxx
#include rtfattributeoutput.hxx
+#include rtfexportfilter.hxx
#include svtools/rtfkeywd.hxx
#include editeng/editobj.hxx
#include svx/svdotext.hxx
+#include svx/unoapi.hxx
+#include vcl/cvtgrf.hxx
using rtl::OString;
using rtl::OStringBuffer;
@@ -438,6 +441,37 @@ void
[Libreoffice-commits] .: basegfx/source
basegfx/source/tools/zoomtools.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4db617efd924ad7ff4ce6988771ad36612c329ec
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Feb 6 16:12:40 2012 +0100
Change the zoom factor to 2^(1/6), hopefully it fits all :-)
diff --git a/basegfx/source/tools/zoomtools.cxx
b/basegfx/source/tools/zoomtools.cxx
index c6c8044..89ea0cc 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -33,12 +33,12 @@ namespace basegfx
namespace zoomtools
{
-/** 2^(1/4) as the default step
+/** 2^(1/6) as the default step
-This ensures (unless the rounding is used) that 4 steps lead
+This ensures (unless the rounding is used) that 6 steps lead
to double / half zoom level.
*/
-const double ZOOM_FACTOR = 1.1892071150027210667175;
+const double ZOOM_FACTOR = 1.12246205;
/**
* Round a value against a specified multiple. Values below half
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - basctl/source basic/source sc/inc
basctl/source/basicide/iderdll.cxx |5 +
basic/source/runtime/basrdll.cxx | 10 +-
basic/source/runtime/step0.cxx |6 --
sc/inc/scdll.hxx |2 --
4 files changed, 6 insertions(+), 17 deletions(-)
New commits:
commit 905d1a4ebe2fd69b0935b630c79b4202bf56be08
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 6 23:38:38 2012 +0900
Removed duplicate macro
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 43a9c9f..e446ea6 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -66,8 +66,6 @@ public:
SfxFilterFlags nMust, SfxFilterFlags nDont
);
};
-#define SC_DLL() ( *(ScModule**) GetAppData(SHL_CALC) )
-
#endif
commit 254f372b01953ec5abda9c58b7e35a2ec4b1943d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 6 22:38:11 2012 +0900
Use defined utility BASIC_DLL()/BASIC_MOD()
diff --git a/basctl/source/basicide/iderdll.cxx
b/basctl/source/basicide/iderdll.cxx
index 10c4c83..c8da69e 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -125,7 +125,7 @@ namespace BasicIDEGlobals
}
IDEResId::IDEResId( sal_uInt16 nId ):
-ResId( nId, *(*(BasicIDEModule**)GetAppData(SHL_IDE))-GetResMgr() )
+ResId( nId, *(BASIC_MOD())-GetResMgr() )
{
}
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index e55910b..e792c03 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -38,13 +38,13 @@
#include sb.hrc
BasResId::BasResId( sal_uInt32 nId ) :
-ResId( nId, *((*(BasicDLL**)GetAppData(SHL_BASIC))-GetBasResMgr()) )
+ResId( nId, *(BASIC_DLL()-GetBasResMgr()) )
{
}
BasicDLL::BasicDLL()
{
- *(BasicDLL**)GetAppData(SHL_BASIC) = this;
+BASIC_DLL() = this;
::com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
bDebugMode = sal_False;
@@ -58,7 +58,7 @@ BasicDLL::~BasicDLL()
void BasicDLL::EnableBreak( sal_Bool bEnable )
{
-BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
+BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, BasicDLL::EnableBreak: Noch keine Instanz! );
if ( pThis )
pThis-bBreakEnabled = bEnable;
@@ -66,7 +66,7 @@ void BasicDLL::EnableBreak( sal_Bool bEnable )
void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
{
-BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
+BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, BasicDLL::EnableBreak: Noch keine Instanz! );
if ( pThis )
pThis-bDebugMode = bDebugMode;
@@ -79,7 +79,7 @@ void BasicDLL::BasicBreak()
// but the Basic doesn't stop early enough, the box might appear more
often...
static sal_Bool bJustStopping = sal_False;
-BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
+BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, BasicDLL::EnableBreak: Noch keine Instanz! );
if ( pThis )
{
commit baf5ffc7c0c8ed7b1bd8f001a91e53eace9e0334
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 6 22:28:42 2012 +0900
Removed dead code
diff --git a/basctl/source/basicide/iderdll.cxx
b/basctl/source/basicide/iderdll.cxx
index 1cf25c4..10c4c83 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -132,9 +132,6 @@ IDEResId::IDEResId( sal_uInt16 nId ):
BasicIDEDLL::~BasicIDEDLL()
{
delete m_pExtraData;
-#if 0
-*(BasicIDEDLL**)GetAppData(SHL_IDE) = NULL;
-#endif
}
BasicIDEDLL::BasicIDEDLL()
commit 64c498ff1719e5c236e803b69af8ae68bdba459a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 6 22:08:24 2012 +0900
Removed unused variables
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index b5591fd..69c748b 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -1154,13 +1154,7 @@ void SbiRuntime::StepINPUT()
else if( err )
{
if( pRestart !pIosys-GetChannel() )
-{
-BasResId aId( IDS_SBERR_START + 4 );
-String aMsg( aId );
-
-
pCode = pRestart;
-}
else
Error( err );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6656ddb26186a9f84daa8b6e59d5b5010ca37af1
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Feb 6 16:37:44 2012 +0100
RTFSdrImport::resolve: replace 75 in the importer as well
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 6c7dd78..1df7bb3 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -34,6 +34,7 @@
#include com/sun/star/text/WritingMode.hpp
#include ooxml/resourceids.hxx // NS_ooxml namespace
+#include filter/msfilter/escherex.hxx
#include rtfsdrimport.hxx
@@ -274,7 +275,7 @@ void RTFSdrImport::resolve(RTFShape rShape)
OUStringToOString( i-second, RTL_TEXTENCODING_UTF8
).getStr() ');
}
-if (nType == 75) // picture frame
+if (nType == ESCHER_ShpInst_PictureFrame) // picture frame
{
if (bPib)
m_rImport.resolvePict(false);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/libpq-parallel-build.patch postgresql/makefile.mk
postgresql/libpq-parallel-build.patch | 11 +++ postgresql/makefile.mk|1 + 2 files changed, 12 insertions(+) New commits: commit 5b381e2adb00a384d34354e45052c73773843dfd Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 6 15:17:20 2012 +0100 fix postgresql massive-parallel build Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/postgresql/libpq-parallel-build.patch b/postgresql/libpq-parallel-build.patch new file mode 100644 index 000..237a483 --- /dev/null +++ b/postgresql/libpq-parallel-build.patch @@ -0,0 +1,11 @@ +diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile +--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2012-02-06 15:11:19.0 +0100 misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile 2012-02-06 15:02:51.0 +0100 +@@ -109,6 +109,7 @@ + libpq.rc: $(top_builddir)/src/Makefile.global + + fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h ++fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h + + $(top_builddir)/src/port/pg_config_paths.h: + $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 8b57a07..dda5242 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -39,6 +39,7 @@ TARGET=so_postgresql TARFILE_NAME=postgresql-9.1.1 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 PATCH_FILES=\ + libpq-parallel-build.patch \ $(TARFILE_NAME).patch .IF $(SYSTEM_POSTGRESQL) == YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/exiter.pm |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit db3aaa31c88a65e9b39bffeda43b624257ca97ce Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 17:54:13 2012 +0100 Print log file in case of error ...so that tinderbox output becomes useful. diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm index 016de1d..18b3b31 100644 --- a/solenv/bin/modules/installer/exiter.pm +++ b/solenv/bin/modules/installer/exiter.pm @@ -91,7 +91,11 @@ sub exit_program installer::files::save_file($installer::globals::logfilename ,\@installer::globals::globallogfileinfo); } installer::logger::print_error($message\nin function: $function); -installer::logger::print_error(Saved logfile: $installer::globals::logfilename\n); +print(ERROR, saved logfile $installer::globals::logfilename is:\n); +open(LOG, , $installer::globals::logfilename); +print : $_ while (LOG); +print \n; +close(LOG); # Saving the debug info ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx|2
l10ntools/source/export.cxx | 199 +---
2 files changed, 60 insertions(+), 141 deletions(-)
New commits:
commit e747a4e87e6abf581a5b0c381f706b581c2a0fbc
Author: Christina Rossmanith chrrossman...@web.de
Date: Sun Feb 5 15:03:30 2012 +0100
Reduced duplicate code (simian) / l10ntools
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d8e3c96..ba086b5 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -352,7 +352,7 @@ private:
sal_Bool PrepareTextToMerge(rtl::OString rText, sal_uInt16 nTyp,
rtl::OString rLangIndex, ResData *pResData);
-
+void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const
rtl::OString rTextType );
void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
void ConvertMergeContent( rtl::OString rText );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 204214f..b41ff8a 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1859,6 +1859,58 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString rText,
sal_uInt16 nTyp,
return sal_True;
}
+void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const
rtl::OString rTextType )
+{
+sal_Bool bAddSemicolon = sal_False;
+sal_Bool bFirst = sal_True;
+rtl::OString sCur;
+
+for( unsigned int n = 0; n aLanguages.size(); n++ ){
+sCur = aLanguages[ n ];
+
+rtl::OString sText;
+sal_Bool bText = pEntry-GetTransex3Text( sText, nType, sCur ,
sal_True );
+if ( bText !sText.isEmpty() sText != - ) {
+rtl::OString sOutput;
+if ( bNextMustBeDefineEOL) {
+if ( bFirst )
+sOutput += \t\\\n;
+else
+sOutput += ;\t\\\n;
+}
+bFirst=sal_False;
+sOutput += \t;
+
+sOutput += rTextType;
+
+if ( ! Export::isSourceLanguage( sCur ) ) {
+sOutput += [ ;
+sOutput += sCur;
+sOutput += ] ;
+}
+sOutput += = ;
+ConvertMergeContent( sText );
+sOutput += sText;
+
+if ( bDefine )
+sOutput += ;\\\n;
+else if ( !bNextMustBeDefineEOL )
+sOutput += ;\n;
+else
+bAddSemicolon = sal_True;
+for ( sal_uInt16 j = 1; j nLevel; j++ )
+sOutput += \t;
+WriteToMerged( sOutput , true );
+}
+}
+
+
+if ( bAddSemicolon ) {
+rtl::OString sOutput( ; );
+WriteToMerged( sOutput , false );
+}
+}
+
/*/
void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
/*/
@@ -1876,150 +1928,17 @@ void Export::MergeRest( ResData *pResData, sal_uInt16
nMode )
case MERGE_MODE_NORMAL : {
PFormEntrys *pEntry = pMergeDataFile-GetPFormEntrys( pResData );
-bool bWriteNoSlash = false;
-if ( pEntry pResData-bText ) {
-
-sal_Bool bAddSemikolon = sal_False;
-sal_Bool bFirst = sal_True;
-rtl::OString sCur;
-for( unsigned int n = 0; n aLanguages.size(); n++ ){
-sCur = aLanguages[ n ];
-
-rtl::OString sText;
-sal_Bool bText = pEntry-GetTransex3Text( sText,
STRING_TYP_TEXT, sCur , sal_True );
-if ( bText !sText.isEmpty() sText != - ) {
-rtl::OString sOutput;
-if ( bNextMustBeDefineEOL) {
-if ( bFirst )
-sOutput += \t\\\n;
-else
-sOutput += ;\t\\\n;
-}
-bFirst=sal_False;
-sOutput += \t;
-sOutput += pResData-sTextTyp;
-if ( ! Export::isSourceLanguage( sCur ) ) {
-sOutput += [ ;
-sOutput += sCur;
-sOutput += ] ;
-}
-sOutput += = ;
-ConvertMergeContent( sText );
-sOutput += sText;
+if ( pEntry ) {
+if ( pResData-bText )
+ResData2Output( pEntry, STRING_TYP_TEXT,
pResData-sTextTyp );
-if ( bDefine bWriteNoSlash )
-sOutput += ;\n;
+if ( pResData-bQuickHelpText )
+ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT,
rtl::OString(QuickHelpText) );
-if ( bDefine
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7bca5b92d45288b380c4f1ebc11a7e5de923fd9a Author: David Tardon dtar...@redhat.com Date: Mon Feb 6 19:01:45 2012 +0100 fix typo diff --git a/configure.in b/configure.in index f14d675..7102f10 100644 --- a/configure.in +++ b/configure.in @@ -3088,7 +3088,7 @@ WORKDIR=$SRC_ROOT/workdir/$INPATH AC_SUBST(COM) AC_SUBST(CPU) AC_SUBST(CPUNAME) -AC_SUBST(EMP_FLAGS) +AC_SUBST(EPM_FLAGS) AC_SUBST(GUI) AC_SUBST(GUIBASE) AC_SUBST(INPATH) ___ 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/appoptio.hxx |8 +++
sc/inc/docoptio.hxx |9
sc/inc/sc.hrc |2
sc/source/core/tool/appoptio.cxx| 68 ++--
sc/source/core/tool/docoptio.cxx| 63 -
sc/source/ui/app/scmod.cxx | 25 +--
sc/source/ui/inc/tpcompatibility.hxx|5 --
sc/source/ui/optdlg/tpcompatibility.cxx | 65 +-
8 files changed, 125 insertions(+), 120 deletions(-)
New commits:
commit 28ff7a37e66c8746a0b176b4ea25e20c1cd135c5
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Fri Feb 3 11:15:31 2012 +0100
Moved ScTpCompat from docoptions to appoptions
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 84fbc86..fac4061 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -33,6 +33,7 @@
#include svx/zoomitem.hxx
#include unotools/configitem.hxx
#include scdllapi.h
+#include scmod.hxx
#include global.hxx
#include optutil.hxx
@@ -87,6 +88,8 @@ public:
voidSetShowSharedDocumentWarning( sal_Bool bNew ) {
mbShowSharedDocumentWarning = bNew; }
sal_BoolGetShowSharedDocumentWarning() const{ return
mbShowSharedDocumentWarning; }
+ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return
meKeyBindingType; }
+voidSetKeyBindingType( ScOptionsUtil::KeyBindingType e ) {
meKeyBindingType = e; }
const ScAppOptions operator= ( const ScAppOptions rOpt );
@@ -110,6 +113,7 @@ private:
sal_Int32 nDefaultObjectSizeWidth;
sal_Int32 nDefaultObjectSizeHeight;
sal_BoolmbShowSharedDocumentWarning;
+ScOptionsUtil::KeyBindingType meKeyBindingType;
};
@@ -128,6 +132,7 @@ class ScAppCfg : public ScAppOptions
ScLinkConfigItemaContentItem;
ScLinkConfigItemaSortListItem;
ScLinkConfigItemaMiscItem;
+ScLinkConfigItemaCompatItem;
DECL_LINK( LayoutCommitHdl, void* );
DECL_LINK( InputCommitHdl, void* );
@@ -135,6 +140,7 @@ class ScAppCfg : public ScAppOptions
DECL_LINK( ContentCommitHdl, void* );
DECL_LINK( SortListCommitHdl, void* );
DECL_LINK( MiscCommitHdl, void* );
+DECL_LINK( CompatCommitHdl, void* );
com::sun::star::uno::Sequencertl::OUString GetLayoutPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetInputPropertyNames();
@@ -142,6 +148,7 @@ class ScAppCfg : public ScAppOptions
com::sun::star::uno::Sequencertl::OUString GetContentPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetSortListPropertyNames();
com::sun::star::uno::Sequencertl::OUString GetMiscPropertyNames();
+com::sun::star::uno::Sequencertl::OUString GetCompatPropertyNames();
public:
ScAppCfg();
@@ -150,7 +157,6 @@ public:
voidOptionsChanged(); // after direct access to ScAppOptions base
class
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index a960ec0..de44cf0 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -45,7 +45,6 @@ class SC_DLLPUBLIC ScDocOptions
SCTAB nInitTabCount;// number of Tabs for new Spreadsheet doc
::rtl::OUString aInitTabPrefix; // The Tab prefix name in new
Spreadsheet doc
sal_uInt16 nPrecStandardFormat; // precision for standard format
-ScOptionsUtil::KeyBindingType eKeyBindingType;
sal_uInt16 nDay;// Null date:
sal_uInt16 nMonth;
sal_uInt16 nYear;
@@ -105,9 +104,6 @@ public:
sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; }
voidSetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; }
-ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return
eKeyBindingType; }
-voidSetKeyBindingType( ScOptionsUtil::KeyBindingType e ) {
eKeyBindingType = e; }
-
sal_BoolIsCalcAsShown() const { return bCalcAsShown; }
voidSetCalcAsShown( sal_Bool bVal ) { bCalcAsShown = bVal; }
@@ -145,7 +141,6 @@ inline const ScDocOptions ScDocOptions::operator=( const
ScDocOptions rCpy )
aInitTabPrefix = rCpy.aInitTabPrefix;
fIterEps= rCpy.fIterEps;
nPrecStandardFormat = rCpy.nPrecStandardFormat;
-eKeyBindingType = rCpy.eKeyBindingType;
nDay= rCpy.nDay;
nMonth = rCpy.nMonth;
nYear = rCpy.nYear;
@@ -175,7 +170,6 @@ inline bool ScDocOptions::operator==( const ScDocOptions
rOpt ) const
rOpt.aInitTabPrefix == aInitTabPrefix
rOpt.fIterEps == fIterEps
rOpt.nPrecStandardFormat== nPrecStandardFormat
- rOpt.eKeyBindingType== eKeyBindingType
rOpt.nDay == nDay
rOpt.nMonth == nMonth
[Libreoffice-commits] .: sc/source svl/inc svl/source
sc/source/ui/app/scmod.cxx| 42 +++---
sc/source/ui/docshell/docsh4.cxx | 19 ++-
sc/source/ui/drawfunc/fuins2.cxx |9 +--
sc/source/ui/pagedlg/scuitphfedit.cxx | 13 ++
sc/source/ui/view/cellsh1.cxx | 42 --
sc/source/ui/view/cellsh2.cxx |5
sc/source/ui/view/cellsh4.cxx | 14 +++
sc/source/ui/view/tabvwsh3.cxx|6 +---
sc/source/ui/view/tabvwshd.cxx|5
sc/source/ui/view/tabvwshf.cxx| 29 +--
svl/inc/svl/itemset.hxx |2 +
svl/source/items/itemset.cxx |5
12 files changed, 77 insertions(+), 114 deletions(-)
New commits:
commit e64c291c5fd1d3ff625dc118ad7e0460df03eb78
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 6 14:29:55 2012 -0500
I think it's time we had a real method for this...
This helps eliminate dozens of IS_AVAILABLE macros scattered across
Calc code. I'm sure we have other similar macros like this
elsewhere.
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index a011370..7072387 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -958,8 +958,6 @@ sal_uInt16 ScModule::GetOptDigitLanguage()
// und SID_AUTOSPELL_CHECK
//
-#define IS_AVAILABLE(w,item)
(SFX_ITEM_SET==rOptSet.GetItemState((w),sal_True,item))
-
void ScModule::ModifyOptions( const SfxItemSet rOptSet )
{
sal_uInt16 nOldSpellLang, nOldCjkLang, nOldCtlLang;
@@ -996,26 +994,26 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
// Linguistik nicht mehr
-if ( IS_AVAILABLE(SID_ATTR_METRIC,pItem) )
+if (rOptSet.HasItem(SID_ATTR_METRIC, pItem))
{
PutItem( *pItem );
pAppCfg-SetAppMetric( (FieldUnit)((const
SfxUInt16Item*)pItem)-GetValue() );
bSaveAppOptions = sal_True;
}
-if ( IS_AVAILABLE(SCITEM_USERLIST,pItem) )
+if (rOptSet.HasItem(SCITEM_USERLIST, pItem))
{
ScGlobal::SetUserList( ((const ScUserListItem*)pItem)-GetUserList() );
bSaveAppOptions = sal_True;
}
-if ( IS_AVAILABLE(SID_SC_OPT_SYNCZOOM,pItem) )
+if (rOptSet.HasItem(SID_SC_OPT_SYNCZOOM, pItem))
{
pAppCfg-SetSynchronizeZoom( static_castconst
SfxBoolItem*(pItem)-GetValue() );
bSaveAppOptions = sal_True;
}
-if ( IS_AVAILABLE(SID_SC_OPT_KEY_BINDING_COMPAT,pItem) )
+if (rOptSet.HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, pItem))
{
sal_uInt16 nVal = static_castconst SfxUInt16Item*(pItem)-GetValue();
ScOptionsUtil::KeyBindingType eOld = pAppCfg-GetKeyBindingType();
@@ -1032,7 +1030,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
// ViewOptions
//
-if ( IS_AVAILABLE(SID_SCVIEWOPTIONS,pItem) )
+if (rOptSet.HasItem(SID_SCVIEWOPTIONS, pItem))
{
const ScViewOptions rNewOpt = ((const
ScTpViewItem*)pItem)-GetViewOptions();
@@ -1064,7 +1062,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
// da GridOptions Member der ViewOptions ist!
//
-if ( IS_AVAILABLE(SID_ATTR_GRID_OPTIONS,pItem) )
+if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,pItem) )
{
ScGridOptions aNewGridOpt( (const SvxOptionsGrid)((const
SvxGridItem)*pItem) );
@@ -1098,7 +1096,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
// DocOptions
//
-if ( IS_AVAILABLE(SID_SCDOCOPTIONS,pItem) )
+if ( rOptSet.HasItem(SID_SCDOCOPTIONS,pItem) )
{
const ScDocOptions rNewOpt = ((const
ScTpCalcItem*)pItem)-GetDocOptions();
@@ -1126,7 +1124,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
}
// nach den eigentlichen DocOptions auch noch die TabDistance setzen
-if ( IS_AVAILABLE(SID_ATTR_DEFTABSTOP,pItem) )
+if ( rOptSet.HasItem(SID_ATTR_DEFTABSTOP,pItem) )
{
sal_uInt16 nTabDist = ((SfxUInt16Item*)pItem)-GetValue();
ScDocOptions aOpt(GetDocOptions());
@@ -1146,7 +1144,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
// AutoSpell nach den Doc-Options (weil Member)
-if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) ) // an
Doc-Options
+if ( rOptSet.HasItem(SID_AUTOSPELL_CHECK,pItem) ) // an
Doc-Options
{
sal_Bool bDoAutoSpell = ((const SfxBoolItem*)pItem)-GetValue();
@@ -1192,43 +1190,43 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet
)
// InputOptions
//
-if ( IS_AVAILABLE(SID_SC_INPUT_SELECTIONPOS,pItem) )
+if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,pItem) )
{
pInputCfg-SetMoveDir( ((const SfxUInt16Item*)pItem)-GetValue() );
[Libreoffice-commits] .: 5 commits - comphelper/inc sc/inc sc/source
comphelper/inc/comphelper/string.hxx |4
sc/inc/callform.hxx | 24 ++--
sc/source/core/data/globalx.cxx | 108 ++
sc/source/core/tool/callform.cxx | 171 +--
4 files changed, 151 insertions(+), 156 deletions(-)
New commits:
commit eb13dcf4bf1faa47c3edd5679c80c25afde50f5d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 6 17:04:51 2012 -0500
We don't need this macro; we can safely pass const char* as-is.
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 10fefe7..fb8b8fe 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -88,11 +88,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define ADVICE Advice
#define UNADVICEUnadvice
-#define LIBFUNCNAME( name ) \
-(String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( name ) ))
-
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
FuncData::FuncData(const rtl::OUString rIName) :
pModuleData (NULL),
aInternalName (rIName),
@@ -234,13 +229,13 @@ bool InitExternalFunc(const rtl::OUString rModuleName)
osl::Module* pLib = new osl::Module( aNP );
if (pLib-is())
{
-FARPROC fpGetCount =
(FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(GETFUNCTIONCOUNT));
-FARPROC fpGetData =
(FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(GETFUNCTIONDATA));
+FARPROC fpGetCount =
(FARPROC)pLib-getFunctionSymbol(GETFUNCTIONCOUNT);
+FARPROC fpGetData = (FARPROC)pLib-getFunctionSymbol(GETFUNCTIONDATA);
if ((fpGetCount != NULL) (fpGetData != NULL))
{
-FARPROC fpIsAsync =
(FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(ISASYNC));
-FARPROC fpAdvice =
(FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(ADVICE));
-FARPROC fpSetLanguage =
(FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(SETLANGUAGE));
+FARPROC fpIsAsync = (FARPROC)pLib-getFunctionSymbol(ISASYNC);
+FARPROC fpAdvice = (FARPROC)pLib-getFunctionSymbol(ADVICE);
+FARPROC fpSetLanguage =
(FARPROC)pLib-getFunctionSymbol(SETLANGUAGE);
if ( fpSetLanguage )
{
LanguageType eLanguage =
Application::GetSettings().GetUILanguage();
@@ -410,7 +405,7 @@ bool FuncData::Unadvice( double nHandle )
{
bool bRet = false;
osl::Module* pLib = pModuleData-GetInstance();
-FARPROC fProc = (FARPROC)pLib-getFunctionSymbol(LIBFUNCNAME(UNADVICE));
+FARPROC fProc = (FARPROC)pLib-getFunctionSymbol(UNADVICE);
if (fProc != NULL)
{
((::Unadvice)fProc)(nHandle);
@@ -432,7 +427,7 @@ bool FuncData::getParamDesc( ::rtl::OUString aName,
::rtl::OUString aDesc, sal
if ( nParam = nParamCount )
{
osl::Module* pLib = pModuleData-GetInstance();
-FARPROC fProc = (FARPROC) pLib-getFunctionSymbol(
LIBFUNCNAME(GETPARAMDESC) );
+FARPROC fProc = (FARPROC) pLib-getFunctionSymbol(GETPARAMDESC);
if ( fProc != NULL )
{
sal_Char pcName[256];
commit d0d9c819b9ce20e7b9a666449c3b5c7007ff7ac0
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 6 17:02:21 2012 -0500
ModuleCollection no longer a child of ScSortedCollection.
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 5fa4d87..10fefe7 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -39,6 +39,8 @@
#include global.hxx
#include adiasync.hxx
+#include boost/ptr_container/ptr_map.hpp
+
//
extern C {
@@ -154,74 +156,81 @@ bool FuncCollection::SearchFunc( const rtl::OUString
rName, sal_uInt16 rIndex
}
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class ModuleData : public ScDataObject
+class ModuleData
{
friend class ModuleCollection;
rtl::OUString aName;
osl::Module* pInstance;
public:
-ModuleData(const String rStr, osl::Module* pInst) : aName (rStr),
pInstance (pInst) {}
-ModuleData(const ModuleData rData) : ScDataObject(), aName (rData.aName)
{pInstance = new osl::Module(aName);}
+ModuleData(const rtl::OUString rStr, osl::Module* pInst) : aName(rStr),
pInstance(pInst) {}
+ModuleData(const ModuleData rData) : aName(rData.aName) {pInstance = new
osl::Module(aName);}
~ModuleData() { delete pInstance; }
-virtual ScDataObject* Clone() const { return new ModuleData(*this); }
const rtl::OUString GetName() const { return aName; }
osl::Module*GetInstance() const { return pInstance; }
voidFreeInstance() { delete pInstance; pInstance = 0; }
+
+struct less : public ::std::binary_functionModuleData, ModuleData, bool
+{
+bool operator() (const ModuleData left, const ModuleData right) const
+{
+return
[Libreoffice-commits] .: sc/source
sc/source/core/tool/callform.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit bc95b9901c42254a0b44be2d9adb5d10aeba9aac
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 6 17:07:07 2012 -0500
Actually I didn't need this.
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index fb8b8fe..3c9d5f0 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -164,14 +164,6 @@ public:
const rtl::OUString GetName() const { return aName; }
osl::Module*GetInstance() const { return pInstance; }
voidFreeInstance() { delete pInstance; pInstance = 0; }
-
-struct less : public ::std::binary_functionModuleData, ModuleData, bool
-{
-bool operator() (const ModuleData left, const ModuleData right) const
-{
-return
ScGlobal::GetpTransliteration()-compareString(left.GetName(), right.GetName())
0;
-}
-};
};
namespace {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 8 commits - solenv/gdb sot/inc sot/source sw/source tools/inc tools/source ucb/source unusedcode.easy
solenv/gdb/libreoffice/sw.py |2 -
sot/inc/sot/filelist.hxx |4 ---
sot/source/base/filelist.cxx | 11 -
sw/source/core/undo/undobj.cxx | 39 +--
tools/inc/tools/fsys.hxx |1
tools/source/fsys/fstat.cxx | 20 -
tools/source/fsys/unx.cxx| 37 -
ucb/source/ucp/gvfs/gvfs_content.hxx |2 -
unusedcode.easy |4 ---
9 files changed, 21 insertions(+), 99 deletions(-)
New commits:
commit ed3a7c0774220894b4b48b4f9cc29a73e472cd06
Author: Greg Kroah-Hartman gre...@linuxfoundation.org
Date: Mon Feb 6 14:05:41 2012 -0800
tools: fsys: Delete unused FileStat::FileStat()
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 3ec1799..b1fcc1e 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -177,7 +177,6 @@ protected:
FileStat( SAL_UNUSED_PARAMETER const void *pInfo ); //
CInfoPBRec
public:
-FileStat();
FileStat( const DirEntry rDirEntry,
FSysAccess nAccess = FSYS_ACCESS_FLOPPY );
sal_BoolUpdate( const DirEntry rDirEntry,
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index 3752aad..c3e6822 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -43,26 +43,6 @@
|*
*/
-FileStat::FileStat()
-: // don't use Default-Ctors!
-aDateCreated( sal_uIntPtr(0) ),
-aTimeCreated( sal_uIntPtr(0) ),
-aDateModified( sal_uIntPtr(0) ),
-aTimeModified( sal_uIntPtr(0) ),
-aDateAccessed( sal_uIntPtr(0) ),
-aTimeAccessed( sal_uIntPtr(0) )
-{
-nSize = 0;
-nKindFlags = FSYS_KIND_UNKNOWN;
-nError = FSYS_ERR_OK;
-}
-
-/*
-|*
-|*FileStat::FileStat()
-|*
-*/
-
FileStat::FileStat( const DirEntry rDirEntry, FSysAccess nAccess )
: // don't use Default-Ctors!
aDateCreated( sal_uIntPtr(0) ),
diff --git a/unusedcode.easy b/unusedcode.easy
index 8f55ded..33aca1d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -23,7 +23,6 @@ EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
-FileStat::FileStat()
FileStream::FileStream(rtl::OString const, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const, unsigned short)
commit ff764e4eb7d8bc02f240314792ad195ac4118f33
Author: Greg Kroah-Hartman gre...@linuxfoundation.org
Date: Mon Feb 6 14:05:40 2012 -0800
tools: fsys: Delete unused FileStat::FileStat(const void *)
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index f8be021..007dc81 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -331,22 +331,6 @@ sal_uInt16 DirReader_Impl::Read()
/*
|*
-|*FileStat::FileStat()
-|*
-*/
-
-FileStat::FileStat( const void * ):
-aDateCreated(0),
-aTimeCreated(0),
-aDateModified(0),
-aTimeModified(0),
-aDateAccessed(0),
-aTimeAccessed(0)
-{
-}
-
-/*
-|*
|*FileStat::Update()
|*
*/
diff --git a/unusedcode.easy b/unusedcode.easy
index 99538e1..8f55ded 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -24,7 +24,6 @@ EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
FileStat::FileStat()
-FileStat::FileStat(void const*)
FileStream::FileStream(rtl::OString const, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const, unsigned short)
commit 8d31e2fe628b725e34427789a6afdd6509a0c3f4
Author: Greg Kroah-Hartman gre...@linuxfoundation.org
Date: Mon Feb 6 14:05:39 2012 -0800
sot: Delete FileList::GetFormat as it is no longer used
diff --git a/sot/inc/sot/filelist.hxx b/sot/inc/sot/filelist.hxx
index 0ba367f..8f18328 100644
--- a/sot/inc/sot/filelist.hxx
+++ b/sot/inc/sot/filelist.hxx
@@ -62,10 +62,6 @@ public:
SOT_DLLPUBLIC friend SvStream operator( SvStream rOStm, const
FileList rFileList );
SOT_DLLPUBLIC friend SvStream operator( SvStream rIStm, FileList
rFileList );
-// Clipboard, DD usw.
-static sal_uLongGetFormat();
-
-
// Liste fuellen/abfragen
void AppendFile( const String rStr );
String GetFile( size_t i ) const;
diff --git
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/autoform.hxx | 62 +-
sc/source/core/tool/autoform.cxx | 41 +-
sc/source/ui/inc/scuiautofmt.hxx |2 -
sc/source/ui/miscdlgs/scuiautofmt.cxx | 14 ++-
sc/source/ui/unoobj/afmtuno.cxx | 19 +++---
sc/source/ui/unoobj/cellsuno.cxx |5 --
6 files changed, 63 insertions(+), 80 deletions(-)
New commits:
commit 9abbf7c181467e665e4b8da3561a31086b65ed08
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 6 21:50:40 2012 -0500
The usual bool string conversion.
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index c65a6f4..5ab5ac1 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -200,17 +200,17 @@ public:
class SC_DLLPUBLIC ScAutoFormatData : public ScDataObject
{
private:
-String aName;
-sal_uInt16 nStrResId;
+rtl::OUString aName;
+sal_uInt16 nStrResId;
// common flags of Calc and Writer
-sal_BoolbIncludeFont : 1;
-sal_BoolbIncludeJustify : 1;
-sal_BoolbIncludeFrame : 1;
-sal_BoolbIncludeBackground : 1;
+boolbIncludeFont : 1;
+boolbIncludeJustify : 1;
+boolbIncludeFrame : 1;
+boolbIncludeBackground : 1;
// Calc specific flags
-sal_BoolbIncludeValueFormat : 1;
-sal_BoolbIncludeWidthHeight : 1;
+boolbIncludeValueFormat : 1;
+boolbIncludeWidthHeight : 1;
ScAutoFormatDataField** ppDataField;
@@ -224,22 +224,22 @@ public:
virtual ScDataObject* Clone() const { return new ScAutoFormatData(
*this ); }
-voidSetName( const String rName ) { aName =
rName; nStrResId = USHRT_MAX; }
-voidGetName( String rName ) const { rName =
aName; }
+voidSetName( const rtl::OUString rName ) { aName
= rName; nStrResId = USHRT_MAX; }
+const rtl::OUString GetName() const { return aName; }
-sal_BoolGetIncludeValueFormat() const { return
bIncludeValueFormat; }
-sal_BoolGetIncludeFont() const { return
bIncludeFont; }
-sal_BoolGetIncludeJustify() const { return
bIncludeJustify; }
-sal_BoolGetIncludeFrame() const { return
bIncludeFrame; }
-sal_BoolGetIncludeBackground() const{ return
bIncludeBackground; }
-sal_BoolGetIncludeWidthHeight() const { return
bIncludeWidthHeight; }
+boolGetIncludeValueFormat() const { return
bIncludeValueFormat; }
+boolGetIncludeFont() const { return
bIncludeFont; }
+boolGetIncludeJustify() const { return
bIncludeJustify; }
+boolGetIncludeFrame() const { return
bIncludeFrame; }
+boolGetIncludeBackground() const{ return
bIncludeBackground; }
+boolGetIncludeWidthHeight() const { return
bIncludeWidthHeight; }
-voidSetIncludeValueFormat( sal_Bool bValueFormat ) {
bIncludeValueFormat = bValueFormat; }
-voidSetIncludeFont( sal_Bool bFont ){
bIncludeFont = bFont; }
-voidSetIncludeJustify( sal_Bool bJustify ) {
bIncludeJustify = bJustify; }
-voidSetIncludeFrame( sal_Bool bFrame ) {
bIncludeFrame = bFrame; }
-voidSetIncludeBackground( sal_Bool bBackground ){
bIncludeBackground = bBackground; }
-voidSetIncludeWidthHeight( sal_Bool bWidthHeight ) {
bIncludeWidthHeight = bWidthHeight; }
+voidSetIncludeValueFormat( bool bValueFormat ) {
bIncludeValueFormat = bValueFormat; }
+voidSetIncludeFont( bool bFont ){ bIncludeFont
= bFont; }
+voidSetIncludeJustify( bool bJustify ) {
bIncludeJustify = bJustify; }
+voidSetIncludeFrame( bool bFrame ) {
bIncludeFrame = bFrame; }
+voidSetIncludeBackground( bool bBackground ){
bIncludeBackground = bBackground; }
+voidSetIncludeWidthHeight( bool bWidthHeight ) {
bIncludeWidthHeight = bWidthHeight; }
const SfxPoolItem* GetItem( sal_uInt16 nIndex, sal_uInt16 nWhich
) const;
voidPutItem( sal_uInt16 nIndex, const SfxPoolItem
rItem );
@@ -247,13 +247,13 @@ public:
const ScNumFormatAbbrevGetNumFormat( sal_uInt16 nIndex ) const;
-sal_Bool
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/autoform.hxx | 56 -
sc/source/core/data/table4.cxx|6 -
sc/source/core/tool/autoform.cxx | 145 +++---
sc/source/ui/docshell/docfunc.cxx |8 -
sc/source/ui/inc/docfunc.hxx |4
sc/source/ui/inc/scuiautofmt.hxx |4
sc/source/ui/miscdlgs/scuiautofmt.cxx | 87 ++--
sc/source/ui/unoobj/afmtuno.cxx | 69
sc/source/ui/unoobj/cellsuno.cxx | 14 +--
sc/source/ui/view/cellsh3.cxx |4
10 files changed, 237 insertions(+), 160 deletions(-)
New commits:
commit 72c1b6141d590fb4479925ed8bc88b79357c2bfc
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Feb 7 00:50:36 2012 -0500
ScAutoFormat no longer a child of ScSortedCollection.
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 5ab5ac1..724d63f 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -69,6 +69,7 @@
#include global.hxx
#include zforauto.hxx
+#include boost/ptr_container/ptr_map.hpp
struct ScAfVersions;
@@ -197,7 +198,7 @@ public:
};
-class SC_DLLPUBLIC ScAutoFormatData : public ScDataObject
+class SC_DLLPUBLIC ScAutoFormatData
{
private:
rtl::OUString aName;
@@ -218,11 +219,9 @@ private:
SC_DLLPRIVATE const ScAutoFormatDataField GetField( sal_uInt16 nIndex )
const;
public:
-ScAutoFormatData();
-ScAutoFormatData( const ScAutoFormatData rData );
-virtual ~ScAutoFormatData();
-
-virtual ScDataObject* Clone() const { return new ScAutoFormatData(
*this ); }
+ScAutoFormatData();
+ScAutoFormatData( const ScAutoFormatData rData );
+~ScAutoFormatData();
voidSetName( const rtl::OUString rName ) { aName
= rName; nStrResId = USHRT_MAX; }
const rtl::OUString GetName() const { return aName; }
@@ -260,23 +259,40 @@ public:
#endif
};
-class SC_DLLPUBLIC ScAutoFormat : public ScSortedCollection
+class SC_DLLPUBLIC ScAutoFormat
{
-private:
-boolbSaveLater;
+typedef boost::ptr_maprtl::OUString, ScAutoFormatData MapType;
+MapType maData;
+bool mbSaveLater;
public:
-ScAutoFormat( sal_uInt16 nLim = 4, sal_uInt16
nDel = 4, sal_Bool bDup = false );
-ScAutoFormat( const ScAutoFormat AutoFormat );
-virtual ~ScAutoFormat();
-virtual ScDataObject* Clone() const { return
new ScAutoFormat( *this ); }
-ScAutoFormatData* operator[]( const
sal_uInt16 nIndex ) const {return (ScAutoFormatData*)At( nIndex );}
-virtual short Compare( ScDataObject* pKey1, ScDataObject*
pKey2 ) const;
-boolLoad();
-boolSave();
-sal_uInt16 FindIndexPerName( const rtl::OUString rName )
const;
-voidSetSaveLater( bool bSet );
-boolIsSaveLater() const { return
bSaveLater; }
+typedef MapType::const_iterator const_iterator;
+typedef MapType::iterator iterator;
+
+ScAutoFormat();
+ScAutoFormat(const ScAutoFormat r);
+~ScAutoFormat();
+bool Load();
+bool Save();
+
+void SetSaveLater( bool bSet );
+bool IsSaveLater() const { return mbSaveLater; }
+
+const ScAutoFormatData* findByIndex(size_t nIndex) const;
+ScAutoFormatData* findByIndex(size_t nIndex);
+const_iterator find(const ScAutoFormatData* pData) const;
+iterator find(const ScAutoFormatData* pData);
+const_iterator find(const rtl::OUString rName) const;
+iterator find(const rtl::OUString rName);
+
+bool insert(ScAutoFormatData* pNew);
+void erase(const iterator it);
+
+size_t size() const;
+const_iterator begin() const;
+const_iterator end() const;
+iterator begin();
+iterator end();
};
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index dac4111..7990d28 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1591,7 +1591,8 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2,
void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
SCROW nEndRow,
const ScPatternAttr rAttr, sal_uInt16
nFormatNo)
{
-ScAutoFormatData* pData = (*ScGlobal::GetOrCreateAutoFormat())[nFormatNo];
+ScAutoFormat rFormat = *ScGlobal::GetOrCreateAutoFormat();
+ScAutoFormatData* pData = rFormat.findByIndex(nFormatNo);
if (pData)
{
ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
@@ -1603,7 +1604,8 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCROW
{
if (ValidColRow(nStartCol, nStartRow) ValidColRow(nEndCol, nEndRow))
{
-ScAutoFormatData*
