Vacation -> 28 September
Just FYI, I'm going in vacation until 28 September. This means I'll be away from any machine nearly powerful enough to build LibreOffice. I'll try to read my email every few days. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] More ::rtl::OUString to OUString in avmedia
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/621 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/621 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e49d84b5a7aa47dc315735a8198ba7fdde0b4e7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania Gerrit-Reviewer: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] More ::rtl::OUString to OUString in avmedia
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/625 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/625 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5478199d8ff1cd79dc54e680e8a6c257e7d8325 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania Gerrit-Reviewer: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: avmedia/source
avmedia/source/gstreamer/gstframegrabber.hxx | 10 +-
avmedia/source/gstreamer/gstmanager.cxx | 14 +++---
avmedia/source/gstreamer/gstmanager.hxx |8
avmedia/source/gstreamer/gstplayer.cxx | 18 +-
4 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 25ebe01cf39eba32e8e65995d709e5e803b627a1
Author: Ricardo Montania
Date: Fri Sep 14 13:15:37 2012 -0300
More ::rtl::OUString to OUString in avmedia
Change-Id: Ic5478199d8ff1cd79dc54e680e8a6c257e7d8325
Reviewed-on: https://gerrit.libreoffice.org/625
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx
b/avmedia/source/gstreamer/gstframegrabber.hxx
index 31dc3cf..bc8a536 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -47,20 +47,20 @@ public:
FrameGrabber( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
~FrameGrabber();
-boolcreate( const ::rtl::OUString& rURL );
+boolcreate( const OUString& rURL );
// XFrameGrabber
virtual ::com::sun::star::uno::Reference<
::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >mxMgr;
-::rtl::OUString
maURL;
+OUString
maURL;
};
} // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstmanager.cxx
b/avmedia/source/gstreamer/gstmanager.cxx
index f04e5cc..91ad26c 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -63,7 +63,7 @@ Manager::~Manager()
//
--
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
OUString& rURL )
throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
@@ -80,15 +80,15 @@ uno::Reference< media::XPlayer > SAL_CALL
Manager::createPlayer( const ::rtl::OU
//
--
-::rtl::OUString SAL_CALL Manager::getImplementationName( )
+OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ) );
+return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME );
}
//
--
-sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName
)
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_GST_MANAGER_SERVICENAME;
@@ -96,11 +96,11 @@ sal_Bool SAL_CALL Manager::supportsService( const
::rtl::OUString& ServiceName )
//
--
-uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
-uno::Sequence< ::rtl::OUString > aRet(1);
-aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM (
AVMEDIA_GST_MANAGER_SERVICENAME ) );
+uno::Sequence< OUString > aRet(1);
+aRet[0] = AVMEDIA_GST_MANAGER_SERVICENAME ;
return aRet;
}
diff --git a/avmedia/source/gstreamer/gstmanager.hxx
b/avmedia/source/gstreamer/gstmanager.hxx
index 73048f2..3f1a7e5 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -48,12 +48,12 @@ public:
~Manager();
// XManager
-virtual ::com::sun::star::uno::Refere
[Libreoffice-commits] .: avmedia/source
avmedia/source/framework/soundhandler.cxx| 28 +--
avmedia/source/framework/soundhandler.hxx| 12 +--
avmedia/source/gstreamer/gstframegrabber.cxx | 18 -
3 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 50f5870632decd081d7396aef81d44c9523f2679
Author: Ricardo Montania
Date: Fri Sep 14 12:20:23 2012 -0300
More ::rtl::OUString to OUString in avmedia
Change-Id: I0e49d84b5a7aa47dc315735a8198ba7fdde0b4e7
Reviewed-on: https://gerrit.libreoffice.org/621
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/avmedia/source/framework/soundhandler.cxx
b/avmedia/source/framework/soundhandler.cxx
index 6d35f88..4a8acfc 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -133,7 +133,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL
SoundHandler::getTypes() throw( cs
}
#define DECLARE_ASCII( SASCIIVALUE ) \
-::rtl::OUString( SASCIIVALUE )
+OUString( SASCIIVALUE )
#define IMPLEMENTATIONNAME_SOUNDHANDLER
DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler")
#define SERVICENAME_CONTENTHANDLER
DECLARE_ASCII("com.sun.star.frame.ContentHandler")
@@ -141,7 +141,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL
SoundHandler::getTypes() throw( cs
/*===*/
/* XServiceInfo */
/*===*/
-::rtl::OUString SAL_CALL SoundHandler::getImplementationName() throw(
css::uno::RuntimeException )
+OUString SAL_CALL SoundHandler::getImplementationName() throw(
css::uno::RuntimeException )
{
return impl_getStaticImplementationName();
}
@@ -149,13 +149,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL
SoundHandler::getTypes() throw( cs
/*===*/
/* XServiceInfo */
/*===*/
-sal_Bool SAL_CALL SoundHandler::supportsService( const ::rtl::OUString&
sServiceName ) throw( css::uno::RuntimeException )
+sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName
) throw( css::uno::RuntimeException )
{
/* Set default return value. */
sal_Bool bReturn = sal_False ;
/* Get names of all supported servicenames. */
-css::uno::Sequence< ::rtl::OUString > seqServiceNames =
getSupportedServiceNames();
-const ::rtl::OUString* pArray =
seqServiceNames.getConstArray();
+css::uno::Sequence < OUString > seqServiceNames =
getSupportedServiceNames();
+const OUString*pArray =
seqServiceNames.getConstArray();
sal_Int32 nCounter= 0;
sal_Int32 nLength =
seqServiceNames.getLength();
/* Search for right name in list. */
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL SoundHandler::supportsService( const
::rtl::OUString& sService
/*===*/
/* XServiceInfo */
/*===*/
-css::uno::Sequence< ::rtl::OUString > SAL_CALL
SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException )
+css::uno::Sequence< OUString > SAL_CALL
SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
@@ -187,9 +187,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL
SoundHandler::getSupportedService
/*===*/
/* Helper for XServiceInfo
*/
/*===*/
-css::uno::Sequence< ::rtl::OUString >
SoundHandler::impl_getStaticSupportedServiceNames()
+css::uno::Sequence< OUString >
SoundHandler::impl_getStaticSupportedServiceNames()
{
-css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
+css::uno::Sequence< OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER;
return seqServiceNames;
}
@@ -197,7 +197,7 @@ css::uno::Sequence< ::rtl::OUString >
SoundHandler::impl_getStaticSupportedServi
/*===*/
/* Helper for XServiceInfo */
/*==
How to change Calc default to NOT add 1 when drag-copying a cell
How do I change the Calc default of adding 1 (+1) when a cell is drag-copied? I just want it to copy to the location(s) drug to, NOT add 1 to each cell in sequence. I know that holding CTL when doing this will prevent the addition, but I need this to be the default action WITHOUT pressing CTL. Excel has this optional setting, so I presume Calc has it, or at least should have it. In my understanding, Libre Office should mirror or excel (pun intended) the Microsquish effort, so as to be fully compatible. Thanks! -- View this message in context: http://nabble.documentfoundation.org/How-to-change-Calc-default-to-NOT-add-1-when-drag-copying-a-cell-tp4007607.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.6.2 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.2. The upcoming 3.6.2 will be the second in a series of frequent bugfix releases, for our feature-packed 3.6 branch. Please be aware that LibreOffice 3.6.2 RC1 is not ready for production use, you should continue to use LibreOffice 3.6.1 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://challenge.documentfoundation.org/ A list of known issues and fixed bugs with 3.6.2 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.2/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint pgpr1FpEZzukp.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-6] don't import old and new cond format data
Hey, [1] prevents the import of old cond format data if the new ones are already imported. Regards, Markus [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=dfc68037328fbc1ec45d18b25822b59a2134285a ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gradients
Hi Christina, Christina Roßmanith schrieb: Hi, I'll have a look at gradients again. Could someone please have a look at the following two gradient specifications and tell me if they are supposed to look the same: 1. Created by LibreOffice (create rectangle in Draw, fill with a blue to green gradient, save as fodg) 2. Modified by me to use svg:linearGradient instead of draw:gradient (rendered as a grey to white gradient, clearly has to be improved :-) ) No, they are not the same. The draw gradient style "linear" alters the colors form top to bottom for angle=0, the svg gradient alters the colors from left to right for the default gradient vector. You need a 90° rotation somewhere. The draw gradient allows step coloring, the svg gradient not. The draw gradient is applied to the bound rectangle of the rotated object, the svg gradient has fill rule "userSpaceOnUse". Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - l10ntools/source sal/inc scp2/source
l10ntools/source/helpmerge.cxx | 17 -
sal/inc/rtl/ustring.hxx |2 +-
scp2/source/gnome/module_gnome.scp |4
scp2/source/kde/module_kde.scp |2 +-
scp2/source/onlineupdate/module_onlineupdate.scp |2 +-
scp2/source/ooo/module_systemint.scp |2 +-
scp2/source/stdlibs/module_stdlibs.scp |4
scp2/source/tde/module_tde.scp |2 +-
8 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit f3b0081044d0a5b98c6c8a5e2bf3dfd84287bc21
Author: Andras Timar
Date: Fri Sep 14 22:44:28 2012 +0200
trim leading (and trailing) spaces when extracting help string
and put leading spaces back on merge. It will result in cleaner
strings in .po files, and indentation of Basic code examples
will be kept more easily.
Change-Id: Icdd5cb94069f506ed0b7edf7483ccfd139f296aa
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8e8d33f..cbf38fb 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -155,7 +155,7 @@ bool HelpParser::CreateSDF(
rtl::OUString()).
replaceAll(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")),
-rtl::OUString()));
+rtl::OUString()).trim());
sBuffer.append( sOUPrj );
sBuffer.append('\t');
if ( !rRoot_in.isEmpty())
@@ -374,8 +374,23 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const
rtl::OString& sCur ,
if( pEntrys != NULL)
{
rtl::OString sNewText;
+rtl::OUString sSourceText(
+pXMLElement->ToOUString().
+replaceAll(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")),
+rtl::OUString()).
+replaceAll(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")),
+rtl::OUString()));
+// re-add spaces to the beginning of translated string,
+// important for indentation of Basic code examples
+sal_Int32 nPreSpaces = 0;
+sal_Int32 nLen = sSourceText.getLength();
+while ( (nPreSpaces < nLen) &&
(*(sSourceText.getStr()+nPreSpaces) == ' ') )
+nPreSpaces++;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true );
rtl::OUString sNewdata(
+sSourceText.copy(0,nPreSpaces) +
rtl::OStringToOUString(sNewText, RTL_TEXTENCODING_UTF8));
if (!sNewdata.isEmpty())
{
commit fa81ac50dd6613ff9c55d2169538a062a417e89d
Author: Andras Timar
Date: Fri Sep 14 22:43:43 2012 +0200
remove DONTSHOWINUSERINSTALL style, because it is not interpreted
Change-Id: I146e29a68b04ce227fd2b9568fd2bbcd79b45792
diff --git a/scp2/source/gnome/module_gnome.scp
b/scp2/source/gnome/module_gnome.scp
index 9194825..80ec3f7 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -32,11 +32,7 @@ Module gid_Module_Optional_Gnome
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
-#ifdef UNX
Styles = ();
-#else
-Styles = (DONTSHOWINUSERINSTALL);
-#endif
#ifdef ENABLE_GNOMEVFS
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 55180c5..f1bc11c 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Kde
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
-Styles = (DONTSHOWINUSERINSTALL);
+Styles = ();
Files = (
#ifdef ENABLE_KDE
gid_File_Lib_Kdebe
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp
b/scp2/source/onlineupdate/module_onlineupdate.scp
index b33235b..29da635 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Onlineupdate
Sortkey = "800";
ParentID = gid_Module_Optional;
Default = YES;
-Styles = (DONTSHOWINUSERINSTALL);
+Styles = ();
Files = (gid_File_Bin_UnpackUpdate,
gid_File_Lib_Updchk,
gid_File_Lib_Updchkui,
diff --git a/scp2/source/ooo/module_systemint.scp
b/scp2/source/ooo/module_systemint.scp
index 12ccef4..bb628f6 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -38,7 +38,7 @@ Module gid_Module_Optional_Systemintegration
#ifdef WNT
Styles = (HIDDEN_ROOT);
#else
-Styles =
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INST
[PUSHED] Change in core[libreoffice-3-5]: fdo#45700: sw ODF export: workaround corrupted table model:
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/613 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/613 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e286a9fcb6ed3df7222c83fe73e870e69561649 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/xml/xmltble.cxx | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 8803f997d0fd03a1b0ba06b99bea6b2ad1e2d3c0
Author: Michael Stahl
Date: Wed Sep 12 23:19:57 2012 +0200
fdo#45700: sw ODF export: workaround corrupted table model:
do not export invalid table:number-columns-spanned="0"
(cherry picked from commit c45c64e3de51d9f56c9d9789729b6f7952547a61)
Conflicts:
sw/source/filter/xml/xmltble.cxx
Change-Id: I7e286a9fcb6ed3df7222c83fe73e870e69561649
Reviewed-on: https://gerrit.libreoffice.org/613
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index f3ee9c7..42918fc 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -980,14 +980,9 @@ void SwXMLExport::ExportTableLine( const SwTableLine&
rLine,
if ( nCol < nOldCol )
{
OSL_FAIL( "table and/or table information seems to be
corrupted." );
-if ( nBox == nBoxes - 1 )
-{
-nCol = rLines.GetColumns().Count() - 1;
-}
-else
-{
-nCol = nOldCol;
-}
+// NOTE: nOldCol is not necessarily a valid index into
+// GetColumns(), but that doesn't matter here
+nCol = nOldCol;
}
sal_uInt16 nColSpan = nCol - nOldCol + 1U;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Gradients
Hi, I'll have a look at gradients again. Could someone please have a look at the following two gradient specifications and tell me if they are supposed to look the same: 1. Created by LibreOffice (create rectangle in Draw, fill with a blue to green gradient, save as fodg) draw:end-color="#00ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/> 2. Modified by me to use svg:linearGradient instead of draw:gradient (rendered as a grey to white gradient, clearly has to be improved :-) ) draw:display-name="Gradient 7"> svg:stop-opacity="100%" /> svg:stop-opacity="100%" /> Thank you, Christina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sfx2/qa svl/source
sfx2/qa/complex/sfx2/DocumentInfo.java | 31 ---
svl/source/items/style.cxx |5 -
2 files changed, 12 insertions(+), 24 deletions(-)
New commits:
commit 96d5134d4ddf66c517c6a024c2624ee0a8cc9ac4
Author: Michael Stahl
Date: Fri Sep 14 21:53:00 2012 +0200
SfxStyleSheetBasePool::Remove: fix valgrind warning:
aStyles contains rtl::References, so the erase() call may cause "p" to
be deleted, while "p" is then used as a parameter to Broadcast;
avoid this by retaining the rtl::Reference on the stack a bit longer.
Valgrind warning observed in sc_unoapi sc.ScStyleFamilyObj on
libreoffice-3-6 branch, called by ScStyleFamilyObj::removeByName.
Change-Id: I96d6de85b1b182b5ae3f74e92987a7f137537ffb
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 3f6b768..2a434b8 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -740,7 +740,10 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
{
if( p )
{
-SfxStyles::iterator aIter( std::find( aStyles.begin(), aStyles.end(),
rtl::Reference< SfxStyleSheetBase >( p ) ) );
+// Reference to keep p alive until after Broadcast call!
+rtl::Reference xP(p);
+SfxStyles::iterator const aIter(
+std::find(aStyles.begin(), aStyles.end(), xP));
if( aIter != aStyles.end() )
{
// Alle Styles umsetzen, deren Parent dieser hier ist
commit c3da81104bf6b82a3688c82ed341666c8f5eeec0
Author: Michael Stahl
Date: Fri Sep 14 19:10:10 2012 +0200
sfx2: DocumentInfo test should use a private temp dir
At least it failed on me once trying to store to its temp file, maybe
the predictable file name was the problem...
Change-Id: I78918ada1615c8337e4c8692d34aa285010bc820
diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java
b/sfx2/qa/complex/sfx2/DocumentInfo.java
index 4822153..1532a3c 100644
--- a/sfx2/qa/complex/sfx2/DocumentInfo.java
+++ b/sfx2/qa/complex/sfx2/DocumentInfo.java
@@ -51,7 +51,7 @@ public class DocumentInfo
XTextDocument xTextDoc = null;
XTextDocument xTextDocSecond = null;
-@Test public void checkDocInfo()
+@Test public void checkDocInfo() throws Exception
{
m_xMSF = getMSF();
@@ -59,8 +59,7 @@ public class DocumentInfo
assertNotNull("## Couldn't get MultiServiceFactory make sure your
Office is started", m_xMSF);
-// TODO: need other temp directory!
-String tempdir = System.getProperty("java.io.tmpdir");
+String tempdir = util.utils.getOfficeTemp/*Dir*/(m_xMSF);
String fs = System.getProperty("file.separator");
if (!tempdir.endsWith(fs))
@@ -127,16 +126,9 @@ public class DocumentInfo
System.out.println("Storing the document");
-try
-{
-XStorable store = UnoRuntime.queryInterface(XStorable.class,
xTextDoc);
-store.storeToURL(sTempDocument, new PropertyValue[] {});
-DesktopTools.closeDoc(xTextDoc);
-}
-catch (Exception e)
-{
-fail("Couldn't store document");
-}
+XStorable store = UnoRuntime.queryInterface(XStorable.class,
xTextDoc);
+store.storeToURL(sTempDocument, new PropertyValue[] {});
+DesktopTools.closeDoc(xTextDoc);
System.out.println("...done");
}
@@ -146,16 +138,9 @@ public class DocumentInfo
{
System.out.println("loading the document");
-try
-{
-XComponentLoader xCL =
UnoRuntime.queryInterface(XComponentLoader.class,
m_xMSF.createInstance("com.sun.star.frame.Desktop"));
-XComponent xComp = xCL.loadComponentFromURL(sTempDocument,
"_blank", 0, new PropertyValue[] {});
-xTextDocSecond =
UnoRuntime.queryInterface(XTextDocument.class, xComp);
-}
-catch (Exception e)
-{
-fail("Couldn't load document");
-}
+XComponentLoader xCL =
UnoRuntime.queryInterface(XComponentLoader.class,
m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+XComponent xComp = xCL.loadComponentFromURL(sTempDocument,
"_blank", 0, new PropertyValue[] {});
+xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class,
xComp);
System.out.println("...done");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: .: accessibility/source cppuhelper/inc cppuhelper/Library_cppuhelper.mk cppuhelper/Package_inc.mk cppuhelper/source cppuhelper/test UnoControls/source
On 14/09/12 19:32, Libreoffice Gerrit user wrote:
> New commits:
> commit 2171077c0c3c43a61546ab2c0ae68ba63c5112f7
> Author: Stephan Bergmann
> Date: Fri Sep 14 19:27:00 2012 +0200
>
> Introduce cppu::supportsService helper, adapt some call-sites
>
> ...more to follow (easy hack?)
> +namespace cppu {
> +
> +/** A helper for implementations of com.sun.star.lang.XServiceInfo.
> +
> +This function is supposed to be called from implementations of
> +com::sun::star::lang::XServiceInfo::supportsService (and therefore, for
> +easier coding takes the caller's this pointer by pointer rather than by
> +com::sun::star::uno::Reference).
> +
> +@param implementation points to the service implementation whose
> +getSupportedServices method is consulted; must be non-null
> +
> +@param name the service name to test
> +
> +@return true iff the sequence returned by the given implementation's
> +getSupportedServices method contains the given name
> +
> +@since LibreOffice 3.7
> +*/
> +bool CPPUHELPER_DLLPUBLIC supportsService(
> +com::sun::star::lang::XServiceInfo * implementation,
> +rtl::OUString const & name);
> +
> +}
that is nice, but it solves only half of the XServiceInfo boilerplate
problem...
a couple years ago i've added this in sw/inc/unobaseclass.cxx:
>> ::com::sun::star::uno::Sequence< ::rtl::OUString >
>> GetSupportedServiceNamesImpl(
>> size_t const nServices, char const*const pServices[]);
>> sal_Bool SupportsServiceImpl(
>> size_t const nServices, char const*const pServices[],
>> ::rtl::OUString const & rServiceName);
can be used with a single global array.
hmm... if the pServices were required to be sorted then supportsService
could even use binary search
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Mihkel Soomere changed: What|Removed |Added Depends on||50542 -- 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
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #379 from Mihkel Soomere 2012-09-14 19:06:01 UTC --- Bug 50542 Showstopper bug for upgrade to LO 3.5/3.6 in some enterprise deployments that store user data in central file servers. -- 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: build failure after libcmis update
On 14/09/12 19:24, Stephan Bergmann wrote:
> On 09/14/2012 05:19 PM, David Tardon wrote:
>> Note: This might be a bit harder to achieve for unzip: the equivalent
>> option is -D, but I am not sure it is supported everywhere. In
>> particular, I know that -DD (which extends the modification time change
>> to directories as well) does not work on MacOS X, because I had used it
>> in solenv/gbuild/UnpackedTarball.mk orginally and had to throw it out,
>> because the MacOS tinderbox(es) were unhappy about it. Could someone try
>> if plain -D works?
>
> No, at least Mac OS X 10.7.4 /usr/bin/unzip ("UnZip 5.52 of 28 February
> 2005, by Info-ZIP") does not know -D.
we already require zip 3.0 for gbuild, which doesn't ship with MacOS X
(at least not with the versions that were current when i looked at this
problem early last year), so requiring a less outdated (2005? isn't
Apple supposed to ship only the most innovative products?) unzip sounds
fine to me.
i wonder, though, whether external build systems generally cope with
having the timestamps mangled: what happens when the Makefile.in happens
to end up with older timestamp than Makefile.am, would that kind of
thing trigger spurious rebuilds?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: accessibility/source cppuhelper/inc cppuhelper/Library_cppuhelper.mk cppuhelper/Package_inc.mk cppuhelper/source cppuhelper/test UnoControls/source
UnoControls/source/base/basecontrol.cxx | 12 --
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 13 --
accessibility/source/extended/AccessibleGridControlBase.cxx | 14 --
accessibility/source/extended/accessibleiconchoicectrl.cxx |9 -
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |9 -
accessibility/source/extended/accessiblelistbox.cxx |9 -
accessibility/source/extended/accessiblelistboxentry.cxx|9 -
accessibility/source/extended/accessibletabbar.cxx |9 -
accessibility/source/extended/accessibletabbarpage.cxx |9 -
accessibility/source/extended/accessibletabbarpagelist.cxx |9 -
accessibility/source/standard/accessiblemenubasecomponent.cxx | 10 --
accessibility/source/standard/vclxaccessiblelistitem.cxx|9 -
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 10 --
accessibility/source/standard/vclxaccessibletabpage.cxx | 10 --
accessibility/source/standard/vclxaccessibletoolboxitem.cxx |9 -
cppuhelper/Library_cppuhelper.mk|1
cppuhelper/Package_inc.mk |1
cppuhelper/inc/cppuhelper/supportsservice.hxx | 49
++
cppuhelper/source/defaultbootstrap.cxx | 17 ---
cppuhelper/source/factory.cxx | 13 --
cppuhelper/source/gcc3.map |5 +
cppuhelper/source/macro_expander.cxx| 10 --
cppuhelper/source/supportsservice.cxx | 40
cppuhelper/test/cfg_test.cxx| 10 --
cppuhelper/test/testcmp/TestComponent.cxx | 11 --
25 files changed, 139 insertions(+), 168 deletions(-)
New commits:
commit 2171077c0c3c43a61546ab2c0ae68ba63c5112f7
Author: Stephan Bergmann
Date: Fri Sep 14 19:27:00 2012 +0200
Introduce cppu::supportsService helper, adapt some call-sites
...more to follow (easy hack?)
Change-Id: Icb02626495701a3905c124c7368b98c3258e91b2
diff --git a/UnoControls/source/base/basecontrol.cxx
b/UnoControls/source/base/basecontrol.cxx
index f8e63f2..068317b 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
//
@@ -246,16 +247,7 @@ OUString SAL_CALL BaseControl::getImplementationName()
throw( RuntimeException )
sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName )
throw( RuntimeException )
{
-Sequence< OUString >seqServiceNames = getSupportedServiceNames();
-const OUString* pArray =
seqServiceNames.getConstArray();
-for ( sal_Int32 nCounter=0; nCounter
#include
+#include
#include
#include
@@ -351,17 +352,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
const OUString& rServiceName )
throw ( uno::RuntimeException )
{
-::osl::MutexGuard aGuard( getOslMutex() );
-
-Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
-const OUString* pArrBegin = aSupportedServices.getConstArray();
-const OUString* pArrEnd = pArrBegin + aSupportedServices.getLength();
-const OUString* pString = pArrBegin;
-
-for( ; ( pString != pArrEnd ) && ( rServiceName != *pString ); ++pString )
-;
-
-return pString != pArrEnd;
+return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL
AccessibleBrowseBoxBase::getSupportedServiceNames()
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index ecccf07..a5f78a4 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -29,7 +29,8 @@
#include "accessibility/extended/AccessibleGridControlBase.hxx"
#include
#include
-//
+#include
+
#include
#include
#include
@@ -300,16 +301,7 @@ sal_Bool SAL_CALL
AccessibleGridControlBase::supportsService(
const OUString& rServiceName )
throw ( uno::RuntimeException )
{
-::osl::MutexGuard aGuard( getOslMutex() );
-
-Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
-const OUString* pArrBegin = aSupportedServices.getConstArray();
-const OUString* pArrEnd = pArrBegin + aSupportedServices.getLength();
-const OUString* pString = pArrBegin;
-
-for( ; ( pString != pArrEnd ) && ( rServiceName != *pString ); ++pString )
-;
-return pString != pArrEnd;
+return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL
AccessibleG
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit 3ed834ae87eca0f6c48699112a95edb74abb
Author: Kohei Yoshida
Date: Fri Sep 14 12:18:02 2012 -0400
Unit test for ScRangeList. For now it's very basic. May expand later.
Change-Id: Ib7454253df250ddc991aed0dd5cd5b0f90476dd8
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 0dd8e4e..5a2043a 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -108,6 +108,7 @@ public:
virtual void tearDown();
void testCollator();
+void testRangeList();
void testInput();
void testCellFunctions();
@@ -226,6 +227,7 @@ public:
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testCollator);
+CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
CPPUNIT_TEST(testCellFunctions);
CPPUNIT_TEST(testSheetsFunc);
@@ -357,6 +359,22 @@ void Test::testCollator()
CPPUNIT_ASSERT_MESSAGE("these strings are supposed to be different!", nRes
!= 0);
}
+void Test::testRangeList()
+{
+m_pDoc->InsertTab(0, "foo");
+
+ScRangeList aRL;
+aRL.Append(ScRange(1,1,0,3,10,0));
+CPPUNIT_ASSERT_MESSAGE("List should have one range.", aRL.size() == 1);
+const ScRange* p = aRL[0];
+CPPUNIT_ASSERT_MESSAGE("Failed to get the range object.", p);
+CPPUNIT_ASSERT_MESSAGE("Wrong range.", p->aStart == ScAddress(1,1,0) &&
p->aEnd == ScAddress(3,10,0));
+
+// TODO: Add more tests here.
+
+m_pDoc->DeleteTab(0);
+}
+
void Test::testInput()
{
rtl::OUString aTabName("foo");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build failure after libcmis update
On 09/14/2012 05:19 PM, David Tardon wrote:
Note: This might be a bit harder to achieve for unzip: the equivalent
option is -D, but I am not sure it is supported everywhere. In
particular, I know that -DD (which extends the modification time change
to directories as well) does not work on MacOS X, because I had used it
in solenv/gbuild/UnpackedTarball.mk orginally and had to throw it out,
because the MacOS tinderbox(es) were unhappy about it. Could someone try
if plain -D works?
No, at least Mac OS X 10.7.4 /usr/bin/unzip ("UnZip 5.52 of 28 February
2005, by Info-ZIP") does not know -D.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - jurt/test
jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java | 91
+++---
1 file changed, 29 insertions(+), 62 deletions(-)
New commits:
commit 3e63d52210a742f6aebf92f46721191dd6eed0a7
Author: Stephan Bergmann
Date: Wed Sep 12 14:36:18 2012 +0200
Remove race conditions from test
Change-Id: I97e10fa3b9058211313a7faa5269d71e233f8bf8
(cherry picked from commit c414499bbd456389ac6cacf677327bff9e6b43f9)
Signed-off-by: Michael Stahl
diff --git a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
index affbb8b..d0a 100644
--- a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
+++ b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
@@ -27,115 +27,82 @@
package com.sun.star.comp.connections;
+import com.sun.star.io.IOException;
import org.junit.Test;
import static org.junit.Assert.*;
public final class PipedConnection_Test {
+private static final int ROUNDS = 2000;
+
@Test public void test() throws Exception {
PipedConnection rightSide = new PipedConnection(new Object[0]);
PipedConnection leftSide = new PipedConnection(new
Object[]{rightSide});
-byte theByte[] = new byte[1];
-
-Reader reader = new Reader(rightSide, theByte);
-Writer writer = new Writer(leftSide, theByte, reader);
+Reader reader = new Reader(rightSide);
+Writer writer = new Writer(leftSide);
reader.start();
writer.start();
-Thread.sleep(2000);
-
-writer.term();
writer.join();
-
reader.join();
assertTrue(writer._state);
assertTrue(reader._state);
+assertEquals(ROUNDS, reader._rounds);
}
-static class Reader extends Thread {
+private static class Reader extends Thread {
PipedConnection _pipedConnection;
-byte _theByte[];
-boolean _quit;
boolean _state = false;
+int _rounds = 0;
-Reader(PipedConnection pipedConnection, byte theByte[]) {
+Reader(PipedConnection pipedConnection) {
_pipedConnection = pipedConnection;
-_theByte = theByte;
}
public void run() {
try {
-byte bytes[][] = new byte[1][];
-
-while(!_quit) {
-int read = _pipedConnection.read(bytes, 1);
-
-if(read == 1) {
-// System.err.println("read :" + bytes[0][0]);
-
-if(_theByte[0] != bytes[0][0])
-throw new NullPointerException();
-
-synchronized(this) {
-notifyAll();
-}
+for (byte v = 0;; v++) {
+byte[][] b = new byte[1][];
+int n = _pipedConnection.read(b, 1);
+if (n == 0) {
+break;
}
-else
-_quit = true; // EOF
+assertEquals(1, n);
+assertEquals(1, b[0].length);
+assertEquals(v, b[0][0]);
+++_rounds;
}
-
_pipedConnection.close();
_state = true;
+} catch (IOException e) {
+throw new RuntimeException(e);
}
-catch(com.sun.star.io.IOException ioException) {
-System.err.println(" Reader - unexpected:" + ioException);
-}
-
}
}
-static class Writer extends Thread {
+private static class Writer extends Thread {
PipedConnection _pipedConnection;
-byte _theByte[];
-Reader _reader;
-boolean _quit;
boolean _state = false;
-Writer(PipedConnection pipedConnection, byte theByte[], Reader reader)
{
+Writer(PipedConnection pipedConnection) {
_pipedConnection = pipedConnection;
-_reader = reader;
-_theByte = theByte;
}
public void run() {
try {
-while(!_quit) {
-synchronized(_reader) {
-_pipedConnection.write(_theByte);
-_pipedConnection.flush();
-// System.err.println("written :" + _theByte[0]);
-
-_reader.wait();
-}
-++ _theByte[0];
+byte v = 0;
+for (int i = 0; i != ROUNDS; ++i) {
+byte[] b = new byte[] { v++ };
+_pipedConnection.write(b);
+_pipedConnection.flush();
}
-
_pipedConnection.close();
-
_state = true;
+} catch (IOException e) {
+throw new RuntimeException
[Libreoffice-commits] .: ucbhelper/source
ucbhelper/source/client/contentbroker.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0cc522175e1a6519b5bb8d3ac946ad7395c8803b
Author: Stephan Bergmann
Date: Fri Sep 14 19:12:52 2012 +0200
Attempt to fix Android-only code
Change-Id: I391e08c2712a51fe0adcd3f0c74d779b07c31c76
diff --git a/ucbhelper/source/client/contentbroker.cxx
b/ucbhelper/source/client/contentbroker.cxx
index 24cec09..4af05c6 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -35,13 +35,13 @@ InitUCBHelper()
Reference< XComponentContext > xCtx;
try
{
-Reference< XComponentContext > xCtx =
::cppu::defaultBootstrap_InitialComponentContext();
+xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
}
catch( Exception& )
{
}
-if( !xFactory.is() )
+if( !xCtx.is() )
{
fprintf( stderr,
"Could not bootstrap UNO, installation must be in disorder.
Exiting.\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/xmlstyli.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dfc68037328fbc1ec45d18b25822b59a2134285a
Author: Markus Mohrhard
Date: Fri Sep 14 18:51:53 2012 +0200
don't add old cond formats if new ones are already loaded, fdo#54749
Change-Id: Ib0cbe1a3347e7231e7908b9bd8135e984e6ef644
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 27af196..a05276f 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -422,7 +422,7 @@ SvXMLImportContext
*XMLTableStyleContext::CreateChildContext(
void XMLTableStyleContext::ApplyCondFormat(
uno::Sequence xCellRanges )
{
-if(!mpCondFormat)
+if(!mpCondFormat || GetScImport().HasNewCondFormatData())
return;
ScRangeList rRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED: 3-6] fdo#54450 install evolution datasource driver
Hi, On Fri, Sep 14, 2012 at 04:22:02PM +0200, Andras Timar wrote: > Hi, > > 2012/9/14 David Tardon : > > Hi, > > > > On Fri, Sep 14, 2012 at 10:16:25AM +0200, Andras Timar wrote: > >> 2012.09.07. 15:37 keltezéssel, Michael Meeks írta: > >> > On Fri, 2012-09-07 at 13:26 +0200, David Tardon wrote: > >> >> This does not affect the official build, because it is configured with > >> >> --enable-gnomevfs, but I think it does not hurt to have it in 3.6, if > >> >> there is anyone who wants to review the fix :-) > >> > > >> > Looks great to me, pushed. > >> > > >> > Thanks, > >> > > >> > Michael. > >> > > >> > >> Hi, > >> > >> This patch caused a problem in Windows installer. Now there is an empty > >> feature (GNOME Integration) which is selected for installation by > >> default. Users find this confusing. It is a Linux-only feature, isn't it? > > > > Are you sure the problem is in this patch? The (optional) module Gnome > > should only be added into the install script if at least one of > > $(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) > > $(ENABLE_GTK) $(ENABLE_GTK3) is TRUE, which should not happen on > > Windows, I think? (Actually, the files in scp2/source/gnome are not even > > processed unless the same condition holds.) Could you check if > > workdir/wnt*/ScpTarget/scp2/source/gnome exists and contains any files > > on the Windows build? And if it does, could you check that all of the > > aforementioned variables are either empty or FALSE in config_host.mk? > > > > ENABLE_GTK=TRUE. But it is true, that your patch is unrelated. I need > to investigate further. Ah, so we clearly need a better mechanism to select VCL plugins that can be built on a given platform. Currently, --enable-gtk is on by default independent of the platform, so it is set even on Windows or MacOS X, where it has no sense. Of course, it has not had any visible effect till now :-) I am going to fix it over the weekend. But in case the fix does not get into 3.6 branch in time, a simple workaround is to add --disable-gtk to the configuration for Windows and MacOS X builds. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
13 +++---
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java |
4 +--
2 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 8f1199860b2ced080f24eeaeb5052d0b68a4b9aa
Author: Michael Meeks
Date: Fri Sep 14 16:27:09 2012 +0100
sdremote: unwind a couple of crasher / corner cases
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 767bec5..ca595d5 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -349,17 +349,12 @@ public class PresentationActivity extends
SherlockFragmentActivity {
@Override
public void run() {
CharSequence aTimeString;
-long aTime = mCommunicationService.getSlideShow().getTimer()
-.getTimeMillis();
-if (mTimerOn) {
-aTimeString = DateFormat.format(aTimerFormat, aTime);
-} else {
-aTimeString = DateFormat.format(aTimeFormat,
-System.currentTimeMillis());
-}
+ long aTime = System.currentTimeMillis();
+ if (mTimerOn && mCommunicationService != null)
+ aTime =
mCommunicationService.getSlideShow().getTimer().getTimeMillis();
+ aTimeString = DateFormat.format(aTimerFormat, aTime);
mTimeLabel.setText(aTimeString);
timerHandler.postDelayed(this, 50);
-
}
};
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 6c24ad7..ba692c3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -130,7 +130,8 @@ public class SelectorActivity extends SherlockActivity {
@Override
public void onBackPressed() {
-mCommunicationService.stopSearching();
+if (mCommunicationService != null)
+mCommunicationService.stopSearching();
Intent aIntent = new Intent(this, CommunicationService.class);
stopService(aIntent);
super.onBackPressed();
@@ -325,4 +326,4 @@ public class SelectorActivity extends SherlockActivity {
return super.onContextItemSelected(item);
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_sw
binfilter/bf_sc/source/core/data/sc_globalx.cxx |4
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx |1
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx|7 -
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx|4
binfilter/bf_so3/source/copied/staticbaseurl.cxx |4
binfilter/bf_so3/source/persist/transuno.cxx | 48 +--
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |6 -
binfilter/bf_svtools/source/misc/svt_urihelper.cxx |1
binfilter/bf_svtools/source/misc1/svt_fstathelper.cxx|7 +
binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx |3
10 files changed, 24 insertions(+), 61 deletions(-)
New commits:
commit ce8df700973de1c20c7ab388671129a3945cdaf3
Author: Stephan Bergmann
Date: Fri Sep 14 18:23:35 2012 +0200
Improvement on previous commit, UCB clean up, binfilter redux
...of core commit c46a972279af60c01e20e54a9f1b78eaff6a7386
Change-Id: I6291e49f334e8217042d632610aaa66409e83dd0
diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
index b5bce64..3409adb 100644
--- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
@@ -21,8 +21,8 @@
#include "callform.hxx"
#include "global.hxx"
+#include
#include
-#include
#include
#include
@@ -71,7 +71,7 @@ namespace binfilter {
/*N*/ try
/*N*/ {
/*N*/ ::ucbhelper::Content aCnt(
aObj.GetMainURL(INetURLObject::NO_DECODE),
-/*N*/ Reference< XCommandEnvironment > () );
+/*N*/ Reference< XCommandEnvironment > (),
comphelper::getProcessComponentContext() );
/*N*/ Reference< sdbc::XResultSet > xResultSet;
/*N*/ Sequence< ::rtl::OUString > aProps;
/*N*/ try
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index 4697886..ff1b54b 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -39,7 +39,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 4fea366..dcdeca1 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -84,7 +84,6 @@ using namespace ::com::sun::star::io;
#include
#include
#include
-#include
#include
#include
#include
@@ -448,7 +447,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ {
/*N*/ try
/*N*/ {
-/*?*/ pImp->aContent = ::ucbhelper::Content( xContent, xEnv );
+/*?*/ pImp->aContent = ::ucbhelper::Content( xContent, xEnv,
comphelper::getProcessComponentContext() );
/*N*/ }
/*N*/ catch ( Exception& )
/*N*/ {
@@ -462,7 +461,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ else if ( aLogicName.Len() )
/*N*/ aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE
);
/*N*/ if ( !aURL.isEmpty() )
-/*N*/ ::ucbhelper::Content::create( aURL, xEnv, pImp->aContent );
+/*N*/ ::ucbhelper::Content::create( aURL, xEnv,
comphelper::getProcessComponentContext(), pImp->aContent );
/*N*/ }
/*N*/ }
/*N*/
@@ -945,7 +944,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/
/*N*/ INetURLObject aSource( pImp->pTempFile->GetURL() );
/*N*/ ::ucbhelper::Content aTempCont;
-/*N*/ if( ::ucbhelper::Content::create( aSource.GetMainURL(
INetURLObject::NO_DECODE ), xEnv, aTempCont ) )
+/*N*/ if( ::ucbhelper::Content::create( aSource.GetMainURL(
INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(),
aTempCont ) )
/*N*/ {
/*N*/ try
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index f68ea41..c51c906 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -435,7 +435,7 @@ sal_False Das Objekt konnte nicht geladen werden
{
try
{
-::ucbhelper::Content aContent( pMedium->GetName(),
::com::sun::star::uno::Reference < XCommandEnvironment >() );
+::ucbhelper::Content aContent( pMedium->GetName(),
::com::sun::star::uno::Reference < XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
::com::sun::star::uno::Reference < XPropertySetInfo > xProps =
aContent.getProperties();
if ( xProps.is() )
{
@@ -769,7 +769,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
[PUSHED] Change in core[libreoffice-3-5]: fdo#44721 protect against negative calculated height value
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/623 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/623 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Lionel Elie Mamane Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Android / threading ...
Hi there, I just got a crash in the PresentationActivity timerUpdateThread - it's not related to this (I think) - but I guess this could cause some nasties I suppose. It seems we're talking to the GUI from multiple threads concurrently: http://developer.android.com/guide/components/processes-and-threads.html "Additionally, the Andoid UI toolkit is not thread-safe. So, you must not manipulate your UI from a worker thread—you must do all manipulation to your user interface from the UI thread. Thus, there are simply two rules to Android's single thread model: 1. Do not block the UI thread 2. Do not access the Android UI toolkit from outside the UI thread" I was also amused to stumble over this: http://weblogs.java.net/blog/kgh/archive/2004/10/multithreaded_t.html Which is quite amusing ;-) Anyhow - perhaps I'm missing something - I don't know what mTimeLabel.setText really does so ... Are we doing our slower IPC in a thread and leaving the main thread to render ? (things are responsive so I assume so generally :-). 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-commits] .: Branch 'libreoffice-3-5' - reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit bacceec11fc1e9d4999308040ae36848c24376d4
Author: Lionel Elie Mamane
Date: Fri Sep 14 14:53:20 2012 +0200
fdo#44721 protect against negative calculated height value
Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360
Reviewed-on: https://gerrit.libreoffice.org/623
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index f1c6e4d..2502334 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -410,8 +410,10 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
if ( pPage && !_rRect.IsEmpty() )
{
uno::Reference xSection = pPage->getSection();
-if ( xSection.is() && (static_cast(_rRect.getHeight() +
_rRect.Top()) > xSection->getHeight()) )
-xSection->setHeight(_rRect.getHeight() + _rRect.Top());
+assert(_rRect.getHeight() >= 0);
+const sal_uInt32 newHeight( ::std::max(0l,
_rRect.getHeight()+_rRect.Top()) );
+if ( xSection.is() && ( newHeight > xSection->getHeight() ) )
+xSection->setHeight( newHeight );
// TODO
//pModel->GetRefDevice()->Invalidate(INVALIDATE_CHILDREN);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] More ::rtl::OUString to OUString in avmedia
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/625 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/625/1 More ::rtl::OUString to OUString in avmedia Change-Id: Ic5478199d8ff1cd79dc54e680e8a6c257e7d8325 --- M avmedia/source/gstreamer/gstframegrabber.hxx M avmedia/source/gstreamer/gstmanager.cxx M avmedia/source/gstreamer/gstmanager.hxx M avmedia/source/gstreamer/gstplayer.cxx 4 files changed, 25 insertions(+), 25 deletions(-) -- To view, visit https://gerrit.libreoffice.org/625 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5478199d8ff1cd79dc54e680e8a6c257e7d8325 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: fdo#49677: ODF export: always add xlink:type attribute
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/615 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/615 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc7301ed1b0120d31a156751888dea1a55e952fe Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source
xmloff/source/text/txtflde.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4fcdc546f065ef2b4098fa3de12325687f1e3389 Author: Michael Stahl Date: Thu Sep 13 17:49:20 2012 +0200 fdo#49677: ODF export: always add xlink:type attribute The xlink:type was optional on text:a and draw:a elements in ODF 1.1 but is mandatory in ODF 1.2 Change-Id: Ifc7301ed1b0120d31a156751888dea1a55e952fe (cherry picked from commit a27a6b68b7e4d2a4674b4de59fc487b17c7c9907) Reviewed-on: https://gerrit.libreoffice.org/615 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index fc550cf..02f7943 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1696,6 +1696,7 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessString(XML_TARGET_FRAME_NAME, GetStringProperty(sPropertyTargetFrame,rPropSet), sal_True, XML_NAMESPACE_OFFICE); +GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); SvXMLElementExport aUrlField(rExport, XML_NAMESPACE_TEXT, XML_A, sal_False, sal_False); GetExport().Characters(sPresentation); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Change in core[libreoffice-3-6-2]: fdo#44721 protect against negative calculated height value
On Fri, Sep 14, 2012 at 04:00:15PM +, Lionel Elie Mamane (via Code Review) wrote: > https://gerrit.libreoffice.org/624 > git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/624/1 > fdo#44721 protect against negative calculated height value > Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 These negative value were causing underflow when converted to unsigned, and thus a very, very long loop in the drawing code, thus equivalent to freeze for the user. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption
On Thu, Aug 23, 2012 at 07:54:45AM +0200, Lionel Elie Mamane wrote: > On Wed, Jun 06, 2012 at 11:44:52PM +0200, Lionel Elie Mamane wrote: >> On Wed, Jun 06, 2012 at 07:35:58PM +0200, Thorsten Behrens wrote: >>> Michael Meeks wrote: A basegfx memory leak / crasher :-) Thorsten is prolly a good guy to have a look I guess. >>> Nah, more likely underflow / insufficient range checking, with the >>> large negatives coming in. Will have a look - a nice, ready-made >>> .odb with a single big button to press appreciated of course :) >> Err... Sorry for the noise, the bug seems to have disappeared. > Well, it has reappeared, with more narrow, but still quite large, > reproduction cases. Could you please have a look? I've attached videos > to the bug to show exactly what to do to reproduce it. Thanks. Finally nailed it! Pfou... Now, need to fix the reasons the UI even allowed one to trigger this bug. Looks complicated again :-| Thorsten, thanks for the hint at which function to look at (which already had "unreasonable values"). -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6-2]: fdo#44721 protect against negative calculated height value
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/624 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/624/1 fdo#44721 protect against negative calculated height value Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 --- M reportdesign/source/core/sdr/RptObject.cxx 1 file changed, 4 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/624 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-2 Gerrit-Owner: Lionel Elie Mamane ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#44721 protect against negative calculated height value
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/623 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/623/1 fdo#44721 protect against negative calculated height value Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 --- M reportdesign/source/core/sdr/RptObject.cxx 1 file changed, 4 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/623 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Lionel Elie Mamane ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#44721 protect against negative calculated height value
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/622 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/622/1 fdo#44721 protect against negative calculated height value Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 --- M reportdesign/source/core/sdr/RptObject.cxx 1 file changed, 4 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/622 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d33453d1ca13369d9132c304c80acf19e9b1ad4e
Author: Lionel Elie Mamane
Date: Fri Sep 14 14:53:20 2012 +0200
fdo#44721 protect against negative calculated height value
Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index dd142d4..699a755 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -410,8 +410,10 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
if ( pPage && !_rRect.IsEmpty() )
{
uno::Reference xSection = pPage->getSection();
-if ( xSection.is() && (static_cast(_rRect.getHeight() +
_rRect.Top()) > xSection->getHeight()) )
-xSection->setHeight(_rRect.getHeight() + _rRect.Top());
+assert(_rRect.getHeight() >= 0);
+const sal_uInt32 newHeight( ::std::max(0l,
_rRect.getHeight()+_rRect.Top()) );
+if ( xSection.is() && ( newHeight > xSection->getHeight() ) )
+xSection->setHeight( newHeight );
// TODO
//pModel->GetRefDevice()->Invalidate(INVALIDATE_CHILDREN);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Lionel Elie Mamane changed: What|Removed |Added Depends on||54933 -- 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
[PUSHED] Change in core[libreoffice-3-5]: fdo#49876: ODF export: do not export font-size="0pt"
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/620 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/620 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2425d7c596ca9c7c80c0d24c44cdd9ec1ac1dd80 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source
xmloff/source/style/chrhghdl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a4e3055818f7d5b22cd1c5577fc17ebbe4d38f96
Author: Michael Stahl
Date: Fri Sep 14 11:56:16 2012 +0200
fdo#49876: ODF export: do not export font-size="0pt"
This is invalid, font size must be positive.
Change-Id: I2425d7c596ca9c7c80c0d24c44cdd9ec1ac1dd80
(cherry picked from commit c9699f82edf67a55f4cfdd885fa779b13d816c87)
Reviewed-on: https://gerrit.libreoffice.org/620
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 584acf9..b5caa89 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -67,6 +67,7 @@ sal_Bool XMLCharHeightHdl::importXML( const OUString&
rStrImpValue, uno::Any& rV
if (::sax::Converter::convertDouble(fSize, rStrImpValue,
eSrcUnit, util::MeasureUnit::POINT))
{
+fSize = ::std::max(fSize, 1.0); // fdo#49876: 0pt is
invalid
rValue <<= (float)fSize;
return sal_True;
}
@@ -82,6 +83,7 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue,
const uno::Any& rV
float fSize = 0;
if( rValue >>= fSize )
{
+fSize = ::std::max(fSize, 1.0f); // fdo#49876: 0pt is invalid
::sax::Converter::convertDouble(aOut, (double)fSize, true,
util::MeasureUnit::POINT, util::MeasureUnit::POINT);
aOut.append( sal_Unicode('p'));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Lionel Elie Mamane changed: What|Removed |Added Depends on||54930 -- 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
[PATCH] More ::rtl::OUString to OUString in avmedia
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/621 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/621/1 More ::rtl::OUString to OUString in avmedia Change-Id: I0e49d84b5a7aa47dc315735a8198ba7fdde0b4e7 --- M avmedia/source/framework/soundhandler.cxx M avmedia/source/framework/soundhandler.hxx M avmedia/source/gstreamer/gstframegrabber.cxx 3 files changed, 29 insertions(+), 29 deletions(-) -- To view, visit https://gerrit.libreoffice.org/621 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e49d84b5a7aa47dc315735a8198ba7fdde0b4e7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
build failure after libcmis update
Hi, some of you may have experienced the same problem as I--build of recent master breaks in ucb/src/ucp/cmis with something like: error: ‘AllowableActionsPtr’ does not name a type It turns out this is caused by stale libcmis headers in solver, because the unpacked header has modification time 2012-Aug-09 12:27 , which is way older than the current copy in solver. The old build system workarounded that by copying the delivered headers to $(OUT)/inc first (by listing them in OUT2INC variable). That seems unnecessary to me; instead, I propose to add --touch to tar options, so the files are extracted with modification times set to extraction time. According to tar's changelog, this option exists since 1995, so it should be supported on all our platforms :-) Any objections? Note: This might be a bit harder to achieve for unzip: the equivalent option is -D, but I am not sure it is supported everywhere. In particular, I know that -DD (which extends the modification time change to directories as well) does not work on MacOS X, because I had used it in solenv/gbuild/UnpackedTarball.mk orginally and had to throw it out, because the MacOS tinderbox(es) were unhappy about it. Could someone try if plain -D works? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/ooxml/factoryimpl_ns.xsl |7 +++
writerfilter/source/ooxml/model.xml |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 393262b325338b568c86b9183f37fc950cfbf127
Author: Miklos Vajna
Date: Fri Sep 14 17:06:47 2012 +0200
n#778140 fix import of w:fldSimple character properties
The character properties of the field are applied when the next run
begins, so insert an empty run right after the field to fix the issue.
Change-Id: I18d747d99d6604fa331a0e70e6989f9f4975eab2
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl
b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index bd913d6..407f405 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -494,6 +494,13 @@ CreateElementMapPointer
pHandler->endField();
+
+
+pHandler->endField();
+pHandler->startCharacterGroup();
+pHandler->text("");
+pHandler->endCharacterGroup();
+
dynamic_cast(pHandler)->sendProperty(
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index e683be1..54f4b20 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22153,7 +22153,7 @@
-
+
begin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/CppunitTest_sal_rtl_uri.mk sal/textenc
sal/CppunitTest_sal_rtl_uri.mk |8
sal/textenc/textenc.cxx|5 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit e63bba0013e5ce34cd04559632206bb7c891eebe
Author: LuboÅ¡ LuÅák
Date: Fri Sep 14 16:47:20 2012 +0200
sal_rtl_uri unittest seems to depend on sal_textenc library too
Change-Id: I3b85f3916d49a1853d073879a906506bee0d4fba
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 125265c..1da1b1b 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -25,4 +25,12 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
$(gb_STDLIBS) \
))
+# The test uses O(U)String capabilities that dlopen this lib
+ifneq ($(OS),ANDROID)
+# Except that on Android we don't build it separately
+$(call gb_CppunitTest_get_target,sal_rtl_uri) : \
+$(call gb_Library_get_target,sal_textenc)
+endif
+
+
# vim: set noet sw=4 ts=4:
commit 42990cc2041635c60f904d78e4adefcfd65cfeab
Author: LuboÅ¡ LuÅák
Date: Fri Sep 14 16:44:46 2012 +0200
better debug message when textenc module loading fails
This is at least the second time there's a race condition during
build, and OSL_TRACE is just SAL_INFO, i.e. not printed by default.
Change-Id: I1c683cf463665c6e36097025756c3aeab3a2c330
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 8aeb67a..97288e4 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -390,14 +390,13 @@ class FullTextEncodingData: private boost::noncopyable {
public:
FullTextEncodingData() {
if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenc")))
{
-OSL_TRACE("Loading sal_textenc library failed");
+SAL_WARN( "sal.textenc", "Loading sal_textenc library failed" );
std::abort();
}
function_ = reinterpret_cast< TextEncodingFunction * >(
module_.getFunctionSymbol("sal_getFullTextEncodingData"));
if (function_ == 0) {
-OSL_TRACE(
-"Obtaining sal_getFullTextEncodingData fuction from
sal_textenc"
+SAL_WARN( "sal.textenc", "Obtaining sal_getFullTextEncodingData
fuction from sal_textenc"
" library failed");
std::abort();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] - fdo#35973 - Remember the state of the sidebar pane in Impr...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/526 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/526 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd45a289a5a7b0cb87100e1ff3854ec72143019c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders Gerrit-Reviewer: Rob Snelders Gerrit-Reviewer: Thorsten Behrens ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: officecfg/registry sd/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 21
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 36
sd/source/ui/framework/module/ImpressModule.cxx |4
sd/source/ui/framework/module/ToolPanelModule.cxx | 155 +---
sd/source/ui/framework/module/ToolPanelModule.hxx | 28
svtools/Library_svt.mk |1
svtools/Package_inc.mk |1
svtools/inc/svtools/toolpanelopt.hxx| 102 ++
svtools/source/config/toolpanelopt.cxx | 441
9 files changed, 673 insertions(+), 116 deletions(-)
New commits:
commit fb42827f323cec964cbbed3a86f9514ea62b1060
Author: Rob Snelders
Date: Sat Sep 1 12:23:14 2012 +0200
- fdo#35973 - Remember the state of the sidebar pane in Impress (ToolPanel)
Change-Id: Ifd45a289a5a7b0cb87100e1ff3854ec72143019c
Reviewed-on: https://gerrit.libreoffice.org/526
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index ff44549..de5d5f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -28,6 +28,25 @@
http://openoffice.org/2004/installation";
xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
@@ -48,7 +67,7 @@
true
-
+
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 6ad225f..aad00d3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1393,6 +1393,42 @@
Options that control the tool panel.
Tool Panel Options
+
+
+Options that control the visibility of the ToolPanel.
+ToolPanel Visibility
+
+
+
+ Visibility of the ToolPanel in the Impress view.
+ ToolPanel Visibility ImpressView
+
+
+
+
+ Visibility of the ToolPanel in the Outline view.
+ ToolPanel Visibility OutlineView
+
+
+
+
+ Visibility of the ToolPanel in the Notes view.
+ ToolPanel Visibility NotesView
+
+
+
+
+ Visibility of the ToolPanel in the HandOut view.
+ ToolPanel Visibility HandOutView
+
+
+
+
+ Visibility of the ToolPanel in the SlideSorter view.
+ ToolPanel Visibility SlideSorterView
+
+
+
List of the URLs of the most recently used master
pages.
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx
b/sd/source/ui/framework/module/ImpressModule.cxx
index 1e7810b..50e9cfb 100644
--- a/sd/source/ui/framework/module/ImpressModule.cxx
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -45,7 +45,9 @@ void ImpressModule::Initialize
(Reference& rxController)
new SlideSorterModule(
rxController,
FrameworkHelper::msLeftImpressPaneURL);
-ToolPanelModule::Initialize(rxController);
+new ToolPanelModule(
+rxController,
+FrameworkHelper::msRightPaneURL);
new ToolBarModule(rxController);
new ShellStackGuard(rxController);
}
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx
b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 3397d5c..880a49d 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -19,136 +19,75 @@
#include "ToolPanelModule.hxx"
-#include "ReadOnlyModeObserver.hxx"
-#include "framework/FrameworkHelper.hxx"
-#include
-#include
+#include "framework/FrameworkHelper.hxx"
+#include
+#include
-#include
-#include
-#include
+#include "strings.hrc"
+#include "sdresid.hxx"
+#include "svtools/toolpanelopt.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
+
using ::rtl::OUString;
using ::sd::framework::FrameworkHelper;
namespace sd { namespace framework {
-namespace {
-
-typedef ::cppu::WeakComponentImplHelper1 <
- ::com::sun::star::frame::XStatusListener
-> LocalReadO
[Libreoffice-commits] .: android/sdremote
android/sdremote/res/layout/dialog_about.xml |
18
android/sdremote/res/values/strings.xml |
5
android/sdremote/res/values/styles.xml |
19
android/sdremote/src/org/libreoffice/impressremote/AboutDialogBuilder.java |
2
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
24 -
android/sdremote/src/pl/polidea/coverflow/AbstractCoverFlowImageAdapter.java |
19
android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java|
215 +-
android/sdremote/src/pl/polidea/coverflow/ResourceImageAdapter.java |
139 +++---
8 files changed, 271 insertions(+), 170 deletions(-)
New commits:
commit 76c5f6fdaf3f1d046a7c46e8fe92ebea55ebdd64
Author: Andrzej J.R. Hunt
Date: Fri Sep 14 16:25:04 2012 +0200
More 2.3 styling + fix for flickering bug on multi-slide change.
Change-Id: Iae19e9d44f1a437737c943c06356a99957c6991e
diff --git a/android/sdremote/res/layout/dialog_about.xml
b/android/sdremote/res/layout/dialog_about.xml
index 8ff6dd4..ce30a25 100644
--- a/android/sdremote/res/layout/dialog_about.xml
+++ b/android/sdremote/res/layout/dialog_about.xml
@@ -51,4 +51,22 @@
android:text="www.libreoffice.org"
tools:ignore="HardcodedText" />
+
+
+
+
\ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 811dac4..8e2f629 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -33,6 +33,8 @@
Close
Version: {0} (Build ID: {1})
Copyright \u00A9 2012 LibreOffice
Contributors and/or their affiliates.
+This app is release under the Mozilla Public
License, v. 2.0.
+This app uses
android-coverflow\n\tCopyright © 2011, Polidea\n\tAll rights reserved.\n\nThis
app uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under
the Apache License, Version 2.0 (the "License")
Add Server
Server name:
Server address as IP or
hostname:
@@ -40,5 +42,6 @@
Add
Cancel
Your connection has been
dropped.
-Attempting to reconnectâ¦
+Attempting to reconnectâ¦
+
\ No newline at end of file
diff --git a/android/sdremote/res/values/styles.xml
b/android/sdremote/res/values/styles.xml
index 73d2209..eb71393 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -25,7 +25,7 @@
@style/Theme.ImpressRemote.ActionBar.Title
@style/Theme.ImpressRemote.ActionBar.Title
@color/text_grey
-@color/text_grey
+@color/text_grey
@@ -41,11 +41,24 @@