[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewfun5.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit bd8be4eae82525434454cc3c7274f7a7a44158c0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 16 10:45:01 2012 +0100
don't paste content if user cancels html import, fdo#47393
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index fa305a5..2456402 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -323,9 +323,15 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
aOptions.SetDetectSpecialNumber(pDlg-IsDateConversionSet());
aObj.SetExtOptions(aOptions);
}
+else
+{
+// prevent error dialog for user cancel action
+bRet = true;
+}
}
+if(!bRet)
+bRet = aObj.ImportStream( *xStream, String(), nFormatId );
// mba: clipboard always must contain absolute URLs (could be
from alien source)
-bRet = aObj.ImportStream( *xStream, String(), nFormatId );
}
else if (nFormatId == FORMAT_STRING aDataHelper.GetString(
nFormatId, aStr ))
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - nss/makefile.mk nss/nss-asm-fix.patch nss/nss-clang_os_Linux_x86_64_s_comments.patch openssl/makefile.mk openssl/openssl-asm-fix.patch
nss/makefile.mk|4 nss/nss-asm-fix.patch | 56 + nss/nss-clang_os_Linux_x86_64_s_comments.patch | 149 + openssl/makefile.mk| 13 +- openssl/openssl-asm-fix.patch | 11 + 5 files changed, 225 insertions(+), 8 deletions(-) New commits: commit 8f29699cd1723bd8b8acc25033708f9777576d6d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 13:05:02 2012 +0100 asm fixes in openssl diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f29b567..226e86c 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -50,6 +50,7 @@ OPENSSL_NAME=openssl-0.9.8o TARFILE_NAME=$(OPENSSL_NAME) TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +PATCH_FILES=openssl-asm-fix.patch CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -83,7 +84,7 @@ OUT2INC += include/openssl/* UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID -PATCH_FILES=openssllnx.patch +PATCH_FILES+=openssllnx.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8o.map \ libssl_OOo_0_9_8o.map @@ -107,7 +108,7 @@ UNAME=$(shell uname) .ENDIF .IF $(OS) == SOLARIS -PATCH_FILES=opensslsol.patch +PATCH_FILES+=opensslsol.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8o.map \ libssl_OOo_0_9_8o.map @@ -129,7 +130,7 @@ UNAME=$(shell uname) .ENDIF .IF $(OS) == IOS -PATCH_FILES=opensslios.patch +PATCH_FILES+=opensslios.patch CONFIGURE_ACTION=Configure ios-armv7 CONFIGURE_FLAGS=no-shared no-idea .ENDIF @@ -137,7 +138,7 @@ UNAME=$(shell uname) .IF $(OS) == WNT .IF $(COM)==GCC -PATCH_FILES=opensslmingw.patch +PATCH_FILES+=opensslmingw.patch CONFIGURE_ACTION=$(PERL) Configure CONFIGURE_FLAGS=mingw shared INSTALL_ACTION=mv libcrypto.a libcrypto_static.a mv libcrypto.dll.a libcrypto.a mv libssl.a libssl_static.a mv libssl.dll.a libssl.a @@ -149,7 +150,7 @@ OUT2BIN = ssleay32.dll OUT2BIN += libeay32.dll .ELSE -PATCH_FILES=openssl.patch +PATCH_FILES+=openssl.patch .IF $(MAKETARGETS) == # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s # If WRAPCMD is set it is prepended before the compiler, don't touch that. diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch new file mode 100644 index 000..bb722be --- /dev/null +++ b/openssl/openssl-asm-fix.patch @@ -0,0 +1,11 @@ +--- misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +@@ -165,7 +165,7 @@ + asm ( \ + roll %1,%0\ + : =r(ret) \ +- : I(n), 0(a)\ ++ : I(n), 0((unsigned int)(a))\ + : cc);\ + ret; \ + }) commit cb3f52275b51546b579d7856b75dca4ecf791c6a Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 13:04:22 2012 +0100 asm fixes in nss diff --git a/nss/makefile.mk b/nss/makefile.mk index ea6f5e6..2bfa920 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -48,7 +48,7 @@ VER_PATCH=8 TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6 TARFILE_MD5=71474203939fafbe271e1263e61d083e TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch nss-string-concat.patch +PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch nss-clang_os_Linux_x86_64_s_comments.patch nss-string-concat.patch nss-asm-fix.patch .IF $(OS)==MACOSX PATCH_FILES+=nss_macosx.patch diff --git a/nss/nss-asm-fix.patch b/nss/nss-asm-fix.patch new file mode 100644 index 000..b45e179 --- /dev/null +++ b/nss/nss-asm-fix.patch @@ -0,0 +1,56 @@ +--- misc/build/nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mp_comba.c.sav 2012-03-16 12:30:23.255942001 +0100 misc/build/nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mp_comba.c 2012-03-16 12:29:01.730170001 +0100 +@@ -49,7 +49,7 @@ __asm__ ( + addq %%rax,%0 \n\t\ + adcq %%rdx,%1 \n\t\ + adcq $0,%2\n\t\ +- :=r(c0), =r(c1), =r(c2): 0(c0), 1(c1), 2(c2), g(i), g(j) :%rax,%rdx,%cc); ++ :=r(c0), =r(c1), =r(c2): 0(c0), 1(c1), 2(c2), g(i), g(j) :%rax,%rdx,cc); + + + +@@ -76,7 +76,7 @@ __asm__ ( + addq %%rax,%0 \n\t\ + adcq %%rdx,%1 \n\t\ + adcq $0,%2\n\t
[Libreoffice-commits] .: 4 commits - sc/inc sc/source
sc/inc/dpcache.hxx |2 -
sc/source/core/data/dpcache.cxx | 44 +++
sc/source/core/data/dpcachetable.cxx | 17 +++--
3 files changed, 9 insertions(+), 54 deletions(-)
New commits:
commit 357059019541c36e5eb0bc3c98d5ed2f12d41371
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Mar 16 09:35:40 2012 -0400
Prevent out-of-bound array access.
Source range may not start from column 0.
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 70c..3e5b433 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -370,7 +370,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange rRange)
for (sal_uInt16 nCol = nStartCol; nCol = nEndCol; ++nCol)
{
AddLabel(createLabelString(pDoc, nCol, nStartRow, nDocTab));
-Field rField = maFields[nCol];
+Field rField = maFields[nCol-nStartCol];
std::vectorBucket aBuckets;
aBuckets.reserve(nEndRow-nStartRow); // skip the topmost label cell.
commit b41cf4c6153e9c4f7f56d0441a649664ffd4c7c2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Mar 16 00:00:59 2012 -0400
We shouldn't skip empty columns, or else column index becomes out of sync.
diff --git a/sc/source/core/data/dpcachetable.cxx
b/sc/source/core/data/dpcachetable.cxx
index 4b7338f..dc7a63a 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -161,6 +161,7 @@ void ScDPCacheTable::fillTable(
// Data rows
for (SCCOL nCol = 0; nCol nColCount; ++nCol)
{
+maFieldEntries.push_back( vectorSCROW() );
SCROW nMemCount = getCache()-GetDimMemberCount( nCol );
if ( nMemCount )
{
@@ -188,7 +189,6 @@ void ScDPCacheTable::fillTable(
aAdded[nOrder] = nIndex;
}
-maFieldEntries.push_back( vectorSCROW() );
for ( SCROW nRow = 0; nRow nMemCount; nRow++ )
{
if ( aAdded[nRow] != -1 )
@@ -216,6 +216,7 @@ void ScDPCacheTable::fillTable()
// Data rows
for (SCCOL nCol = 0; nCol nColCount; ++nCol)
{
+maFieldEntries.push_back( vectorSCROW() );
SCROW nMemCount = getCache()-GetDimMemberCount( nCol );
if ( nMemCount )
{
@@ -234,7 +235,6 @@ void ScDPCacheTable::fillTable()
pAdded[nOrder] = nIndex;
}
-maFieldEntries.push_back( vectorSCROW() );
for ( SCROW nRow = 0; nRow nMemCount; nRow++ )
{
if ( pAdded[nRow] != -1 )
commit 9776cc1503690e4ccb0dd1d8d6cf6c35d5c8f01d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 15 23:40:12 2012 -0400
Check all this in one place i.e. in ValidQuery().
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 40ca039..70c 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -471,8 +471,12 @@ bool ScDPCache::InitFromDataBase (const
Referencesdbc::XRowSet xRowSet, const
bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam rParam) const
{
+if (!rParam.GetEntryCount())
+return true;
+
if (!rParam.GetEntry(0).bDoQuery)
return true;
+
bool bMatchWholeCell = mpDoc-GetDocOptions().IsMatchWholeCell();
SCSIZE nEntryCount = rParam.GetEntryCount();
diff --git a/sc/source/core/data/dpcachetable.cxx
b/sc/source/core/data/dpcachetable.cxx
index c32d079..4b7338f 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -64,15 +64,6 @@ using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::sheet::DataPilotFieldFilter;
-
-static sal_Bool lcl_HasQueryEntry( const ScQueryParam rParam )
-{
-return rParam.GetEntryCount() 0
-rParam.GetEntry(0).bDoQuery;
-}
-
-//
-
bool ScDPCacheTable::RowFlag::isActive() const
{
return mbShowByFilter mbShowByPage;
@@ -186,9 +177,9 @@ void ScDPCacheTable::fillTable(
maRowFlags.back().mbShowByFilter = false;
}
-if ( lcl_HasQueryEntry(rQuery)
-!getCache()-ValidQuery(nRow , rQuery) )
+if (!getCache()-ValidQuery(nRow, rQuery))
continue;
+
if ( bIgnoreEmptyRows getCache()-IsRowEmpty( nRow ) )
continue;
commit efdb67ca924dc0072c6984a68c9b97db260464b6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 15 23:32:34 2012 -0400
We don't ever compare equality of two caches.
That'd be super-expensive anyway.
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 1e26688..bd2fa5a 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -152,8 +152,6 @@ public:
const
[Libreoffice-commits] .: sw/source
sw/source/core/layout/dumpfilter.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1a6b52a1bfc184524fc63d4a9d0b51055bf9af23 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Mar 16 14:24:22 2012 +0100 add indentation to sw's layout dumper diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index b5ee4ee..75c2f0e 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -146,6 +146,7 @@ namespace sw writeCallback, closeCallback, ( void* ) xOut.get(), NULL ); xmlTextWriterPtr writer = xmlNewTextWriter( outBuffer ); +xmlTextWriterSetIndent(writer, 1); xmlTextWriterStartDocument( writer, NULL, NULL, NULL ); // TODO This doesn't export the whole XML file, whereas dumpAsXML() does it nicely ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source desktop/source embeddedobj/source extensions/source filter/source framework/source odk/examples offapi/com sfx2/Library_sfx.mk sfx2/source shell/source
cui/source/dialogs/SpellDialog.cxx|2
cui/source/dialogs/about.cxx |2
cui/source/options/optlingu.cxx |2
desktop/source/deployment/gui/dp_gui_dialog2.cxx |2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx |2
embeddedobj/source/msole/oleembed.cxx |2
extensions/source/update/check/updatecheck.cxx|2
filter/source/xsltdialog/xmlfiltertestdialog.cxx |2
framework/source/dispatch/mailtodispatcher.cxx|2
framework/source/dispatch/systemexec.cxx |2
framework/source/services/backingwindow.cxx |2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx |2
offapi/com/sun/star/system/SystemShellExecuteFlags.idl|6
offapi/com/sun/star/system/XSystemShellExecute.idl|6
sfx2/Library_sfx.mk |1
sfx2/source/appl/app.hrc |2
sfx2/source/appl/app.src |7
sfx2/source/appl/appopen.cxx | 195 +++---
sfx2/source/appl/appserv.cxx |4
sfx2/source/appl/openuriexternally.cxx| 101 +
sfx2/source/appl/sfxhelp.cxx |2
sfx2/source/inc/openuriexternally.hxx | 57 ++
sfx2/source/view/view.hrc |2
sfx2/source/view/view.src | 18
sfx2/source/view/viewsh.cxx | 27 -
shell/source/unix/exec/shellexec.cxx | 44 ++
shell/source/win32/SysShExec.cxx | 26 +
shell/source/win32/SysShExec.hxx |6
shell/source/win32/SysShentry.cxx | 13
svtools/source/contnr/templwin.cxx|2
svtools/source/misc/templatefoldercache.cxx | 11
sw/source/ui/docvw/extedit.cxx|2
sw/source/ui/lingu/olmenu.cxx |2
swext/mediawiki/src/com/sun/star/wiki/Helper.java |2
toolkit/source/awt/vclxwindows.cxx|2
uui/source/newerverwarn.cxx |2
36 files changed, 362 insertions(+), 202 deletions(-)
New commits:
commit 32a5ad89a505be22fb8ca0b990a8991a7de6453a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 16 14:57:51 2012 +0100
fdo#37593 Make sure needsUpdate compares canonicalized paths
...so that it does not erroneously always claim an update is needed, so that
SvtDocumentTemplateDialog::UpdateHdl_Impl does not always jump back to
OpenTemplateRoot() shortly after opening the dialog (and thus jumps away
from
the last remembered folder).
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index d7a5679..1486fb2 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -693,6 +693,17 @@ namespace svt
{
String sTemplatePath( aDirs.getToken(0, ';', nIndex) );
sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath );
+
+// Make sure excess .. path segments (from expanding bootstrap
+// variables in paths) are normalized in the same way they are
+// normalized for paths read from the .templdir.cache file (where
+// paths have gone through makeRelocatable URL on writing out and
+// then through makeAbsoluteURL when reading back in), as otherwise
+// equalStates() in needsUpdate() could erroneously consider
+// m_aCurrentState and m_aPreviousState as different:
+sTemplatePath = getOfficeInstDirs()-makeAbsoluteURL(
+getOfficeInstDirs()-makeRelocatableURL(sTemplatePath));
+
// create a new entry
m_aCurrentState.push_back( new TemplateContent( INetURLObject(
sTemplatePath ) ) );
TemplateFolderContent::iterator aCurrentRoot =
m_aCurrentState.end();
commit d4b67611c421ebe9b75284106fe389b434419961
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 16 11:16:14 2012 +0100
Introduced SystemShellExecuteFlags::URIS_ONLY
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 21ab29c..570e7eb 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2146,7 +2146,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink,
svt::FixedHyperlink*, pHyperlink )
uno::Reference com::sun::star::system::XSystemShellExecute
[Libreoffice-commits] .: libcdr/libcdr-0.0.4.patch libcdr/libcdr-0.0.5.patch libcdr/makefile.mk libcdr/prj ooo.lst.in
libcdr/libcdr-0.0.4.patch | 20 libcdr/libcdr-0.0.5.patch | 20 libcdr/makefile.mk|4 ++-- libcdr/prj/d.lst |1 + ooo.lst.in|2 +- 5 files changed, 24 insertions(+), 23 deletions(-) New commits: commit 06427dfad309bec7aad2c60ed7c21ae9c814b403 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 16 15:33:21 2012 +0100 Uploading libcdr-0.0.5 diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch deleted file mode 100644 index 9e9079d..000 --- a/libcdr/libcdr-0.0.4.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 -+++ misc/build/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 -@@ -54,17 +54,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/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch new file mode 100644 index 000..b622bd6 --- /dev/null +++ b/libcdr/libcdr-0.0.5.patch @@ -0,0 +1,20 @@ +--- misc/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 misc/build/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 +@@ -54,17 +54,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/libcdr/makefile.mk b/libcdr/makefile.mk index 30ffd2f..475fb2c 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -59,8 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF -TARFILE_NAME=libcdr-0.0.4 -TARFILE_MD5=b99553516040a6f9d5885db56e8ca79f +TARFILE_NAME=libcdr-0.0.5 +TARFILE_MD5=4def42cfe3527ed7c515bea8cc3f23b8 PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst index f74aa63..e3ec3bd 100644 --- a/libcdr/prj/d.lst +++ b/libcdr/prj/d.lst @@ -2,5 +2,6 @@ mkdir: %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\ ..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\ +..\%__SRC%\misc\build\libcdr*\src\lib\CMXDocument.h %_DEST%\inc\libcdr\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index a57cc20..5de0e5a 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -b99553516040a6f9d5885db56e8ca79f-libcdr-0.0.4.tar.bz2 +4def42cfe3527ed7c515bea8cc3f23b8-libcdr-0.0.5.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 18 ++---
sw/source/core/layout/paintfrm.cxx | 44
2 files changed, 42 insertions(+), 20 deletions(-)
New commits:
commit 804d0a896731629397c5328c13c04a45bc55f459
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 16 15:35:49 2012 +0100
fdo#42750: delay painting borders until after subsidiary lines
With commit 0f0896c26fb260d1bbf31d7a886df3f61837f0f2, borders are drawn
immediately, but then the subsidiary lines are drawn over the borders,
hiding 1 twip wide borders completely.
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index dac3e27..958e279 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -119,6 +119,7 @@
#include drawinglayer/primitive2d/textlayoutdevice.hxx
#include svx/sdr/contact/objectcontacttools.hxx
#include svx/unoapi.hxx
+#include comphelper/sequenceasvector.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -219,6 +220,22 @@ public:
inline void Ins( const SwRect rRect, const sal_uInt8 nSCol );
};
+class BorderLines
+{
+::comphelper::SequenceAsVector
+ ::drawinglayer::primitive2d::Primitive2DReference m_Lines;
+public:
+void AddBorderLine(
+::drawinglayer::primitive2d::Primitive2DReference const xLine)
+{
+m_Lines.push_back(xLine);
+}
+drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const
+{
+return m_Lines.getAsConstList();
+}
+};
+
//- End of classes for border lines --
static ViewShell *pGlobalShell = 0;
@@ -252,6 +269,7 @@ static double aEdgeScale = 0.5;
// be compared with pLines before the work in order to avoid help lines
// to hide borders.
// bTablines is sal_True during the Paint of a table.
+static BorderLines *g_pBorderLines = 0;
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and footnote
frames.
@@ -334,6 +352,7 @@ class SwSavePaintStatics
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2,
*pSFlyOnlyDraw;
+BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
@@ -359,6 +378,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
pSRetoucheFly ( pRetoucheFly ),
pSRetoucheFly2 ( pRetoucheFly2 ),
pSFlyOnlyDraw ( pFlyOnlyDraw ),
+pBLines ( g_pBorderLines),
pSLines ( pLines),
pSSubsLines ( pSubsLines),
pSSpecSubsLines ( pSpecSubsLines),
@@ -383,6 +403,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
aScaleX = aScaleY = 1.0;
aMinDistScale = 0.73;
aEdgeScale = 0.5;
+g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
pSpecSubsLines = 0L;
@@ -397,6 +418,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
pFlyOnlyDraw = pSFlyOnlyDraw;
+g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
pSpecSubsLines = pSSpecSubsLines;
@@ -2889,6 +2911,7 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
pSubsLines = new SwSubsRects;
pSpecSubsLines = new SwSubsRects;
}
+g_pBorderLines = new BorderLines;
aPaintRect._Intersection( aRect );
@@ -3002,6 +3025,9 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
DELETEZ( pSubsLines );
DELETEZ( pSpecSubsLines );
}
+// fdo#42750: delay painting these until after subsidiary lines
+ProcessPrimitives(g_pBorderLines-GetBorderLines());
+DELETEZ(g_pBorderLines);
pVout-Leave();
// #i68597#
@@ -4507,11 +4533,8 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
-// TODO Postpone the processing of the primitives
if ( lcl_GetLineWidth( pLeftRightBorder ) 0 )
{
-drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 );
-
double nExtentIS = lcl_GetExtent( pTopBorder, NULL );
double nExtentIE = lcl_GetExtent( pBottomBorder, NULL );
double nExtentOS = lcl_GetExtent( NULL, pTopBorder );
@@ -4533,21 +4556,22 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
Color aLeftColor = _bLeft ? pLeftRightBorder-GetColorOut( _bLeft ) :
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c6246139df005d6ac4627bc8f4665539effb6e94
Author: Noel Power noel.po...@novell.com
Date: Thu Mar 8 16:01:36 2012 +
fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832
(cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba)
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 11d2a1e..2cf856c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -368,7 +368,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if
$(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib)
msvcprtd.lib kernel32.lib) user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false;
fi) \
- $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then
mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+ $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ];
then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest
-outputresource:$(DLLTARGET)\;2; fi) \
+ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then
mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+ ; exit $$RC)
endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - chart2/source
chart2/source/view/main/VLegendSymbolFactory.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4ce99d42806e87378614207c8d5adf38d43c756c
Author: Katarina Machalkova bu...@bubli.org
Date: Mon Feb 20 22:20:12 2012 +0100
fdo#31551: Show actual line width in the legend
however, limit the line width from above by legend entry height
(which +- matches the font height)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx
b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 31b2cbc..79db3c1 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -44,7 +44,8 @@ namespace
void lcl_setPropetiesToShape(
const Reference beans::XPropertySet xProp,
const Reference drawing::XShape xShape,
-::chart::VLegendSymbolFactory::tPropertyType ePropertyType )
+::chart::VLegendSymbolFactory::tPropertyType ePropertyType,
+const awt::Size aMaxSymbolExtent = awt::Size(0,0))
{
const ::chart::tPropertyNameMap aFilledSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForFilledSeriesProperties());
const ::chart::tPropertyNameMap aLineSeriesNameMap(
::chart::PropertyMapper::getPropertyNameMapForLineSeriesProperties());
@@ -83,7 +84,8 @@ void lcl_setPropetiesToShape(
sal_Int32 nLineWidth = 0;
if( pLineWidthAny (*pLineWidthAny=nLineWidth) )
{
-const sal_Int32 nMaxLineWidthForLegend = 50;/*1/100 mm*///todo:
make this dependent from legend entry height
+// use legend entry height as upper limit for line width
+sal_Int32 nMaxLineWidthForLegend = aMaxSymbolExtent.Height;
if( nLineWidthnMaxLineWidthForLegend )
*pLineWidthAny = uno::makeAny( nMaxLineWidthForLegend );
}
@@ -134,7 +136,7 @@ Reference drawing::XShape
VLegendSymbolFactory::createSymbol(
xLine-setSize( awt::Size( rEntryKeyAspectRatio.Width, 0 ));
xLine-setPosition( awt::Point( 0,
rEntryKeyAspectRatio.Height/2 ));
-lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType );
+lcl_setPropetiesToShape( xLegendEntryProperties, xLine,
ePropertyType, rEntryKeyAspectRatio );
}
Reference drawing::XShape xSymbol;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 985da32129e1cacd3231cca2f60c5b3f4d9b0b2e Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 16 16:40:41 2012 +0100 Some include clean up diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx index 1f4ff4a..c6ed362 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx @@ -37,9 +37,7 @@ #include com/sun/star/frame/XDispatchResultListener.hpp #include com/sun/star/util/URL.hpp #include com/sun/star/util/XURLTransformer.hpp -#include com/sun/star/system/XSystemShellExecute.hpp #include com/sun/star/document/XTypeDetection.hpp -#include com/sun/star/system/SystemShellExecuteFlags.hpp #include com/sun/star/document/MacroExecMode.hpp #include com/sun/star/document/UpdateDocMode.hpp #include com/sun/star/task/XInteractionRequest.hpp @@ -99,7 +97,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::system; using namespace ::com::sun::star::task; using namespace ::cppu; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit eee16791673412f44435b6357248b34ef7613296 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Mar 16 12:41:43 2012 -0400 Better wording. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 5d71971..b7a2df2 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1904,9 +1904,9 @@ void Test::testPivotTableCache() aDimName = aCache.GetDimensionName(2); CPPUNIT_ASSERT_MESSAGE(wrong dimension name, aDimName.equalsAscii(F3)); -// In each dimension, member ID values also represent their order; -// dimension members are sorted in ascending order. And values come -// before strings. Also, no duplicate dimension members exist. +// In each dimension, member ID values also represent their sort order. +// Value items are sorted before string ones. Also, no duplicate +// dimension members should exist. // Dimension 0 - a mix of strings and values. long nMemCount = aCache.GetDimMemberCount(0); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 16ab673ccbed29d460aaca93cb09663fdd63dc19 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Mar 16 12:43:33 2012 -0400 More wording tweak. Members are sorted only in source dims (for now). diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index b7a2df2..5324601 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1904,9 +1904,10 @@ void Test::testPivotTableCache() aDimName = aCache.GetDimensionName(2); CPPUNIT_ASSERT_MESSAGE(wrong dimension name, aDimName.equalsAscii(F3)); -// In each dimension, member ID values also represent their sort order. -// Value items are sorted before string ones. Also, no duplicate -// dimension members should exist. +// In each dimension, member ID values also represent their sort order (in +// source dimensions only, not in group dimensions). Value items are +// sorted before string ones. Also, no duplicate dimension members should +// exist. // Dimension 0 - a mix of strings and values. long nMemCount = aCache.GetDimMemberCount(0); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fea5d3c26c61f83eca26cc14c435eeda34c68bc Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 17:16:40 2012 +0100 fix gcc bug 26905 detection with clang it uses GOT instead of PLT on i386 with -02 diff --git a/configure.in b/configure.in index 72b45b9..4fc314a 100644 --- a/configure.in +++ b/configure.in @@ -4532,7 +4532,7 @@ _ACEOF if test $_os = Darwin; then gccvisbroken=no else -if $EGREP -q '@PLT' visibility.s; then +if $EGREP -q '@PLT|@GOT' visibility.s; then gccvisbroken=no else gccvisbroken=yes ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/Library_sw.mk
sw/Library_sw.mk |1 - 1 file changed, 1 deletion(-) New commits: commit cac985081415a4840a9d04332ee778b6ba48e7aa Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 18:07:36 2012 +0100 sw doesn't need to link oox that commit should have been cleaned up before it went upstream diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 2b0bce3..4d5cdd6 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ i18nisolang1 \ i18nutil \ lng \ -oox \ sal \ salhelper \ sax \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit dc3ea99bd09fa0f38e0b6ff939badaa449fd39b4 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 20:11:04 2012 +0100 add autogen.lastrun.bak to .gitignore diff --git a/.gitignore b/.gitignore index 441e4bc..c1aef58 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ /aclocal.m4 /autom4te.cache /autogen.lastrun +/autogen.lastrun.bak /ChangeLog /config.guess /config.log ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/cell.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 14ed2c61066b38d812bb68c4c1f02f8cb7c97f4d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 15 22:22:10 2012 +0100
update the relatice refs after the absolute refs, fdo#47285
The algoithm for updating absolute refs needs to calculate the old
position based on the information before any updates to the RefData
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 9b431fa..4ed94b9 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -861,9 +861,6 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell rCell,
ScDocument rDoc, cons
{
pCode = rCell.pCode-Clone();
-if ( nCloneFlags SC_CLONECELL_ADJUST3DREL )
-pCode-ReadjustRelative3DReferences( rCell.aPos, aPos );
-
// evtl. Fehler zuruecksetzen und neu kompilieren
// nicht im Clipboard - da muss das Fehlerflag erhalten bleiben
// Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler
behalten
@@ -900,6 +897,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell rCell,
ScDocument rDoc, cons
pCode-AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos );
}
+if ( nCloneFlags SC_CLONECELL_ADJUST3DREL )
+pCode-ReadjustRelative3DReferences( rCell.aPos, aPos );
+
if( !bCompile )
{ // Name references with references and ColRowNames
pCode-Reset();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - dbaccess/source fpicker/Library_fps_kde4.mk fpicker/Module_fpicker.mk fpicker/Package_kde4_moc.mk fpicker/source vcl/unx
dbaccess/source/ui/misc/charsets.cxx |2 -
fpicker/Library_fps_kde4.mk |8 ---
fpicker/Module_fpicker.mk|1
fpicker/Package_kde4_moc.mk | 36 ---
fpicker/source/unx/kde4/Makefile | 35 --
vcl/unx/kde4/KDESalGraphics.cxx |2 -
6 files changed, 2 insertions(+), 82 deletions(-)
New commits:
commit 43a56ce0cbed9187658340d0d4fbfa76c2c83d1b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 16 20:57:07 2012 +0100
remove extraneous parentheses
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 0be12fb..80c38ec 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -306,7 +306,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType
type, ControlPart part,
draw( QStyle::CE_PushButton, option, m_image,
vclStateValue2StateFlag(nControlState, value) );
}
-else if ( (type == CTRL_MENUBAR))
+else if (type == CTRL_MENUBAR)
{
if (part == PART_MENU_ITEM)
{
commit cd131c6366a2ee70d15fc4d4794ddf62b8db646e
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 16 20:36:14 2012 +0100
kde4 fpicker doesn't use Q_OBJECT, no need for moc
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
index d806737..7c3e95f 100644
--- a/fpicker/Library_fps_kde4.mk
+++ b/fpicker/Library_fps_kde4.mk
@@ -27,10 +27,6 @@
$(eval $(call gb_Library_Library,fps_kde4))
-$(eval $(call gb_Library_add_package_headers,fps_kde4,\
- fpicker_kde4_moc \
-))
-
$(eval $(call
gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
$(eval $(call gb_Library_add_api,fps_kde4,\
@@ -61,10 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,fps_kde4,\
fpicker/source/unx/kde4/KDE4FPEntry \
))
-$(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
- CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
-))
-
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
-Wno-shadow \
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 0491e54..2faa777 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -62,7 +62,6 @@ endif
ifeq ($(ENABLE_KDE4),TRUE)
$(eval $(call gb_Module_add_targets,fpicker,\
Library_fps_kde4 \
- Package_kde4_moc \
))
endif
endif
diff --git a/fpicker/Package_kde4_moc.mk b/fpicker/Package_kde4_moc.mk
deleted file mode 100644
index 27ab13a..000
--- a/fpicker/Package_kde4_moc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the GPLv3+), or
-# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call
gb_Package_Package,fpicker_kde4_moc,$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4))
-
-$(eval $(call
gb_Package_add_customtarget,fpicker_kde4_moc,fpicker/source/unx/kde4))
-
-$(eval $(call gb_CustomTarget_add_dependencies,fpicker/source/unx/kde4,\
-fpicker/source/unx/kde4/KDE4FilePicker.hxx \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/fpicker/source/unx/kde4/Makefile b/fpicker/source/unx/kde4/Makefile
deleted file mode 100644
index cd0ad6e..000
--- a/fpicker/source/unx/kde4/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/Library_sw.mk
sw/Library_sw.mk |1 - 1 file changed, 1 deletion(-) New commits: commit a3ace305bcbd0bf04badddff8ef6273287f30556 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 18:07:36 2012 +0100 sw doesn't need to link oox that commit should have been cleaned up before it went upstream Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 40e70f3..9529470 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -63,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ i18nisolang1 \ i18nutil \ lng \ -oox \ sal \ salhelper \ sax \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/view/viewfun5.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 76f3a63432e70d017760a2087652a1abc9b126d3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 16 10:45:01 2012 +0100
don't paste content if user cancels html import, fdo#47393
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index eae1329..cdf373a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -322,9 +322,15 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
aOptions.SetDetectSpecialNumber(pDlg-IsDateConversionSet());
aObj.SetExtOptions(aOptions);
}
+else
+{
+// prevent error dialog for user cancel action
+bRet = true;
+}
}
+if(!bRet)
+bRet = aObj.ImportStream( *xStream, String(), nFormatId );
// mba: clipboard always must contain absolute URLs (could be
from alien source)
-bRet = aObj.ImportStream( *xStream, String(), nFormatId );
}
else if (nFormatId == FORMAT_STRING aDataHelper.GetString(
nFormatId, aStr ))
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/app/inputhdl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c39e96d984b5907f8e0c0247828c8e35f2e9ce72 Author: Noel Power noel.po...@novell.com Date: Thu Mar 15 20:10:12 2012 + fix to update inputbar when setting a range for a formula fdo#46809 Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 95d2b7f..e461b0b 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1719,7 +1719,7 @@ void ScInputHandler::UpdateActiveView() else pTableView = NULL; -if (pInputWin pInputWin-IsInputActive()) +if (pInputWin eMode == SC_INPUT_TOP ) pTopView = pInputWin-GetEditView(); else pTopView = NULL; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/update/check/updatecheck.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d943c6ba374481b1f9a6561b790b0b0410b78b0e Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 21:28:42 2012 +0100 logical || - binary | diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 54f9b4c..88f7234 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -160,7 +160,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString aFile) oslProcessError rc = osl_executeProcess_WithRedirectedIO( aUnpackPath.pData, // [in] Image name aSystemPath.pData, 1, // [in] Arguments -osl_Process_WAIT || osl_Process_NORMAL, // [in] Options +osl_Process_WAIT | osl_Process_NORMAL, // [in] Options NULL, // [in] Security NULL, // [in] Working directory NULL, 0,// [in] Environment variables ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/README
tubes/README | 37 + 1 file changed, 37 insertions(+) New commits: commit 6ae3da5cae73400d1ef7efe83274f35fd7b6c6c6 Author: Eike Rathke er...@redhat.com Date: Fri Mar 16 23:49:18 2012 +0100 ideas and todos diff --git a/tubes/README b/tubes/README index ca8764f..20cdcfa 100644 --- a/tubes/README +++ b/tubes/README @@ -1,5 +1,11 @@ Interface to Telepathy Tubes. +The idea is to provide 1-1 collaboration between contacts and many-many +collaboration via MUCs, using Telepathy DBus Tubes over Jabber/XMPP. + +First stab is at 1-1 contact channels, hopefully MUCs can be realized using +the same TeleConference abstraction. + To enable configure LibO with --enable-telepathy Status 2012-03-16: @@ -31,3 +37,34 @@ Status 2012-03-16: * unsure if the uniquify setup with tp_simple_handler_new_with_factory() would work at all, hence trying to have one instance un-uniquified, but to no avail + + +TODOs (once those basic problems are solved) + +* associate a document with a conference + * use SfxObjectShell as an abstraction and broadcast incoming changes? + * use UNO API? + * first setup just to get something working could share a document +accessible by all parties on a network share or some such +* may need one master responsible to save the document + * later document transfer will be needed, use Telepathy File Transfer +* dialog to pick own account +* dialog to pick contact or MUC to work with +* dialog to accept/reject collaboration requests + + +In applications, e.g. Calc: + +* stricter model,view,controller +* disable all actions we cannot process collaboratively +* separate input from view +* preprocess input to determine data type (text, number, date, ...) +* send typed/categorized data over wire before actually processing in model +* process serialized input as received +* Calc specific: + * use existing shared document feature with change-tracking enabled to +visualize changes +* may have the benefit of having already only a subset of trackable change + actions available + * let ScDocFunc handle also received changes +* have dialogs send their result item sets over the wire ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/Module_tubes.mk
tubes/Module_tubes.mk |4 1 file changed, 4 insertions(+) New commits: commit a238f0dc92484930b8c8b2dcb018ba52caf1d5f4 Author: Eike Rathke er...@redhat.com Date: Sat Mar 17 00:02:48 2012 +0100 disable entire module if without --enable-telepathy diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk index ce810e1..9ed4a48 100644 --- a/tubes/Module_tubes.mk +++ b/tubes/Module_tubes.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,tubes)) +ifeq ($(ENABLE_TELEPATHY),TRUE) + $(eval $(call gb_Module_add_targets,tubes,\ Library_tubes \ )) @@ -35,4 +37,6 @@ $(eval $(call gb_Module_add_check_targets,tubes,\ CppunitTest_tubes_test \ )) +endif + # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ ___ 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/dpcache.hxx |5 +++
sc/inc/dpitemdata.hxx | 10 +--
sc/source/core/data/dpcache.cxx| 28 --
sc/source/core/data/dpitemdata.cxx | 47 ++---
4 files changed, 72 insertions(+), 18 deletions(-)
New commits:
commit f81d15c3bab32938b5b475e16ae2a746a7a32ea9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Mar 16 21:44:55 2012 -0400
Use shared string pool to share string instances among string item values.
This brings down the reload time from 22 seconds to 4.3 seconds with
my test document. This is what I've been looking for!
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 839f64b..2591b3d 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -36,6 +36,7 @@
#include boost/noncopyable.hpp
#include boost/scoped_ptr.hpp
#include boost/ptr_container/ptr_vector.hpp
+#include boost/unordered_set.hpp
#include mdds/flat_segment_tree.hpp
#include vector
@@ -58,6 +59,8 @@ struct ScDPNumGroupInfo;
*/
class SC_DLLPUBLIC ScDPCache : boost::noncopyable
{
+typedef boost::unordered_setrtl::OUString, rtl::OUStringHash
StringSetType;
+
public:
typedef std::vectorScDPItemData ItemsType;
typedef std::setScDPObject* ObjectSetType;
@@ -112,6 +115,7 @@ private:
FieldsType maFields;
GroupFieldsType maGroupFields;
+mutable StringSetType maStringPool;
LabelsType maLabelNames;// Stores dimension names.
mdds::flat_segment_treeSCROW, bool maEmptyRows;
@@ -119,6 +123,7 @@ private:
bool mbDisposing;
public:
+const rtl::OUString* InternString(const rtl::OUString rStr) const;
void AddReference(ScDPObject* pObj) const;
void RemoveReference(ScDPObject* pObj) const;
const ObjectSetType GetAllReferences() const;
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index e30eae3..20535a8 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -49,7 +49,7 @@ class SC_DLLPUBLIC ScDPItemData
friend class ScDPCache;
public:
-enum Type { GroupValue = 0, RangeStart, Value, String, Error, Empty };
+enum Type { GroupValue = 0, RangeStart = 1, Value = 2, String = 3, Error =
4, Empty = 5 };
static const sal_Int32 DateFirst;
static const sal_Int32 DateLast;
@@ -63,12 +63,13 @@ public:
private:
union {
-rtl::OUString* mpString;
+const rtl::OUString* mpString;
GroupValueAttr maGroupValue;
double mfValue;
};
-Type meType;
+sal_uInt8 meType:3;
+bool mbStringInterned:1;
void DisposeString();
@@ -79,16 +80,19 @@ public:
ScDPItemData();
ScDPItemData(const ScDPItemData r);
ScDPItemData(const rtl::OUString rStr);
+ScDPItemData(const rtl::OUString* pStr);
ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue);
~ScDPItemData();
Type GetType() const;
void SetString(const rtl::OUString rS);
+void SetString(const rtl::OUString* pS);
void SetValue(double fVal);
void SetRangeStart(double fVal);
void SetRangeFirst();
void SetRangeLast();
void SetErrorString(const rtl::OUString rS);
+void SetErrorString(const rtl::OUString* pS);
bool IsCaseInsEqual(const ScDPItemData r) const;
// exact equality
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 216c2ff..369c5b3 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -138,7 +138,9 @@ rtl::OUString createLabelString(ScDocument* pDoc, SCCOL
nCol, SCROW nRow, SCTAB
return aDocStr;
}
-void initFromCell(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
ScDPItemData rData, sal_uLong rNumFormat)
+void initFromCell(
+ScDPCache rCache, ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+ScDPItemData rData, sal_uLong rNumFormat)
{
rtl::OUString aDocStr = pDoc-GetString(nCol, nRow, nTab);
rNumFormat = 0;
@@ -147,7 +149,7 @@ void initFromCell(ScDocument* pDoc, SCCOL nCol, SCROW nRow,
SCTAB nTab, ScDPItem
if (pDoc-GetErrCode(aPos))
{
-rData.SetErrorString(aDocStr);
+rData.SetErrorString(rCache.InternString(aDocStr));
}
else if (pDoc-HasValueData(nCol, nRow, nTab))
{
@@ -157,12 +159,12 @@ void initFromCell(ScDocument* pDoc, SCCOL nCol, SCROW
nRow, SCTAB nTab, ScDPItem
}
else if (pDoc-HasData(nCol, nRow, nTab))
{
-rData.SetString(aDocStr);
+rData.SetString(rCache.InternString(aDocStr));
}
}
void getItemValue(
-ScDPItemData rData, const Referencesdbc::XRow xRow, sal_Int32 nType,
+ScDPCache rCache, ScDPItemData rData, const Referencesdbc::XRow xRow,
sal_Int32 nType,
long nCol, const Date rNullDate, short rNumType)
{
rNumType = NUMBERFORMAT_NUMBER;
@@ -232,7 +234,7 @@ void getItemValue(
case sdbc::DataType::VARBINARY:
case sdbc::DataType::LONGVARBINARY:
default:
-
[Libreoffice-commits] .: sc/inc
sc/inc/dpitemdata.hxx |8
1 file changed, 8 insertions(+)
New commits:
commit 99b9c0bfccd73a97d99666986cc9e84a0e8f9aeb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Mar 16 23:34:31 2012 -0400
Added class description.
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 20535a8..b0f361b 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -44,6 +44,14 @@
class ScDocument;
+/**
+ * When assigning a string value, you can also assign an interned string
+ * whose life-cycle is managed by the pivot cache that it belongs to. Those
+ * methods that take a string pointer assume that the string is interned.
+ *
+ * pDo make sure that an item with an interned string won't persist after
+ * the pivot cache has been destroyed or reloaded./p
+ */
class SC_DLLPUBLIC ScDPItemData
{
friend class ScDPCache;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/xmldpimp.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 3ae3f098ed4e6495c0be0748dacf03dd8e0fe091
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Mar 17 00:07:33 2012 -0400
Fixed potential memory leak UniString removal.
diff --git a/sc/source/filter/xml/xmldpimp.cxx
b/sc/source/filter/xml/xmldpimp.cxx
index ee8e3aa..8fa7312 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1037,11 +1037,14 @@ SvXMLImportContext
*ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 n
void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
{
if (pDim)
+{
pDim-AddMember(pMember);
-
-if (!pMember-GetIsVisible())
-// This member is hidden.
-mbHasHiddenMember = true;
+if (!pMember-GetIsVisible())
+// This member is hidden.
+mbHasHiddenMember = true;
+}
+else
+delete pMember;
}
void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString rName)
@@ -1636,7 +1639,7 @@ void ScXMLDataPilotMemberContext::EndElement()
{
if (bHasName) // #i53407# don't check sName, empty name is allowed
{
-ScDPSaveMember* pMember = new ScDPSaveMember(String(sName));
+ScDPSaveMember* pMember = new ScDPSaveMember(sName);
if (!maDisplayName.isEmpty())
pMember-SetLayoutName(maDisplayName);
pMember-SetIsVisible(bDisplay);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
