[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 6796128fbeea7b2cd71e99123bf86b56c23efd18 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 11:43:58 2012 +0200 Don't point to non-existent directories in JAVA_LIB diff --git a/configure.in b/configure.in index 50f895c..f9a889e 100644 --- a/configure.in +++ b/configure.in @@ -4989,7 +4989,10 @@ esac if test -n $JAVA_ARCH ; then JRE_BASE_DIR=$JAVA_HOME/jre/lib/$JAVA_ARCH -JAVALIB=-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread +JAVALIB=-L $JAVA_HOME/$LIB64 +test -d $JRE_BASE_DIR JAVALIB=$JAVALIB -L $JRE_BASE_DIR +test -d $JRE_BASE_DIR/$JAVA_TOOLKIT JAVALIB=$JAVALIB -L $JRE_BASE_DIR/$JAVA_TOOLKIT +test -d $JRE_BASE_DIR/native_thread JAVALIB=$JAVALIB -L $JRE_BASE_DIR/native_thread fi AC_SUBST(x_JAVALIB) commit d199ce626d491d6c95e467bad60b4bb1c8b9f8c0 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 11:30:36 2012 +0200 Google calls armel just arm diff --git a/configure.in b/configure.in index 24d6652..50f895c 100644 --- a/configure.in +++ b/configure.in @@ -4927,7 +4927,7 @@ linux-androideabi*) case $host_cpu in -armel) +arm|armel) JAVA_ARCH=arm JAVA_TOOLKIT=server ;; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/stream/stream.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 75a6a51a9da2aa3b6eb0f0e43c0130844f6ab86c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 10:56:28 2012 +0100 Fix int/sal_Int32 mismatch. diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 6064a77..1ebbcb3 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -69,7 +69,7 @@ inline static void SwapLong( long r ) { r = SWAPLONG(r); } inline static void SwapULong( sal_uInt32 r ) { r = SWAPLONG(r); } -inline static void SwapLongInt( int r ) +inline static void SwapLongInt( sal_Int32 r ) { r = SWAPLONG(r); } inline static void SwapLongUInt( unsigned int r ) { r = SWAPLONG(r); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source vcl/inc vcl/source
connectivity/source/drivers/dbase/DTable.cxx |2 +- vcl/inc/vcl/graphictools.hxx |4 ++-- vcl/source/gdi/graphictools.cxx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c6b8c461bb4b119f833517112813def858903415 Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 19 09:58:23 2012 + WaE: fix misc. SvStream operator problems. diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 40f1469..dde41d2 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1311,7 +1311,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject aFile, sal_Bool bCreateMe (*m_pFileStream) cTyp; if ( nDbaseType == VisualFoxPro ) -(*m_pFileStream) (nRecLength-1); +(*m_pFileStream) sal_uInt16(nRecLength-1); else m_pFileStream-Write(aBuffer, 4); diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index c027f6a..78be3b9 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -274,7 +274,7 @@ public: GradientTypeaGradientType, // TODO: Transparent gradients (orthogonal to normal ones) Color aGradient1stColor, // TODO: vector of colors and offsets Color aGradient2ndColor, -int aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. +sal_Int32 aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. const Graphic aFillGraphic ); // accessors @@ -348,7 +348,7 @@ private: GradientTypemaGradientType; Color maGradient1stColor; Color maGradient2ndColor; -int maGradientStepCount; +sal_Int32 maGradientStepCount; Graphic maFillGraphic; }; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 3f6a0ec..d945e53 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -343,7 +343,7 @@ SvtGraphicFill::SvtGraphicFill( const PolyPolygon rPath, GradientTypeaGradientType, Color aGradient1stColor, Color aGradient2ndColor, -int aGradientStepCount, +sal_Int32 aGradientStepCount, const Graphic aFillGraphic ) : maPath( rPath ), maFillColor( aFillColor ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/extras/xdatapilotdescriptor.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 16af33302b19fd90c5c24031e23a7c36e3b6b412 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 11:21:57 2012 +0100 Fix C++03 enum member scope. diff --git a/sc/qa/extras/xdatapilotdescriptor.cxx b/sc/qa/extras/xdatapilotdescriptor.cxx index 97612e8..e5151d5 100644 --- a/sc/qa/extras/xdatapilotdescriptor.cxx +++ b/sc/qa/extras/xdatapilotdescriptor.cxx @@ -156,35 +156,35 @@ void ScXDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference sheet: case 0: { uno::Any aAny; -aAny= sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_COLUMN; + aAny= sheet::DataPilotFieldOrientation_COLUMN; xPropSet-setPropertyValue(aOrientation, aAny); } break; case 1: { uno::Any aAny; -aAny= sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_ROW; +aAny= sheet::DataPilotFieldOrientation_ROW; xPropSet-setPropertyValue(aOrientation, aAny); } break; case 2: { uno::Any aAny; -aAny= sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_DATA; +aAny= sheet::DataPilotFieldOrientation_DATA; xPropSet-setPropertyValue(aOrientation, aAny); } break; case 3: { uno::Any aAny; -aAny= sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_HIDDEN; +aAny= sheet::DataPilotFieldOrientation_HIDDEN; xPropSet-setPropertyValue(aOrientation, aAny); } break; case 4: { uno::Any aAny; -aAny= sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_PAGE; +aAny= sheet::DataPilotFieldOrientation_PAGE; xPropSet-setPropertyValue(aOrientation, aAny); } break; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/extras/xdatapilotdescriptor.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c4e5e06ecca8c7f7f83e2e6e784157a3f2a93ef8 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 11:26:08 2012 +0100 Undo inadvertent indentation change. diff --git a/sc/qa/extras/xdatapilotdescriptor.cxx b/sc/qa/extras/xdatapilotdescriptor.cxx index e5151d5..e58c145 100644 --- a/sc/qa/extras/xdatapilotdescriptor.cxx +++ b/sc/qa/extras/xdatapilotdescriptor.cxx @@ -156,7 +156,7 @@ void ScXDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference sheet: case 0: { uno::Any aAny; - aAny= sheet::DataPilotFieldOrientation_COLUMN; +aAny= sheet::DataPilotFieldOrientation_COLUMN; xPropSet-setPropertyValue(aOrientation, aAny); } break; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxprinter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 877663b9c262be9b5d8620f756a4cfdf97195279 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 11:39:15 2012 +0100 Explicit type in SvStream::operator call. diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 137c6f6..25a6efb 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -269,7 +269,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString rFormDescription ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; -aMem BINARYSETUPMARKER; +aMem sal_uInt32(BINARYSETUPMARKER); aMem GetPrinter()-GetJobSetup(); return ::com::sun::star::uno::Sequencesal_Int8( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl sal/util tools/inc tools/source
sal/inc/osl/detail/file.h | 12 -- sal/inc/osl/file.h |1 sal/osl/unx/file.cxx|2 - sal/osl/unx/file_stat.cxx | 12 -- sal/util/sal.map|2 - tools/inc/tools/stream.hxx |4 +- tools/source/stream/strmunx.cxx | 71 +++- 7 files changed, 38 insertions(+), 66 deletions(-) New commits: commit 4a086fca7b0a77c20bc9f1c97507966e2861f3da Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 19 12:23:23 2012 + fix SvStream to not require a custom open or lstat method. diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h index 108d230..065c355 100644 --- a/sal/inc/osl/detail/file.h +++ b/sal/inc/osl/detail/file.h @@ -49,25 +49,13 @@ extern C { #define osl_File_OpenFlag_Trunc 0x0010L #define osl_File_OpenFlag_NoExcl0x0020L -/* Variant of osl_openFile that takes the file pathname directly as a - char* -*/ - -SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath( -const char *cpFilePath, -oslFileHandle *pHandle, -sal_uInt32 uFlags ); - /* Compare directory items for being the same underlying file * this unwinds unix hard-links and symlinks etc. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(oslDirectory a, oslDirectory b); -SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath( const char *cpFilePath, struct stat *statb ); - /* Get the OS specific handle of an open file. */ - SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle( oslFileHandle Handle, sal_IntPtr *piFileHandle ); diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h index 2a8cf37..0e0d765 100644 --- a/sal/inc/osl/file.h +++ b/sal/inc/osl/file.h @@ -664,6 +664,7 @@ typedef void *oslFileHandle; #define osl_File_OpenFlag_Write 0x0002L #define osl_File_OpenFlag_Create0x0004L #define osl_File_OpenFlag_NoLock0x0008L +/* larger bit-fields reserved for internal use cf. detail/file.h */ /** Open a regular file. diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 64ce977..7bb6bae 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -892,7 +892,7 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandl #define OPEN_CREATE_FLAGS ( O_CREAT | O_RDWR ) #endif -oslFileError +static oslFileError SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 uFlags ) { oslFileError eRet; diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index 0477a52..320744f 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -462,7 +462,6 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b) return sal_True; fprintf (stderr, We have to do an inode compare !\n); - /* int rc = stat_c( cpFilePath, statb ); @@ -475,15 +474,4 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b) return sal_False; } -oslFileError -SAL_CALL osl_lstatFilePath( const char *cpFilePath, struct stat *statb ) -{ -int rc = lstat_c( cpFilePath, statb ); - -if (rc == -1) -return oslTranslateFileError(OSL_FET_ERROR, errno); -else -return osl_File_E_None; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/util/sal.map b/sal/util/sal.map index 26c30fc..02610f5 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -647,9 +647,7 @@ PRIVATE_textenc.1 { # LibreOffice 3.6 PRIVATE_file.1 { # LibreOffice 3.6 global: -osl_openFilePath; osl_identicalDirectoryItem; -osl_lstatFilePath; osl_getFileOSHandle; }; diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 37b7c3f..8c7fa0c 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -576,10 +576,10 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream friend class FileCopier; private: -StreamData* pInstanceData; +StreamData* pInstanceData; String aFilename; sal_uInt16 nLockCounter; -sal_BoolbIsOpen; +sal_BoolbIsOpen; sal_uInt32 GetFileHandle() const; // Forbidden and not implemented. diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 0fcddbd..d2135fa 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -223,7 +223,7 @@ class StreamData public: oslFileHandle rHandle; -StreamData() { } +StreamData() : rHandle( 0 ) { } }; // --- @@ -683,8 +683,6 @@ void SvFileStream::Open( const String rFilename, StreamMode nOpenMode ) { sal_uInt32 uFlags; oslFileHandle nHandleTmp; -struct stat buf; -sal_Bool bStatValid = sal_False; Close(); errno = 0; @@ -707,16 +705,22 @@ void SvFileStream::Open( const
[Libreoffice-commits] .: tools/source
tools/source/stream/strmunx.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 5785734a1947c6b3fb2081b7e33fe3d0bd125bbb Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 15:18:20 2012 +0200 Don't use too modern C++ diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index d2135fa..850eedc 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -710,13 +710,13 @@ void SvFileStream::Open( const String rFilename, StreamMode nOpenMode ) osl::FileStatus aStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL ); // FIXME: we really need to switch to a pure URL model ... -if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) != osl::FileBase::RC::E_None ) +if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) != osl::FileBase::E_None ) aFileURL = aFilename; -bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) != osl::FileBase::RC::E_None -aItem.getFileStatus( aStatus ) != osl::FileBase::RC::E_None ); +bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) != osl::FileBase::E_None +aItem.getFileStatus( aStatus ) != osl::FileBase::E_None ); // SvFileStream can't open a directory -if( bStatValid aStatus.getFileType() == osl::FileStatus::Type::Directory ) +if( bStatValid aStatus.getFileType() == osl::FileStatus::Directory ) { SetError( ::GetSvError( EISDIR ) ); return; @@ -742,11 +742,11 @@ void SvFileStream::Open( const String rFilename, StreamMode nOpenMode ) { if ( nOpenMode STREAM_COPY_ON_SYMLINK ) { -if ( bStatValid aStatus.getFileType() == osl::FileStatus::Type::Link +if ( bStatValid aStatus.getFileType() == osl::FileStatus::Link aStatus.getLinkTargetURL().getLength() 0 ) { // delete the symbolic link, and replace it with the contents of the link -if (osl::File::remove( aFileURL ) == osl::FileBase::RC::E_None ) +if (osl::File::remove( aFileURL ) == osl::FileBase::E_None ) { File::copy( aStatus.getLinkTargetURL(), aFileURL ); #if OSL_DEBUG_LEVEL 0 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sw/source sw/uiconfig writerfilter/documentation writerfilter/source
sw/source/core/layout/tabfrm.cxx |5 --- writerfilter/documentation/ooxml/model.xml | 41 + writerfilter/source/ooxml/model.xml|2 - 3 files changed, 42 insertions(+), 6 deletions(-) New commits: commit 9f03ad248e2e0151facadee0738a7fa6158743f9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Jan 19 14:22:27 2012 +0100 a feeble attempt at at least some docs for writerfilter diff --git a/writerfilter/documentation/ooxml/model.xml b/writerfilter/documentation/ooxml/model.xml new file mode 100644 index 000..c50f23d --- /dev/null +++ b/writerfilter/documentation/ooxml/model.xml @@ -0,0 +1,41 @@ +These are various notes about ooxml/model.xml and related stuff. They have been +mostly found out by trial and error, because existing documentation is poor +or nonexistent, so I don't actually understand writerfilter that much (and +think nothing nice about it) and don't think it (both writerfilter and my +understanding/liking of it) could be noticeably improved. In an ideal world +it should be nuked from orbit and started again from scratch with a saner design. + +- +CT_xxx (Complex Type) - it seems to be used for XML elements +ST_xxx (Simple Type) - it seems to be used for XML attributes + +- SPRM - no idea what that actually means, but in the context of OOXML it seems +to pretty much mean XML element + +- + +Format of the resource tag (shortened CT_Font example): + +resource name=CT_Font resource=Properties tag=font + element name=charset tokenid=ooxml:CT_Font_charset/ + attribute name=name tokenid=ooxml:CT_Font_name/ +/resource + +CT_Font is the type that is defined how it will be handled. +resource=XXX means it will be handled by OOXMLFastContextHandlerXXX class +no idea what tag=font means or if it matters +element defines the w:charset subelement will be handled in sprm() function +as NS_ooxml::LN_CT_Font_charset case +attribute defines the w:name attribute of the element will be handled +in attribute() function as NS_ooxml::LN_CT_Font_name case +in both cases sprm()/attribute() may mean actually any of the various strange +naming ideas like lcl_sprm() + +- +If an element (and its subelements) are not processed but the element itself +does not require any special handling, make sure something like the below is present. +Otherwise null context will be created and the element and all its subelements +will be ignored. + +resource name=CT_OMathPara resource=Stream tag=math/ + commit 58de34f6330e7093238bae2a14982e598867b336 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Jan 18 18:08:26 2012 +0100 fix reading w:charset, you misdesigned writerfilter monster (fdo#34814) diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 39ecf66..4dc8c49 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -20473,7 +20473,7 @@ define name=CT_Charset optional attribute name=val -ref name=CT_UcharHexNumber/ +ref name=ST_UcharHexNumber/ /attribute /optional optional commit 38fea73760e675dc04e0c20f3e01e50aa8b03767 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Jan 17 14:28:38 2012 +0100 remove executable bit on source files diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx old mode 100755 new mode 100644 diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src old mode 100755 new mode 100644 diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx old mode 100755 new mode 100644 diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml old mode 100755 new mode 100644 commit 254ba40392b17c2cb2fa1ef35a835d19a5f4a5e1 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jan 16 17:42:39 2012 +0100 remove pointless forward moving of a table (bnc#706138) This appears to be broken. Why should a table where all rows want to be kept together be moved one page forward just because there is something before it on the page where it is? It either fits its curent page, in which case it's wrong, or it does not fit, in which case it may not fit the following page either and something else needs to take care of it anyway. diff
[Libreoffice-commits] .: sal/inc sal/util tools/source
sal/inc/osl/file.h | 24 sal/inc/osl/file.hxx| 26 +- sal/util/sal.map|2 +- tools/source/stream/strmunx.cxx |2 +- 4 files changed, 51 insertions(+), 3 deletions(-) New commits: commit 13a752cdbb9e2c1e2c0f922158f03fc70c12245c Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 19 14:01:33 2012 + sal: expose a public API for comparing directory items Windows impl. still pending. diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h index 0e0d765..3bcd877 100644 --- a/sal/inc/osl/file.h +++ b/sal/inc/osl/file.h @@ -316,6 +316,30 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_acquireDirectoryItem( SAL_DLLPUBLIC oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item ); +/** Determine if two directory items point the the same underlying file + +The comparison is done first by URL, and then by resolving links to +find the target, and finally by comparing inodes on unix. + +@param pItemA [in] +A directory handle to compare with another handle + +@param pItemB [in] +A directory handle to compare with pItemA + +@return +sal_True: if the items point to an identical resourcebr +sal_False: if the items point to a different resource, or a fatal error occuredbr + +@see osl_getDirectoryItem() + +@since LibreOffice 3.6 +*/ + +SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem( +oslDirectoryItem pItemA, +oslDirectoryItem pItemB ); + /* File types */ typedef enum { diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx index d9a1d89..85393f5 100644 --- a/sal/inc/osl/file.hxx +++ b/sal/inc/osl/file.hxx @@ -1389,9 +1389,9 @@ public: class DirectoryItem: public FileBase { +oslDirectoryItem _pData; public: -oslDirectoryItem _pData; /** Constructor. */ @@ -1529,6 +1529,30 @@ public: return (RC) osl_getFileStatus( _pData, rStatus._aStatus, rStatus._nMask ); } +/** Determine if two directory items point the the same underlying file + +The comparison is done first by URL, and then by resolving links to +find the target, and finally by comparing inodes on unix. + +@param pItemA [in] +A directory handle to compare with another handle + +@param pItemB [in] +A directory handle to compare with pItemA + +@return +sal_True: if the items point to an identical resourcebr +sal_False: if the items point to a different resource, or a fatal error occuredbr + +@see osl_getDirectoryItem() + +@since LibreOffice 3.6 +*/ +inline sal_Bool isIdenticalTo( const DirectoryItem pOther ) +{ +return osl_identicalDirectoryItem( _pData, pOther._pData ); +} + friend class Directory; }; diff --git a/sal/util/sal.map b/sal/util/sal.map index 02610f5..1e9753b 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -613,6 +613,7 @@ LIBO_UDK_3.5 { # symbols available in = LibO 3.5 LIBO_UDK_3.6 { # symbols available in = LibO 3.6 global: osl_unmapMappedFile; +osl_identicalDirectoryItem; } UDK_3.10; PRIVATE_1.0 { @@ -647,7 +648,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6 PRIVATE_file.1 { # LibreOffice 3.6 global: -osl_identicalDirectoryItem; osl_getFileOSHandle; }; diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 850eedc..031aaa5 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -146,7 +146,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr for( size_t i = 0; i rLockList.size(); ++i ) { pLock = rLockList[ i ]; -if( osl_identicalDirectoryItem( aItem._pData, pLock-m_aItem._pData) ) +if( aItem.isIdenticalTo( pLock-m_aItem ) ) { sal_Bool bDenyByOptions = sal_False; StreamMode nLockMode = pLock-m_pStream-GetStreamMode(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/sbx/sbxvalue.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 35b5cc9522a1c496a432b49534b1b202f99113e0 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 16:16:57 2012 +0200 Fix SvStream::operator problem that showed up with the Android gcc 4.4.3 diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index c6c95dc..e67335c 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1566,8 +1566,11 @@ sal_Bool SbxValue::LoadData( SvStream r, sal_uInt16 ) // Match the Int on this system? if( n SAL_TYPES_SIZEOFINT ) r aData.nLong, aData.eType = SbxLONG; -else -r aData.nInt; +else { +sal_Int32 nInt; +r nInt; +aData.nInt = nInt; +} break; } case SbxUINT: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80a1001a206a3e3b6bf83b9734580cc7f46b0e33 Author: Rene Engelhard r...@debian.org Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 6befda1..6fd19fe 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f150e63a4df2f4dccc6eeeac3a2462429ebc4c2 Author: Rene Engelhard r...@debian.org Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index cea27c0..d8c648e 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/ubuntu/oneiric-3.4' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'distro/ubuntu/oneiric-3.4'
New branch 'distro/ubuntu/oneiric-3.4' available with the following commits: commit 3129d7d23d06ac9609957d141cedbc04ac42c48a Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 13 21:01:28 2011 + Resolves: rhbz#761009 IFSD_Equal is asymmetrical commit 6a98980289ecc5b21a9c1044ca22e8de4f8f9c93 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Aug 25 00:23:31 2011 +0200 lp#832121: libgcc_s magic breaks horribly on armel and powerpc commit 1518416ac6a692c2234dfa3cb4b98a382ebe65cc Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Jun 29 19:20:43 2011 +0200 lp#746375: soffice.bin crashed with SIGSEGV in uno_type_sequence_construct() commit 9d3fb278999edb233eb1c2612412a06cd150e396 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Jun 29 19:15:31 2011 +0200 lp#720716: more translations in desktop files commit 2c1ac0ff6558bd2b3dafe79a76a5fbaaa6507ba3 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Jun 29 19:49:36 2011 +0200 apply ubuntu-palette.diff commit 4441ba7add7cd954b7f9077585d10033cc4ded2b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Jul 19 13:16:14 2011 +0200 disable default as-needed on linking for gbuild too * for not breaking pkg-config provided link switches (because of order) commit 903c82fa3bfeafe33965ca5d38c4ff144dbad572 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sun Jul 3 11:37:02 2011 +0200 adding human theme to scp2 commit 83eed6f49ede0f7b60d3b19e9cc558a90c762ecc Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Jul 1 10:45:59 2011 +0200 disable default as-needed on linking * for not breaking pkg-config provided link switches (because of order) commit 1821350817000893ed9643f3081fca225ca151c2 Author: Rene Engelhard r...@debian.org Date: Thu Jun 30 10:18:47 2011 +0200 apply system-lpsolve-rpath.diff from libreoffice-build ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source svx/source sw/source
sd/source/filter/eppt/eppt.cxx |2 +- sd/source/filter/eppt/epptso.cxx |4 ++-- svx/source/gallery2/gallery1.cxx |2 +- sw/source/filter/ww8/rtfexport.cxx |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 4229f1b186b84ab36d97b723a6a1f81e79d40d82 Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 19 17:08:47 2012 + WaE: ongoing stream operator cleanup, persuade ints they are sal_Int32s diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 7da27aa..1f7606f 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1457,7 +1457,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() mpStrm-Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable *mpStrm nPersistEntrys n1 - 2; + sal_Int32(2); mpStrm-Seek( nOldPos ); } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7949538..2e5102b 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -255,7 +255,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) (sal_uInt32)( EPP_ViewInfoAtom 16 ) (sal_uInt32)52 (sal_Int32)170 (sal_Int32)200 (sal_Int32)170 (sal_Int32)200 // scaling atom - Keeps the current scale (sal_Int32)170 (sal_Int32)200 (sal_Int32)170 (sal_Int32)200 // scaling atom - Keeps the previous scale -(sal_Int32)0x17ac 0xdda// Origin - Keeps the origin in master coordinates +(sal_Int32)0x17ac (sal_Int32)0xdda// Origin - Keeps the origin in master coordinates (sal_Int32)-780 (sal_Int32)-84 // Origin (sal_uInt8)1 // bool1 varScale - Set if zoom to fit is set (sal_uInt8)0 // bool1 draftMode - Not used @@ -1151,7 +1151,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream rOut, int nTextInstance, sal_u PPTExParaSheet rParaSheet = mpStyleSheet-GetParaSheet( nTextInstance ); rOut (sal_uInt32)( ( EPP_TextHeaderAtom 16 ) | ( nAtomInstance 4 ) ) (sal_uInt32)4 - nTextInstance; + sal_Int32(nTextInstance); if ( mbEmptyPresObj ) mnTextSize = 0; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 64a94ab..0ac9fab 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -285,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject rBaseURL, sal_Bool rbDirIsR if( pTestStm ) { -*pTestStm 1; +*pTestStm sal_Int32(1); if( pTestStm-GetError() ) rbDirIsReadOnly = sal_True; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 8534f82..6a9679f 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -715,7 +715,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt rFmt ) if (((const SwTxtFmtColl*)pParent)-IsAssignedToListLevelOfOutlineStyle()) { // Level 9 disables the outline -Strm() OOO_STRING_SVTOOLS_RTF_LEVEL 9; +Strm() OOO_STRING_SVTOOLS_RTF_LEVEL sal_Int32(9); bRet = true; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - cppu/source sc/inc sc/source solenv/gbuild
cppu/source/threadpool/thread.cxx| 25 ++ cppu/source/threadpool/thread.hxx|2 sc/inc/global.hxx|1 sc/source/core/data/global.cxx |5 sc/source/core/data/table4.cxx | 232 +-- sc/source/ui/docshell/docfunc.cxx|4 sc/source/ui/miscdlgs/scuiautofmt.cxx|4 sc/source/ui/unoobj/afmtuno.cxx | 88 -- sc/source/ui/unoobj/cellsuno.cxx |4 sc/source/ui/view/cellsh3.cxx|4 solenv/gbuild/platform/unxgcc_gdbforjunit.sh |2 11 files changed, 190 insertions(+), 181 deletions(-) New commits: commit e2dda69cfe9925e6f5d2bc922febb53a0f69c50f Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 16 13:56:32 2011 +0100 Report backtraces for all threads. (cherry picked from commit 54a918bbfba47734d414832755e35434da103ed5) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh index 730d2e9..0341e7b 100755 --- a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh +++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh @@ -44,7 +44,7 @@ then echo Found a core dump at ${COREFILE} echo Stacktrace: GDBCOMMANDFILE=`mktemp` -echo bt ${GDBCOMMANDFILE} +echo thread apply all bt ${GDBCOMMANDFILE} gdb -x $GDBCOMMANDFILE --batch ${OFFICEFILE}.bin ${COREFILE} rm ${GDBCOMMANDFILE} echo commit c77a382e27d6ecabd98fa4788b4a372008fe7dbf Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jan 11 09:26:41 2012 +0100 ScGlobal::GetAutoFormat not always required to create fresh instance. ...at least in ~ScAutoFormatObj it appears unnecessary and can lead to crashes during Desktop::DeregisterServices (when ScGlobal::ppRscString is already null and ScAutoFormat ctor calls ScGlobal::GetRscString). Therefore split GetAutoFormat in two, GetOrCreateAutoFormat for cases that probably need a non-null return and GetAutoFormat for those that are OK with a null return. (cherry picked from commit 0e4b36269097f8865bdbc1b9d299a2776ae0cc06) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index a810400..ac10094 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -562,6 +562,7 @@ public: SC_DLLPUBLIC static const SvxSearchItemGetSearchItem(); SC_DLLPUBLIC static voidSetSearchItem( const SvxSearchItem rNew ); SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat(); +SC_DLLPUBLIC static ScAutoFormat* GetOrCreateAutoFormat(); static void ClearAutoFormat(); //BugId 54209 static FuncCollection* GetFuncCollection(); SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 6de3782..c43a853 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -299,6 +299,11 @@ void ScGlobal::ClearAutoFormat() ScAutoFormat* ScGlobal::GetAutoFormat() { +return pAutoFormat; +} + +ScAutoFormat* ScGlobal::GetOrCreateAutoFormat() +{ if ( !pAutoFormat ) { pAutoFormat = new ScAutoFormat; diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 9b38214..bc99c5c 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -1592,14 +1592,10 @@ 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) { -ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat(); -if (pAutoFormat) +ScAutoFormatData* pData = (*ScGlobal::GetOrCreateAutoFormat())[nFormatNo]; +if (pData) { -ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo]; -if (pData) -{ -ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr); -} +ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr); } } @@ -1608,140 +1604,136 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW { if (ValidColRow(nStartCol, nStartRow) ValidColRow(nEndCol, nEndRow)) { -ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat(); -if (pAutoFormat) +ScAutoFormatData* pData = (*ScGlobal::GetOrCreateAutoFormat())[nFormatNo]; +if (pData) { -ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo]; -if (pData) +ScPatternAttr* pPatternAttrs[16]; +for (sal_uInt8 i = 0; i 16; ++i) +{ +
[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source formula/inc formula/source sc/source unusedcode.easy vcl/source
basegfx/inc/basegfx/color/bcolortools.hxx | 10 - basegfx/inc/basegfx/tools/canvastools.hxx | 15 -- basegfx/source/color/bcolortools.cxx | 38 -- basegfx/source/tools/canvastools.cxx | 78 formula/inc/formula/formdata.hxx |1 formula/inc/formula/formula.hxx|1 formula/inc/formula/token.hxx |2 formula/inc/formula/tokenarray.hxx |2 formula/source/core/api/token.cxx | 29 formula/source/core/inc/core_resource.hxx |7 - formula/source/core/resource/core_resource.cxx |7 - formula/source/ui/dlg/formula.cxx | 151 - formula/source/ui/dlg/funcutl.cxx | 21 --- formula/source/ui/dlg/structpg.cxx | 10 - formula/source/ui/dlg/structpg.hxx |3 sc/source/ui/inc/formula.hxx |2 unusedcode.easy| 31 - vcl/source/gdi/pdfwriter_impl.cxx | 77 vcl/source/gdi/pdfwriter_impl.hxx |1 19 files changed, 486 deletions(-) New commits: commit d93536e52943c910936504e531956f04d9c0503f Author: Thomas Arnhold tho...@arnhold.org Date: Thu Jan 19 19:14:49 2012 +0100 remove unused methods diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx index 5841f04..0bb0659 100644 --- a/basegfx/inc/basegfx/color/bcolortools.hxx +++ b/basegfx/inc/basegfx/color/bcolortools.hxx @@ -50,16 +50,6 @@ namespace basegfx /// Transform from HSV to RGB BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor rHSVColor); -/// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor rRGBColor); -/// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor rYIQColor); - -/// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) -BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor rRGBColor); -/// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B' -BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor rYPbPrColor); - /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point) BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor rXYZColor ); /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 5884563..ea1924a 100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx @@ -138,7 +138,6 @@ namespace basegfx homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix transform, const ::com::sun::star::geometry::AffineMatrix2Dmatrix ); -BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D matrix ); BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D matrix ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D @@ -157,17 +156,13 @@ namespace basegfx BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange ); -BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D ); BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D ); BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D ); BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange ); BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D ); -BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D );
[Libreoffice-commits] .: writerfilter/documentation
writerfilter/documentation/ooxml/model.xml |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3520d6dfdd3adc9ac328ca9050f796478aaf2020 Author: Miklos Vajna vmik...@frugalware.org Date: Thu Jan 19 20:48:41 2012 +0100 writerfilter/documentation: describe what an sprm is diff --git a/writerfilter/documentation/ooxml/model.xml b/writerfilter/documentation/ooxml/model.xml index c50f23d..75ee217 100644 --- a/writerfilter/documentation/ooxml/model.xml +++ b/writerfilter/documentation/ooxml/model.xml @@ -9,8 +9,9 @@ it should be nuked from orbit and started again from scratch with a saner design CT_xxx (Complex Type) - it seems to be used for XML elements ST_xxx (Simple Type) - it seems to be used for XML attributes -- SPRM - no idea what that actually means, but in the context of OOXML it seems -to pretty much mean XML element +- SPRM (the Sprm structure specified a modification to a property of a +character, paragraph, table, or section in the binary .doc format) - in +the context of OOXML it seems to pretty much mean XML element - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source cppu/inc stoc/test
connectivity/source/drivers/dbase/DTable.cxx |2 - cppu/inc/com/sun/star/uno/Reference.h| 33 ++- stoc/test/testiadapter.cxx |2 - 3 files changed, 15 insertions(+), 22 deletions(-) New commits: commit 2fbefa3d30e05948e3263b9c4bfe40ac49204f55 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 20:53:49 2012 +0100 Change back to 32 bit (which is hopefully right). diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index dde41d2..0386f66 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1311,7 +1311,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject aFile, sal_Bool bCreateMe (*m_pFileStream) cTyp; if ( nDbaseType == VisualFoxPro ) -(*m_pFileStream) sal_uInt16(nRecLength-1); +(*m_pFileStream) sal_uInt32(nRecLength-1); else m_pFileStream-Write(aBuffer, 4); commit 3c7ad92d43b0823b9f69b0d44e86f674f9dcf070 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 15:47:58 2012 +0100 Drop UNO_REF_QUERY[_THROW] duplicates of UNO_QUERY[_THROW]. They are virtually unused (at least the LibO code base has only a single use of UNO_REF_QUERY) but confuse static analysis tools that classify unused function parameters as tags (which legalizes the unusedness of those parameters) if they are of an enum type with exactly one value defined. diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index d3611ac..72aecfc 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -140,19 +140,16 @@ public: inline sal_Bool SAL_CALL operator ( const BaseReference rRef ) const SAL_THROW( () ); }; -/** Enum defining UNO_QUERY and UNO_REF_QUERY for implicit interface query. +/** Enum defining UNO_QUERY for implicit interface query. */ enum UnoReference_Query { /** This enum value can be used for implicit interface query. */ UNO_QUERY, -/** This enum value can be used for implicit interface query. -*/ -UNO_REF_QUERY }; #ifndef EXCEPTIONS_OFF -/** Enum defining UNO_QUERY_THROW and UNO_REF_QUERY_THROW for implicit interface query. +/** Enum defining UNO_QUERY_THROW for implicit interface query. If the demanded interface is unavailable, then a RuntimeException is thrown. */ enum UnoReference_QueryThrow @@ -160,9 +157,6 @@ enum UnoReference_QueryThrow /** This enum value can be used for implicit interface query. */ UNO_QUERY_THROW, -/** This enum value can be used for implicit interface query. -*/ -UNO_REF_QUERY_THROW }; /** Enum defining UNO_SET_THROW for throwing if attempts are made to assign a null interface @@ -176,7 +170,7 @@ enum UnoReference_SetThrow #endif /** Template reference class for interface type derived from BaseReference. -A special constructor given the UNO_QUERY or UNO_REF_QUERY identifier queries interfaces +A special constructor given the UNO_QUERY identifier queries interfaces for reference type. */ template class interface_type @@ -287,7 +281,7 @@ public: /** Constructor: Queries given interface for reference interface type (interface_type). @param rRef another reference -@param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to other constructors +@param dummy UNO_QUERY to force obvious distinction to other constructors */ inline Reference( const BaseReference rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). @@ -307,7 +301,7 @@ public: Throws a RuntimeException if the demanded interface cannot be queried. @param rRef another reference -@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction +@param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ inline Reference( const BaseReference rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); @@ -315,7 +309,7 @@ public: Throws a RuntimeException if the demanded interface cannot be queried. @param pInterface an interface pointer -@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction +@param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); @@ -323,7 +317,7 @@ public: Throws a RuntimeException if the demanded interface cannot be queried. @param rAny an any -@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit f727553f3b8c6632d1d374b918221649a9427eac Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 22:03:34 2012 +0200 Don't break file: URLs diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index b7b4e94..7552f09 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -246,13 +246,19 @@ gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin # convert parameters filesystem root to native notation # does some real work only on windows, make sure not to # break the dummy implementations on unx* + +# This file:/// - file:!!! - file:/// substitution is to protect the +# slashes after file: in a file: URL from being unduplicated by the +# // - / substitution. define gb_Helper_convert_native +$(subst file:!!!,file:///, \ $(subst //,/, \ +$(subst file:///,file:!!!, \ $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \ $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \ $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \ $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \ -$(1)) +$(1 endef # YaccTarget class ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - dbaccess/source svx/source
dbaccess/source/core/api/RowSetBase.cxx |2 dbaccess/source/core/api/RowSetCache.cxx | 313 --- dbaccess/source/core/api/RowSetCache.hxx | 10 svx/source/fmcomp/gridctrl.cxx |4 4 files changed, 178 insertions(+), 151 deletions(-) New commits: commit 1234d599d4ee67bd725f0513431b2d4c56c9e09d Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Jan 19 20:20:06 2012 +0100 ORowSetCache: overhaul internals diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 8fc264a..bcc8652 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -443,17 +443,29 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) } if(!m_nPosition) { -sal_Int32 nNewSt = 1; -fillMatrix(nNewSt,_nSize+1); +sal_Int32 nNewSt = 0; +fillMatrix(nNewSt,_nSize); +OSL_ENSURE(nNewSt == 0, fillMatrix set new start to unexpected value); m_nStartPos = 0; m_nEndPos = _nSize; } -else if (m_nStartPos m_nPosition m_nPosition m_nEndPos) +else if (m_nStartPos m_nPosition m_nPosition = m_nEndPos) { sal_Int32 nNewSt = -1; -fillMatrix(nNewSt,_nSize+1); -m_nStartPos = 0; -m_nEndPos = _nSize; +fillMatrix(nNewSt,_nSize); +if (nNewSt = 0) +{ +m_nStartPos = nNewSt; +m_nEndPos = nNewSt + _nSize; +m_aMatrixIter = calcPosition(); +} +} +else +{ +OSL_FAIL(m_nPosition not between m_nStartPos and m_nEndpos); +// try to repair +moveWindow(); +m_aMatrixIter = calcPosition(); } } @@ -737,32 +749,34 @@ sal_Bool ORowSetCache::afterLast( ) sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos) { OSL_ENSURE(_nNewStartPos != _nNewEndPos,ORowSetCache::fillMatrix: StartPos and EndPos can not be equal!); -// fill the whole window with new data +// If _nNewStartPos = 0, then fill the whole window with new data +// Else if _nNewStartPos == -1, then fill only segment [m_nEndPos, _nNewEndPos) +// Else, undefined (invalid argument) +OSL_ENSURE( _nNewStartPos = -1, ORowSetCache::fillMatrix: invalid _nNewStartPos ); + ORowSetMatrix::iterator aIter; sal_Int32 i; sal_Bool bCheck; if ( _nNewStartPos == -1 ) { -aIter = m_pMatrix-begin() + m_nEndPos; -i = m_nEndPos+1; +aIter = m_pMatrix-begin() + (m_nEndPos - m_nStartPos); +i = m_nEndPos; } else { aIter = m_pMatrix-begin(); -i = _nNewStartPos; +i = _nNewStartPos + 1; } -bCheck = m_pCacheSet-absolute(i); // -1 no need to +bCheck = m_pCacheSet-absolute(i); -for(;i_nNewEndPos;++i,++aIter) +for(; i = _nNewEndPos; ++i,++aIter) { if(bCheck) { if(!aIter-is()) *aIter = new ORowSetValueVector(m_xMetaData-getColumnCount()); m_pCacheSet-fillValueRow(*aIter,i); -if(!m_bRowCountFinal) -++m_nRowCount; } else { // there are no more rows found so we can fetch some before start @@ -775,35 +789,28 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos m_nRowCount = i-1; // it can be that getRow return zero m_bRowCountFinal = sal_True; } -if(m_nRowCount m_nFetchSize) +const ORowSetMatrix::iterator aEnd = aIter; +ORowSetMatrix::iterator aRealEnd = m_pMatrix-end(); +sal_Int32 nPos = (m_nRowCount m_nFetchSize) ? (m_nRowCount - m_nFetchSize) : 0; +_nNewStartPos = nPos; +++nPos; +bCheck = m_pCacheSet-absolute(nPos); + +for(;bCheck aIter != aRealEnd;++aIter) { -ORowSetMatrix::iterator aEnd = aIter; -ORowSetMatrix::iterator aRealEnd = m_pMatrix-end(); -sal_Int32 nPos = m_nRowCount - m_nFetchSize + 1; -_nNewStartPos = nPos; -bCheck = m_pCacheSet-absolute(_nNewStartPos); - -for(;bCheck aIter != aRealEnd;++aIter) -{ -if(bCheck) -{ -if(!aIter-is()) -*aIter = new ORowSetValueVector(m_xMetaData-getColumnCount()); -m_pCacheSet-fillValueRow(*aIter,nPos++); -} -bCheck = m_pCacheSet-next(); -} -if(aIter != aEnd) -::std::rotate(m_pMatrix-begin(),aEnd,aRealEnd); +if(!aIter-is()) +*aIter = new ORowSetValueVector(m_xMetaData-getColumnCount()); +m_pCacheSet-fillValueRow(*aIter,nPos++); +bCheck =
[Libreoffice-commits] .: 2 commits - sd/CppunitTest_sd_regression_test.mk sd/Module_sd.mk sd/qa unotest/inc unotest/source
sd/CppunitTest_sd_regression_test.mk |3 sd/Module_sd.mk |1 sd/qa/unit/data/svg/test.svg | 162 +++ sd/qa/unit/regression-test.cxx | 40 ++ unotest/inc/unotest/bootstrapfixturebase.hxx |6 + unotest/source/cpp/bootstrapfixturebase.cxx | 10 + 6 files changed, 220 insertions(+), 2 deletions(-) New commits: commit 28e1b3984080e238866fcd44034de6ea47895962 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jan 19 21:04:26 2012 +0100 enable sd's regression test in the subsequenttest target diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 4fd3a95..edc6f25 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -52,6 +52,7 @@ endif $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ JunitTest_sd_unoapi \ +CppunitTest_sd_regression_test \ )) # vim: set noet sw=4 ts=4: commit 9b27d39081379aefbd8e1636088bf7eee3216ae3 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jan 19 21:01:05 2012 +0100 finish sd's regression test Implemented a simple character based comparison of the exported file and the reference file diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 42a7d99..1c3b089 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_regression_test)) $(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \ -sd/qa/unit/regression-test2 \ +sd/qa/unit/regression-test \ )) $(eval $(call gb_CppunitTest_add_linked_libs,sd_regression_test, \ @@ -113,7 +113,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/expand/ucpexpand1 \ ucb/source/ucp/file/ucpfile1 \ -ucb/source/ucp/gio/ucpgio \ ucb/source/ucp/package/ucppkg1 \ ucb/source/ucp/tdoc/ucptdoc1 \ unotools/util/utl \ diff --git a/sd/qa/unit/data/svg/test.svg b/sd/qa/unit/data/svg/test.svg new file mode 100644 index 000..9e8ce1d --- /dev/null +++ b/sd/qa/unit/data/svg/test.svg @@ -0,0 +1,162 @@ +?xml version=1.0 encoding=UTF-8? + +svg version=1.2 baseProfile=tiny viewBox=0 0 28002 20999 preserveAspectRatio=xMidYMid fill-rule=evenodd clip-path=url(#presentation_clip_path) stroke-width=28.222 stroke-linejoin=round xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:presentation=urn:oasis:names:tc:opendocument:xmlns:presentation:1.0 xmlns:smil=urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0 xmlns:anim=urn:oasis:names:tc:opendocument:xmlns:animation:1.0 xml:space=preserve + defs + clipPath id=presentation_clip_path clipPathUnits=userSpaceOnUse + rect x=0 y=0 width=28002 height=20999/ + /clipPath + /defs + defs + font id=EmbeddedFont_1 horiz-adv-x=2048 + font-face font-family=Liberation Sans embedded units-per-em=2048 font-weight=normal font-style=normal ascent=1852 descent=423/ + missing-glyph horiz-adv-x=2048 d=M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z/ + glyph unicode=x horiz-adv-x=1033 d=M 801,0 L 510,444 217,0 23,0 408,556 41,1082 240,1082 510,661 778,1082 979,1082 612,558 1002,0 801,0 Z/ + glyph unicode=v horiz-adv-x=1059 d=M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,173 522,194 528,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z/ + glyph unicode=u horiz-adv-x=901 d=M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,231 C 997,208 997,185 998,160 998,135 998,111 999,89 1000,66 1000,47 1001,31 1002,15 1002,5 1003,0 L 833,0 C 832,3 832,12 831,27 830,42 830,59 829,78 828,97 827,116 826,136 825,155 825,172 825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z/ + glyph unicode=t horiz-adv-x=531 d=M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z/ + glyph unicode=r horiz-adv-x=556 d=M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969
[Libreoffice-commits] .: 2 commits - i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 22 -- i18npool/source/localedata/data/ja_JP.xml |7 +++ 2 files changed, 27 insertions(+), 2 deletions(-) New commits: commit af25972c19bcd0bef7739bd777c67907d61b2b16 Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 22:25:33 2012 +0100 added [ja-JP] date acceptance patterns (various) diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml index 54c42a2..0b39a2c 100644 --- a/i18npool/source/localedata/data/ja_JP.xml +++ b/i18npool/source/localedata/data/ja_JP.xml @@ -35,6 +35,13 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternM-D/DateAcceptancePattern +DateAcceptancePatternM/D/DateAcceptancePattern +DateAcceptancePatternMï¼D/DateAcceptancePattern +DateAcceptancePatternY.M.D/DateAcceptancePattern +DateAcceptancePatternYï¼Mï¼D/DateAcceptancePattern +DateAcceptancePatternYå¹´MæDæ¥/DateAcceptancePattern +DateAcceptancePatternMæDæ¥/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=short usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement commit 0dc4e9cd0aac2d203219bb5ea4266693427c744c Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 22:23:59 2012 +0100 added check for duplicated date acceptance patterns Also insert full date acceptance pattern at first position instead of appending to have it be first in checks. diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 1b1e777..42cf583 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -1185,7 +1185,8 @@ void LCFormatNode::generateCode (const OFileWriter of) const { fprintf( stderr, Generated date acceptance pattern: '%s' from '%s'\n, OSTR( aPattern), OSTR( sTheDateEditFormat)); -theDateAcceptancePatterns.push_back( aPattern); +// Insert at front so full date pattern is first in checks. +theDateAcceptancePatterns.insert( theDateAcceptancePatterns.begin(), aPattern); } if (aPatternBuf2.getLength() 0) { @@ -1200,7 +1201,7 @@ void LCFormatNode::generateCode (const OFileWriter of) const { fprintf( stderr, Generated 2nd acceptance pattern: '%s' from '%s'\n, OSTR( aPattern2), OSTR( sTheDateEditFormat)); -theDateAcceptancePatterns.push_back( aPattern2); +theDateAcceptancePatterns.insert( theDateAcceptancePatterns.begin(), aPattern2); } } @@ -1222,6 +1223,23 @@ void LCFormatNode::generateCode (const OFileWriter of) const } } +// Check for duplicates. +for (vectorOUString::const_iterator aIt = theDateAcceptancePatterns.begin(); +aIt != theDateAcceptancePatterns.end(); ++aIt) +{ +for (vectorOUString::iterator aComp = theDateAcceptancePatterns.begin(); +aComp != theDateAcceptancePatterns.end(); /*nop*/) +{ +if (aIt != aComp *aIt == *aComp) +{ +incErrorStr( Duplicated DateAcceptancePattern, *aComp); +aComp = theDateAcceptancePatterns.erase( aComp); +} +else +++aComp; +} +} + sal_Int16 nbOfDateAcceptancePatterns = static_castsal_Int16(theDateAcceptancePatterns.size()); for (sal_Int16 i = 0; i nbOfDateAcceptancePatterns; ++i) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/be_BY.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 09c1d111208619197fa851b21ff24bd261a93b15 Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 22:37:53 2012 +0100 added [be-BY] date acceptance patterns D.M. and D/M/ diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml index a020dcc..6d1bc97 100644 --- a/i18npool/source/localedata/data/be_BY.xml +++ b/i18npool/source/localedata/data/be_BY.xml @@ -35,6 +35,8 @@ MeasurementSystemMetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD/M//DateAcceptancePattern +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - svx/inc svx/source
svx/inc/svx/svdpagv.hxx | 11 --- svx/inc/svx/svdpntv.hxx |2 +- svx/source/svdraw/svdmrkv.cxx | 17 +++-- svx/source/svdraw/svdpagv.cxx |7 --- svx/source/svdraw/svdpntv.cxx |2 +- 5 files changed, 9 insertions(+), 30 deletions(-) New commits: commit 50f4d165b42a85993685e546cbc524bc1bf68e5c Author: Kohei Yoshida kohei.yosh...@suse.com Date: Thu Jan 19 16:51:09 2012 -0500 Make this a private member (to make it easier to keep track of its usage). diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 761e5d3..c5773d1 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -132,6 +132,7 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, p friend classFrameAnimator; friend classSdrGrafObj; +SdrPageView*mpPageView; protected: SdrModel* pMod; #ifdef DBG_UTIL @@ -145,7 +146,6 @@ protected: String aMeasureLayer; // Aktueller Layer fuer Bemassung // Container aPagV; // Liste von SdrPageViews -SdrPageView*mpPageView; // All windows this view is displayed on SdrPaintWindowVectormaPaintWindows; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f720e68..d7c8959 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -307,21 +307,15 @@ void SdrMarkView::ClearPageView() void SdrMarkView::HideSdrPage() { bool bMrkChg(false); -//HMHbool bVis(false); -if(mpPageView) +SdrPageView* pPageView = GetSdrPageView(); +if (pPageView) { // break all creation actions when hiding page (#75081#) BrkAction(); -//HMHbVis = IsMarkHdlShown(); - -//HMHif(bVis) -//HMH{ -//HMH HideMarkHdl(); -//HMH} // Discard all selections on this page -bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*mpPageView); +bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*pPageView); } SdrSnapView::HideSdrPage(); @@ -331,11 +325,6 @@ void SdrMarkView::HideSdrPage() MarkListHasChanged(); AdjustMarkHdl(); } - -//HMHif(bVis) -//HMH{ -//HMH ShowMarkHdl(); -//HMH} } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 331354b..8d5d71a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -204,7 +204,7 @@ void SdrPaintView::ImpClearVars() } SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) -: mpPageView(0L), +: mpPageView(NULL), aDefaultAttr(pModel1-GetItemPool()), mbBufferedOutputAllowed(false), mbBufferedOverlayAllowed(false), commit d06779dd50a61b941dbfe9bb2a2f4070aaa09ce5 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Thu Jan 19 16:31:19 2012 -0500 No class derives from SdrPageView. No sense using protected visibility. diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 4b06de3..ab75435 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -73,7 +73,7 @@ typedef ::std::vector SdrPageWindow* SdrPageWindowVector; class SVX_DLLPUBLIC SdrPageView { -protected: +private: SdrView mrView; SdrPage* mpPage; Point aPgOrg; // Nullpunkt der Page @@ -105,7 +105,7 @@ protected: SdrPageWindow* mpPreparedPageWindow; // interface to SdrPageWindow -protected: +private: void ClearPageWindows(); void AppendPageWindow(SdrPageWindow rNew); SdrPageWindow* RemovePageWindow(SdrPageWindow rOld); @@ -124,13 +124,12 @@ public: const SdrPageWindow* FindPatchedPageWindow( const OutputDevice rOutDev ) const; void PaintOutlinerView(OutputDevice* pOut, const Rectangle rRect) const; + private: SVX_DLLPRIVATE SdrPageWindow CreateNewPageWindowEntry(SdrPaintWindow rPaintWindow); -protected: void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; -protected: void SetLayer(const String rName, SetOfByte rBS, sal_Bool bJa); sal_Bool IsLayer(const String rName, const SetOfByte rBS) const; commit 71860292f774920c99663cdbd8bbe0498a0e8da5 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Thu Jan 19 16:25:42 2012 -0500 Don't be a listener if you aren't interested in listening. diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 8a825a0..4b06de3 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -71,7 +71,7 @@ typedef ::std::vector SdrPageWindow* SdrPageWindowVector; -class SVX_DLLPUBLIC SdrPageView : public SfxListener +class SVX_DLLPUBLIC SdrPageView { protected: SdrView
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/view/viewfun2.cxx | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 4dd59855872736864c24947ca9886af9472e0980 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Thu Jan 19 17:21:31 2012 -0500 Fix a crash when copying a sheet with drawing obj to a new document. diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index e2c950c..794db51 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -47,6 +47,7 @@ #include svl/stritem.hxx #include svl/zforlist.hxx #include svl/svstdarr.hxx +#include svx/svdview.hxx #include vcl/msgbox.hxx #include vcl/sound.hxx #include vcl/waitobj.hxx @@ -2466,7 +2467,7 @@ void ScViewFunc::MoveTable( sal_Bool bUndo (pDoc-IsUndoEnabled()); bool bRename = pNewTabName !pNewTabName-isEmpty(); -sal_Bool bNewDoc = ( nDestDocNo == SC_DOC_NEW ); +bool bNewDoc = (nDestDocNo == SC_DOC_NEW); if ( bNewDoc ) { nDestTab = 0; // firstly insert @@ -2646,7 +2647,16 @@ void ScViewFunc::MoveTable( pDestDoc-DeleteTab(static_castSCTAB(TheTabs.size())); // old first table if (pDestViewSh) +{ +// Make sure to clear the cached page view after sheet +// deletion, which still points to the sdr page belonging to +// the deleted sheet. +SdrView* pSdrView = pDestViewSh-GetSdrView(); +if (pSdrView) +pSdrView-ClearPageView(); + pDestViewSh-TabChanged(); // Pages auf dem Drawing-Layer +} pDestShell-PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_SIZE ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewfun2.cxx | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 1df43525da87c181e7c9b42967f30072951cb794 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Thu Jan 19 17:21:31 2012 -0500 Fix a crash when copying a sheet with drawing obj to a new document. diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 77a2601..3cb218d 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -47,6 +47,7 @@ #include svl/stritem.hxx #include svl/zforlist.hxx #include svl/svstdarr.hxx +#include svx/svdview.hxx #include vcl/msgbox.hxx #include vcl/sound.hxx #include vcl/waitobj.hxx @@ -2466,7 +2467,7 @@ void ScViewFunc::MoveTable( sal_Bool bUndo (pDoc-IsUndoEnabled()); bool bRename = pNewTabName !pNewTabName-isEmpty(); -sal_Bool bNewDoc = ( nDestDocNo == SC_DOC_NEW ); +bool bNewDoc = (nDestDocNo == SC_DOC_NEW); if ( bNewDoc ) { nDestTab = 0; // firstly insert @@ -2646,7 +2647,16 @@ void ScViewFunc::MoveTable( pDestDoc-DeleteTab(static_castSCTAB(TheTabs.size())); // old first table if (pDestViewSh) +{ +// Make sure to clear the cached page view after sheet +// deletion, which still points to the sdr page belonging to +// the deleted sheet. +SdrView* pSdrView = pDestViewSh-GetSdrView(); +if (pSdrView) +pSdrView-ClearPageView(); + pDestViewSh-TabChanged(); // Pages auf dem Drawing-Layer +} pDestShell-PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_SIZE ); ___ 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/windows/msiglobal.pm | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) New commits: commit 5d2f27834abd9ea13556387ffa7f773587edbebc Author: Andras Timar ati...@suse.com Date: Thu Jan 19 23:22:38 2012 +0100 fdo#44915 MSI installer l10n bug Unfortunately msiinfo.exe has a limitation, it truncates Language property in Summary Information at char position 254. The replacement, WiLangId.vbs does not have this limitation. diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 8b8007a..a097780 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -982,14 +982,11 @@ sub create_transforms my $msitran = msitran.exe;# Has to be in the path my $msidb = msidb.exe;# Has to be in the path -my $msiinfo = msiinfo.exe;# Has to be in the path +my $wilangid = $ENV{WINDOWS_SDK_HOME} . /Samples/SysMgmt/Msi/scripts/WiLangId.vbs; my $from = cwd(); -my $architecture = Intel; -if (( $allvariableshashref-{'64BITPRODUCT'} ) ( $allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; } - -my $templatevalue = \ . $architecture . ;1033; +my $templatevalue = 1033; $installdir = installer::converter::make_path_conform($installdir); @@ -1124,8 +1121,7 @@ sub create_transforms } } -$templatevalue = $templatevalue . \; # adding ending '' -$systemcall = $msiinfo . . $basedbname . -p . $templatevalue; +$systemcall = cscript.exe . $wilangid . . $basedbname . Package . $templatevalue; $returnvalue = system($systemcall); @@ -1134,12 +1130,12 @@ sub create_transforms if ($returnvalue) { -$infoline = ERROR: Could not execute $msiinfo!\n; +$infoline = ERROR: Could not execute WiLangId.vbs!\n; push( @installer::globals::logfileinfo, $infoline); } else { -$infoline = Success: Executed $msiinfo successfully!\n; +$infoline = Success: Executed WiLangId.vbs successfully!\n; push( @installer::globals::logfileinfo, $infoline); } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - i18npool/source offapi/com
i18npool/source/localedata/data/kab_DZ.xml |1 + offapi/com/sun/star/i18n/NumberFormatIndex.idl |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit bffecae79a79feec906f55f25d0d563915d64c6e Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 23:27:34 2012 +0100 added [kab-DZ] date acceptance pattern D/M diff --git a/i18npool/source/localedata/data/kab_DZ.xml b/i18npool/source/localedata/data/kab_DZ.xml index ad39e6d..3e80f5d 100644 --- a/i18npool/source/localedata/data/kab_DZ.xml +++ b/i18npool/source/localedata/data/kab_DZ.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$DA-85F] +DateAcceptancePatternD/M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeneral/FormatCode /FormatElement commit 6f607469e97d6d6aeba99b5fcad264c40b47fd2e Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 23:22:02 2012 +0100 minor corrections in comments diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl b/offapi/com/sun/star/i18n/NumberFormatIndex.idl index c7105b0..708b2d4 100644 --- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl +++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl @@ -50,7 +50,7 @@ module com { module sun { module star { module i18n { bMUST/b support some predefined format codes. These predefined format codes are accessed through indices as the following, and the locale data format code definitions in -i18npool\source\localedata\data\*.xml bMUST/b have matching +i18npool/source/localedata/data/*.xml bMUST/b have matching entries in the form br/ codelt;FormatElement formatindex=0gt;/code br/ @@ -65,7 +65,7 @@ module com { module sun { module star { module i18n { p Date formats may have a comment of DIN/EN/ISO, meaning ul -li DIN 5008 (Deutsche Industrie Norm) /li +li DIN 5008 (Deutsches Institut fuuml;r Normung, formerly Deutsche Industrie-Norm) /li li EN 28601 (European Norm) /li li ISO 8601 (International Standards Organization) /li /ul @@ -198,7 +198,7 @@ published constants NumberFormatIndex const short DATE_SYS_D = DATE_START+12; /// 10-08 br/ DIN/EN const short DATE_DIN_MMDD = DATE_START+13; -/// 97-10-08br/ DIN/EN/ISO +/// 97-10-08br/ DIN/EN const short DATE_DIN_YYMMDD = DATE_START+14; /// 1997-10-08 br/ DIN/EN/ISO const short DATE_DIN_MMDD = DATE_START+15; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/i18n/NumberFormatIndex.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit decd4c806264042e5fd8b21026c7d3c0cc760f44 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 23:34:54 2012 +0100 Undo comment fix that introduces start of nested comment. diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl b/offapi/com/sun/star/i18n/NumberFormatIndex.idl index 708b2d4..0dd4d21 100644 --- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl +++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl @@ -50,7 +50,7 @@ module com { module sun { module star { module i18n { bMUST/b support some predefined format codes. These predefined format codes are accessed through indices as the following, and the locale data format code definitions in -i18npool/source/localedata/data/*.xml bMUST/b have matching +i18npool\source\localedata\data\*.xml bMUST/b have matching entries in the form br/ codelt;FormatElement formatindex=0gt;/code br/ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - i18npool/source
i18npool/source/localedata/data/fr_BE.xml |1 + i18npool/source/localedata/data/fr_FR.xml |1 + i18npool/source/localedata/data/fr_LU.xml |1 + 3 files changed, 3 insertions(+) New commits: commit 688551303ee5b918841b64ac85f06ab12989b7fc Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 23:47:48 2012 +0100 added [fr-LU] date acceptance pattern D/M diff --git a/i18npool/source/localedata/data/fr_LU.xml b/i18npool/source/localedata/data/fr_LU.xml index 4697c51..a0f7787 100644 --- a/i18npool/source/localedata/data/fr_LU.xml +++ b/i18npool/source/localedata/data/fr_LU.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$F-140C] +DateAcceptancePatternD/M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement commit 513e5c109da38f545b535120cf35126cb5b239fa Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 23:46:41 2012 +0100 added [fr-BE] date acceptance pattern D/M diff --git a/i18npool/source/localedata/data/fr_BE.xml b/i18npool/source/localedata/data/fr_BE.xml index 2cb8be2..9e59a81 100644 --- a/i18npool/source/localedata/data/fr_BE.xml +++ b/i18npool/source/localedata/data/fr_BE.xml @@ -38,6 +38,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD/M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement commit 3e49fe29e8cf83bda35ca1858c8765073d348a11 Author: Eike Rathke er...@redhat.com Date: Thu Jan 19 23:44:46 2012 +0100 added [fr-FR] date acceptance pattern D/M diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 2745d9b..1e2bbea 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$F-40C] +DateAcceptancePatternD/M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) New commits: commit 370fc96b92e59d35c2eb2e14fd77eb14bfc72fd4 Author: Miklos Vajna vmik...@frugalware.org Date: Fri Jan 20 01:36:25 2012 +0100 Fix RTF import of dotted and word underline The problem was that these are flags, not toggles. diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b2e2f7d..0a1fafb 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1450,6 +1450,21 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) checkUnicode(); RTFSkipDestination aSkip(*this); int nParam = -1; +int nSprm = -1; + +// Map all underline flags to a single sprm. +switch (nKeyword) +{ +case RTF_ULD: nSprm = 4; break; +case RTF_ULW: nSprm = 2; break; +default: break; +} +if (nSprm = 0) +{ +RTFValue::Pointer_t pValue(new RTFValue(nSprm)); +m_aStates.top().aCharacterSprms-push_back(make_pair(NS_sprm::LN_CKul, pValue)); +return 0; +} // Indentation switch (nKeyword) @@ -2565,11 +2580,10 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam int nSprm = -1; RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0)); -// Map all underline keywords to a single sprm. +// Map all underline toggles to a single sprm. switch (nKeyword) { case RTF_UL: nSprm = 1; break; -case RTF_ULD: nSprm = 4; break; case RTF_ULDASH: nSprm = 7; break; case RTF_ULDASHD: nSprm = 9; break; case RTF_ULDASHDD: nSprm = 10; break; @@ -2583,7 +2597,6 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam case RTF_ULTHDASHDD: nSprm = 26; break; case RTF_ULTHLDASH: nSprm = 55; break; case RTF_ULULDBWAVE: nSprm = 43; break; -case RTF_ULW: nSprm = 2; break; case RTF_ULWAVE: nSprm = 11; break; default: break; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_basic
binfilter/bf_basic/source/sbx/sbxvalue.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 65731b5747c2753a046e02be2a1fc81a4cfacda8 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 18:04:47 2012 -0600 fix SvStream:;operator problem diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx index 44a7849..2da46d3 100644 --- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx +++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx @@ -1550,7 +1550,11 @@ BOOL SbxValue::LoadData( SvStream r, USHORT ) if( n SAL_TYPES_SIZEOFINT ) r aData.nLong, aData.eType = SbxLONG; else -r aData.nInt; +{ +sal_Int32 nInt; +r nInt; +aData.nInt = nInt; +} break; } case SbxUINT: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/inc sal/inc
cppuhelper/inc/cppuhelper/weak.hxx |6 +++--- sal/inc/osl/file.hxx | 13 + sal/inc/osl/pipe_decl.hxx |4 ++-- sal/inc/osl/profile.hxx|9 - sal/inc/osl/security_decl.hxx | 22 +- sal/inc/osl/socket_decl.hxx|8 sal/inc/rtl/logfile.hxx|2 +- sal/inc/rtl/string.hxx |2 +- sal/inc/rtl/ustrbuf.hxx|6 +++--- 9 files changed, 32 insertions(+), 40 deletions(-) New commits: commit 6ac30d8be976d60f56783327984b263fb1307e2a Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 20:18:48 2012 -0600 clean-up Doxygen warnings diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index b8b9ddd..ceddbda 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.hxx @@ -130,8 +130,8 @@ public: SAL_THROW( () ) { return *this; } -/** Basic queryInterface() implementation supporting ::com::sun::star::uno::XWeak and -::com::sun::star::uno::XInterface. +/** Basic queryInterface() implementation supporting \::com::sun::star::uno::XWeak and +\::com::sun::star::uno::XInterface. @param rType demanded type @return demanded type or empty any @@ -150,7 +150,7 @@ public: /** XWeak::queryAdapter() implementation -@return a ::com::sun::star::uno::XAdapter reference +@return a \::com::sun::star::uno::XAdapter reference */ virtual ::com::sun::star::uno::Reference ::com::sun::star::uno::XAdapter SAL_CALL queryAdapter() throw (::com::sun::star::uno::RuntimeException); diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx index 85393f5..d63126b 100644 --- a/sal/inc/osl/file.hxx +++ b/sal/inc/osl/file.hxx @@ -120,7 +120,7 @@ public: @param ustrRequestedURL [in] Requested name of a file or directory. -@param pustrValidURL [out] +@param ustrValidURL [out] On success receives a name which is unused and valid on the actual Operating System and File System. @@ -251,7 +251,7 @@ public: /** Retrieves the file URL of the system's temporary directory path. -@param ustrTempDirURL[out] +@param[out] ustrTempDirURL On success receives the URL of system's temporary directory path. @return @@ -1529,16 +1529,13 @@ public: return (RC) osl_getFileStatus( _pData, rStatus._aStatus, rStatus._nMask ); } -/** Determine if two directory items point the the same underlying file +/** Determine if a directory item point the the same underlying file The comparison is done first by URL, and then by resolving links to find the target, and finally by comparing inodes on unix. -@param pItemA [in] -A directory handle to compare with another handle - -@param pItemB [in] -A directory handle to compare with pItemA +@param[in] pOther +A directory handle to compare with the underlying object's item @return sal_True: if the items point to an identical resourcebr diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx index 54ccb93..b361440 100644 --- a/sal/inc/osl/pipe_decl.hxx +++ b/sal/inc/osl/pipe_decl.hxx @@ -59,7 +59,7 @@ public: /** Creates a secure pipe that access depends on the umask settings. @param strName @param Options -@param Security +@param rSecurity */ inline Pipe(const ::rtl::OUString strName, oslPipeOptions Options,const Security rSecurity); @@ -87,7 +87,7 @@ public: If the pipe was already created, the old one will be discarded. @param strName @param Options -@param Security +@param rSec @return True if socket was successfully created. */ inline sal_Bool create( const ::rtl::OUString strName, diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx index 88476e0..e372285 100644 --- a/sal/inc/osl/profile.hxx +++ b/sal/inc/osl/profile.hxx @@ -62,7 +62,6 @@ namespace osl { /** Close the opened profile an flush all data to the disk. -@param Profile handle to a opened profile. */ ~Profile() { @@ -143,8 +142,9 @@ namespace osl { return bRet; } -/** Acquire the mutex, block if already acquired by another thread. -@param Profile handle to a opened profile. +/** Remove an entry from a section. +@param rSection Name of the section. +@param rEntry Name of the entry to remove. @return False if section or entry could not be found. */ sal_Bool removeEntry(const rtl::OString rSection, const rtl::OString rEntry) @@ -153,7 +153,7 @@ namespace osl { } /** Get all entries belonging to the specified section. -@param Profile handle to a opened
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: commit 6eb80737c333ed6cb706c391305ecb98fe838e6f Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 02:00:03 2012 -0600 migrate a bunch of mostly windows related variables + clean-up in set_soenv commit b1e46eddd16431e0123d44d178ce8be4e320eba9 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:58:22 2012 -0600 ENABLE_RPATH and LINKFLAGSRUNPATH are not used commit 5c56f8f36fdc2785ed66ba45d3daae12402a1687 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:55:59 2012 -0600 migrate TARFILE_LOCATION out of set_soenv commit e37d68a8f6c9c42cc5210118bd80bf20746b4515 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:53:39 2012 -0600 avoid exporting un-necessary symbol/alias for stable scripts commit 46cf2d208ffbab0c38c6b07f3360c0dacc9886b9 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:52:10 2012 -0600 migrate WITH_POOR_HELP_LOCALIZATIONS out of set_soenv commit f6ef15066aaa8fd87d71d480505de79e60c4a57c Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:48:41 2012 -0600 migrate ENABLE_DEBUG out of set_soenv commit 2aedab1a289f7dc604c4f540cabf5a5dac1babb0 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:46:38 2012 -0600 WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info commit ecb71ab22d9ca071578d899b012ec153b36511ac Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:44:29 2012 -0600 migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv commit 61dd97373ba3865797ab53f1fc1fd04d096730b1 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:34:37 2012 -0600 migrate SYSBASE out of set_soenv commit 5b6ccfda960bd31760633dac1316fb1c9175879f Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:31:21 2012 -0600 migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv commit 62e1774c2a5c66ce6f274da2d9015ae370b48233 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:28:32 2012 -0600 replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses commit 15b1bc5e02cdd46b7d1a7eb4c8fbea9fd99ae1b3 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jan 19 01:23:33 2012 -0600 remove unused CC_X64_BINARY commit fbe3af0b7dfc5828807e8b9c2fd3cba26a54df33 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:54:03 2012 -0600 Eliminate un-used DIRECTX5 commit d327f2e3f3aff5c1b6214a523751e187ed4d877a Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:38:42 2012 -0600 migrate SYNAMIC_CRT and use_shl_version commit d1bc6eee75865673b8474f1687b7fb8ccf905bef Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:35:37 2012 -0600 move SunOS compiler detection up so that COMPATH is settled earlier commit 2ae30b3edda449a5bda89827d2bca4d8fc31a02f Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:34:39 2012 -0600 add api in configure.in to deal with PATH manipulations... prep-work for the migration of PATH handling from set_soenv... commit eef73f24e99f42e1804ec0c44c42f6239c723295 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:33:30 2012 -0600 export a flag-variable to deal with cygwin only export commit a4c1a2b55fd39ece3179b1ad0a1e56e9bf28c974 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Jan 18 15:32:46 2012 -0600 add function to deal with native windows path variables commit 40db56839103147c24080f4f5c262ce4ac069eac Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Jan 9 19:50:53 2012 -0600 move WORK_STAMP out of set_soenv.in commit 51b3918cdaa7fd4d8dcfa461d377408114e7b2a5 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Jan 9 19:09:14 2012 -0600 Move MACOS related variable out of set_soenv.in commit 8bba4adeb9d180a143f0fecc7f5af7c52cb7ec5f Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Jan 3 13:02:04 2012 -0600 move COMPATH,EPM_FLAGS and connex variables out of set_soenv.in ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On 01/04/2012 03:30 PM, Stephan Bergmann wrote: With autodoc no longer used to document C++, the next step would be to either replace its use to generate IDL docu as well (and completely remove autodoc), or at least remove the C++-specific autodoc code. The SDK includes the autodoc executable, but I guess it would be OK to change that... As replacing autodoc for generation of IDL documentation is not so easy (see another post in this thread), I bit the bullet and removed just the C++-specific parts of autodoc with http://cgit.freedesktop.org/libreoffice/core/commit/?id=8419668ea809036e734201770ff7a5a778509cce Remove obsolete autodoc C++ functionality. (I'm sure there is potential for further clean up, also in auxiliary modules like cosv. The next run of callcatcher should probably find a bunch of hits -- in case anybody wants to pick up on that easy hack.) The result is an incompatibility in LO 3.6, that autodoc included in the SDK will no longer support the -lg c++ switch. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Advice needed about some 3.4 named range related problem
Hi Markus On 13/01/12 18:27, Markus Mohrhard wrote: I think it makes sense to remove the findByName and replace them with findByUpperName. The findByName is error-prone and therefore I removed it for 3-5, internally we only use upper name (and in 3.5 we use it even to store the range name). I will clean-up your patch a bit because some changes to rangeutl.cxx only make sense with other changes in master/3.5. re. our discussion on IRC last night, please have a look at the attached patch. ok for 3.4 you think now? Noel 0001-fix-getCellRangeByName-failure-for-named-range.patch Description: application/mbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] CPU eating after opening a password protected macro library
On Wed, 2012-01-18 at 14:15 -0500, Kohei Yoshida wrote: In general, Laurent understands our rule, and is more than willing to dive into the code given some pointers. Sorry pardon :-) my mistake. Just to update, he's already done some profiling to figure it out, but got some roadblocks. Yep - nice work there Laurent, it'd be nice to get some gdb traces from while it is stuck - they're often rather helpful. Apologies, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [ANN] LibreOffice 3.5.0 RC1 pre-available
Hi *, for the upcoming new version 3.5.0, we continue with a release candidate 1 build that is now feature-complete. For further milestones on the way towards 3.5.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#3.5_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to beta3 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-5-release-3.5.0.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich (copying Thorsten's words) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Advice needed about some 3.4 named range related problem
Hello Noel, I think it makes sense to remove the findByName and replace them with findByUpperName. The findByName is error-prone and therefore I removed it for 3-5, internally we only use upper name (and in 3.5 we use it even to store the range name). I will clean-up your patch a bit because some changes to rangeutl.cxx only make sense with other changes in master/3.5. re. our discussion on IRC last night, please have a look at the attached patch. ok for 3.4 you think now? Yes, that looks much better. I will still try to run ScFiltersTest::testRangeName on 3-4. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW 3-5] remove duplicated icons from soffice.bin/soffice.exe (fdo#37740)
Hi Andras, On Wed, 2012-01-18 at 22:02 +0100, Andras Timar wrote: Under Windows soffice.exe and soffice.bin contained 40 icons each. Right - I had always assumed that these were used for file associations and rendering in the windows explorer etc. Many icons were duplicated. At various different sizes ? or duplicated beyond that ? Are we confident that this will not alter the look of .ods / .odt etc. in windows explorer at different zoom levels ? Are we confident that the Alt-Tab application icon images are un-affected [ really we should get those from images.zip IMHO but ... ]. If so - this is a lovely win I'm all for it :-) that has always been something of a hideous waste. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44075, which changed state. Bug 44075 Summary: mysql-connector-ooo-1.0.1 does not work https://bugs.freedesktop.org/show_bug.cgi?id=44075 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Andras Timar tima...@gmail.com changed: What|Removed |Added Depends on||44915 --- Comment #110 from Andras Timar tima...@gmail.com 2012-01-19 03:49:12 PST --- https://bugs.freedesktop.org/show_bug.cgi?id=44915 MSI installer does not show localized UI for many languages, for example pt-BR. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW 3-5] remove duplicated icons from soffice.bin/soffice.exe (fdo#37740)
Hi Michael, 2012/1/19 Michael Meeks michael.me...@suse.com: Hi Andras, On Wed, 2012-01-18 at 22:02 +0100, Andras Timar wrote: Under Windows soffice.exe and soffice.bin contained 40 icons each. Right - I had always assumed that these were used for file associations and rendering in the windows explorer etc. Many icons were duplicated. At various different sizes ? or duplicated beyond that ? Duplicated beyond that. Windows .ico files contain icon sets, each file contains 16x16, 32x32, 48x48, 128x128, and 256x256 icons. But many identical .ico files were embedded into the resource with different names (for historical reasons). Almost all of them were referenced from the code. Another level of duplication was that soffice.exe and soffice.bin both contained the same 40 icons. soffice.exe contained the icons for Windows Explorer, soffice.bin contained the icons for application windows' titlebar and Alt-Tab. Now Windows Explorer takes the icons from soffice.bin, too. Are we confident that this will not alter the look of .ods / .odt etc. in windows explorer at different zoom levels ? Are we confident that the Alt-Tab application icon images are un-affected [ really we should get those from images.zip IMHO but ... ]. Zoom levels are not affected. And yes, I read your comment in the bug about images.zip. But I have no idea how to create an icon handle from an image runtime, that Windows API call expects. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Timur gti...@gmail.com changed: What|Removed |Added CC||gti...@gmail.com Version|LibO 3.4.3 release |LibO 3.4.5 release --- Comment #250 from Timur gti...@gmail.com 2012-01-19 04:06:26 PST --- Nominate: https://bugs.freedesktop.org/show_bug.cgi?id=36876 which should be, if it that's not clear, OpenOffice bug 13791. It prevents import of .doc with table. Nominate: https://bugs.freedesktop.org/show_bug.cgi?id=38261 because current LO's FindReplace doesn't take care of original word case and it doesn't preserve capitalisation. But, it should be overall enhanced, just like Alternative Find Replace extension which doesn't work properly on LO anymore. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Removing unused code
--- .../inc/basegfx/polygon/b2dpolygoncutandtouch.hxx | 10 -- basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 112 unusedcode.easy|4 - 3 files changed, 0 insertions(+), 126 deletions(-) diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx index 0c6296d..8997c54 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -53,28 +53,18 @@ namespace basegfx // not change or add points to rMask. BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon rMask, const B2DPolygon rCandidate); -// look for intersections of rCandidate with all polygons from rMask and add extra points there. Do -// not change or add points to rMask. -BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon rMask, const B2DPolyPolygon rCandidate); - // look for intersections of rCandidate with the edge from rStart to rEnd and add extra points there. // Points are only added in the range of the edge, not on the endless vector. BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate, const B2DPoint rStart, const B2DPoint rEnd); -BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, const B2DPoint rStart, const B2DPoint rEnd); // look for intersections of rCandidate with the mask Polygon and add extra points there. // The mask polygon is assumed to be closed, even when it's not explicitly. BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate, const B2DPolyPolygon rMask); -BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, const B2DPolyPolygon rMask); // look for self-intersections in given polygon and add extra points there. Result will have no // intersections on an edge BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate); -// add points at all self-intersections of single polygons (depends on bSelfIntersections) -// and at polygon-polygon intersections -BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, bool bSelfIntersections = true); - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index 011ecff..9ff9fe1 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -1033,20 +1033,6 @@ namespace basegfx -B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon rMask, const B2DPolyPolygon rCandidate) -{ -B2DPolyPolygon aRetval; - -for(sal_uInt32 a(0L); a rCandidate.count(); a++) -{ -aRetval.append(addPointsAtCutsAndTouches(rMask, rCandidate.getB2DPolygon(a))); -} - -return aRetval; -} - - - B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate, const B2DPoint rStart, const B2DPoint rEnd) { const sal_uInt32 nCount(rCandidate.count()); @@ -1094,18 +1080,6 @@ namespace basegfx return rCandidate; } -B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, const B2DPoint rStart, const B2DPoint rEnd) -{ -B2DPolyPolygon aRetval; - -for(sal_uInt32 a(0); a rCandidate.count(); a++) -{ -aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(a), rStart, rEnd)); -} - -return aRetval; -} - B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate, const B2DPolyPolygon rPolyMask) @@ -1189,18 +1163,6 @@ namespace basegfx return rCandidate; } -B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, const B2DPolyPolygon rMask) -{ -B2DPolyPolygon aRetval; - -for(sal_uInt32 a(0); a rCandidate.count(); a++) -{ -aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(a), rMask)); -} - -return aRetval; -} - B2DPolygon addPointsAtCuts(const B2DPolygon rCandidate) { if(rCandidate.count()) @@ -1217,80 +1179,6 @@ namespace basegfx } } -B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon rCandidate, bool bSelfIntersections) -{ -
[Libreoffice] [PATCH] Removing unused code
--- basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx |7 -- basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx | 14 --- basegfx/source/polygon/b2dpolygonclipper.cxx | 66 - basegfx/source/polygon/b3dpolygonclipper.cxx | 102 - unusedcode.easy |6 - 5 files changed, 0 insertions(+), 195 deletions(-) diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx index 172996a..2556b34 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx @@ -57,13 +57,6 @@ namespace basegfx BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke); BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke); -// Clip given PolyPolygon against the endless edge (ray) defined by the given two points. bAbove defines on which side -// of the edge the result will be together with the definition of the edge. If the edge is seen as a vector -// from A to B and bAbove is true, the result will contain the geometry left of the vector. -// The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). -BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon rCandidate, const B2DPoint rPointA, const B2DPoint rPointB, bool bAbove, bool bStroke); -BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon rCandidate, const B2DPoint rPointA, const B2DPoint rPointB, bool bAbove, bool bStroke); - // Clip given PolyPolygon against given clipping polygon. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). // With stroke polygons, You get all line snippets inside rCip. diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx index 0c66967..f34effe 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx @@ -62,26 +62,12 @@ namespace basegfx // version for Polygons BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); -// Clip the given PolyPolygon against the given range. bInside defines if the result will contain the -// parts which are contained in the range or vice versa. -// The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon rCandidate, const B3DRange rRange, bool bInside, bool bStroke); - // version for Polygons BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon rCandidate, const B3DRange rRange, bool bInside, bool bStroke); // versions for B2DRange, clips only against X,Y -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke); BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke); -// Clip the given PolyPolygon against given plane in 3D. The plane is defined by a plane normal and a point on the plane. -// The value bClipPositive defines on which side the return value will be (true - on positive side of plane). -// The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon rCandidate, const B3DPoint rPointOnPlane, const B3DVector rPlaneNormal, bool bClipPositive, bool bStroke); - -// version for Polygons -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon rCandidate, const B3DPoint rPointOnPlane, const B3DVector rPlaneNormal, bool bClipPositive, bool bStroke); - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 8514fd0..9343c2e 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -346,72 +346,6 @@ namespace basegfx return aRetval; } -B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon rCandidate, const B2DPoint rPointA, const B2DPoint rPointB, bool bAbove, bool bStroke) -{ -B2DPolyPolygon aRetval; - -if(rPointA.equal(rPointB)) -{ -// edge has no length, return polygon -
Re: [Libreoffice] [REVIEW 3-5] remove duplicated icons from soffice.bin/soffice.exe (fdo#37740)
Hi Andras, On Thu, 2012-01-19 at 13:01 +0100, Andras Timar wrote: Duplicated beyond that. Windows .ico files contain icon sets, each file contains 16x16, 32x32, 48x48, 128x128, and 256x256 icons. But many identical .ico files were embedded into the resource with different names (for historical reasons). Almost all of them were referenced from the code. Oh - nice :-) Another level of duplication was that soffice.exe and soffice.bin both contained the same 40 icons. soffice.exe contained the icons for Windows Explorer, soffice.bin contained the icons for application windows' titlebar and Alt-Tab. Now Windows Explorer takes the icons from soffice.bin, too. Great. Zoom levels are not affected. And yes, I read your comment in the bug about images.zip. But I have no idea how to create an icon handle from an image runtime, that Windows API call expects. Lovely; so - I'm ecstatic :-) it'd be nice to get a triple new-feature review from Tor or Fridrich on the topic - but I'd like to see it in 3.5 if we can: should shrink our download speed our startup. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Version|LibO 3.4.5 release |LibO 3.4.0 Beta2 --- Comment #251 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-01-19 04:47:50 PST --- @Timur Please do not nominate, nobody will check such nominations. Consider wise, add a bug or do not add it. https://bugs.freedesktop.org/show_bug.cgi?id=37361#c91 Enhancement Requests do not sound like most annoying http://wiki.documentfoundation.org/BugReport_Details#Version -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: connectivity/source WaE: fix misc. SvStream operator problems.
On Thu, 2012-01-19 at 11:10 +0100, Stephan Bergmann wrote: --- a/connectivity/source/drivers/dbase/DTable.cxx ... (*m_pFileStream) cTyp; if ( nDbaseType == VisualFoxPro ) -(*m_pFileStream) (nRecLength-1); +(*m_pFileStream) sal_uInt16(nRecLength-1); This would previously have been written as four bytes. Are you sure that writing it as two bytes is what is wanted? Oh - I didn't want to change anything, beyond fixing the compilation bug. nRecLength is a sal_uInt16 - so subtracting one turns it into an int ? if so please do fix that up. else m_pFileStream-Write(aBuffer, 4); I guess that would be the equivalent as zeros for non-VisualFoxPro :-) Any chance you can fix it up ? Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #111 from sasha.libreoff...@gmail.com 2012-01-19 05:42:48 UTC --- Possible regression: In Writer options disappears one option, important for Asian languages. See explanations in last comments of this bug: Bug 33743 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Timur gti...@gmail.com changed: What|Removed |Added Depends on||36876 --- Comment #112 from Timur gti...@gmail.com 2012-01-19 07:06:30 PST --- I added https://bugs.freedesktop.org/show_bug.cgi?id=36876 which should be, if it that's not clear, OpenOffice bug 13791. Writer FILEOPEN: document in format DOC with table opens incorrectly. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] minutes of ESC call ...
* Present: + Andras, Norbert, Tor, Michael, Thorsten, Eike, Mitch, David, Rainer, Stephan, Fridrich, Bjoern, Michael S, Lionel * Completed Action Item + create http://hub.libreoffice.org/file-a-bug/ (Christian) + chase / mentor ICU size shrink work (Eike) * Pending Action Items + [slow progress] extract 64bit build hardware from firewall (Kendy / Admins) + hack up the Help-File bug menu item (Thorsten) + rename VCL API to make it GetBeamerFoo fix (Michael) + include slowchecks into tail_build's Makefile (Markus?) * Action Items review * Release Engineering update (Fridrich) + 3.4.5 retrospective + slightly delayed by marketing AA: + poke website + marketing guys wrt. this (Michael) + no new, significant issues found + 3.5.0 status + tag created Wednesday, up-loaded RC1 + bug-hunting on it this weekend + fixed major stlport packaging issue for Win32 * Double review mode on libreoffice-3-5 for RC2 * * FOSDEM dev-room schedule + ~final schedule is on-line: + http://fosdem.org/2012/schedule/track/libreoffice_devroom * QA update (Rainer) + no major news + German lists helping out with bug confirming * ODF 1.2 standards compliance vs. 'the real world' + producing known-broken ODF is problematic, unless the standard is fixed. + much more in ODF 1.2 that is not back-compat with 1.1 + a superficial fix for this version doesn't really address the real problem. + Microsoft Office doesn't support ODF 1.2 + the version is needed to decide which interpretation of the incompatible changes in 1.2 to use eg. list level / numbering + ie. we need to be able to load our own format accurately. + MS Office does import the document content after 'repairing' = no action * 3.5 most annoying bugs ... + 21 (of 76) open vs. last week: 23 (of 71) open + https://bugs.freedesktop.org/showdependencytree.cgi?id=37361hide_resolved=1 + concerns wrt. base + some pretty incompletely tested code. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Problem with clipboard paste in 3.5
Hello. I managed to build the recent version of Libreoffice 3.5.0 on x86_64 Linux. The only problem I have found so far is that the CTRL-V clipboard paste does not do anything, as if the clipboard is empty. However, the middle mouse button works. Could someone direct me to the piece of code that is responsible for this function, so I can try to do some troubleshooting ? Best Regards Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] optimized zoom to use more common intervals
Hi, this patch does round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. The zoom factor was also changed from 1.2 to 1.1. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 594d7b4f6821cbe98b65c3a8c235f86ad7f2dcbc Mon Sep 17 00:00:00 2001 From: Tim Hardeck thard...@suse.com Date: Wed, 18 Jan 2012 16:42:55 +0100 Subject: [PATCH] optimized zoom to use more common intervals Round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. The zoom factor was also changed from 1.2 to 1.1. --- basegfx/Library_basegfx.mk |1 + basegfx/Package_inc.mk |1 + basegfx/StaticLibrary_basegfx_s.mk |1 + basegfx/inc/basegfx/tools/zoomtools.hxx | 57 + basegfx/source/tools/zoomtools.cxx | 139 +++ sc/source/ui/view/prevwsh.cxx |5 +- sc/source/ui/view/tabview.cxx |6 +- sd/source/ui/view/viewshel.cxx |6 +- svx/inc/svx/zoom_def.hxx|3 - svx/source/stbctrls/zoomsliderctrl.cxx |6 +- sw/source/ui/uiview/viewport.cxx|6 +- 11 files changed, 214 insertions(+), 17 deletions(-) create mode 100644 basegfx/inc/basegfx/tools/zoomtools.hxx create mode 100644 basegfx/source/tools/zoomtools.cxx diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index fa0607b..fc6a479 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/tools/b2dclipstate \ basegfx/source/tools/canvastools \ + basegfx/source/tools/zoomtools \ basegfx/source/tools/gradienttools \ basegfx/source/tools/keystoplerp \ basegfx/source/tools/liangbarsky \ diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk index 5767a8f..13b5ff8 100644 --- a/basegfx/Package_inc.mk +++ b/basegfx/Package_inc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.h $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx)) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 79d6ed9..69616f7 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -72,6 +72,7 @@ $(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/tools/liangbarsky \ CustomTarget/basegfx/source/tools/canvastools \ + CustomTarget/basegfx/source/tools/zoomtools \ CustomTarget/basegfx/source/tools/gradienttools \ CustomTarget/basegfx/source/tools/keystoplerp \ CustomTarget/basegfx/source/tools/unopolypolygon \ diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx new file mode 100644 index 000..8deb385 --- /dev/null +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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) 2012 Tim Hardeck thard...@suse.com + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms
Re: [Libreoffice] minutes of ESC call ...
On Thu, 2012-01-19 at 15:44 +, Michael Meeks wrote: * Present: + Andras, Norbert, Tor, Michael, Thorsten, Eike, Mitch, David, Rainer, Stephan, Fridrich, Bjoern, Michael S, Lionel Just FYI (it doesn't matter much but) I was there too. But I didn't utter my name loud enough. :-P Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] [ANN] LibreOffice 3.5.0 RC1 pre-available
Hi Fridrich *, Fridrich Strba wrote (19-01-12 11:22) If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. So far no critical notes to add - all installs fine and did some work. Will do more work testing tomorrow. Fridrich (copying Thorsten's words) :-) -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] [ANN] LibreOffice 3.5.0 RC1 pre-available
2012/1/19 Cor Nouws oo...@nouenoff.nl: Fridrich Strba wrote (19-01-12 11:22) If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. So far no critical notes to add - all installs fine and did some work. Will do more work testing tomorrow. Just yesterday installed beta3, today rc1. Where/how can I find out the differences ? Regards, -- Luc Castermans mailto:luc.casterm...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] [ANN] LibreOffice 3.5.0 RC1 pre-available
Luc Castermans wrote (19-01-12 17:45) Just yesterday installed beta3, today rc1. Busy times ;-) Where/how can I find out the differences ? this link was in the words copied from Thorsten http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-5-release-3.5.0.1.log groeten, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Problem with clipboard paste in 3.5
On Thu, 2012-01-19 at 16:39 +0100, Petr Cisar wrote: Hello. I managed to build the recent version of Libreoffice 3.5.0 on x86_64 Linux. The only problem I have found so far is that the CTRL-V clipboard paste does not do anything, as if the clipboard is empty. However, the middle mouse button works. So, copy and pasting on Linux can be influenced by several factors. First of all, if you are running KDE, chances are that KDE's clipboard manager thingie (I forget the name) can interfere with LibreOffice's copy and paste. If you are in this situation, try disabling it to see if that makes any difference. Failing that, most of the clipboard handling code for unix platform is located under vcl/generic/dtrans. HTH, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of ESC call ...
19.01.2012 19:44, Michael Meeks пишет: * Pending Action Items + hack up the Help-File bug menu item (Thorsten) Oh, I've just noticed this ^^^ We have the bug for this: https://bugs.freedesktop.org/show_bug.cgi?id=35855 and Rainer assigned it to me and I even have a patch (of dubious quality though :) - attaching it. So, I either have to reassign the bug to Thorsten or have to ask how to make the patch better. :) Thorsten, are you working on this already? Best Regards, Ivan From 186a015831027d5a8c77a0110b49b3e4614ac38d Mon Sep 17 00:00:00 2001 From: Ivan Timofeev timofeev@gmail.com Date: Wed, 18 Jan 2012 22:47:58 +0400 Subject: [PATCH] add the Send Feedback... help menu item --- basctl/uiconfig/basicide/menubar/menubar.xml |3 +- chart2/uiconfig/menubar/menubar.xml|3 +- dbaccess/uiconfig/dbapp/menubar/menubar.xml|3 +- dbaccess/uiconfig/dbquery/menubar/menubar.xml |3 +- dbaccess/uiconfig/dbrelation/menubar/menubar.xml |3 +- dbaccess/uiconfig/dbtable/menubar/menubar.xml |3 +- dbaccess/uiconfig/dbtdata/menubar/menubar.xml |3 +- .../uiconfig/sbibliography/menubar/menubar.xml |3 +- framework/uiconfig/startmodule/menubar/menubar.xml |3 +- .../org/openoffice/Office/UI/GenericCommands.xcu |5 reportdesign/uiconfig/dbreport/menubar/menubar.xml |3 +- sc/uiconfig/scalc/menubar/menubar.xml |3 +- sd/uiconfig/sdraw/menubar/menubar.xml |3 +- sd/uiconfig/simpress/menubar/menubar.xml |3 +- sfx2/inc/sfx2/sfxsids.hrc |1 + sfx2/sdi/appslots.sdi |4 +++ sfx2/sdi/sfx.sdi | 25 sfx2/source/appl/appserv.cxx | 16 starmath/uiconfig/smath/menubar/menubar.xml|3 +- sw/uiconfig/sglobal/menubar/menubar.xml|3 +- sw/uiconfig/sweb/menubar/menubar.xml |3 +- sw/uiconfig/swform/menubar/menubar.xml |3 +- sw/uiconfig/swreport/menubar/menubar.xml |3 +- sw/uiconfig/swriter/menubar/menubar.xml|3 +- sw/uiconfig/swxform/menubar/menubar.xml|3 +- 25 files changed, 91 insertions(+), 20 deletions(-) diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 15d4fcd..0d7ecd7 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -83,8 +83,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 3c50167..a52dff8 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -147,8 +147,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index a76fda5..0367d7e 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -133,8 +133,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 2d6ec8d..e041079 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -74,8 +74,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +
Re: [Libreoffice] minutes of ESC call ...
Hi Ivan, On Thu, 2012-01-19 at 21:59 +0400, Ivan Timofeev wrote: + hack up the Help-File bug menu item (Thorsten) We have the bug for this: https://bugs.freedesktop.org/show_bug.cgi?id=35855 and Rainer assigned it to me and I even have a patch (of dubious quality though :) - attaching it. Great news ! :-) Looks like you got most of this there. So, I either have to reassign the bug to Thorsten or have to ask how to make the patch better. :) It's fine to work on it - but perhaps Thorsten can help you out. Now I see it, I wonder whether this new menu item will break the translation freeze ... Thorsten, are you working on this already? Luckily, I think not yet :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][PATCH] Removed formula::FormulaCompiler::IsMatrixFunction() const listed in unusedcode.easy
Hi Mariusz, On Thursday, 2012-01-19 00:15:07 +0100, Mariusz Dykierek wrote: Code is contributed under the LGPLv3+ / MPL Thanks, seen pushed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=d93536e52943c910936504e531956f04d9c0503f But please add the [PATCH] tag to the subject of patch messages so it stands out, and create a new thread for new patches instead of replying to a message so the new patch doesn't get buried in an already existing thread. Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpE7ge5Ai9bB.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] [REVIEW-3-5] fdo#44025 isLast() erroneously returns true
Attached patch fixes fdo#44025; the original symptom is search in a database does not go beyond prefetch window. The underlying reason is that dbaccess::ORowSetCache::isLast() returns true on the last line of the *prefetch* *window* even if it is not the last line of the data. This patch ensures that the underlying statistics are kept up to date, so that isLast() gives a correct result. Please apply to libreoffice-3-5. -- Lionel From 884a3ee289d445c494be12a84b3f53b9c3a3ffcc Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane lio...@mamane.lu Date: Thu, 19 Jan 2012 20:29:36 +0100 Subject: [PATCH] fdo#44025: repair dbaccess::ORowSetCache::isLast() after matrix (re)fill After filling matrix, *do* check if we hit the last row and update m_nRowCount accordingly. Else, a subsequent isLast() will return true on the last row of the prefetch window, even if it is not the last row of the data. Thus the algorithm: while ( ! pResultSet-isLast() ) { //do stuff pResultSet-next() } will stop too soon, which is exactly the symptom in fdo#44025. --- dbaccess/source/core/api/RowSetCache.cxx |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 49f6368..272d260 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -803,7 +803,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos } // we have to read one row forward to ensure that we know when we are on last row // but only when we don't know it already -/* if(!m_bRowCountFinal) { if(!m_pCacheSet-next()) @@ -816,7 +815,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos m_nRowCount = std::max(i,m_nRowCount); } -*/ return bCheck; } -- 1.7.7.3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #113 from Lionel Elie Mamane lio...@mamane.lu 2012-01-19 11:50:47 PST --- Adding bug 44025 ORowSetCache provides the XResultSet interface. Its isLast() returned true on the last line of the prefetch window, instead of the last line of the data. This has the potential to break a lot of other stuff, and in particular breaks search: the search does not look beyond the prefetch window. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: connectivity/source WaE: fix misc. SvStream operator problems.
On 01/19/2012 01:50 PM, Michael Meeks wrote: nRecLength is a sal_uInt16 - so subtracting one turns it into an int ? sure it does if so please do fix that up. done -- hopefully this *is* right now (hard to tell from the code); see https://bugs.freedesktop.org/show_bug.cgi?id=39428#c4 and following for making confusion like this go away in the future Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unit test concept for draw/impress
Hey, I finally found some time finishing the test. It now uses a character based comparison of the exported file and the reference file ( we can switch to a xml based diff later ). I enabled the test in the subsequenttest and hope that Stephan's tinderbox complains if I did something terribly wrong. I think now it is possible for draw/impress developers to add test cases and check if this test works as expected. Please test this also on different platforms and check if the exported file is equal to the reference file on each platform. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][PATCH] Removed Window::GetFullscreenSpriteCanvas listed in unusedcode.easy
Hi Mariusz, Found already pushed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=105546f7f11ccee50f8066bfb7c753fabb177fc8 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpJzNSN0VVOY.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of ESC call ...
Ivan Timofeev wrote: So, I either have to reassign the bug to Thorsten or have to ask how to make the patch better. :) Hah, wonderful - let me get to that tomorrow first thing! :) Cheers, -- Thorsten pgpCylVxonopw.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: connectivity/source WaE: fix misc. SvStream operator problems.
On Thu, 2012-01-19 at 20:58 +0100, Stephan Bergmann wrote: sure it does Ah ! fair cop; thanks for fixing that. I fixed a dozen other places and now it builds for me again :-) hopefully the tinderboxen will recover too. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Depends on||44025 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: connectivity/source WaE: fix misc. SvStream operator problems.
Le 19/01/2012 11:10, Stephan Bergmann a écrit : Hi Stephan, Don't know whether it is linked, but I get a build faliure on Oneiric with the latest pull : In file included from /home/alex/LODEV/core/tools/source/stream/strmsys.cxx:33:0: /home/alex/LODEV/core/tools/source/stream/strmunx.cxx: In static member function ‘static sal_Bool InternalStreamLock::LockFile(sal_Size, sal_Size, SvFileStream*)’: /home/alex/LODEV/core/tools/source/stream/strmunx.cxx:149:19: erreur: ‘class osl::DirectoryItem’ has no member named ‘isIdenticalTo’ Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44915, which changed state. Bug 44915 Summary: MSI does not read localized storage transform for many languages https://bugs.freedesktop.org/show_bug.cgi?id=44915 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fdo#44915 missing MSI localizations
Hi, https://bugs.freedesktop.org/show_bug.cgi?id=44915 This bug first looked mysterious, then limitation of MSI format was suspected. Fortunately it was not the case. Only a tool, msiinfo.exe has a limitation, it cannot take arbitrarily long parameters, and it truncates the Language parameter at char position 254. WiLangId.vbs – which is also part of Windows SDK – does not have this limitation, so the patch below works well, and we can put all of our supported language codes into the Language field of Summary Information. http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d2f27834abd9ea13556387ffa7f773587edbebc Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: connectivity/source WaE: fix misc. SvStream operator problems.
On 01/19/2012 11:19 PM, Alex Thurgood wrote: In file included from /home/alex/LODEV/core/tools/source/stream/strmsys.cxx:33:0: /home/alex/LODEV/core/tools/source/stream/strmunx.cxx: In static member function ‘static sal_Bool InternalStreamLock::LockFile(sal_Size, sal_Size, SvFileStream*)’: /home/alex/LODEV/core/tools/source/stream/strmunx.cxx:149:19: erreur: ‘class osl::DirectoryItem’ has no member named ‘isIdenticalTo’ Sounds like recent tml/mmeeks changes? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] Fix RTF import of dotted and word underline
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=370fc96b92e59d35c2eb2e14fd77eb14bfc72fd4 Could somebody sign-off and push to -3-5, please? I noticed this while trying to figure out why word underline is not exported in doc, it seems in WW8AttributeOutput::CharUnderline() pItem is always NULL (even if we're dealing with a word underline), but that's a different issue. Thanks, Miklos pgpL57B2M0A6G.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-4] date change regression fdo#44385
On 01/16/2012 08:01 AM, Eike Rathke wrote: Hi Noel, On Friday, 2012-01-13 09:51:33 +, Noel Power wrote: this change ( the variant ) is what is on master, here the intention is as Andrew pointed out ( in a previous mail discussing the regression ) to allow operations on date types return dates ( regardless of the operation ) which seems reasonable. Not every operation on date types should return a date, i.e. substracting two dates should return a number of days (I don't think adding/multiplying/dividing two dates makes sense, but it should return a number of days as well). Eike The original code verified that a date was used in at least one argument, and, if so, then a date is returned. Eike, to follow your suggestion of NOT returning a date if we expect that the answer should be a number of days, then we would want to check both parameters, and if both are of type date then return a double rather than date. If you really desire to strive for accuracy, then what you want to say is that if two dates are involved and there is a subtraction, then you desire the elapsed time between the two date objects. I need to be careful in what I say because I am not intimate with the code, but, I believe that a date is internally represented as a double. I also seem to remember that a time is a date that has zero days. This leaves a day that cannot be represented (well, it won't print as a date anyway, at least I think it did not when I last tested it long before LibO existed). One may choose to argue that date arithmetic makes no sense (ie, what does it mean to add today to today, or to multiply today by 2), but I believe that the original solution was written to allow for the common case and do the expected thing. So, Perhaps I have code such as (time_1 + time_2 - time_3), the intent seems to be to determine the difference between time_2 and time_3 and add that to time_1. In the original code, that would work. I suppose that if we add a check to verify that one parameter is a date and that the other is not, then our result would be mostly as expected, but that feels onerous. It is a bit difficult and fraught with peril, however, because I believe that if the new time passes midnight (ie, 24 hours), then it will suddenly display as a date rather than a time. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-4] date change regression fdo#44385
On 01/19/2012 09:03 PM, Andrew Douglas Pitonyak wrote: On 01/16/2012 08:01 AM, Eike Rathke wrote: Hi Noel, On Friday, 2012-01-13 09:51:33 +, Noel Power wrote: this change ( the variant ) is what is on master, here the intention is as Andrew pointed out ( in a previous mail discussing the regression ) to allow operations on date types return dates ( regardless of the operation ) which seems reasonable. Not every operation on date types should return a date, i.e. substracting two dates should return a number of days (I don't think adding/multiplying/dividing two dates makes sense, but it should return a number of days as well). Eike The original code verified that a date was used in at least one argument, and, if so, then a date is returned. Eike, to follow your suggestion of NOT returning a date if we expect that the answer should be a number of days, then we would want to check both parameters, and if both are of type date then return a double rather than date. If you really desire to strive for accuracy, then what you want to say is that if two dates are involved and there is a subtraction, then you desire the elapsed time between the two date objects. I need to be careful in what I say because I am not intimate with the code, but, I believe that a date is internally represented as a double. I also seem to remember that a time is a date that has zero days. This leaves a day that cannot be represented (well, it won't print as a date anyway, at least I think it did not when I last tested it long before LibO existed). One may choose to argue that date arithmetic makes no sense (ie, what does it mean to add today to today, or to multiply today by 2), but I believe that the original solution was written to allow for the common case and do the expected thing. So, Perhaps I have code such as (time_1 + time_2 - time_3), the intent seems to be to determine the difference between time_2 and time_3 and add that to time_1. In the original code, that would work. I suppose that if we add a check to verify that one parameter is a date and that the other is not, then our result would be mostly as expected, but that feels onerous. It is a bit difficult and fraught with peril, however, because I believe that if the new time passes midnight (ie, 24 hours), then it will suddenly display as a date rather than a time. Oh my Looks like Date and Time are represented as different types internally. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW][3-4] date change regression fdo#44385
On 01/17/2012 04:46 AM, Noel Power wrote: On 16/01/12 16:59, Eike Rathke wrote: b) not so risky ( I think ), and... would change the present behaviour in consistent way for treatment of minus operator -if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) +if( ( eOp == SbxPLUS || eOp == SbxMINUS ) ( ( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) ( GetType() != rOp.GetType() ) ) ) That one (b) looks good. ok, good you don't see additional problems then c) risker variant of b that allows all operations on a date type to retain it's date type -if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) +if( ( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) ( GetType() != rOp.GetType() ) ) I don't spot sense in 2*today() = 2124-02-02;-) Eike well like I said neither do I but iirc Andrew mentioned he could think of some possible strange use cases ( maybe I misunderstood him ) Anyway I will commit the solution we agreed on. Andrew, if still feel strongly enough that the 'Date' type should be preserved then I guess you can submit an extra patch and rational to the list. thanks again Noel Sorry for the delay in my response Ripped some muscles in my leg and I am a bit behind in my email It was exacerbated by the fact that any email that includes the mailing list in any way is all filtered into the list (so I needed to read a few hundred messages to find these). So, when might someone multiply dates? Well, people that choose to store a date or time delta in the native type will do it for sure. Find the difference between two dates, perform some manipulation on that, etc. My primary concerns 1. Change in behavior that may break existing code. 2. Previous behavior was never flagged as an issue, and may arguably be considered logical to some. for example, storing a delta in the native type. 3. The rules are more complicated now and require complex examples to explain; for example, time_1 + time_2 + time_3 returns a date but time_1 + time_2 does not. We cannot simply state that math done with dates or including a date returns a date. I expect, however, that this will allow the majority case to function. If we desire to argue that it makes no sense to multiply two dates together, then why not simply call it an error? (I am not advocating this) This will now fail for all code that chooses to store a time / date difference in the time / date type. Sadly, this is an error that will only be discovered when that particular code is run. I found the code while trying to fix existing code that was sent to me... They wanted to know why it failed in LibO. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][PATCH] proposed fix for fdo#44283
11.01.2012 22:15, Lionel Elie Mamane пишет: On Wed, Jan 11, 2012 at 04:22:59PM +, Caolán McNamara wrote: Looks good to me on the surface anyway. Go for it I say for master and 3.5. Lionel ? are we right here ? Yes, that patch is right. I committed (and pushed) a slightly extended version of it to libreoffice-3-5 and a more extensive cleanup to master. [PUSHED] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fdo#44915 missing MSI localizations
Hi Andras, 20.01.2012 02:33, Andras Timar пишет: http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d2f27834abd9ea13556387ffa7f773587edbebc #offtopic: My native windows build had failed on that call to msiinfo.exe, it would be nice to build with your patch again... Cheers, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] clean-up Doxygen warnings
On 01/20/2012 03:19 AM, Norbert Thiebaud wrote: commit 6ac30d8be976d60f56783327984b263fb1307e2a Author: Norbert Thiebaudnthieb...@gmail.com Date: Thu Jan 19 20:18:48 2012 -0600 clean-up Doxygen warnings diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index b8b9ddd..ceddbda 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.hxx @@ -130,8 +130,8 @@ public: SAL_THROW( () ) { return *this; } -/** Basic queryInterface() implementation supporting ::com::sun::star::uno::XWeak and -::com::sun::star::uno::XInterface. +/** Basic queryInterface() implementation supporting \::com::sun::star::uno::XWeak and +\::com::sun::star::uno::XInterface. Another (simpler) solution is to just drop the leading :: from the name. Doxygen apparently attaches specific meaning to that prefix (produce a link to the named entity, IIUC), and to preserve the meaning of the comment the prefix it is not really necessary. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 44924] New: MAILMERGE stops responding sending document with complex DRAW OLE in page header
https://bugs.freedesktop.org/show_bug.cgi?id=44924 Bug #: 44924 Summary: MAILMERGE stops responding sending document with complex DRAW OLE in page header Classification: Unclassified Product: LibreOffice Version: LibO 3.3.0 Beta2 Platform: Other OS/Version: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: libreoff...@bielefeldundbuss.de Created attachment 55763 -- https://bugs.freedesktop.org/attachment.cgi?id=55763 Test kit Steps to reporoduce with Parallel Dev-Installation of LibreOffice 3.5.0 Beta3- WIN7 Home Premium (64bit) German UI [Build-ID: e40af8c-10029e3-615e522-88673a2-727f724] : 1. Download / unzip attached test kit 2. replace my e-mail address by yours in spreadsheet adhoc.ods 3. Create and connect a database adhoc.odb 4. open sampledrawing.odt 5. Start Mail merge wizard and try to send all 158 mails as PDF Starts promising, but when send process starts LibO will hang Kill LibO, start again 11. open samplegdi.odt (more or less the same, but heading picture created by cutting DRAWing and inserting as GDI 12. Start Mail merge wizard and try to send all 158 mails as PDF Much faster creation of 158 documents to be sent, send process is heavy work for LibO, but all few seconds a document will be sent I also checked older Master versions and OOo 3.1.1., all the same. Seems inherited from OOo. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44925] New: list box contents should be same direction/alignment as sheet, not the interface
https://bugs.freedesktop.org/show_bug.cgi?id=44925 Bug #: 44925 Summary: list box contents should be same direction/alignment as sheet, not the interface Classification: Unclassified Product: LibreOffice Version: LibO 3.5.0 Beta3 Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Spreadsheet AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: kaplanl...@gmail.com Created attachment 55764 -- https://bugs.freedesktop.org/attachment.cgi?id=55764 list boxes in RTL UI For left to right UI we have this logic: The text in th list box (e.g. selection list) is aligned to the same side as the sheet (LTR sheet to the left, RTL sheets to the right). For right to left UI this logic is reversed (see attached screenshot), so the in LTR sheet the text is aligned to the right, and the in RTL sheet the text is align to the left. The behavior should be the same for both LTR and RTL UIs, as the alignment should be calculated by the sheet's directionality, not the UI's. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44926] New: EDITING: test for R. Bielefeld
https://bugs.freedesktop.org/show_bug.cgi?id=44926 Bug #: 44926 Summary: EDITING: test for R. Bielefeld Classification: Unclassified Product: LibreOffice Version: LibO 3.5.0 Beta3 Platform: Other OS/Version: All Status: UNCONFIRMED Status Whiteboard: BSA Severity: normal Priority: medium Component: Spreadsheet AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: tomhube...@gmail.com Problem description: Steps to reproduce: 1. check whether i can submit a bug 2. 3. Current behavior: Expected behavior: Platform (if different from the browser): Browser: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.18 (KHTML, like Gecko) Chrome/18.0.1010.0 Safari/535.18 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42121] BUGZILLAASSISTANT: Submission process does not start, remains before Step 1
https://bugs.freedesktop.org/show_bug.cgi?id=42121 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added AssignedTo|l...@dachary.org|libreoffice-b...@lists.free ||desktop.org --- Comment #15 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-01-19 02:02:03 PST --- Loic currently is not active in the project. To clarify: Generally I am already logged in when I start submission process because I forgot to log out after the session before. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44931] New: EDITING, FILEOPEN: cross-referencing HEADINGS in a sub-document from master-document fails
https://bugs.freedesktop.org/show_bug.cgi?id=44931 Bug #: 44931 Summary: EDITING, FILEOPEN: cross-referencing HEADINGS in a sub-document from master-document fails Classification: Unclassified Product: LibreOffice Version: LibO 3.5.0 Beta3 Platform: x86-64 (AMD64) OS/Version: Windows (All) Status: UNCONFIRMED Severity: major Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: guigo...@gmail.com Created attachment 55768 -- https://bugs.freedesktop.org/attachment.cgi?id=55768 MASTER and SUB-docs with failing cross-references but only if HEADINGS in the sub-document ARE NOT local cross-referenced from itself... Or, in other words, if you write a sub-document in wich you make cross-references to some of its headins, you will then cross-reference this headins from a master document in wich you have inserted the sub-doc; the rest of the headings will look OK when you insert the cross-reference, but doing a Tools/Update/Update All will convert all cross-references in a Error: Reference source not found message. Here you are a demo of a master and sub document with failing cross-references... -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44931] EDITING, FILEOPEN: cross-referencing HEADINGS in a sub-document from master-document fails
https://bugs.freedesktop.org/show_bug.cgi?id=44931 --- Comment #1 from gui guigo...@gmail.com 2012-01-19 02:29:53 PST --- Created attachment 55769 -- https://bugs.freedesktop.org/attachment.cgi?id=55769 Repaired MASTER and SUB-document with functionall cross-references To cross-reference the sub-document HEADINGS from the master-document, first you should cross-reference them from the same sub-document -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44932] New: PRINTING: Printing 6.75 10 envelopes
https://bugs.freedesktop.org/show_bug.cgi?id=44932 Bug #: 44932 Summary: PRINTING: Printing 6.75 10 envelopes Classification: Unclassified Product: LibreOffice Version: LibO 3.5.0 Beta3 Platform: Other OS/Version: All Status: UNCONFIRMED Status Whiteboard: BSA Severity: normal Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: jlerne...@comcast.net Problem description: Will not print envelopes correctly according to the icon within the program Steps to reproduce: I open Writer and go to Insert Envelope. I then pick out Format after entering Addressee - I then pick the Printer tab and select Print from the bottom and then select the picture that matched my printers Envelope format (Flap up on left side- envelope enters from the right side of printer). I can not seem to get it to printer on the envelope. It keeps wanting to print on the left side (where there no envelope). I even tried to print it as a PDF and still no luck. Current behavior: Prints address as if the envelope is on the left side of the printer. Expected behavior: Envelope actions are on the right side of the printer Platform (if different from the browser): Browser: Mozilla/5.0 (Windows NT 5.1; rv:10.0) Gecko/20100101 Firefox/10.0 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44931] EDITING, FILEOPEN: cross-referencing HEADINGS in a sub-document from master-document fails
https://bugs.freedesktop.org/show_bug.cgi?id=44931 gui guigo...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 40481] Unattended msi installation installs all languages by default
https://bugs.freedesktop.org/show_bug.cgi?id=40481 --- Comment #11 from Timur gti...@gmail.com 2012-01-19 03:05:55 PST --- This is VERY important to me and I wish it were of high importance. There are few issues which are from my experience related to unattended MSI installation: - selecting only some languages and dictionaries, which can be done as described here, although not in a clean manner; I couldn't do it by creating MST - installing additional extensions; I couldn't find a way to do it now - setting Tools-Options-Language Settings-Languages-Default Languages for Documents and Tools-Options-Language Settings-Languages-User Interface; I couldn't find a way to do it now, and average users will not be able to use Check spelling feature - setting Tools-Options-Security-Macro Security-Security Level to Medium; I couldn't find a way to do it now, and average users will not be able to open some complex tables For the last two items, I found that an existing and working registrymodifications.xcu should be copied to new installation, but I couldn't get it to work. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 34425] [EasyHack] formatting background color toolbar button
https://bugs.freedesktop.org/show_bug.cgi?id=34425 --- Comment #19 from Winfried Donkers o...@dci-electronics.nl 2012-01-19 03:11:23 PST --- Looks like I have solved the problem for the backgroundcolor. I wanted to use the color as stored in the SvxFontColorExtToolBoxControl, but could not get to the control from ScFormatShell::ExecuteAttr() (in formatsh.cxx). Now I have used the same method as with writer: store the last used color in ScTabViewShell. I am not proud of the solution (I'd still rather use the color alreday stored in the control), but it works. I want to do some extra testing and polishing of the code changes before I submit the patch. The font color is handled differently; I don't see how I can put the needed functionality in ScFormatShell::ExecuteAttr() (in formatsh.cxx) for this control, so I'll leave that control as it is, unless someone has a suggestion that helps me to do it. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44933] New: Installation stopped
https://bugs.freedesktop.org/show_bug.cgi?id=44933 Bug #: 44933 Summary: Installation stopped Classification: Unclassified Product: LibreOffice Version: unspecified Platform: x86 (IA32) OS/Version: Windows (All) Status: UNCONFIRMED Severity: blocker Priority: medium Component: Installation AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: agostino.bruzz...@tiscali.it Created attachment 55770 -- https://bugs.freedesktop.org/attachment.cgi?id=55770 screen shot LibreOffice 3.4.5 italian - first installation. RAM 2 GB; os Windows XP sp 3. When installation begins, after selecting user names etc, the following message is displayed: Si prega di uscire da LibreOffice 3.4 e libreOffice 3.4 Quick start prima di continuare. Se utilizzate un sistema multiutente, assicuratevi che nessun altro utente abbia LibreOffice 3.4 aperto -pulsante OK Giving OK installation ends. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44933] Installation stopped
https://bugs.freedesktop.org/show_bug.cgi?id=44933 Ago agostino.bruzz...@tiscali.it changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44933] Installation stopped
https://bugs.freedesktop.org/show_bug.cgi?id=44933 Ago agostino.bruzz...@tiscali.it changed: What|Removed |Added Priority|medium |high Version|unspecified |LibO 3.4.5 release -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44934] New: Select row; maximize spreadsheet; only part of the row is highlighted
https://bugs.freedesktop.org/show_bug.cgi?id=44934 Bug #: 44934 Summary: Select row; maximize spreadsheet; only part of the row is highlighted Classification: Unclassified Product: LibreOffice Version: LibO 3.4.2 release Platform: Other OS/Version: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Spreadsheet AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: b...@herbison.com Open a new spreadsheet in a window that only fills a portion of the width of the screen. Click on a row number to select the row, the visible cells in the selected row are highlighted. Scroll right, more columns appear and the cells in the selected row are highlighted (sometimes with a noticeable delay, but the highlight happens). Maximize the window, several new columns appear on the right.The cells of the selected row in the newly displayed columns are not highlighted. Minimizing and restoring the window do not fix the problem, and neither does switching to another application and back. Scrolling right or left does fix the problem. The same behavior was observer with Windows 7 and Ubuntu 11.04, both LibreOffice 3.4.2 / OOO340m1 (Build:203). -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44075] mysql-connector-ooo-1.0.1 does not work
https://bugs.freedesktop.org/show_bug.cgi?id=44075 Fridrich Strba fridrich.st...@bluewin.ch changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Fridrich Strba fridrich.st...@bluewin.ch 2012-01-19 03:25:59 UTC --- This mixup was due to a bug that prevented us from packaging stlport_vc7145.dll. This bug is fixed in libreoffice-3-5 branch and will be in 3.5.0-rc2. Closing it as fixed. Please verify when 3.5.0-rc2 is out. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs