[Libreoffice-commits] .: sot/source svl/source svtools/source unotools/inc unotools/source xmlsecurity/source
sot/source/sdstor/ucbstorage.cxx |1 svl/source/fsstor/fsstorage.cxx|1 svtools/source/contnr/templwin.cxx |7 svtools/source/control/inettbc.cxx |9 unotools/inc/unotools/ucbhelper.hxx| 91 - unotools/source/ucbhelper/ucbhelper.cxx| 995 + xmlsecurity/source/component/documentdigitalsignatures.cxx | 15 7 files changed, 465 insertions(+), 654 deletions(-) New commits: commit 2af9040d38af7c7353855415dbea0134585058f3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 28 10:09:57 2011 +0100 Cleaned up utl::UCBContentHelper. diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index d0b3534..b6fb581 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -32,6 +32,7 @@ #include com/sun/star/lang/IllegalArgumentException.hpp #include ucbhelper/content.hxx #include com/sun/star/uno/Reference.h +#include com/sun/star/ucb/NameClash.hpp #include com/sun/star/ucb/XCommandEnvironment.hpp #include unotools/tempfile.hxx #include unotools/ucbstreamhelper.hxx diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 7617563..4fbc780 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -29,6 +29,7 @@ #include com/sun/star/beans/PropertyValue.hpp #include com/sun/star/embed/ElementModes.hpp #include com/sun/star/embed/XTransactedObject.hpp +#include com/sun/star/ucb/NameClash.hpp #include com/sun/star/ucb/XProgressHandler.hpp #include com/sun/star/ucb/XContentAccess.hpp #include com/sun/star/ucb/XSimpleFileAccess.hpp diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 00623c3..3792826 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -236,10 +236,9 @@ void ODocumentInfoPreview::fill( // size if ( i_rURL.Len() 0 ) { -sal_uLong nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL ); m_pEditWin-InsertEntry( m_pInfoTable-GetString( DI_SIZE ), -CreateExactSizeText_Impl( nDocSize ) ); +CreateExactSizeText_Impl( utl::UCBContentHelper::GetSize( i_rURL ) ) ); } // MIMEType @@ -749,8 +748,8 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String rURL ) const String SvtFileViewWindow_Impl::GetFolderTitle() const { -String aTitle; -::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle ); +rtl::OUString aTitle; +::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle ); return aTitle; } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 9ed13a1..21547e3 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1200,7 +1200,7 @@ String SvtURLBox::GetURL() Any aAny = UCBContentHelper::GetProperty(aURL,aPropName); sal_Bool success = (aAny = aFileURL); -String aTitle; +rtl::OUString aTitle; if(success) aTitle = String( INetURLObject(aFileURL).getName( @@ -1209,12 +1209,11 @@ String SvtURLBox::GetURL() INetURLObject::DECODE_WITH_CHARSET )); else success = -UCBContentHelper::GetTitle(aURL,aTitle); +UCBContentHelper::GetTitle(aURL,aTitle); if( success -( aTitle.Len() 1 || - (aTitle.CompareToAscii(/) != 0 - aTitle.CompareToAscii(.) != 0) ) ) +!(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(/)) + || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.))) ) { aObj.SetName( aTitle ); if ( bSlash ) diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index b0ed12a..358d8e1 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -25,55 +25,58 @@ * for a copy of the LGPLv3 License. * / -#include unotools/unotoolsdllapi.h #ifndef _UNOTOOLS_UCBHELPER_HXX #define _UNOTOOLS_UCBHELPER_HXX -// include --- -#include com/sun/star/uno/Sequence.hxx -#include com/sun/star/uno/Reference.hxx -#include com/sun/star/ucb/NameClash.hpp -#include com/sun/star/ucb/XContentProvider.hpp - -#include tools/string.hxx - -namespace ucbhelper -{ -class Content; -} - -namespace utl -{ -class UNOTOOLS_DLLPUBLIC UCBContentHelper -{ -public: -static sal_Bool IsDocument( const String rContent ); -static sal_Bool IsFolder( const String rContent ); -
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/index.hxx|2 +- sw/source/core/bastyp/index.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5a8fef9b8e3ecc6658c477bdf903fe9e196db596 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 28 10:13:57 2011 +0100 Undo short - xub_StrLen change (fixes warning on Mac OS X). diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index ec5a980..a671e04 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -67,7 +67,7 @@ private: public: explicit SwIndex(SwIndexReg *const pReg, xub_StrLen const nIdx = 0); SwIndex( const SwIndex ); -SwIndex( const SwIndex , xub_StrLen const nDiff ); +SwIndex( const SwIndex , short nDiff ); ~SwIndex() { Remove(); } INLINE SwIndex operator=( xub_StrLen const ); diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index 112430f..70b5712 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -46,7 +46,7 @@ SwIndex::SwIndex(SwIndexReg *const pReg, xub_StrLen const nIdx) Init(m_nIndex); } -SwIndex::SwIndex( const SwIndex rIdx, xub_StrLen const nDiff ) +SwIndex::SwIndex( const SwIndex rIdx, short nDiff ) : m_pIndexReg( rIdx.m_pIndexReg ) , m_pNext( 0 ) , m_pPrev( 0 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source svx/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 23 ++ svx/source/customshapes/EnhancedCustomShape2d.cxx |1 2 files changed, 24 insertions(+) New commits: commit c08d55eccc1b2e26d8d0408d70654751e8672fa7 Author: Radek Doulik r...@novell.com Date: Fri Nov 25 16:12:42 2011 +0100 make sure the bOOXMLShape flag is initialized diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 8e25997..12fb3e4 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -694,6 +694,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : nCoordTop ( 0 ), nCoordWidth ( 21600 ), nCoordHeight( 21600 ), +bOOXMLShape ( sal_False ), nXRef ( 0x8000 ), nYRef ( 0x8000 ), nFlags ( 0 ), commit d169860411a7fea060079d8ca27797b10af44732 Author: Radek Doulik r...@novell.com Date: Wed Nov 16 09:23:39 2011 +0100 more debug info for emf+ rendering - path diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index fe5a129..91c9560 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -207,6 +207,7 @@ namespace cppcanvas if ((pPointTypes [i] 0x07) == 3) { if (((i - last_normal )% 3) == 1) { polygon.setNextControlPoint (p - 1, mapped); +EMFP_DEBUG (printf (polygon append next: %d mapped: %f,%f\n, p - 1, mapped.getX (), mapped.getY ())); continue; } else if (((i - last_normal) % 3) == 2) { prev = mapped; @@ -217,14 +218,17 @@ namespace cppcanvas last_normal = i; } polygon.append (mapped); +EMFP_DEBUG (printf (polygon append point: %f,%f mapped: %f,%f\n, pPoints [i*2], pPoints [i*2 + 1], mapped.getX (), mapped.getY ())); if (hasPrev) { polygon.setPrevControlPoint (p, prev); +EMFP_DEBUG (printf (polygon append prev: %d mapped: %f,%f\n, p, prev.getX (), prev.getY ())); hasPrev = false; } p ++; if (pPointTypes (pPointTypes [i] 0x80)) { // closed polygon polygon.setClosed (true); aPolygon.append (polygon); +EMFP_DEBUG (printf (close polygon\n)); last_normal = i + 1; p = 0; polygon.clear (); @@ -234,6 +238,25 @@ namespace cppcanvas if (polygon.count ()) aPolygon.append (polygon); +EMFP_DEBUG ( +for (unsigned int i=0; iaPolygon.count(); i++) { +polygon = aPolygon.getB2DPolygon(i); +printf (polygon: %d\n, i); +for (unsigned int j=0; jpolygon.count(); j++) { +::basegfx::B2DPoint point = polygon.getB2DPoint(j); +printf (point: %f,%f\n, point.getX(), point.getY()); +if (polygon.isPrevControlPointUsed(j)) { +point = polygon.getPrevControlPoint(j); +printf (prev: %f,%f\n, point.getX(), point.getY()); +} +if (polygon.isNextControlPointUsed(j)) { +point = polygon.getNextControlPoint(j); +printf (next: %f,%f\n, point.getX(), point.getY()); +} +} +} +); + return aPolygon; } }; ___ 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/fi_FI.xml | 134 -- 1 file changed, 129 insertions(+), 5 deletions(-) New commits: commit 227eef01b8fc343fd51f4d6a628dedbbc311c68c Author: Harri Pitkänen hatap...@iki.fi Date: Sun Nov 27 19:01:52 2011 +0200 Add genitive and partitive month names for fi_FI locale Add genitive and partitive month names and remove hardcoded case suffixes from predefined date formats. One format incorrectly had case suffixes added to abbreviated month names. diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml index 1f7747d..7980be9 100644 --- a/i18npool/source/localedata/data/fi_FI.xml +++ b/i18npool/source/localedata/data/fi_FI.xml @@ -87,7 +87,7 @@ FormatCodeP.K./FormatCode /FormatElement FormatElement msgid=DateFormatskey9 default=true type=long usage=DATE formatindex=19 - FormatCodeP. ta /FormatCode + FormatCodeP. /FormatCode /FormatElement FormatElement msgid=DateFormatskey8 default=true type=medium usage=DATE formatindex=20 FormatCodePP.KK.VV/FormatCode @@ -105,22 +105,22 @@ FormatCodeP. KKK. /FormatCode /FormatElement FormatElement msgid=DateFormatskey12 default=false type=long usage=DATE formatindex=25 - FormatCodeP. ta /FormatCode + FormatCodeP. /FormatCode /FormatElement FormatElement msgid=DateFormatskey17 default=false type=long usage=DATE formatindex=26 FormatCodeP. /FormatCode /FormatElement FormatElement msgid=DateFormatskey13 default=false type=long usage=DATE formatindex=27 - FormatCodeNN P. KKKta VV/FormatCode + FormatCodeNN P. KKK VV/FormatCode /FormatElement FormatElement msgid=DateFormatskey2 default=false type=medium usage=DATE formatindex=28 FormatCodeNN PP. KKK VV/FormatCode /FormatElement FormatElement msgid=DateFormatskey14 default=false type=long usage=DATE formatindex=29 - FormatCodeNN P. ta /FormatCode + FormatCodeNN P. /FormatCode /FormatElement FormatElement msgid=DateFormatskey15 default=false type=long usage=DATE formatindex=30 - FormatCodeP. ta /FormatCode + FormatCodeP. /FormatCode /FormatElement FormatElement msgid=DateFormatskey18 default=false type=short usage=DATE formatindex=31 FormatCodeKK-PP/FormatCode @@ -286,6 +286,130 @@ DefaultFullNamejoulukuu/DefaultFullName /Month /MonthsOfYear + GenitiveMonths +Month + MonthIDjan/MonthID + DefaultAbbrvNametammi/DefaultAbbrvName + DefaultFullNametammikuun/DefaultFullName +/Month +Month + MonthIDfeb/MonthID + DefaultAbbrvNamehelmi/DefaultAbbrvName + DefaultFullNamehelmikuun/DefaultFullName +/Month +Month + MonthIDmar/MonthID + DefaultAbbrvNamemaalis/DefaultAbbrvName + DefaultFullNamemaaliskuun/DefaultFullName +/Month +Month + MonthIDapr/MonthID + DefaultAbbrvNamehuhti/DefaultAbbrvName + DefaultFullNamehuhtikuun/DefaultFullName +/Month +Month + MonthIDmay/MonthID + DefaultAbbrvNametouko/DefaultAbbrvName + DefaultFullNametoukokuun/DefaultFullName +/Month +Month + MonthIDjun/MonthID + DefaultAbbrvNamekesä/DefaultAbbrvName + DefaultFullNamekesäkuun/DefaultFullName +/Month +Month + MonthIDjul/MonthID + DefaultAbbrvNameheinä/DefaultAbbrvName + DefaultFullNameheinäkuun/DefaultFullName +/Month +Month + MonthIDaug/MonthID + DefaultAbbrvNameelo/DefaultAbbrvName + DefaultFullNameelokuun/DefaultFullName +/Month +Month + MonthIDsep/MonthID + DefaultAbbrvNamesyys/DefaultAbbrvName + DefaultFullNamesyyskuun/DefaultFullName +/Month +Month + MonthIDoct/MonthID + DefaultAbbrvNameloka/DefaultAbbrvName + DefaultFullNamelokakuun/DefaultFullName +/Month +Month + MonthIDnov/MonthID + DefaultAbbrvNamemarras/DefaultAbbrvName + DefaultFullNamemarraskuun/DefaultFullName +/Month +Month + MonthIDdec/MonthID + DefaultAbbrvNamejoulu/DefaultAbbrvName + DefaultFullNamejoulukuun/DefaultFullName +/Month + /GenitiveMonths + PartitiveMonths +Month + MonthIDjan/MonthID + DefaultAbbrvNametammi/DefaultAbbrvName + DefaultFullNametammikuuta/DefaultFullName +/Month +Month + MonthIDfeb/MonthID + DefaultAbbrvNamehelmi/DefaultAbbrvName + DefaultFullNamehelmikuuta/DefaultFullName +/Month +Month + MonthIDmar/MonthID +
[Libreoffice-commits] .: oox/inc
oox/inc/oox/mathml/importutils.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dabe836c6ed66c5740582c17dbc39b2196608e6d Author: Jan Holesovsky ke...@suse.cz Date: Mon Nov 28 11:24:14 2011 +0100 Fix visibility problem on Windows. diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index ad6ad6b..3a59320 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -71,7 +71,7 @@ public: // One could theoretically use oox::AttributeList, but that complains if the passed reference is empty, // which would be complicated to avoid here. Also, parsers apparently reuse the same instance of XFastAttributeList, // which means using oox::AttributeList would make them all point to the one instance. -struct AttributeList +struct OOX_DLLPUBLIC AttributeList { bool hasAttribute( int token ) const; rtl::OUString attribute( int token, const rtl::OUString def = rtl::OUString()) const; @@ -82,7 +82,7 @@ public: /** Structure representing a tag, including its attributes and content text immediatelly following it. */ -struct Tag +struct OOX_DLLPUBLIC Tag { Tag( int token = XML_TOKEN_INVALID, const com::sun::star::uno::Reference com::sun::star::xml::sax::XFastAttributeList attributes = com::sun::star::uno::Reference com::sun::star::xml::sax::XFastAttributeList (), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source vcl/generic
sw/source/core/text/itradj.cxx|4 vcl/generic/glyphs/gcach_ftyp.cxx |1 - 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit d13e9baca52a9e8f07312ee03915bcdeac1ab4cd Author: Khaled Hosny khaledho...@eglug.org Date: Mon Nov 28 11:51:42 2011 +0100 Fix Kashida justification when there is no Kashida glyph diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 925bee6..92eb70b 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -164,6 +164,10 @@ bool lcl_CheckKashidaPositions( SwScriptInfo rSI, SwTxtSizeInfo rInf, SwTxtIte xub_StrLen nKashidasInAttr = rSI.KashidaJustify ( 0, 0, nIdx, nNext - nIdx ); if ( nKashidasInAttr ) { +// Kashida glyph looks suspicious, skip Kashida justification +if ( rInf.GetOut()-GetMinKashida() = 0 ) +return false; + xub_StrLen nKashidasDropped = 0; if ( !SwScriptInfo::IsArabicText( rInf.GetTxt(), nIdx, nNext - nIdx ) ) { diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index d009d81..7d14ce8 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1097,7 +1097,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData rTo, long rFactor ) const // initialize kashida width // TODO: what if there are different versions of this glyph available -rTo.mnMinKashida = rTo.mnAscent / 4; // a reasonable default const int nKashidaGlyphId = GetRawGlyphIndex( 0x0640 ); if( nKashidaGlyphId ) { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 7c8c4f783101a427da5e1f44eede054595a72605 Author: Tor Lillqvist t...@iki.fi Date: Sun Nov 27 00:20:38 2011 +0200 Add comment about SOLAR_JAVA's alleged BUILD value diff --git a/configure.in b/configure.in index 2f8cf7f..3977d7f 100644 --- a/configure.in +++ b/configure.in @@ -3875,7 +3875,12 @@ AC_SUBST(SOLAR_JAVA) dnl SOLAR_JAVA=YES (yes, silly name, should rename) indicates whether we dnl want there to be *run-time* (and build-time) support for Java extensions in the dnl built LibreOffice. -dnl SOLAR_JAVA=BUILD indicate build-time only support (no runtime support) + +dnl SOLAR_JAVA=BUILD is claimed to indicate build-time only support +dnl (no runtime support). It doesn't seem to ever be set to this +dnl value, though, and everywhere SOLAR_JAVA is only checked for being +dnl empty or non-empty. + dnl SOLAR_JAVA= indicate no java support at all if test $_os = Linux test $host_cpu = powerpc; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/inputwin.cxx | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) New commits: commit e46454b676bedc5585456cc37c63c9e4ff7deaad Author: Noel Power noel.po...@novell.com Date: Mon Nov 28 10:58:31 2011 + reorganise some resize logic diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 5c94f0b..63265f9 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -520,9 +520,9 @@ void ScInputWindow::Resize() ToolBox::Resize(); if ( lcl_isExperimentalMode() ) { -Size aSize = GetSizePixel(); aTextWindow.Resize(); -aSize.Height() = aTextWindow.GetSizePixel().Height() + 11; +Size aSize = GetSizePixel(); +aSize.Height() = CalcWindowSizePixel().Height(); SetSizePixel(aSize); Invalidate(); } @@ -1027,7 +1027,6 @@ IMPL_LINK( ScInputBarGroup, ClickHdl, PushButton*, EMPTYARG ) OSL_FAIL(The parent window pointer pParent is null); return 1; } - if( aMultiTextWnd.GetNumLines() 1 ) { aMultiTextWnd.SetNumLines( 1 ); @@ -1064,7 +1063,6 @@ void ScInputBarGroup::TriggerToolboxLayout() else pParent-SetToolbarLayoutMode( TBX_LAYOUT_NORMAL ); xLayoutManager-lock(); -pParent-Resize(); DataChangedEvent aFakeUpdate( DATACHANGED_SETTINGS, NULL, SETTINGS_STYLE ); // this basically will trigger the reposititioning of the // items in the toolbar from ImplFormat ( which is controlled by @@ -1073,6 +1071,10 @@ void ScInputBarGroup::TriggerToolboxLayout() // controlled via mbFormat. It seems the easiest way to get these // booleans set is to send in the fake event below. pParent-DataChanged( aFakeUpdate); +// highest item in toolbar will have been calculated via the +// event above. Call resize on InputBar to pick up the height +// change +pParent-Resize(); // unlock relayouts the toolbars in the 4 quadrants xLayoutManager-unlock(); } @@ -1137,7 +1139,10 @@ void ScMultiTextWnd::SetNumLines( long nLines ) { mnLines = nLines; if ( nLines 1 ) +{ mnLastExpandedLines = nLines; +Resize(); +} } void ScMultiTextWnd::Resize() @@ -1161,6 +1166,7 @@ void ScMultiTextWnd::Resize() pEditEngine-SetPaperSize( PixelToLogic(Size((aOutputSize.Width()-= 2 * nTextStartPos - 1), 1 ) )); } + SetScrollBarRange(); SetSizePixel(aTextBoxSize); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/nlpflatten' - 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] .: 3 commits - sd/inc sd/source sfx2/inc sw/source
sd/inc/glob.hrc |1 - sd/source/core/glob.src | 36 +++- sd/source/ui/view/ViewShellBase.cxx |2 +- sfx2/inc/sfx2/objface.hxx |4 ++-- sw/source/ui/inc/shells.hrc |4 sw/source/ui/shells/shells.src |8 6 files changed, 46 insertions(+), 9 deletions(-) New commits: commit ac07fe981912dfd435e571ae42d4c1980fd1cfe7 Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 11:16:14 2011 + add defined but missing SfxInterface strings diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index 5d736a5..a3c5436 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -346,10 +346,44 @@ String STR_MEDIAOBJECTBARSHELL String STR_TABLEOBJECTBARSHELL { -Text [ de ] = Tabelle ; Text [ en-US ] = Table ; }; +String STR_SLIDESORTERVIEWSHELL +{ +Text [ en-US ] = Slide Sorter ; +}; + +String STR_TOOL_PANEL_SHELL +{ +Text [ en-US ] = Tool Panel ; +}; + +String STR_LEFT_IMPRESS_PANE_SHELL +{ +Text [ en-US ] = Slides ; +}; + +String STR_LEFT_DRAW_PANE_SHELL +{ +Text [ en-US ] = Pages ; +}; + +String STR_TASKPANEVIEWSHELL +{ +Text [ en-US ] = Tasks ; +}; + +String STR_MASTERPAGESSELECTOR +{ +Text [ en-US ] = Master Pages ; +}; + +String STR_TASKPANELAYOUTMENU +{ +Text [ en-US ] = Layout ; +}; + String STR_POWERPOINT_IMPORT { Text [ en-US ] = PowerPoint Import; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 569dba2..6c3e409 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -94,10 +94,6 @@ #define STR_REDLINE_EDIT(RC_SHELLS_BEGIN + 56) #define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) -// #i68101# no longer needed -// #define STR_NAME_SHAPE_LABEL(RC_SHELLS_BEGIN + 58) -// #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59) - #define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) #define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index ad275b5..ee1f6ec 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -205,6 +205,14 @@ String STR_SHELLNAME_DRAW_TEXT { Text [ en-US ] = Draw text ; }; +String STR_SHELLNAME_MEDIA +{ +Text [ en-US ] = Media ; +}; +String STR_SHELLNAME_NAVIGATION +{ +Text [ en-US ] = Navigation ; +}; //Strings fuer Gallery/Hintergrund String STR_SWBG_PARAGRAPH { commit 55c5ea43a59e505297fb6fa20b77aaa28f7c67bc Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 10:49:36 2011 + there is no STR_VIEWSHELLBASE string diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 89b2b67..4de2609 100755 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -125,7 +125,6 @@ #define STR_SAVE_DOCRID_GLOB_START+100 #define STR_PREVIEWVIEWSHELLRID_GLOB_START+101 #define RID_SD_ERRHDL RID_GLOB_START+102 -#define STR_VIEWSHELLBASE RID_GLOB_START+103 #define STR_3DOBJECTBARSHELLRID_GLOB_START+104 #define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 #define STR_SLIDESORTERVIEWSHELLRID_GLOB_START+106 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3f7094d..94ed8ff 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -261,7 +261,7 @@ void ViewShellBase::InitFactory() -SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(STR_VIEWSHELLBASE)) +SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) { } commit 5d0051ac3733db9f04dd459db46212f70a9c07e9 Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 10:11:54 2011 + SfxInterfaces may legally have no translatable ui name diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index 7e43c19..c4d38f2 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -80,9 +80,9 @@ public: const SfxSlot* GetSlot( const String rCommand ) const; const char* GetClassName() const { return pName; } -int HasName() const { return 0 != aNameResId.GetId(); } +boolHasName() const { return 0 != aNameResId.GetId(); } rtl::OUString GetName() const -{ return String(aNameResId); } +{ return HasName() ? ResId::toString(aNameResId) : rtl::OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc8a2861b473043956e01aeb60a0f419b8705255 Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 12:09:29 2011 + tidy up escaping so this works for me diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index c5c0324..fe2aa7e 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -403,7 +403,7 @@ define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` \ printf . $(OUTDIR)/installation/opt/program/ooenv\\n $${OFFICESCRIPT} \ printf gdb $(OUTDIR)/installation/opt/program/soffice.bin $${OFFICESCRIPT} \ -printf -ex \set args --norestore --nologo \\\--accept=pipe,name=$(USER);urp;\\\ -env:UserInstallation=file://$(OUTDIR)/installation/\ $${OFFICESCRIPT} \ +printf -ex \set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=file://$(OUTDIR)/installation/\ $${OFFICESCRIPT} \ printf -ex \r\\\n $${OFFICESCRIPT} \ $(SHELL) $${OFFICESCRIPT} \ rm $${OFFICESCRIPT} ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nlpsolver/prj
nlpsolver/prj/makefile.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3915eb4ffef25b093b6880d35d1366ed61201979 Author: Michael Meeks michael.me...@suse.com Date: Mon Nov 28 12:12:12 2011 + add missing dmakefile to please gbuild diff --git a/nlpsolver/prj/makefile.mk b/nlpsolver/prj/makefile.mk new file mode 100644 index 000..0997622 --- /dev/null +++ b/nlpsolver/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svl/CppunitTest_svl_lngmisc.mk
svl/CppunitTest_svl_lngmisc.mk |8 1 file changed, 8 deletions(-) New commits: commit b1447d64662cdf9c7d8b11a9075cd13dfb800d4e Author: Michael Stahl mst...@redhat.com Date: Mon Nov 28 14:29:27 2011 +0100 svl: remove unnecessary libs from cppunittest diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index fc5dd45..5c38e41 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -34,19 +34,11 @@ svl/qa/unit/test_lngmisc \ # add a list of all needed libraries here $(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ -comphelper \ cppu \ cppuhelper \ sal \ salhelper \ -sb \ -sot \ svl \ -svt \ -tl \ -utl \ -vcl \ -xcr \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source sdext/source vcl/unx writerfilter/source
basic/source/sbx/sbxcurr.cxx | 10 +++--- sdext/source/pdfimport/tree/imagecontainer.cxx | 14 vcl/unx/gtk/app/gtkinst.cxx |2 - vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx|2 - writerfilter/source/dmapper/ConversionHelper.cxx | 38 +++ 5 files changed, 33 insertions(+), 33 deletions(-) New commits: commit 75dbef14bb484e018f9019c82b7bd9d54549401c Author: Thorsten Behrens tbehr...@suse.com Date: Mon Nov 28 14:18:04 2011 +0100 Headless got moved, fix gtk3 build. diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index a16df25..f3f1343 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -611,7 +611,7 @@ GenPspGraphics *GtkInstance::CreatePrintGraphics() } #if GTK_CHECK_VERSION(3,0,0) -#include ../../headless/svpinst.cxx +#include ../../../headless/svpinst.cxx #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index cb84e15..1a9f5b9 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -28,7 +28,7 @@ // Gross inclusion hacks for now ... -#include ../../headless/svpgdi.cxx +#include ../../../headless/svpgdi.cxx #include unx/gtk/gtkframe.hxx #include unx/gtk/gtkdata.hxx #include unx/gtk/gtkinst.hxx commit 13673b71bc9936d4a8c97f86c7d6f4e713839b40 Author: August Sodora aug...@gmail.com Date: Sat Nov 26 02:03:23 2011 -0500 Remove uses of OUString::setCharAt diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 5f2e89c..20a3968 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -85,13 +85,13 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 rVal ) for ( sal_Int32 charCpyIndex = aAbsStr.getLength() - 1; nInsertIndex = nEndIndex; ++nDigitCount ) { if ( nDigitCount == 4 ) -aBuf.setCharAt( nInsertIndex--, cDecimalSep ); +aBuf[nInsertIndex--] = cDecimalSep; #if MAYBEFUTURE if ( nDigitCount 4 ! ( ( nDigitCount - 4 ) % 3) ) -aBuf.setCharAt( nInsertIndex--, cThousandSep ); +aBuf[nInsertIndex--] = cThousandSep; #endif if ( nDigitCount initialLen ) -aBuf.setCharAt( nInsertIndex--, aAbsStr[ charCpyIndex-- ] ); +aBuf[nInsertIndex--] = aAbsStr[ charCpyIndex-- ]; else // Handle leading 0's to right of decimal point // Note: in VBA the stringification is a little more complex @@ -104,10 +104,10 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 rVal ) // 0 0. 0 // 0.1 0.1000 0.1 -aBuf.setCharAt( nInsertIndex--, (sal_Unicode)'0' ); +aBuf[nInsertIndex--] = (sal_Unicode)'0'; } if ( isNeg ) -aBuf.setCharAt( nInsertIndex, (sal_Unicode)'-' ); +aBuf[nInsertIndex] = (sal_Unicode)'-'; aAbsStr = aBuf.makeStringAndClear(); return aAbsStr; diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 921b573..d6ab304 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -73,16 +73,16 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe aBuf.appendAscii(); sal_uInt8 nIndex (static_castsal_uInt8((nBinary 0xFC) 18)); -aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]); +aBuf[nBufPos] = aBase64EncodeTable [nIndex]; nIndex = static_castsal_uInt8((nBinary 0x3F000) 12); -aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]); +aBuf[nBufPos+1] = aBase64EncodeTable [nIndex]; nIndex = static_castsal_uInt8((nBinary 0xFC0) 6); -aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]); +aBuf[nBufPos+2] = aBase64EncodeTable [nIndex]; nIndex = static_castsal_uInt8((nBinary 0x3F)); -aBuf.setCharAt(nBufPos+3, aBase64EncodeTable [nIndex]); +aBuf[nBufPos+3] = aBase64EncodeTable [nIndex]; } if( nRemain 0 ) { @@ -98,15 +98,15 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe break; } sal_uInt8 nIndex (static_castsal_uInt8((nBinary 0xFC) 18)); -aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]); +aBuf[nBufPos] = aBase64EncodeTable [nIndex]; nIndex = static_castsal_uInt8((nBinary 0x3F000) 12); -aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]); +aBuf[nBufPos+1] = aBase64EncodeTable [nIndex]; if( nRemain == 2 ) { nIndex = static_castsal_uInt8((nBinary 0xFC0) 6); -aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]); +
[Libreoffice-commits] .: cui/source
cui/source/dialogs/colorpicker.cxx |6 -- cui/source/dialogs/colorpicker.src | 13 +++-- cui/source/dialogs/zoom.src|2 +- 3 files changed, 8 insertions(+), 13 deletions(-) New commits: commit 6a8350377bbcc7e1bf9877ab71bf19510b0c0abe Author: Andras Timar ati...@suse.com Date: Mon Nov 28 15:47:09 2011 +0100 no space between number and percent or degree mark - consistency diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 3f3110d..5ae4a10 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1151,12 +1151,6 @@ ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int { FreeResource(); -String sUnitText; -sUnitText.Append( ' ' ); -sUnitText.Append( (sal_Unicode) 0xb0 ); - -maMFHue.SetCustomUnitText( sUnitText ); - Link aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) ); maColorField.SetModifyHdl( aLink ); maColorSlider.SetModifyHdl( aLink ); diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index b444f74..6fee862 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -312,6 +312,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 360 ; Last = 360 ; Unit = FUNIT_CUSTOM ; +CustomUnitText = ° ; }; FixedText CT_SATURATION @@ -333,7 +334,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; FixedText CT_BRIGHTNESS @@ -355,7 +356,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; // - @@ -388,7 +389,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; FixedText CT_MAGENTA @@ -410,7 +411,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; FixedText CT_YELLOW @@ -432,7 +433,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; FixedText CT_KEY @@ -454,7 +455,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; -CustomUnitText = % ; +CustomUnitText = % ; }; // -- diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index f96323a..26729fa 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -71,7 +71,7 @@ ModalDialog RID_SVXDLG_ZOOM HelpID = cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 105, 10 ) ; -Text = ~100 % ; +Text = ~100% ; }; RadioButton BTN_USER { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - dbaccess/source
dbaccess/source/ui/dlg/ConnectionHelper.cxx |2 +- dbaccess/source/ui/dlg/makefile.mk |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit e86982ad35010aa52375b6949eecb2b742e6485f Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Nov 24 19:01:22 2011 +0100 fdo#32347: reenable ADO URL helper UI cleanup obsolete DISABLE_ADO logic diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 3b70cbe..da2af7e 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -70,7 +70,7 @@ #include tools/urlobj.hxx #include tools/diagnose_ex.h #include sfx2/docfilt.hxx -#if !defined(WINDOWS_VISTA_PSDK) defined(WNT) +#if defined(WNT) #define _ADO_DATALINK_BROWSE_ #endif diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk index 8fa615d..55f9027 100644 --- a/dbaccess/source/ui/dlg/makefile.mk +++ b/dbaccess/source/ui/dlg/makefile.mk @@ -128,11 +128,7 @@ SLOFILES= \ $(EXCEPTIONSFILES) \ $(SLO)$/optionalboolitem.obj -.IF $(WINDOWS_VISTA_PSDK)!= $(PROF_EDITION)== -DISABLE_ADO=TRUE -.ENDIF # $(WINDOWS_VISTA_PSDK)!= $(PROF_EDITION)== - -.IF $(GUI)==WNT $(DISABLE_ADO)== +.IF $(GUI)==WNT SLOFILES+= $(SLO)$/adodatalinks.obj .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nlpsolver/src
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb | 13 ++ 1 file changed, 13 insertions(+) New commits: commit 959d4ceac805d78142ace304f367fa0919359b3f Author: Michael Meeks michael.me...@suse.com Date: Mon Nov 28 15:49:00 2011 + nlpsolver: add missing passive registration rdb diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb new file mode 100644 index 000..151ec5e --- /dev/null +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb @@ -0,0 +1,13 @@ +?xml version=1.0? +components xmlns=http://openoffice.org/2010/uno-components; +component loader=com.sun.star.loader.Java2 uri=./nlpsolver.jar +implementation name=com.sun.star.comp.Calc.NLPSolver.DEPSSolverImpl +service name=com.sun.star.beans.PropertySet/ +service name=com.sun.star.sheet.Solver/ +/implementation +implementation name=com.sun.star.comp.Calc.NLPSolver.SCOSolverImpl +service name=com.sun.star.beans.PropertySet/ +service name=com.sun.star.sheet.Solver/ +/implementation +/component +/components ___ 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/ru_RU.xml | 62 ++ 1 file changed, 62 insertions(+) New commits: commit c01ce861aced958302087117a5c5019d420b9d52 Author: Serg Bormant borm...@gmail.com Date: Mon Nov 28 17:18:10 2011 +0100 added [ru-RU] genitive case month names diff --git a/i18npool/source/localedata/data/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml index 17405f6..fd64844 100644 --- a/i18npool/source/localedata/data/ru_RU.xml +++ b/i18npool/source/localedata/data/ru_RU.xml @@ -285,6 +285,68 @@ DefaultFullNameÐекабÑÑ/DefaultFullName /Month /MonthsOfYear + GenitiveMonths +Month + MonthIDjan/MonthID + DefaultAbbrvNameÑнв/DefaultAbbrvName + DefaultFullNameÑнваÑÑ/DefaultFullName +/Month +Month + MonthIDfeb/MonthID + DefaultAbbrvNameÑев/DefaultAbbrvName + DefaultFullNameÑевÑалÑ/DefaultFullName +/Month +Month + MonthIDmar/MonthID + DefaultAbbrvNameмаÑ/DefaultAbbrvName + DefaultFullNameмаÑÑа/DefaultFullName +/Month +Month + MonthIDapr/MonthID + DefaultAbbrvNameапÑ/DefaultAbbrvName + DefaultFullNameапÑелÑ/DefaultFullName +/Month +Month + MonthIDmay/MonthID + DefaultAbbrvNameмай/DefaultAbbrvName + DefaultFullNameмаÑ/DefaultFullName +/Month +Month + MonthIDjun/MonthID + DefaultAbbrvNameиÑн/DefaultAbbrvName + DefaultFullNameиÑнÑ/DefaultFullName +/Month +Month + MonthIDjul/MonthID + DefaultAbbrvNameиÑл/DefaultAbbrvName + DefaultFullNameиÑлÑ/DefaultFullName +/Month +Month + MonthIDaug/MonthID + DefaultAbbrvNameавг/DefaultAbbrvName + DefaultFullNameавгÑÑÑа/DefaultFullName +/Month +Month + MonthIDsep/MonthID + DefaultAbbrvNameÑен/DefaultAbbrvName + DefaultFullNameÑенÑÑбÑÑ/DefaultFullName +/Month +Month + MonthIDoct/MonthID + DefaultAbbrvNameокÑ/DefaultAbbrvName + DefaultFullNameокÑÑбÑÑ/DefaultFullName +/Month +Month + MonthIDnov/MonthID + DefaultAbbrvNameноÑ/DefaultAbbrvName + DefaultFullNameноÑбÑÑ/DefaultFullName +/Month +Month + MonthIDdec/MonthID + DefaultAbbrvNameдек/DefaultAbbrvName + DefaultFullNameдекабÑÑ/DefaultFullName +/Month + /GenitiveMonths Eras Era EraIDbc/EraID ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nlpsolver/prj
nlpsolver/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8eca6b52b82e04654a5a3245b0578c2e04a26740 Author: Michael Meeks michael.me...@suse.com Date: Mon Nov 28 16:29:39 2011 + add missing dep. to generate LICENSE diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst index 8d0edca..d496bc8 100644 --- a/nlpsolver/prj/build.lst +++ b/nlpsolver/prj/build.lst @@ -1,2 +1,2 @@ -nlpsolver nlpsolver : javaunohelper unoil jurt NULL +nlpsolver nlpsolver : javaunohelper unoil jurt readlicense_oo NULL nlpsolver nlpsolver\prj nmake - all nlp_prj NULL ___ 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/ast_ES.xml | 36 ++--- 1 file changed, 18 insertions(+), 18 deletions(-) New commits: commit 56a6704509bd24ac699d9ee9e4c430225f1b07cd Author: Xuacu Saturio xuacu...@gmail.com Date: Mon Nov 28 17:34:52 2011 +0100 changed [ast-ES] date and currency formats diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml index 1c2b5e5..e83257d 100644 --- a/i18npool/source/localedata/data/ast_ES.xml +++ b/i18npool/source/localedata/data/ast_ES.xml @@ -21,7 +21,7 @@ ListSeparator;/ListSeparator LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator LongDateDaySeparator /LongDateDaySeparator - LongDateMonthSeparator /LongDateMonthSeparator + LongDateMonthSeparator de /LongDateMonthSeparator LongDateYearSeparator /LongDateYearSeparator /Separators Markers @@ -66,28 +66,28 @@ FormatCode0,00%/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY formatindex=12 - FormatCode[CURRENCY]#.##0;-[CURRENCY]#.##0/FormatCode + FormatCode#.##0[CURRENCY];-#.##0[CURRENCY]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey2 default=false type=medium usage=CURRENCY formatindex=13 - FormatCode[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00/FormatCode + FormatCode#.##0,00[CURRENCY];-#.##0,00[CURRENCY]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey3 default=false type=medium usage=CURRENCY formatindex=14 - FormatCode[CURRENCY]#.##0;[RED]-[CURRENCY]#.##0/FormatCode + FormatCode#.##0[CURRENCY];[RED]-#.##0[CURRENCY]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey4 default=true type=medium usage=CURRENCY formatindex=15 - FormatCode[CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00/FormatCode + FormatCode#.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey5 default=false type=medium usage=CURRENCY formatindex=16 FormatCodeCCC#.##0,00/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey6 default=false type=medium usage=CURRENCY formatindex=17 - FormatCode[CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--/FormatCode + FormatCode#.##0,--[CURRENCY];[RED]-#.##0,--[CURRENCY]/FormatCode /FormatElement FormatElement msgid=DateFormatskey11 default=true type=short usage=DATE formatindex=18 FormatCodeD/MM/YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey14 default=true type=long usage=DATE formatindex=19 - FormatCodeDD, /FormatCode + FormatCodeDD de /FormatCode /FormatElement FormatElement msgid=DateFormatskey6 default=true type=medium usage=DATE formatindex=20 FormatCodeDD/MM/YY/FormatCode @@ -96,34 +96,34 @@ FormatCodeDD/MM//FormatCode /FormatElement FormatElement msgid=DateFormatskey15 default=false type=long usage=DATE formatindex=22 - FormatCodeD, MMM YY/FormatCode + FormatCodeD MMM YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey16 default=false type=long usage=DATE formatindex=23 - FormatCodeD, MMM /FormatCode + FormatCodeD MMM de /FormatCode /FormatElement FormatElement msgid=DateFormatskey21 default=false type=long usage=DATE formatindex=24 - FormatCodeD, MMM /FormatCode + FormatCodeD MMM de /FormatCode /FormatElement FormatElement msgid=DateFormatskey17 default=false type=long usage=DATE formatindex=25 - FormatCodeD, /FormatCode + FormatCodeD de /FormatCode /FormatElement FormatElement msgid=DateFormatskey22 default=false type=long usage=DATE formatindex=26 - FormatCodeD, YY/FormatCode + FormatCodeD YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey10 default=false type=medium usage=DATE formatindex=27 FormatCodeNN, DD/MMM/YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey18 default=false type=long usage=DATE formatindex=28 - FormatCodeNN, D, MMM YY/FormatCode + FormatCodeNN, D MMM YY/FormatCode /FormatElement FormatElement msgid=DateFormatskey19 default=false type=long usage=DATE formatindex=29 - FormatCodeNN, D, /FormatCode + FormatCodeNN, D de /FormatCode /FormatElement FormatElement msgid=DateFormatskey20 default=false type=long usage=DATE formatindex=30 - FormatCodeD, /FormatCode + FormatCodeD de /FormatCode /FormatElement FormatElement msgid=DateFormatskey12 default=false type=short usage=DATE formatindex=31 - FormatCodeMM/DD/FormatCode + FormatCodeDD/MM/FormatCode /FormatElement FormatElement msgid=DateFormatskey7 default=false type=medium usage=DATE
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdglue.cxx | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 59df2942aec0fd8123b15799c6375abc83b9937e Author: Michael Meeks michael.me...@suse.com Date: Mon Nov 28 16:48:17 2011 + correct gluepoint sizing to match new 9x9 glue-points (thanks to Astron) diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index eac2430..69bd69c 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -32,7 +32,7 @@ #include svx/svdobj.hxx #include svx/svdtrans.hxx - +static const Size aGlueHalfSize(4,4); void SdrGluePoint::SetReallyAbsolute(bool bOn, const SdrObject rObj) { @@ -250,10 +250,13 @@ void SdrGluePoint::Invalidate(Window rWin, const SdrObject* pObj) const Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rWin.LogicToPixel(aPt); rWin.EnableMapMode(sal_False); -long x=aPt.X(),y=aPt.Y(); // Size fixed to 7 pixels for now + +Size aSiz( aGlueHalfSize ); +Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(), +aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height()); // do not erase background, that causes flicker (!) -rWin.Invalidate(Rectangle(Point(x-3,y-3),Point(x+3,y+3)), INVALIDATE_NOERASE); +rWin.Invalidate(aRect, INVALIDATE_NOERASE); rWin.EnableMapMode(bMapMerk); } @@ -261,7 +264,7 @@ void SdrGluePoint::Invalidate(Window rWin, const SdrObject* pObj) const bool SdrGluePoint::IsHit(const Point rPnt, const OutputDevice rOut, const SdrObject* pObj) const { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); -Size aSiz=rOut.PixelToLogic(Size(3,3)); +Size aSiz=rOut.PixelToLogic(aGlueHalfSize); Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height()); return aRect.IsInside(rPnt); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sax/source
sax/source/tools/converter.cxx | 43 + 1 file changed, 43 insertions(+) New commits: commit f970963fd7438fe4a026febf2046a2f4430d0a9f Author: Radek Doulik r...@novell.com Date: Mon Nov 28 17:50:25 2011 +0100 added conversion from MeasureUnit::CM diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index e9a08c4..198ea4d 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1966,6 +1966,49 @@ double Converter::GetConversionFactor(::rtl::OUStringBuffer rUnit, sal_Int16 nS } break; } +case MeasureUnit::CM: +{ +switch(nTargetUnit) +{ +case MeasureUnit::MM_100TH: +{ +fRetval = .001; +break; +} +case MeasureUnit::MM_10TH: +{ +fRetval = .01; +break; +} +case MeasureUnit::MM: +{ +fRetval = .1; +psUnit = gpsMM; +break; +} +case MeasureUnit::CM: +{ +break; +} +case MeasureUnit::POINT: +{ +// 0.01pt = 0.35 mm/100 (exactly) +fRetval = 2.54 / 72.0; +psUnit = gpsPT; +break; +} +case MeasureUnit::INCH: +default: +{ +OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, output unit not supported for cm values); +// 0.0001in = 0.254 mm/100 (exactly) +fRetval = 2.54; +psUnit = gpsINCH; +break; +} +} +break; +} default: OSL_ENSURE(false, sax::Converter::GetConversionFactor(): source unit not supported); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltertabdialog.hxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f26974181331713b166119d7149c5b280bf3a83e Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 16:51:54 2011 + The vcl tabdlg, not the sfx2 one, is the one actually used diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 7a4a539..ad8d889 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -29,7 +29,9 @@ #define _XMLFILTERTABDIALOG_HXX_ #include com/sun/star/lang/XMultiServiceFactory.hpp -#include sfx2/tabdlg.hxx +#include vcl/tabctrl.hxx +#include vcl/tabdlg.hxx +#include vcl/button.hxx class Window; class ResMgr; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - Makefile.in solenv/gbuild tail_build/Makefile
Makefile.in | 165 +++- solenv/gbuild/Module.mk | 48 +- solenv/gbuild/extensions/post_AuxTargets.mk | 77 +++ solenv/gbuild/extensions/post_BuildplTargets.mk | 76 +++ solenv/gbuild/extensions/post_SpeedUpTargets.mk | 38 + solenv/gbuild/gbuild.mk |2 tail_build/Makefile |2 7 files changed, 281 insertions(+), 127 deletions(-) New commits: commit ce33bdce9d3499b7419b9210a2b5117ccda7ea32 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Nov 28 17:56:11 2011 +0100 targets must be postextension SRCDIR is empty otherwise diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk new file mode 100644 index 000..fff1c10 --- /dev/null +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -0,0 +1,77 @@ +# -*- 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) 2011 Bjoern Michaelsen bjoern.michael...@canonical.com (initial developer) ] +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap + +id: + @create-ids + +tags: + @create-tags + +docs: + @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg + +distro-pack-install: install + $(SRCDIR)/bin/distro-install-clean-up + $(SRCDIR)/bin/distro-install-desktop-integration + $(SRCDIR)/bin/distro-install-sdk + $(SRCDIR)/bin/distro-install-file-lists + +$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download + @$(SRCDIR)/download $(SRCDIR)/ooo.lst touch $@ + +fetch: $(SRCDIR)/src.downloaded + +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) ./bootstrap + @mkdir -p $(dir $@) touch $@ + +bootstrap: $(WORKDIR)/bootstrap + +ifeq ($(strip $(gb_PARTIALBUILD)),) + +clean-host: + rm -rf $(SRCDIR)/*/$(INPATH) + rm -rf install + +clean-build: + if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi + rm -f solenv/*/bin/dmake* + rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD) + +distclean: clean + if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi + cd $(SRCDIR) rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \ + bin/repo-list build_env config.log config.status configure \ + desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ + set_soenv set_soenv.last set_soenv.stamp src.downloaded warn + +endif + + +# vim:set shiftwidth=4 softtabstop=4 noexpandtab: diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 6c62649..1fa6a2b 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -42,7 +42,34 @@ unitcheck: dev-install @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ gb_PARTIALBUILD= all: - + +ifeq ($(filter-out build,$(MAKECMDGOALS)),) +gb_MAKETARGET=build +else +gb_MAKETARGET=all +endif + +define gb_BuildplTarget_command +cd $(SRCDIR)/$(1) unset MAKEFLAGS $(SOLARENV)/bin/build.pl --all gb_MAKETARGET=$(gb_MAKETARGET) +endef + +.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build + +smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset) + $(call gb_BuildplTarget_command,$@) + +instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset) + $(call gb_BuildplTarget_command,$@) + +cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded + $(call gb_BuildplTarget_command,$@) + +dev-install: smoketestoo_native + +all: instsetoo_native + +build: instsetoo_native + endif
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/extensions/post_BuildplTargets.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 92d68ce31ab351905e5411a523a557ea658b9802 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Nov 28 19:42:21 2011 +0100 source build env for crosscompiles diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index cba5b33..0dcc15a 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -62,7 +62,7 @@ instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $( $(call gb_BuildplTarget_command,$@) cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded - $(call gb_BuildplTarget_command,$@) + source $(SRCDIR)/Env.Build.sh $(call gb_BuildplTarget_command,$@) dev-install: smoketestoo_native ___ 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/locale.dtd |4 1 file changed, 4 insertions(+) New commits: commit 281d8e3ab8689a24f21f0dfd6d4de2ca1d46dc34 Author: Eike Rathke er...@redhat.com Date: Mon Nov 28 20:03:14 2011 +0100 non-preset formatindex=... values must be =50 Explicitly mention that formatindex=... values for formats defined additionally to the preset range must be =50 and unique within a locale. diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index ff88bfd..aca66e5 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -198,6 +198,10 @@ This isn't necessary to be technically correct and isn't done in many locales yet, but will certainly help. +If you want to define yet more formats than the preset and reserved +0..49 range that's fine, only make sure those formatindex=... values +are each =50 and all values are unique within one locale. + Of usage=FIXED_NUMBER: formatindex=0 MUST be the format containing the 'General' keyword. The keyword itself may be localized, it is good practice though to ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source nlpsolver/src
l10ntools/source/localize.cxx |1 + nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit a969d2aa5d38a501887d51995b817ed6f941c743 Author: Andras Timar ati...@suse.com Date: Mon Nov 28 20:39:39 2011 +0100 enable l10n of nlpsolver diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 4969ba9..41f55eb 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -135,6 +135,7 @@ const char *ModuleList[] = { helpcontent2, instsetoo_native, mysqlc, +nlpsolver, officecfg, padmin, readlicense_oo, diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml index 45fdbd8..9289756 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml @@ -4,13 +4,13 @@ version value=0.9/ identifier value=com.sun.star.comp.Calc.NLPSolver/ display-name -name lang=enSolver for Nonlinear Programming/name +name lang=en-USSolver for Nonlinear Programming/name /display-name publisher -name lang=en xlink:href=http://www.documentfoundation.org;The Document Foundation/name +name lang=en-US xlink:href=http://www.documentfoundation.org;The Document Foundation/name /publisher extension-description -src lang=en xlink:href=description-en-US.txt/ +src lang=en-US xlink:href=description-en-US.txt/ /extension-description dependencies OpenOffice.org-minimal-version xmlns:d=http://openoffice.org/extensions/description/2006; d:name=OpenOffice.org 3.0 value=3.0/ ___ 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/gd_GB.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ceb55cd688cebede8cef8408540019fe54528869 Author: Michael Bauer f...@akerbeltz.org Date: Mon Nov 28 20:37:54 2011 +0100 [gd-GB] partitive vs genitive case month names diff --git a/i18npool/source/localedata/data/gd_GB.xml b/i18npool/source/localedata/data/gd_GB.xml index b08f61e..095cbe6 100644 --- a/i18npool/source/localedata/data/gd_GB.xml +++ b/i18npool/source/localedata/data/gd_GB.xml @@ -347,7 +347,7 @@ DefaultFullNameDùbhlachd/DefaultFullName /Month /MonthsOfYear -GenitiveMonths +PartitiveMonths Month MonthIDjan/MonthID DefaultAbbrvNameFaoi/DefaultAbbrvName @@ -408,7 +408,7 @@ DefaultAbbrvNameDùbh/DefaultAbbrvName DefaultFullNamedhen Dùbhlachd/DefaultFullName /Month -/GenitiveMonths +/PartitiveMonths Eras Era EraIDbc/EraID ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 70324f1e66bf64882d5ffc0b9215aa5524dc2e23 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Nov 28 21:09:51 2011 +0100 dont overoptimize a plain make without an explicit target diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 1ac06ee..7e1a640 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -27,12 +27,14 @@ # speed up if no target need to parse all modules +ifneq ($(strip $(MAKECMDGOALS)),) ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun,$(MAKECMDGOALS)),) gb_Module_add_target= gb_Module_add_check_target= gb_Module_add_subsequentcheck_target= gb_FULLDEPS= endif +endif # vim:set shiftwidth=4 softtabstop=4 noexpandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - nlpsolver/help nlpsolver/src
nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp |5 ++--- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt |2 -- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 837711466e06648eca2152da9bd0cccfd672c6f0 Author: Andras Timar ati...@suse.com Date: Mon Nov 28 21:38:05 2011 +0100 remove CR/LF linefeed from description diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt index 5a9fbed..9288dcf 100755 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt @@ -1,2 +1 @@ -This extension integrates into Calc and offers new Solver engines -to use for optimizing nonlinear programming models. \ No newline at end of file +This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models. commit 9fce330f8f47a148bc12413540a80696cb90a0b4 Author: Andras Timar ati...@suse.com Date: Mon Nov 28 21:35:57 2011 +0100 eliminate duplicate IDs diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp index bbe5888..af4ecd4 100755 --- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp +++ b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp @@ -97,7 +97,7 @@ /tablerow tablerow tablecell - paragraph xml-lang=en-US id=par_id0503200917103794 role=tablecontent l10n=NEWStagnation Limit/paragraph + paragraph xml-lang=en-US id=par_id0504200917103794 role=tablecontent l10n=NEWStagnation Limit/paragraph /tablecell tablecell paragraph xml-lang=en-US id=par_id050320091710377 role=tablecontent l10n=NEWIf this number of individuals found solutions within a close range, the iteration is stopped and the best of these values is chosen as optimal./paragraph @@ -165,7 +165,7 @@ /tablerow tablerow tablecell - paragraph xml-lang=en-US id=par_id0603200910394232 role=tablecontent l10n=NEWPS: Social Constant/paragraph + paragraph xml-lang=en-US id=par_id0603200910394292 role=tablecontent l10n=NEWPS: Social Constant/paragraph /tablecell tablecell paragraph xml-lang=en-US id=par_id0603200910394284 role=tablecontent l10n=NEW⦠sets the importance of the global best point between all particles/individuals./paragraph @@ -194,4 +194,4 @@ /table /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - android/examples sal/osl
android/examples/DocumentLoader/AndroidManifest.xml | 18 + android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java | 97 ++ sal/osl/android/Makefile | 25 +- sal/osl/android/jni/lo-bootstrap.c | 51 +++-- sal/osl/android/src/org/libreoffice/android/Bootstrap.java | 42 ++-- 5 files changed, 187 insertions(+), 46 deletions(-) New commits: commit 3ad35cbadbed5c8cf2d2bbcccd154768a5a62b34 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Nov 29 01:24:01 2011 +0200 Android hacking Start of an app to just load some document. Uses API from the org.libreoffice.android.Bootstrap class. Not sure what is the sanest way to build an app like this. It needs a bunch of shared libraries of course to be copied into libs/armeabi-v7a so that they get included in the .apk. Perhaps a Makefile similar to the one for lo-bootstrap might be good? But for debugging the Java code Eclipse is the way to go (?), and to be able to do that Eclipse wants a project. So should this then be built only through Eclipse? Can one build Eclipse projects from the command line? diff --git a/android/examples/DocumentLoader/AndroidManifest.xml b/android/examples/DocumentLoader/AndroidManifest.xml new file mode 100644 index 000..c137311 --- /dev/null +++ b/android/examples/DocumentLoader/AndroidManifest.xml @@ -0,0 +1,18 @@ +?xml version=1.0 encoding=utf-8? +manifest xmlns:android=http://schemas.android.com/apk/res/android; + package=org.libreoffice.android.examples + android:versionCode=1 + android:versionName=1.0 +uses-sdk android:minSdkVersion=9 / +application android:label=@string/app_name + android:debuggable=true +activity android:name=.DocumentLoader + android:label=LO DocumentLoader + android:configChanges=orientation|keyboardHidden +intent-filter +action android:name=android.intent.action.MAIN / +category android:name=android.intent.category.LAUNCHER / +/intent-filter +/activity +/application +/manifest diff --git a/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java new file mode 100644 index 000..41f69dd --- /dev/null +++ b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java @@ -0,0 +1,97 @@ +// -*- Mode: Java; 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) 2011 Tor Lillqvist t...@iki.fi (initial developer) +// Copyright (C) 2011 SUSE Linux http://suse.com (initial developer's employer) +// +// All Rights Reserved. +// +// For minor contributions see the git repository. +// +// Alternatively, the contents of this file may be used under the terms of +// either the GNU General Public License Version 3 or later (the GPLv3+), or +// the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +// in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +// instead of those above. + +package org.libreoffice.android.examples; + +import android.app.Activity; +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; +import android.widget.EditText; + +import com.sun.star.uno.UnoRuntime; + +import org.libreoffice.android.Bootstrap; + +public class DocumentLoader +extends Activity { + +@Override +public void onCreate(Bundle savedInstanceState) +{ +super.onCreate(savedInstanceState); + +try { + +Thread.sleep(2); + +Bootstrap.setup(this); + +Bootstrap.dlopen(libjuh.so); + +com.sun.star.uno.XComponentContext xContext = null; + +xContext = com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext(); + +com.sun.star.lang.XMultiComponentFactory xMCF = +xContext.getServiceManager(); + +
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 61edefc8c862c94750e172c3f7d7b86379a2b862 Author: Miklos Vajna vmik...@frugalware.org Date: Tue Nov 29 00:54:28 2011 +0100 remove debug printf diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 1a138c0..f3d56c9 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3206,7 +3206,6 @@ void RTFDocumentImpl::checkUnicode() { if (m_aUnicodeBuffer.getLength() 0) { -OSL_TRACE(debug, sending collected unicode chars); OUString aString = m_aUnicodeBuffer.makeStringAndClear(); text(aString); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/about.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a0e84426bfab5787abda96162fe1d06d4a2ec38 Author: Lior Kaplan kaplanl...@gmail.com Date: Tue Nov 29 01:58:28 2011 +0200 credits.html redirects to about-us/credits/, lets not depend on a rewrite rule in the website diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 5ad35ac..8ee4862 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -94,7 +94,7 @@ ModalDialog RID_DEFAULTABOUT }; String ABOUT_STR_LINK { -Text[ en-US ] = http://www.libreoffice.org/credits.html;; +Text[ en-US ] = http://www.libreoffice.org/about-us/credits/;; }; String ABOUT_STR_BUILD { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/localizationmgr.cxx | 14 +++--- basctl/source/inc/localizationmgr.hxx |8 2 files changed, 11 insertions(+), 11 deletions(-) New commits: commit a82a87315033e416d267242002b6722051deb8a4 Author: August Sodora aug...@gmail.com Date: Mon Nov 28 22:16:47 2011 -0500 String-OUString diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index d6cd053..cf034d8 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -50,7 +50,7 @@ static ::rtl::OUString aSemi( RTL_CONSTASCII_USTRINGPARAM( ; )); LocalizationMgr::LocalizationMgr( BasicIDEShell* pIDEShell, -const ScriptDocument rDocument, String aLibName, +const ScriptDocument rDocument, ::rtl::OUString aLibName, const Reference XStringResourceManager xStringResourceManager ) : m_xStringResourceManager( xStringResourceManager ) , m_pIDEShell( pIDEShell ) @@ -927,8 +927,8 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* BasicIDE::MarkDocumentModified( aDocument ); } -void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument rDocument, const String aLibName, -const String aDlgName, Reference container::XNameContainer xDialogModel ) +void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument rDocument, const ::rtl::OUString aLibName, +const ::rtl::OUString aDlgName, Reference container::XNameContainer xDialogModel ) { static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( ResourceResolver )); @@ -959,8 +959,8 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument rDocument } } -void LocalizationMgr::renameStringResourceIDs( const ScriptDocument rDocument, const String aLibName, -const String aDlgName, Reference container::XNameContainer xDialogModel ) +void LocalizationMgr::renameStringResourceIDs( const ScriptDocument rDocument, const ::rtl::OUString aLibName, +const ::rtl::OUString aDlgName, Reference container::XNameContainer xDialogModel ) { // Get library Reference container::XNameContainer xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, sal_True ) ); @@ -990,8 +990,8 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument rDocument, } } -void LocalizationMgr::removeResourceForDialog( const ScriptDocument rDocument, const String aLibName, -const String aDlgName, Reference container::XNameContainer xDialogModel ) +void LocalizationMgr::removeResourceForDialog( const ScriptDocument rDocument, const ::rtl::OUString aLibName, +const ::rtl::OUString aDlgName, Reference container::XNameContainer xDialogModel ) { // Get library Reference container::XNameContainer xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, sal_True ) ); diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index 6942b8e..67a0131 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -75,7 +75,7 @@ class LocalizationMgr void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode ); public: -LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument rDocument, String aLibName, +LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument rDocument, ::rtl::OUString aLibName, const ::com::sun::star::uno::Reference ::com::sun::star::resource::XStringResourceManager xStringResourceManager ); ::com::sun::star::uno::Reference @@ -111,13 +111,13 @@ public: static void deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor, ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString aCtrlName ); -static void setStringResourceAtDialog( const ScriptDocument rDocument, const String aLibName, const String aDlgName, +static void setStringResourceAtDialog( const ScriptDocument rDocument, const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName, ::com::sun::star::uno::Reference ::com::sun::star::container::XNameContainer xDialogModel ); -static void renameStringResourceIDs( const ScriptDocument rDocument, const String aLibName, const String aDlgName, +static void renameStringResourceIDs( const ScriptDocument rDocument, const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName, ::com::sun::star::uno::Reference ::com::sun::star::container::XNameContainer xDialogModel ); -static void removeResourceForDialog( const ScriptDocument rDocument, const String aLibName, const String aDlgName, +static void removeResourceForDialog( const ScriptDocument rDocument, const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName, ::com::sun::star::uno::Reference ::com::sun::star::container::XNameContainer xDialogModel ); static
[Libreoffice-commits] .: configure.in
configure.in | 111 ++- 1 file changed, 80 insertions(+), 31 deletions(-) New commits: commit 9c31884d929f837695f3ed0a2ead8c5aea900ec7 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Nov 29 05:50:51 2011 +0100 Make branding bulk-configurable. diff --git a/configure.in b/configure.in index 3977d7f..4bb2f1f 100644 --- a/configure.in +++ b/configure.in @@ -1591,6 +1591,16 @@ dnl === dnl Branding dnl === +AC_ARG_WITH(branding, +[ --with-brandingUse given path to retrieve all branding images. + Expects /path/intro.png ... + /path/backing_rtl_right.png to be there. Individual + images can be overridden via --with-intro-bitmap ... + --with-startcenter-rtl-left-bitmap switches. + + Usage: --with-branding=/path/to/images +],,) + AC_ARG_WITH(intro-bitmap, [ --with-intro-bitmapPrefer the specified intro bitmap over the the default one. @@ -9224,20 +9234,6 @@ if test -n ${GIT_LINK_SRC}; then fi AC_SUBST(GIT_LINK_SRC) -AC_MSG_CHECKING([for another 'intro' bitmap]) -INTRO_BITMAP= -if test -z $with_intro_bitmap -o $with_intro_bitmap = no ; then -INTRO_BITMAP= -AC_MSG_RESULT([none]) -else -case $with_intro_bitmap in -*.png) INTRO_BITMAP=$with_intro_bitmap ;; -*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;; -esac -AC_MSG_RESULT([$INTRO_BITMAP]) -fi -AC_SUBST(INTRO_BITMAP) - AC_MSG_CHECKING([for custom 'intro' progress bar color]) PROGRESSBARCOLOR= if test -z $with_intro_progressbar_color ; then @@ -9282,10 +9278,58 @@ else fi AC_SUBST(PROGRESSFRAMECOLOR) -AC_MSG_CHECKING([for another 'about' bitmap]) +AC_MSG_CHECKING([for alternative branding images directory]) +INTRO_BITMAP= ABOUT_BITMAP= +STARTCENTER_LEFT_BITMAP= +STARTCENTER_RIGHT_BITMAP= +STARTCENTER_RTL_LEFT_BITMAP= +STARTCENTER_RTL_RIGHT_BITMAP= +STARTCENTER_SPACE_BITMAP= +if test -z $with_branding -o $with_branding = no ; then +AC_MSG_RESULT([none]) +else +INTRO_BITMAP=$with_branding/intro.png +ABOUT_BITMAP=$with_branding/about.png +STARTCENTER_LEFT_BITMAP=$with_branding/backing_left.png +STARTCENTER_RIGHT_BITMAP=$with_branding/backing_right.png +STARTCENTER_RTL_LEFT_BITMAP=$with_branding/backing_rtl_left.png +STARTCENTER_RTL_RIGHT_BITMAP=$with_branding/backing_rtl_right.png +STARTCENTER_SPACE_BITMAP=$with_branding/backing_space.png +for i in $INTRO_BITMAP \ + $ABOUT_BITMAP \ + $STARTCENTER_LEFT_BITMAP \ + $STARTCENTER_RIGHT_BITMAP \ + $STARTCENTER_RTL_LEFT_BITMAP \ + $STARTCENTER_RTL_RIGHT_BITMAP \ + $STARTCENTER_SPACE_BITMAP; do +if test ! -f $i; then +AC_MSG_WARN([Required file $i does not exist!]) +fi +done +AC_MSG_RESULT([$with_branding]) +fi + +AC_MSG_CHECKING([for yet another 'intro' bitmap]) +if test -z $with_intro_bitmap -o $with_intro_bitmap = no ; then +if test $with_intro_bitmap = no ; then +INTRO_BITMAP= +fi +AC_MSG_RESULT([none]) +else +case $with_intro_bitmap in +*.png) INTRO_BITMAP=$with_intro_bitmap ;; +*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;; +esac +AC_MSG_RESULT([$INTRO_BITMAP]) +fi +AC_SUBST(INTRO_BITMAP) + +AC_MSG_CHECKING([for yet another 'about' bitmap]) if test -z $with_about_bitmap -o $with_about_bitmap = no ; then -ABOUT_BITMAP= +if test $with_about_bitmap = no ; then +ABOUT_BITMAP= +fi AC_MSG_RESULT([none]) else case $with_about_bitmap in @@ -9296,10 +9340,11 @@ else fi AC_SUBST(ABOUT_BITMAP) -AC_MSG_CHECKING([for another 'start center left' bitmap]) -STARTCENTER_LEFT_BITMAP= +AC_MSG_CHECKING([for yet another 'start center left' bitmap]) if test -z $with_startcenter_left_bitmap -o $with_startcenter_left_bitmap = no ; then - STARTCENTER_LEFT_BITMAP= + if test $with_startcenter_left_bitmap = no ; then + STARTCENTER_LEFT_BITMAP= + fi AC_MSG_RESULT([none]) else case $with_startcenter_left_bitmap in @@ -9310,10 +9355,11 @@ else fi AC_SUBST(STARTCENTER_LEFT_BITMAP) -AC_MSG_CHECKING([for another 'start center right' bitmap]) -STARTCENTER_RIGHT_BITMAP= +AC_MSG_CHECKING([for yet another 'start center right' bitmap]) if test -z $with_startcenter_right_bitmap -o $with_startcenter_right_bitmap = no ; then - STARTCENTER_RIGHT_BITMAP= + if test $with_startcenter_right_bitmap = no ; then + STARTCENTER_RIGHT_BITMAP= + fi AC_MSG_RESULT([none]) else case $with_startcenter_right_bitmap in @@ -9324,10 +9370,11 @@ else fi AC_SUBST(STARTCENTER_RIGHT_BITMAP) -AC_MSG_CHECKING([for another 'start center rtl left' bitmap]) -STARTCENTER_RTL_LEFT_BITMAP=
[Libreoffice-commits] .: 10 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source
offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl | 44 ++ sc/inc/docuno.hxx |2 sc/inc/markdata.hxx |8 + sc/inc/viewuno.hxx| 33 sc/source/core/data/markdata.cxx | 19 ++ sc/source/ui/inc/preview.hxx | 67 +- sc/source/ui/inc/viewdata.hxx |4 sc/source/ui/unoobj/docuno.cxx| 51 ++- sc/source/ui/unoobj/viewuno.cxx | 120 +++--- sc/source/ui/view/preview.cxx | 117 + sc/source/ui/view/prevwsh.cxx |6 sc/source/ui/view/viewdata.cxx|4 13 files changed, 325 insertions(+), 151 deletions(-) New commits: commit 6a4bb3e17c79d1ce8b2528a4b9c22456be911f32 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Nov 28 23:44:47 2011 -0500 More meaningless comments removed. diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 19fc66a..272be84 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -937,7 +937,6 @@ void ScPreview::DataChanged( const DataChangedEvent rDCEvt ) } } -//Issue51656 Add resizeable margin on page preview from maoyg void ScPreview::MouseButtonDown( const MouseEvent rMEvt ) { Fraction aPreviewZoom( nZoom, 100 ); @@ -1471,7 +1470,7 @@ void ScPreview::MouseMove( const MouseEvent rMEvt ) } } } -//Issue51656 Add resizeable margin on page preview from maoyg + void ScPreview::InvalidateLocationData(sal_uLong nId) { bLocationValid = false; commit 4bbef9595f12dd5ac3c6f4558f4d466f84b8f5ad Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Nov 28 23:43:49 2011 -0500 Arg to CalcPages() no longer used. diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 26ef7b3..f698291 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -104,7 +104,7 @@ private: longnFooterHeight; voidTestLastPage(); -voidCalcPages( SCTAB nToWhichTab ); +voidCalcPages(); voidRecalcPages(); voidUpdateDrawView(); voidDoPrint( ScPreviewLocationData* pFillLocation ); @@ -154,15 +154,15 @@ public: sal_uInt16 GetZoom() const { return nZoom; } Point GetOffset() const { return aOffset; } -SCTAB GetTab(){ if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; } -longGetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; } +SCTAB GetTab(){ if (!bValid) { CalcPages(); RecalcPages(); } return nTab; } +longGetTotalPages() { if (!bValid) { CalcPages(); RecalcPages(); } return nTotalPages; } boolAllTested() const { return bValid nTabsTested = nTabCount; } sal_uInt16 GetOptimalZoom(bool bWidthOnly); longGetFirstPage(SCTAB nTab); -voidCalcAll() { CalcPages(MAXTAB); } +voidCalcAll() { CalcPages(); } voidSetInGetState(bool bSet) { bInGetState = bSet; } DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index fb72a8b..19fc66a 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -223,7 +223,7 @@ void ScPreview::TestLastPage() } -void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) +void ScPreview::CalcPages() { WaitObject( this ); @@ -314,7 +314,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert bool bDone = false; while (nPageNo = nTotalPages nTabsTested nTabCount) { -CalcPages( nTabsTested ); +CalcPages(); bDone = true; } @@ -351,7 +351,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { if (!bValid) { -CalcPages(0); +CalcPages(); RecalcPages(); UpdateDrawView(); // Tabelle evtl. geaendert } @@ -674,7 +674,7 @@ String ScPreview::GetPosString() { if (!bValid) { -CalcPages(nTab); +CalcPages(); UpdateDrawView(); // Tabelle evtl. geaendert } @@ -742,7 +742,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP) long nPage = 0; if (nTabP0) { -CalcPages( nTabP ); +CalcPages(); UpdateDrawView(); // Tabelle evtl. geaendert for (SCTAB i=0; inTabP; i++) commit 8ea81446029b314ae78e45fddb64903ea6ac5509 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Nov 28 23:41:09 2011 -0500 sal_Bool cleanup in ScPreview. diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 9313d75..26ef7b3 100644 ---
[Libreoffice-commits] .: sc/source
sc/source/ui/view/tabvwsh4.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 2d99262c2de5ccaaaee7b4cade3e05228a90eb64 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Tue Nov 29 00:51:51 2011 -0500 fdo#32826: Preserve selected sheets after print preview ended. diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index e6f7946..5dc459d 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -94,6 +94,8 @@ #include scabstdlg.hxx #include externalrefmgr.hxx #include docoptio.hxx +#include markdata.hxx +#include preview.hxx void ActivateOlk( ScViewData* pViewData ); void DeActivateOlk( ScViewData* pViewData ); @@ -1725,6 +1727,9 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, { ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh); nForceDesignMode = pPreviewShell-GetSourceDesignMode(); +ScPreview* p = pPreviewShell-GetPreview(); +if (p) +GetViewData()-GetMarkData().SetSelectedTabs(p-GetSelectedTabs()); } Construct( nForceDesignMode ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] final and override
On 11/27/2011 08:58 PM, Noel Grandin wrote: I see the Mozilla project is adding MOZ_FINAL and MOZ_OVERRIDE macros to help control method overriding in their codebase http://whereswalden.com/2011/11/16/introducing-moz_override-to-annotate-virtual-functions-which-override-base-class-virtual-functions/ http://whereswalden.com/2011/11/26/introducing-moz_final-prevent-inheriting-from-a-class-or-prevent-overriding-a-virtual-function/ Would such things be useful additions to the LibreOffice codebase? In principle, yes. Like happened with features of the old C++ Standard that only made it slowly into the various compilers (the infamous VOS_NAMESPACE etc. stuff, e.g.), we will likely need macros for new features that can be enabled for compilers that already understand them, without breaking the code for legacy compilers. However, given that override and final will only make it into GCC 4.7 (according to http://wiki.apache.org/stdcxx/C++0xCompilerSupport), it might still be a bit early to address them. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] windows make dev-install, was build break in smoketestoo_native : LibO_*_install-arc_en-US.zip: No such file or directory
On 11/25/2011 09:48 PM, Tor Lillqvist wrote: Hmm, this is windows. I'm not altogether sure that the make dev-install suggestion makes sense for windows ? I don't think it does, no. In principle, given that make dev-install essentially just builds smoketestoo_native to get a working installation in solver (as a side effect), and smoketest should work on Windows (at least it used to for OOo), this should not fail to work on Windows. One difference (in OOo) has always been that smoketestoo_native put the installation not under solver, but in some temp path (and removed it again after running the smoketest). This was to take care of the problem with long pathnames on Windows (with the assumption that the paths into the temp directory would be shorter than those into solver). So even if smoketestoo_native were not broken on Windows (it at least looks so from the OP), building smoketestoo_native would not have the desired side effect of leaving a working installation in solver. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Leftovers
.On Sun, Nov 27, 2011 at 03:15:31AM -0800, Tom wrote: Just a normal bug-report but with [wish-list] added into the subject-line should be ok? Use the second method (not the assistant), see section Reporting a bug in few steps at http://wiki.documentfoundation.org/BugReport#Reporting_a_bug_in_few_Steps Then put enhancement for the field severity. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Eclipse: Libre Office integration help
Hello, On Sun, 2011-11-27 at 17:29 +0530, deenadayalan k wrote: Can anybody provide some information on how to integrate libre Office SDK source (LGPL license) in my own Eclipse RCP application? You asked me the same question privately and I see no reason to answer it privately. I worked on that years ago for Nuxeo, but I fear the code is no longer available. Here are some blog posts I wrote at that time who could help you: http://blogs.nuxeo.com/dev/2006/06/openoffice-org-editor-in-eclipse-first-version.html http://blogs.nuxeo.com/dev/2006/06/embedding-ooo-and-msoffice-in-eclipse-part-3.html The main problem is that you need to setup the proper classpath at runtime as each Eclipse plugin has its own classpath and you don't know for sure the path to LO jars on the machine. You can also find some similar code in OOEclipse: http://cgit.freedesktop.org/libreoffice/contrib/ooeclipse/tree/core/source/org/openoffice/ide/eclipse/core/office I hope this could help you. -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
On Thu, Nov 17, 2011 at 01:35:25AM +0100, Fridrich Strba wrote: On 16/11/11 23:22, Lionel Elie Mamane wrote: *** Necessary before pushing to master *** - Add an option --enable-ext-postgresql-sdbc, similar to --enable-ext-mysql-connector, and if that option is not given don't build postgresql-sdbc I can give you a hand with this next week. Is it enough? That's done with the kind help of Norbert Thiebaud. The code is now in master, but: - General review of connectivity/source/drivers/postgresql/makefile.mk - The .oxt file is created in ${OUTDIR}/lib; that's probably not that good a choice. MySQL driver seems to do it ${OUTDIR}/bin, shall PostgreSQL driver do the same? - The build system currently just creates a .oxt file; should probably be changed to take into account --with-extension-integration. Will help with this too, My I kindly remind you of this? We are already missing the beta0 deadline, I'd like not to miss the 3.5 features deadline. Thanks in advance! not sure about the internal postgresql though. Yeah, keeping it as external is OK; after all, we do that for the MySQL C client library, too. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] Cherry pick a commit for fdo 43263
On Sat, Nov 26, 2011 at 12:26:16PM -0800, julien2412 wrote: As I explained on the comment https://bugs.freedesktop.org/show_bug.cgi?id=43263#c1, the commit b645f9195f4da3014e001fb27b8a117d89c8f389 could be cherry picked on 3.4 branch to fix the crash. Did that. PS : I don't know how to cherry pick but if someone could explain me or show me a link, I'd be glad to learn :-) Normally, with git, it would be pretty easy: git cherry-pick b645f9195f4da3014e001fb27b8a117d89c8f389 But it is made more complicated by the fact that libreoffice-3-4 and master are in different git repositories. So I did: ~/src/libreoffice/libreoffice-3.4/clone/filters$ ( cd ~/src/libreoffice/core/; git format-patch --stdout b645f9195f4da3014e001fb27b8a117d89c8f389^1..b645f9195f4da3014e001fb27b8a117d89c8f389 ) | git am -s Maybe a bit more clear like that: cd /libo3-4/clone/FOO CHERRYPICK_ID=b645f9195f4da3014e001fb27b8a117d89c8f389 LIBO_CORE_DIR=~/src/libreoffice/core/ ( cd ${LIBO_CORE_DIR}; git format-patch --stdout ${CHERRYPICK_ID}^1.. ${CHERRYPICK_ID} ) \ git am -s -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Eclipse: Libre Office integration help
Hi there, On Sun, 2011-11-27 at 17:29 +0530, deenadayalan k wrote: Can anybody provide some information on how to integrate libre Office SDK source (LGPL license) in my own Eclipse RCP application? Can you ask a more specific question ? is it about license compliance ? or about integrating these together into something that works or ... ? If it is license compliance; I suggest you ship and offer the source code for the URE / LibreOffice SDK with your application. HTH, 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] [PATCH] [PUSHED] Hide function pointers
On 11/27/2011 08:57 AM, Daisuke Nishino wrote: Exposing functioin pointers to outside is not a good practice I think. This patch encapsulates them. Also, since fnLeaveSelect is called from only one location, I eliminated the indirection. Great, thanks. Pushed (I simplified the this-*this- calls by removing the redundant second this-). I do not find your license statement at http://wiki.documentfoundation.org/Development/Developers, can you add it there (I assume you contribute under LGPLv3+/MPL 1.1+)? Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [libreoffice-l10n] [ANNOUNCE] added possessive genitive case month names, HEADS UP localizers ; -)
Hi Eike, all Here is Russian GenitiveMonths patch. Cc-ed to e-mail. -- wbr, sb ru_RU.GenitiveMonths.diff.gz Description: GNU Zip compressed data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Tinderbox failure, last success: 2011-11-18 20:05:29
Hi Miklos, On 2011-11-22 at 00:56 +0100, Jan Holesovsky wrote: [...on the Tinderbox status page...] Unfortunately the JavaScript the page uses sometimes makes the window disappear before you reach the choice; in that case it helps to move the mouse cursor around that window, and enter it from a different direction. [No kidding - if anybody of you knows how to fix this annoying behavior, I'll buy you a beer at the next LibreOffice conference.] And the winner is... Miklos! Thank you for the fix, changing onmouseover to onclick for the Close button did it. Looking forward to meeting you at the conference (or earlier) to keep my promise :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] Translation of German comments in /svx/source/svdraw
Stefan Knorr (Astron) wrote: The above patch and all of my possible future contributions is/are made available under the LGPLv3+/MPL. Hi Astron, really nice big cleanup, thanks for that - pushed with a few tiny edits. Would you want to add a line for yourself to http://wiki.documentfoundation.org/Development/Developers, and link your license statement email from there? Cheers, -- Thorsten pgpUPERfNdlM9.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] final and override
On Mon, 2011-11-28 at 09:03 +0100, Stephan Bergmann wrote: VOS_NAMESPACE etc. stuff, e.g.), we will likely need macros for new features that can be enabled for compilers that already understand them, without breaking the code for legacy compilers. I believe the Mozilla guys augment this stuff by having an LLVM plugin that does the validation of the keywords on top of the compiler. That seems like a sensible approach to me. On the other hand; I'd (personally) prefer to use some defines to create the 'override' and 'final' keywords (as they will be in future). Defining them to 'virtual' or even empty would do, if they are not present in the compiler. cf. glib's provision of a stock 'inline'. That should help reduce code thrash, and hideous ugliness ;-) keeping us closer to more readable, standard C++. HTH, 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] Add genitive and partitive month names for fi_FI locale
Harri Pitkänen wrote: Add genitive and partitive month names and remove hardcoded case suffixes from predefined date formats. One format incorrectly had case suffixes added to abbreviated month names. Sweet, pushed as-is. Many thanks!! -- Thorsten pgpHJ5V2IdTMH.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Tinderbox failure, last success: 2011-11-18 20:05:29
On Mon, 2011-11-28 at 11:09 +0100, Jan Holesovsky wrote: And the winner is... Miklos! Thank you for the fix, changing onmouseover to onclick for the Close button did it. Looking forward to meeting you at the conference (or earlier) to keep my promise :-) Yah, *crowd cheers*. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] windows nss build failure (master)
Am I missing some magic incantation ? haven't built on windows forever, the build fails with nss, it just refuses to build for me ( attached is build log and autogen.lastrun ) There are some errors in the config from nss to do with phtreads but not sure if this is normal or not, or if this is the cause why 'make' thinks there is nothing to build ? Any ideas/suggestions welcome ( oh btw this is VS 2008 ( not express ) ) thanks, Noel = (1/1) Building module nss Entering /cygdrive/g/master/core/nss if [ -f ./wntmsci12.pro/misc/build/nss-3.12.8.exists ] ; then mv ./wntmsci12.pro/misc/build/nss-3.12.8 ./wntmsci12.pro/misc/build/nss-3.12.8_removeme ; fi make writeable... patching file nss-3.12.8/mozilla/nsprpub/config/rules.mk patching file nss-3.12.8/mozilla/nsprpub/configure Hunk #1 succeeded at 4070 with fuzz 2 (offset 170 lines). patching file nss-3.12.8/mozilla/security/coreconf/Darwin.mk patching file nss-3.12.8/mozilla/security/coreconf/Linux.mk Hunk #2 succeeded at 154 with fuzz 1 (offset 4 lines). Hunk #3 succeeded at 182 with fuzz 2 (offset 21 lines). patching file nss-3.12.8/mozilla/security/coreconf/SunOS5.mk patching file nss-3.12.8/mozilla/security/coreconf/arch.mk patching file nss-3.12.8/mozilla/security/coreconf/rules.mk patching file nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk patching file nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile patching file nss-3.12.8/mozilla/nsprpub/configure Hunk #1 succeeded at 3146 with fuzz 1 (offset 173 lines). Hunk #2 succeeded at 3276 (offset 173 lines). patching file nss-3.12.8/mozilla/nsprpub/configure.in Hunk #1 succeeded at 968 (offset 137 lines). Hunk #2 succeeded at 1009 (offset 137 lines). patching file nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in patching file nss-3.12.8/mozilla/security/coreconf/AIX.mk patching file nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk Hunk #1 succeeded at 171 (offset -2 lines). Hunk #2 succeeded at 221 (offset -2 lines). patching file nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile patching file nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile patching file nss-3.12.8/mozilla/security/nss/nss-config.in patching file nss-3.12.8/mozilla/security/coreconf/arch.mk creating cache ./config.cache checking host system type... i686-pc-cygwin checking target system type... i686-pc-cygwin checking build system type... i686-pc-cygwin checking for cl... /cygdrive/e/PROGRA~1/MICROS~1.0/VC/bin/cl.exe checking for whoami... /usr/bin/whoami checking for gcc... (cached) /cygdrive/e/PROGRA~1/MICROS~1.0/VC/bin/cl.exe checking whether the C compiler (/cygdrive/e/PROGRA~1/MICROS~1.0/VC/bin/cl.exe ) works... yes checking whether the C compiler (/cygdrive/e/PROGRA~1/MICROS~1.0/VC/bin/cl.exe ) is a cross-compiler... no checking whether we are using GNU C... no checking whether /cygdrive/e/PROGRA~1/MICROS~1.0/VC/bin/cl.exe accepts -g... no checking how to run the C preprocessor... /lib/cpp checking for ranlib... ranlib checking for as... /usr/bin/as checking for ar... /usr/bin/ar checking for ld... /usr/bin/ld checking for strip... /usr/bin/strip checking for windres... /usr/bin/windres checking for gcc -pipe support... no checking whether C compiler supports -fprofile-generate... yes checking for perl5... C:/cygwin/bin/perl checking for dlopen in -ldl... no checking for lchown... no checking for strerror... yes checking for pthread_create in -lpthreads... dummy.c dummy.c(2) : fatal error C1083: Cannot open include file: 'pthread.h': No such file or directory no checking for pthread_create in -lpthread... dummy.c dummy.c(2) : fatal error C1083: Cannot open include file: 'pthread.h': No such file or directory no checking for pthread_create in -lc_r... dummy.c dummy.c(2) : fatal error C1083: Cannot open include file: 'pthread.h': No such file or directory no checking for pthread_create in -lc... dummy.c dummy.c(2) : fatal error C1083: Cannot open include file: 'pthread.h': No such file or directory no updating cache ./config.cache creating ./config.status creating Makefile creating config/Makefile creating config/autoconf.mk creating config/nsprincl.mk creating config/nsprincl.sh creating config/nspr-config creating lib/Makefile creating lib/ds/Makefile creating lib/libc/Makefile creating lib/libc/include/Makefile creating lib/libc/src/Makefile creating lib/tests/Makefile creating pkg/Makefile creating pkg/linux/Makefile creating pkg/solaris/Makefile creating pkg/solaris/SUNWpr/Makefile creating pkg/solaris/SUNWprd/Makefile creating pr/Makefile creating pr/include/Makefile creating pr/include/md/Makefile creating pr/include/obsolete/Makefile creating pr/include/private/Makefile creating pr/src/Makefile creating pr/src/io/Makefile creating pr/src/linking/Makefile creating pr/src/malloc/Makefile creating pr/src/md/Makefile creating pr/src/md/windows/Makefile creating pr/src/memory/Makefile creating pr/src/misc/Makefile creating pr/src/threads/Makefile creating pr/tests/Makefile creating
Re: [Libreoffice] final and override
On 11/28/2011 11:25 AM, Michael Meeks wrote: On the other hand; I'd (personally) prefer to use some defines to create the 'override' and 'final' keywords (as they will be in future). Defining them to 'virtual' or even empty would do, if they are not present in the compiler. cf. glib's provision of a stock 'inline'. That should help reduce code thrash, and hideous ugliness ;-) keeping us closer to more readable, standard C++. One nitpick: While it would keep the code surely more readable, it would make it less standard. For one, override and final are technically not keywords in C++11, so a correct program that used them as identifiers would be broken if we defined them to be empty (for a compiler not yet supporting them). For another, if override and final /were/ keywords, defining them in any way would result in undefined behaviour. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
Le 28/11/11 10:32, Lionel Elie Mamane a écrit : Hi Lionel, I want to write up some help about the driver because I thought that while we were waiting for the connector to be integrated, I'd put it up as an extension on the extensions site. However, to do that, I need to write up a little mini-help with the string connection info. I managed to get the driver to work on my Linux 32bit installation under Ubuntu 11.10, but it took me quite a while to establish the connection with the required connstr parameters. As it turns out, for a locally running pg instance, all the user has to enter is the dbname in the URL field, so something like : dbname='mydb' The wizard then goes on to ask for User/PWD combo and allow you to test. However, I have no idea how you would enter the strings for a remote db instance, in particular, the parameter separators. Trawling around the net and in the postgres documentation didn't get me any further, because any of the strings I tried failed miserably with either a failed host lookup, or else a message saying that I needed to add ='' after my colon separators. Could you fill me in please on the string sequence required ? TIA, Alex PS : I haven't managed to build the connector on Mac OSX yet, because configure keeps saying it can't find pq_config. I tried setting the env var manually from the terminal, but it still refuses to see it, so I'll end up having to edit my bash/plist file to get the path in. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] Fix Kashida justification when there is no Kashida glyph
Khaled Hosny wrote: This patch removes the reasonable default value of mnMinKashida which makes no sense at all; either the font have a Kashida glyph and mnMinKashida is set to its width or it doesn't and mnMinKashida is kept 0. Hi Khaled, nice one, pushed - by any chance, do you have a small test document that demonstrates the problem, e.g. with a common font that lacks kashida support? Such that going forward, we don't break this again. Cheers, -- Thorsten pgpaTxGIlMAp5.pgp Description: PGP signature ___ 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 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||43266 --- Comment #235 from Petr Mladek pmla...@suse.cz 2011-11-28 03:01:49 UTC --- Nominate bug 43266: Another problem to start 3.4.4 on 64-bit Windows Hmm, we screwed up something on 64-bit Windows systems. -- 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] Assertions and Logging
[somehow this mail got eaten somewhere, so i'll send it again...] On 22/11/11 13:15, Bjoern Michaelsen wrote: Hi Michael, Stephan, all, On Tue, Nov 22, 2011 at 12:46:52PM +0100, Michael Stahl wrote: one requirement i would have on conditional compilation is that, whether --disable-dbgutil or --enable-dbgutil, objects built with debug=t (resulting in OSL_DEBUG_LEVEL being set to non-zero) should always be binary compatible with objects built without debug=t. this makes e.g. tracking down bugs introduced by mis-optimisation much easier; i think we are in agreement on this point. Full agreement here. i think i've seen members of SwDoc being added with: #if OSL_DEBUG_LEVEL 1 #if OSL_DEBUG_LEVEL 0 this kind of thing always struck me as wrong: it should be DBG_UTIL, will try to clean that up a bit... A bit of digging in gits history shows that to be a blunt removal commit of DBG_UTIL in sw in 2010. I cant make any sense of it, as it completly broke non DBG_UTIL debug builds for no gain. Can anyone enlighten me on this? have fixed this now with: http://cgit.freedesktop.org/libreoffice/core/commit/?id=279a176397623ea83e98fac5a7f4132325b42594 so in sw at least we should have ABI compatible objects now. also, noticed that in a lot of places debug checks and OSL_ENSUREs were behind #if OSL_DEBUG_LEVEL 1, which is not true for either --enable-debug or --enable-dbgutil, so most developers would not get these; have tried to fix that up as well by checking 0 instead. finally, i have deployed our new aborting assertions for some definitely wrong cases in SwIndex: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d2a6999fc320843e4db0c99d961414416a8451c in summary, debug builds of sw should be a lot more useful now :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] windows nss build failure (master)
On 28/11/11 11:46, Andras Timar wrote: [...] --with-mozilla-build=/cygdrive/c/mozilla-build/ For me it is --with-mozilla-build=c:/mozilla-build Give it a try, because your build system does not find nsinstall.exe and it is possible, that this is the root cause. unfortunately that wasn't it, I will try and get to the bottom of it :-/ Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] windows nss build failure (master)
On 11/28/11 1:17 PM, Noel Power wrote: On 28/11/11 11:46, Andras Timar wrote: [...] --with-mozilla-build=/cygdrive/c/mozilla-build/ For me it is --with-mozilla-build=c:/mozilla-build Give it a try, because your build system does not find nsinstall.exe and it is possible, that this is the root cause. unfortunately that wasn't it, I will try and get to the bottom of it :-/ Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice I am not sure but I remember seeing an email thread about mozilla decoupling not sure if that might be related to this issue on windows. Regards Jonathan Aquilina Get a signature like this. Click here. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] final and override
On Mon, 2011-11-28 at 11:42 +0100, Stephan Bergmann wrote: On 11/28/2011 11:25 AM, Michael Meeks wrote: On the other hand; I'd (personally) prefer to use some defines to create the 'override' and 'final' keywords (as they will be in future). Defining them to 'virtual' or even empty would do, if they are not present in the compiler. cf. glib's provision of a stock 'inline'. ... One nitpick: While it would keep the code surely more readable, it would make it less standard. For one, override and final are technically not keywords in C++11, so a correct program that used them as identifiers would be broken if we defined them to be empty (for a compiler not yet supporting them). Sure - but I suspect the instance count of that is really low in our nFinal aOverride world; a quick: git grep final | grep \.[ch]xx git grep override | grep \.[ch]xx Shows almost no problems here. For another, if override and final /were/ keywords, defining them in any way would result in undefined behaviour. Sure - which is why we'd do that for old compiler versions only; that is what glib does for 'inline' - quite successfully. The main downside to this might be the odd error messages when someone does: bool final = false; ;-) but - apparently people don't do that. Either way, I know which I prefer: finalbool methodFoo(); virtual char methodBaz(); override int methodBaa(); vs. SAL_FINALbool methodFoo() virtual char methodBaz(); SAL_OVERRIDE int methodBaa() But, since there is (as yet) no patch, it's hardly worth discussing. ;-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] I need some advice to fix fdo#40363
Hi all, The bug described in fdo#40363 may occur if you make a typo when type some dates in Calc. For example 1011-11-28 instead of 2011-11-28. In such a case, chart2 loops infinitely in master and LibO 3.4. The loop occurs in GetDateSomeYearsAway method in DateHelper.cxx : http://opengrok.libreoffice.org/xref/core/chart2/source/view/axes/DateHelper.cxx#81 The problem is that the chart wizard want compute tick marks. If a date is far before 1582-10-15 then GetDateSomeYearsAway() is called for another year before 1582-10-15. This methods goes in the past by steps of one day until it finds a valid date. The problem is that the validity of the date is defined by IsValid() in tdate.cxx : http://opengrok.libreoffice.org/xref/core/tools/source/datetime/tdate.cxx#321 For this method every dates before 1582-10-15 are not valid... If I modify Date::IsValid so that only dates strictly between 1582-10-05 and 1582-10-15 are not valid, then the chart wizard works without problem. I do not understand why every dates before 1582-10-15 should not be valid when only dates from 1582-10-05 to 1582-10-14 do not exist due to the switch from julian calendar to gregorian calendar. What is very annoying for me is that the chart wizard works well with the same data in LibO 3.3 (precisely LibO 3.3.2 from Ubuntu PPA for Ubuntu 10.04 x86_64) and I was not able to find any modification of the file tdate.cxx (git log -p tdate.cxx) that I can relate to this problem. In other words, AFAIK, actual code of Date::IsValid was already there in LibO 3.3. Now, my question is what to do? Is it a good idea to modify Date::IsValid in tdate.cxx without knowing why it works in LibO 3.3 ? Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Depends on||43298 --- Comment #8 from Lionel Elie Mamane lio...@mamane.lu 2011-11-28 04:50:55 UTC --- Nominate bug 43298 cannot open MS Access (.mdb) files -- 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] Possible little code simplification
On 25/11/11 19:05, Ivan Timofeev wrote: Hello Michael, 2011/11/25 Michael Stahl mst...@redhat.com: On 24/11/11 19:07, Ivan Timofeev wrote: [...] What do you think about changing the code so that pSortedObjs will be alive every time? We will be able to return a reference to pSortedObjs in GetSortedObjs() instead of a pointer and remove the mentioned checks (there are a lot of such checks). I could do this. :-) the writer core and layout code is highly optimized, especially for 16-bit windows where memory is scarce :) Well, another possible memory optimization is to merge SwSortedObjsImpl into SwSortedObjs. What is the reason to use the pImpl pattern here? usually pImpl is a good idea because it is the only way to get actual encapsulation in C++; but in this case it definitely looks overdone to me... it really does not make any sense to have a separate header and cxx file for the impl class, that should all be moved into swsortedobjs.cxx. hmmm... am not sure about the question should it have a pImpl at all, currently the impl only contains a vector, but on the other hand, perhaps somebody will add other members later... i don't have a strong opinion in this case :) i guess for SwPageFrm it doesn't matter at all if the SwSortedObj always exists. Same problem with the field 'SwSortedObjs* pDrawObjs' in the class SwFrm. since this is the base class of all frames there will be a couple more instances of it, and most of these probably won't use pDrawObjs; would be interesting to know how much memory this would uses for a large document... Ok, there are many SwFrms in a big doc... We don't want to throw away memory. But we would use a shared between the SwFrm instances static variable for an empty list (null object), and return it in GetDrawObjects when our SwSortedObjs is dead. What do you think about it? for this case i don't like it, because this null object would be mutable: it would be possible that somebody mis-uses this to get the pDrawObjs, receiving the static instance, and then adding an element, which is obviously bogus. so the explicit null checks look like the lesser evil :) what perhaps could be investigated is whether the pDrawObjs really has to be a member of SwFrm, perhaps it could be moved to some sub-class that is less often used... but note i am not familiar with the layout code so that is just a guess. Kind Regards, Ivan regards, michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Fix for fdo39748 Easy hack: Cleanup extensions list
Hi Please find attached a patch for FDO 39748, Easy Hack Cleanup Extension list. Some post-commit I missed (I don't know how to fix a patch): in /desktop/source/deployment/gui/dp_gui.hrc, please drop the line +#define RID_EM_BTN_SELECT 23 in /desktop/source/deployment/gui/dp_gui_dialog2.cxx, please drop the line +aPos = Point( 0, 5 ); Thank you -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 From 54d9ab52456ce8392c41152b156d761e6c65ef1f Mon Sep 17 00:00:00 2001 From: Olivier Hallot olivier.hal...@alta.org.br Date: Mon, 28 Nov 2011 10:54:55 -0200 Subject: [PATCH] Fix for bug fdo39748, Easy-hack Cleanup extension list. This patch introduces 3 new check box in the extension manager GUI to allow selection of extension type to display: bundled, shared or user. Dialog is automatically updated upon toggling checkbox. On toggling each checkbox, the extension list is recreated from scratch and packages are added to the list depending on the checkmark state. Initial state is all checks marked. --- desktop/source/deployment/gui/dp_gui.hrc |5 + desktop/source/deployment/gui/dp_gui_dialog2.cxx | 84 ++-- desktop/source/deployment/gui/dp_gui_dialog2.hxx |6 ++ desktop/source/deployment/gui/dp_gui_dialog2.src | 33 +++- .../source/deployment/gui/dp_gui_extlistbox.cxx|1 - desktop/source/deployment/gui/dp_gui_theextmgr.cxx |1 - desktop/source/deployment/gui/dp_gui_theextmgr.hxx |3 +- 7 files changed, 121 insertions(+), 12 deletions(-) diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 4924051..0419e63 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -41,9 +41,14 @@ #define RID_EM_BTN_CHECK_UPDATES 13 #define RID_EM_BTN_OPTIONS 14 #define RID_EM_BTN_CANCEL 15 +#define RID_EM_FT_TYPE_EXTENSIONS 16 +#define RID_EM_CBX_BUNDLED 17 +#define RID_EM_CBX_SHARED 18 +#define RID_EM_CBX_USER19 #define RID_EM_FT_GET_EXTENSIONS 20 #define RID_EM_FT_PROGRESS 21 #define RID_EM_FT_MSG 22 +#define RID_EM_BTN_SELECT 23 // local RIDs: #define PB_LICENSE_DOWN 50 diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2301eff..fe92e19 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -26,7 +26,6 @@ * / - #include dp_gui.hrc #include svtools/controldims.hrc #include svtools/svtools.hrc @@ -98,6 +97,10 @@ namespace dp_gui { #define PROGRESS_WIDTH 60 #define PROGRESS_HEIGHT 14 +#define USER_PACKAGE_MANAGEROUSTR(user) +#define SHARED_PACKAGE_MANAGER OUSTR(shared) +#define BUNDLED_PACKAGE_MANAGER OUSTR(bundled) + //-- struct StrAllFiles : public rtl::StaticWithInit OUString, StrAllFiles { @@ -588,7 +591,7 @@ String DialogHelper::getResourceString( sal_uInt16 id ) //-- bool DialogHelper::IsSharedPkgMgr( const uno::Reference deployment::XPackage xPackage ) { -if ( xPackage-getRepositoryName().equals( OUSTR(shared) ) ) +if ( xPackage-getRepositoryName().equals( SHARED_PACKAGE_MANAGER ) ) return true; else return false; @@ -705,6 +708,11 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, TheExtensionManager *pManager ) : m_aCloseBtn( this, getResId( RID_EM_BTN_CLOSE ) ), m_aHelpBtn( this, getResId( RID_EM_BTN_HELP ) ), m_aDivider( this ), +m_aDivider2(this), +m_aTypeOfExtTxt( this , getResId( RID_EM_FT_TYPE_EXTENSIONS ) ), +m_aBundledCbx(this, getResId (RID_EM_CBX_BUNDLED)), +m_aSharedCbx(this, getResId (RID_EM_CBX_SHARED)), +m_aUserCbx (this, getResId (RID_EM_CBX_USER)), m_aGetExtensions( this, getResId( RID_EM_FT_GET_EXTENSIONS ) ), m_aProgressText( this, getResId( RID_EM_FT_PROGRESS ) ), m_aProgressBar( this, WB_BORDER + WB_3DLOOK ), @@ -732,6 +740,10 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, TheExtensionManager *pManager ) : m_aGetExtensions.SetClickHdl( LINK( this, ExtMgrDialog, HandleHyperlink ) ); m_aCancelBtn.SetClickHdl( LINK( this, ExtMgrDialog, HandleCancelBtn ) ); +m_aBundledCbx.SetClickHdl( LINK( this, ExtMgrDialog, HandleExtTypeCbx ) ); +m_aSharedCbx.SetClickHdl( LINK( this, ExtMgrDialog, HandleExtTypeCbx ) ); +m_aUserCbx.SetClickHdl( LINK( this, ExtMgrDialog,
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
Le 28/11/2011 11:47, Alexander Thurgood a écrit : Hi all, However, I have no idea how you would enter the strings for a remote db instance, in particular, the parameter separators. Trawling around the net and in the postgres documentation didn't get me any further, because any of the strings I tried failed miserably with either a failed host lookup, or else a message saying that I needed to add ='' after my colon separators. Could you fill me in please on the string sequence required ? OK, I seem to have figured it out from re-reading libpq documentation. The URL field accepts connection strings of pair KEYWORD=VALUE, so one can enter : host=10.0.0.1 dbname=mydb and then move on to the user/pwd field and connection test (I imagine that one could enter the usr/pwd combo in the URL field too, but I haven't tried that yet. I will try and write something up about this in the next few days unless someone beats me to it. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||43246 --- Comment #9 from Petr Mladek pmla...@suse.cz 2011-11-28 05:24:06 PST --- (In reply to comment #5) Nominate Bug 43246 - MinGW FILEOPEN FILESAVE: General Error message Makes sense = added -- 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] Eclipse: Libre Office integration help
Hi, On Mon, 2011-11-28 at 16:51 +0530, deenadayalan k wrote: Thanks for pointing to references (URL's). By the way I answered on the mailing-list, it's just because I don't want to hold such an interesting discussion privately. Please reply to the mailing-list too: this is archived and could help people coming with the same question later. I won't even answer to your next private email. You can also find some similar code in OOEclipse: http://cgit.freedesktop.org/libreoffice/contrib/ooeclipse/tree/core/source/org/openoffice/ide/eclipse/core/office How can i download the above ../tree/core/source/..? using git? Sure it's a git repository. This seems to a eclipse plugin http://cgit.freedesktop.org/libreoffice/contrib/ooeclipse/tree/core but in this folder hierarchy, 'office' is a folder at ../source/org/openoffice/ide/eclipse/core/office, is this good enough to open a 'open office' in my own Eclipse RCP application or should i need to download http://cgit.freedesktop.org/libreoffice/contrib/ooeclipse/tree/core/source? The whole thing is not even intended to open a document from within Eclipse. As I said, this is not the code I refer to in the links I gave you... but another example of how to bootstrap LibreOffice from an Eclipse plugin. That code is simply getting useful data from the LibreOffice installation to help developing LibreOffice extensions. To integrate the 'open office' in my own RCP application, should i need to install the open office in my computer or i could download the required *.jar files and then i can create eclipse 'reference library' (as another plugin) that can be referenced by the actual RCP application (which opens the excel in open office). I never liked the embed-the-jars-in-the-plugin attitude and that's why I never re-used Ubion's code. To be more independent from the installed version, you should use the installed Jars. Just to be clear: I don't want to dive again in that mess and haven't done it for years. The best I can do now for you is to give you the links and some code pointers to help you, but that's now done. I won't do the work for you even though I did it once! Regards, -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] GTK warnings on console when launching LO built from master
Hi all, When testing my (more or less) daily build of LO master, I keep getting these warning messages on the console, whenever the app is in the process of creating a new file (during the 'Save' operation : Gtk-WARNING **: Unable to retrieve the file info for `file:///home/alex/Documents/IPGALORE/BDD/testdbpq': Error stating file '/home/alex/Documents/IPGALORE/BDD/testdbpq': No such file or directory Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] final and override
On 11/28/2011 01:27 PM, Michael Meeks wrote: Sure - which is why we'd do that for old compiler versions only ...where it would still result in undefined behaviour, technically (note the nitpick, was meant somewhat tongue-in-cheek). finalbool methodFoo(); virtual char methodBaz(); override int methodBaa(); (Note that final and override go at the end of the declaration.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Assertions and Logging
On Mon, 2011-11-28 at 12:51 +0100, Michael Stahl wrote: finally, i have deployed our new aborting assertions for some definitely wrong cases in SwIndex: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d2a6999fc320843e4db0c99d961414416a8451c And I have abort on make subsequentcheck in writer on getting the anchor for an embeddedobj, i.e. sw.SwXTextEmbeddedObject test Here's what I see... in __GI___assert_fail (assertion=0x7fffdbf615b8 m_pIndexReg == rIndex.m_pIndexReg, file=0x7fffdbf61278 /home/caolan/LibreOffice/core/sw/source/core/bastyp/index.cxx, line=382, function= 0x7fffdbf616a0 bool SwIndex::operator(const SwIndex) const) at assert.c:105 Digging, I see the m_pIndexReg is zero-ed out at... SwFmtAnchor::SetAnchor (this=0x7fffdd1ac6a0, pPos=0x7fffdd1ac958) at /home/caolan/LibreOffice/core/sw/source/core/layout/atrfrm.cxx:1508 fuller logs attached. The zeroing out code is... void SwFmtAnchor::SetAnchor( const SwPosition *pPos ) { delete pCntntAnchor; pCntntAnchor = pPos ? new SwPosition( *pPos ) : 0; //AM Absatz gebundene Flys sollten nie in den Absatz hineinzeigen. if (pCntntAnchor ((FLY_AT_PARA == nAnchorId) || (FLY_AT_FLY == nAnchorId))) { pCntntAnchor-nContent.Assign( 0, 0 ); } } So we are a FLY_AT_PARA anchor, so the SwIndex m_pIndexReg is set to 0 from the first arg, comment is in German, but I guess the jist of it is paragraph anchors shouldn't point into a specific location in the paragraph, which seems plausible. Later on though when we want to find the anchor we end up comparing SwIndex'es and the assert fires, so how do we fix this ? a) Tweak the SwIndex::operator to allow NULL m_pIndexReg when m_nIndex is 0 and sort them before non-NULL m_pIndexReg ? b) Do that in SwPosition::operator instead ?. c) Not null out the m_pIndexReg in the first place in SetCntntAnchor, and just set it to the 0th element d) custom compare in lcl_MarkOrderingByStart, lcl_Lower etc ? C. #3 0x003a6782dd02 in __GI___assert_fail (assertion=0x7fffdbf615b8 m_pIndexReg == rIndex.m_pIndexReg, file=0x7fffdbf61278 /home/caolan/LibreOffice/core/sw/source/core/bastyp/index.cxx, line=382, function= 0x7fffdbf616a0 bool SwIndex::operator(const SwIndex) const) at assert.c:105 #4 0x7fffdb47e265 in SwIndex::operator (this=0x22547b8, rIndex=...) at /home/caolan/LibreOffice/core/sw/source/core/bastyp/index.cxx:382 #5 0x7fffdb4d1126 in SwPosition::operator (this=0x22547a0, rPos=SwPosition (node 12, offset 0)) at /home/caolan/LibreOffice/core/sw/source/core/crsr/pam.cxx:111 #6 0x7fffdb524933 in (anonymous namespace)::lcl_MarkOrderingByStart (rpFirst=..., rpSecond=...) at /home/caolan/LibreOffice/core/sw/source/core/doc/docbm.cxx:82 #7 0x7fffdb530ef2 in __gnu_debug::__check_partitioned_lower__gnu_debug::_Safe_iterator__gnu_cxx::__normal_iteratorboost::shared_ptrsw::mark::IMark*, std::__cxx1998::vectorboost::shared_ptrsw::mark::IMark, std::allocatorboost::shared_ptrsw::mark::IMark , std::__debug::vectorboost::shared_ptrsw::mark::IMark, std::allocatorboost::shared_ptrsw::mark::IMark , boost::shared_ptrsw::mark::IMark, bool (*)(boost::shared_ptrsw::mark::IMark const, boost::shared_ptrsw::mark::IMark const) (__first=..., __last=..., __value= ..., __pred= 0x7fffdb5248de (anonymous namespace)::lcl_MarkOrderingByStart(IDocumentMarkAccess::pMark_t const, IDocumentMarkAccess::pMark_t const)) at /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../include/c++/4.6.1/debug/functions.h:362 #8 0x7fffdb52e128 in std::lower_bound__gnu_debug::_Safe_iterator__gnu_cxx::__normal_iteratorboost::shared_ptrsw::mark::IMark*, std::__cxx1998::vectorboost::shared_ptrsw::mark::IMark, std::allocatorboost::shared_ptrsw::mark::IMark , std::__debug::vectorboost::shared_ptrsw::mark::IMark, std::allocatorboost::shared_ptrsw::mark::IMark , boost::shared_ptrsw::mark::IMark, bool (*)(boost::shared_ptrsw::mark::IMark const, boost::shared_ptrsw::mark::IMark const) (__first=..., __last=..., __val=..., __comp= 0x7fffdb5248de (anonymous namespace)::lcl_MarkOrderingByStart(IDocumentMarkAccess::pMark_t const, IDocumentMarkAccess::pMark_t const)) at /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../include/c++/4.6.1/bits/stl_algo.h:2406 #9 0x7fffdb524a14 in (anonymous namespace)::lcl_InsertMarkSorted (io_vMarks=..., pMark=...) at /home/caolan/LibreOffice/core/sw/source/core/doc/docbm.cxx:100 #10 0x7fffdb526a7f in sw::mark::MarkManager::makeMark (this=0x1d15740, rPaM=SwPaM = {...}, rName=, eType= IDocumentMarkAccess::UNO_BOOKMARK) at /home/caolan/LibreOffice/core/sw/source/core/doc/docbm.cxx:392 #11 0x7fffdbabf80d in SwXTextRange::SetPositions (this=0x23c0730, rPam=SwPaM = {...}) at /home/caolan/LibreOffice/core/sw/source/core/unocore/unoobj2.cxx:867 #12 0x7fffdbabf2c6 in SwXTextRange::SwXTextRange (this=0x23c0730, rPam=SwPaM = {...}, xParent=..., eRange= SwXTextRange::RANGE_IN_TEXT) at
Re: [Libreoffice] GTK warnings on console when launching LO built from master
Hi Alex, On Mon, 2011-11-28 at 14:35 +0100, Alex Thurgood wrote: When testing my (more or less) daily build of LO master, I keep getting these warning messages on the console, whenever the app is in the process of creating a new file (during the 'Save' operation : Sounds like a generic gtk+ file-selector bug I guess. Do you get it when using gedit ? Gtk-WARNING **: Unable to retrieve the file info for `file:///home/alex/Documents/IPGALORE/BDD/testdbpq': Error stating file '/home/alex/Documents/IPGALORE/BDD/testdbpq': No such file or directory Failing that; whack a breakpoint in g_logv, and get a trace (with debug symbols from vcl/). Can you confirm it does not occur in 3.4 ? 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] Removing uses of OUString::setCharAt
August Sodora wrote: Tonight I tried to remove some uses of setCharAt so that it can eventually be removed, and I ran across a few cases that I would like to get another pair of eyes on. Especially in one particular case, I added a guard to make sure that the index was within range and I want to make sure that it is necessary or if something more involved is required. The patch is attached, and I remembered to add [PATCH] to the subject this time :) Hi August, looks good, pushed now - except for the svl/source/misc/lngmisc.cxx snippet which was based on older code it seems, dropped that part entirely. Thanks a lot, looking forward for more! :) -- Thorsten pgpZWJULoOeIT.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
On Mon, 2011-11-28 at 14:23 +0100, Alex Thurgood wrote: However, I have no idea how you would enter the strings for a remote db instance, in particular, the parameter separators. ... OK, I seem to have figured it out from re-reading libpq documentation. The URL field accepts connection strings of pair KEYWORD=VALUE, so one can enter : host=10.0.0.1 dbname=mydb Gosh - it sounds like an horrific user experience :-) Presumably in the star-treck future, having a per-backend UI with key/value pairs specified that can be presented pleasantly with descriptions, widgets etc. filled out would be rather nicer. Perhaps an easy hack ;-) ATB, 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] [PATCH] [PUSHED] Hide function pointers
On Mon, Nov 28, 2011 at 6:42 PM, Stephan Bergmann sberg...@redhat.comwrote: On 11/27/2011 08:57 AM, Daisuke Nishino wrote: Exposing functioin pointers to outside is not a good practice I think. This patch encapsulates them. Also, since fnLeaveSelect is called from only one location, I eliminated the indirection. Great, thanks. Pushed (I simplified the this-*this- calls by removing the redundant second this-). Thanks! I do not find your license statement at http://wiki.documentfoundation.org/Development/Developers, can you add it there (I assume you contribute under LGPLv3+/MPL 1.1+)? Ah, I posted the license statement on Nov 25: On Fri, Nov 25, 2011 at 2:10 AM, Daisuke Nishino niboshi...@gmail.comwrote: Lisence: All my past and future contributions (including this one) to LibreOffice are under LGPLv3+/MPL until further notice. I thought I don't need to write the statement once I have posted the above. Should I edit the wiki page, or do I need to write it in every posts? p.s. I noticed a typo now :( Thanks, -- Daisuke Nishino ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] Hide function pointers
On 11/28/2011 04:28 PM, Daisuke Nishino wrote: I thought I don't need to write the statement once I have posted the above. Should I edit the wiki page, or do I need to write it in every posts? It suffices if you posted it once (I just did not bother to search the mail archives, only looked at the wiki page). Please just add yourself to the wiki page; that would make future patch handling as easy as possible. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED-3-4] [REVIEW-3-4] fdo#32347 reenable ADO URL helper UI
Lionel Elie Mamane wrote: Attached patch is a partial backport of my commit 538190e0ea142d0a7da244809c66241379d4d91b in master. It reenables the ADO URL helper UI on MS Windows, which makes it *much* easier to connect to ADO databases. It is a regression compared to any version compiled with Windows XP SDK, i.e. OO.org. Thanks, pushed to -3-4 - seeing green win32 tbox builds post-Nov-23rd, this appears sane. Cheers, -- Thorsten pgpqLh22an3J5.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] EuroOffice Barcode
Hi Tibor, On 2011-11-23 at 10:29 +0100, Brenner Tibor wrote: I'm Tibor Brenner from MultiRcio Ltd. We are the developer team of EuroOffice software package and extensions. I've written to András Tímár from your team about a request with our Barcode extension, and he suggested to use your mailing list. Terribly sorry for the late answer :-( I'm the one who initially did the wikihelp, please feel free to explicitly CC: me on anything regarding the http://help.libreoffice.org functionality. Since LibreOffice has an online help system, when somebody installs our Barcode extension, he won't have its help page. So, we would like to ask your help to built in our help files into your online help system. I can upload our extension to your extensions webpage, as it's an absolutely free one for everyone. In this case you will have all help files, or I can send you the whole extension, if it's a better way. This is a very good point; so far there is no explicit functionality to handle extensions when the online help is used. Maybe it might be as easy as handling the extensions explicitly, ie. to use their (bundled) help when the extension help is requested. How does the page URL look like when the barcode extension help is issued, please? Maybe tweaking the impl_hasHelpInstalled() from sfx2/source/appl/sfxhelp.cxx:659 could do the trick? Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] ru-RU genitive case month names (was: [libreoffice-l10n] [ANNOUNCE] added possessive genitive case month names, HEADS UP localizers ; -))
Hi Serg, On Monday, 2011-11-28 13:45:11 +0400, Serg Bormant wrote: Here is Russian GenitiveMonths patch. Thanks, pushed to master http://cgit.freedesktop.org/libreoffice/core/commit/?id=c01ce861aced958302087117a5c5019d420b9d52 Cc-ed to e-mail. Only received in personal mail, list strips attachments. As this apparently was your first contribution to the actual code base, could you please give us a blanket license agreement that this and your further contributions are under LGPLv3+ and MPL 1.1 Thanks again Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpnPCaLaIIMM.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] WaE on vcl because of qt4 module
On Friday 25 of November 2011, julien2412 wrote: Hello, By compiling vcl module (Debian testing x86-32, WaE, debug and symbols enabled), I've got this : In file included from /usr/include/qt4/QtCore/qdatastream.h:45:0, from /usr/include/qt4/QtCore/qpair.h:45, from /usr/include/qt4/QtCore/qhash.h:49, from /home/maryline/compile-libreoffice/libo/vcl/unx/kde4/KDEXLib.hxx:35, from /home/maryline/compile-libreoffice/libo/vcl/unx/kde4/KDEData.cxx:31: /usr/include/qt4/QtCore/qscopedpointer.h: In static member function ‘static void QScopedPointerDeleterT::cleanup(T*)’: /usr/include/qt4/QtCore/qscopedpointer.h:55:5: error: declaration of ‘pointer’ shadows a global declaration [-Werror=shadow] A really helpful error message from gcc. The argument of the Qt function shadows an unknown global declaration and gcc does not feel like saying where it is. As long as you don't compile the file with just -E and find in the preprocessed source where the global 'pointer' comes from, this is just guessing, but I think it's rather good guessing that Qt is innocent here and the problem is wherever the global 'pointer' is. I do not see any global 'pointer' indentifier in vcl, so presumably something pollutes the global namespace and that is what should get fixed. As for the Qt bugreport you've made, please close it. First of all, nobody will fix it simply because it's most probably invalid and definitely unhelpful (do you realize that you are asking Qt developers to rename a function argument to something that does not clash with anything in the whole of LibreOffice and everything it uses?). Moreover, in Qt-based land -Whadow is (AFAICT) usually considered a nuisance rather than help (and this shows why), so I expect nobody will even seriously look at it anyway, for a reason. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] [REVIEW-3-4] fdo#39950 report builder segfault during copy/paste
Attached patch is a backport of commit 538190e0ea142d0a7da244809c66241379d4d91b in master by Caolán McNamara. The only change wrt to master is in whitespace in context lines (tabs vs spaces...) It fixes fdo#39950, most annoying and severity critical: when copy/pasting (or drag'n dropping across section boundaries) a control in report builder, LibreOffice segfaults. I've tested this patch on libreoffice-3-4 (and on master). Please apply to libreoffice-3-4. -- Lionel From 28db081efcf00d14f4ae8c8b7e156af7521030f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com Date: Fri, 25 Nov 2011 20:16:36 + Subject: [PATCH] Resolves: fdo#39950 fix dnd crash from default assignment operators Signed-off-by: Lionel Elie Mamane lio...@mamane.lu --- reportdesign/inc/RptObject.hxx |4 ++ reportdesign/source/core/sdr/RptObject.cxx | 58 ++-- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index d58950b..e24d51f 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -224,6 +224,8 @@ public: virtual OOle2Obj* Clone() const; virtual void initializeOle(); +OOle2Obj operator=(const OOle2Obj rObj); + void initializeChart( const ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel _xModel); }; @@ -275,6 +277,8 @@ public: virtual sal_uInt32 GetObjInventor() const; virtual OUnoObject* Clone() const; +OUnoObject operator=(const OUnoObject rObj); + private: voidimpl_setReportComponent_nothrow(); voidimpl_initializeModel_nothrow(); diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 1f6a01a..80d56cb 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -941,18 +941,24 @@ uno::Reference uno::XInterface OUnoObject::getUnoShape() { return OObjectBase::getUnoShapeOf( *this ); } -// - + +OUnoObject OUnoObject::operator=(const OUnoObject rObj) +{ +if( this == rObj ) +return *this; +SdrUnoObj::operator=(rObj); + +ReferenceXPropertySet xSource(const_castOUnoObject(rObj).getUnoShape(), uno::UNO_QUERY); +ReferenceXPropertySet xDest(getUnoShape(), uno::UNO_QUERY); +if ( xSource.is() xDest.is() ) +comphelper::copyProperties(xSource.get(), xDest.get()); + +return *this; +} + OUnoObject* OUnoObject::Clone() const { -OUnoObject* pClone = CloneHelper OUnoObject (); -if ( pClone ) -{ -ReferenceXPropertySet xSource(const_castOUnoObject*(this)-getUnoShape(),uno::UNO_QUERY); -ReferenceXPropertySet xDest(pClone-getUnoShape(),uno::UNO_QUERY); -if ( xSource.is() xDest.is() ) -comphelper::copyProperties(xSource.get(),xDest.get()); -} -return pClone; +return CloneHelper OUnoObject (); } // // OOle2Obj @@ -1128,22 +1134,32 @@ uno::Reference chart2::data::XDatabaseDataProvider lcl_getDataProvider(const } return xSource; } -// - -// Clone() soll eine komplette Kopie des Objektes erzeugen. -OOle2Obj* OOle2Obj::Clone() const + +OOle2Obj OOle2Obj::operator=(const OOle2Obj rObj) { -OOle2Obj* pObj = CloneHelper OOle2Obj (); -OReportModel* pRptModel = static_castOReportModel*(GetModel()); -svt::EmbeddedObjectRef::TryRunningState( pObj-GetObjRef() ); -pObj-impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get()); +if( this == rObj ) +return *this; +SdrOle2Obj::operator=(rObj); -uno::Reference chart2::data::XDatabaseDataProvider xSource( lcl_getDataProvider(GetObjRef()) ); -uno::Reference chart2::data::XDatabaseDataProvider xDest( lcl_getDataProvider(pObj-GetObjRef()) ); +OReportModel* pRptModel = static_castOReportModel*(rObj.GetModel()); +svt::EmbeddedObjectRef::TryRunningState( GetObjRef() ); +impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get()); + +uno::Reference chart2::data::XDatabaseDataProvider xSource( lcl_getDataProvider(rObj.GetObjRef()) ); +uno::Reference chart2::data::XDatabaseDataProvider xDest( lcl_getDataProvider(GetObjRef()) ); if ( xSource.is() xDest.is() ) comphelper::copyProperties(xSource.get(),xDest.get()); -pObj-initializeChart(pRptModel-getReportDefinition().get()); -return pObj; +initializeChart(pRptModel-getReportDefinition().get()); + +return *this; +} + +// - +// Clone() soll eine komplette Kopie des Objektes erzeugen. +OOle2Obj* OOle2Obj::Clone() const +{ +return CloneHelper OOle2Obj (); } //
Re: [Libreoffice] minutes of tech. steering call ...
On 25/11/11 15:13, Bjoern Michaelsen wrote: On Fri, Nov 25, 2011 at 11:20:50AM +0100, Michael Stahl wrote: DISPLAY=:42 ./soffice --accept=pipe,name=$USER;urp; --norestore --nologo -env:UserInstallation=file:///tmp/xyz instead of that monster you cant now run: make debugrun on Linux(*), which ... then attach gdb to soffice.bin will do that too. then run subsequenttests e.g. make subsequentcheck OOO_TEST_SOFFICE=connect:pipe,name=$USER Instead of that you can now: make subsequentcheck gb_JunitTest_DEBUGRUN=T And have one shell running gdb and the other running the test. thanks a lot, that's a lot simpler and should finally make subsequenttests so easy to debug that even mmeeks can do it ;) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] LoadComponentFromUrl misuse lead to crash
Hi here is a summary of the bug i encounter, present in all LibO versions (master, 344, 322), but safe in OOo321 inside a macro, i launch a stardesktop.loadComponentFromUrl(firstArg, ...). if firstArg is an URL, starting with file://, no problem if firstArg is a path, /the/path/to/my/file, LibO crashes yes, firstArg has to be an URL, it is specified. But LibO should throw an IllegalArgumentException as OOo does. Never good that LibO crashes when i say it crashes, it starts loading. but then enters a loop when progress bar ends; using gdb, i have a lot of the same cycle calls (given at the of the mail) Examining the code, i see no URL check (but may have missed something, high probability) http://opengrok.libreoffice.org/xref/core/framework/source/services/desktop.cxx#657 http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#164 http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#180 http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#239 http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#281 I propose to add a check of validity of sURl somewhere and throw illegalArgument The most easy i see would be in http://opengrok.libreoffice.org/xref/core/framework/source/services/desktop.cxx#657 any other better place in your opinion ? may be in http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#classifyContent ??? do we have any tool that can check if an URL is valid ? (taking various protocols into account like in http://opengrok.libreoffice.org/xref/core/framework/source/loadenv/loadenv.cxx#631 any guidelines welcome so that i can propose a patch Laurent ' gdb bt #0 0xb7b52af4 in typelib_static_type_getByTypeClass () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/../ure-link/lib/libuno_cppu.so.3 #1 0xb7afe90b in cppu::OWeakObject::queryInterface(com::sun::star::uno::Type const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 #2 0xb7af7975 in cppu::WeakImplHelper_query(com::sun::star::uno::Type const, cppu::class_data*, void*, cppu::OWeakObject*) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 #3 0xb79a3bd2 in ?? () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libsfxlo.so #4 0xb7995d8d in SfxBaseModel::queryInterface(com::sun::star::uno::Type const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libsfxlo.so #5 0xae0b5c43 in ScModelObj::queryInterface(com::sun::star::uno::Type const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/../program/libsclo.so #6 0xb68f1794 in ?? () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #7 0xb69080fb in ?? () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #8 0xb6906eef in framework::TitleHelper::impl_updateTitleForModel(com::sun::star::uno::Referencecom::sun::star::frame::XModel const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #9 0xb69076d8 in framework::TitleHelper::impl_updateTitle() () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #10 0xb69079be in framework::TitleHelper::getTitle() () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #11 0xb799ff10 in SfxBaseModel::getTitle() () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libsfxlo.so #12 0xb69073cb in framework::TitleHelper::impl_updateTitleForController(com::sun::star::uno::Referencecom::sun::star::frame::XController const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #13 0xb69076ec in framework::TitleHelper::impl_updateTitle() () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #14 0xb690791a in framework::TitleHelper::titleChanged(com::sun::star::frame::TitleChangedEvent const) () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #15 0xb690598a in framework::TitleHelper::impl_sendTitleChangedEvent() () from /home/lgodard/projets/libreoffice/build/git/master/libo/solver/unxlngi6.pro/installation/opt/program/libfwelo.so #16 0xb690714c in
Re: [Libreoffice] final and override
Hello, However, given that override and final will only make it into GCC 4.7 (according to http://wiki.apache.org/stdcxx/C++0xCompilerSupport), it according to gcc.gnu.org too.. but since it seems that MSCV (according the same wiki) supports it / will support it, why not just wait a bit and then use it directly, setting a minimal compiler version ? This would allow a cleaner code, not having to take into account before implementation status. (would also be valid for other major features ) Most probably a too harsh approach ? regards Pierre-André ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] New Windows tinderbox: Windows 2008R2
Jan Holesovsky schrieb: Hi, I've retired the Windows XP SP3 Hi, thank you for providing WIN tinderboxes. Unfortunately currently the situation is a little worrying. We have very few WII Master testers (pls see reporter-table): https://bugs.freedesktop.org/report.cgi?x_axis_field=y_axis_field=reporterz_axis_field=query_format=report-tableshort_desc_type=allwordssubstrshort_desc=product=LibreOfficelongdesc_type=allwordssubstrlongdesc=bug_file_loc_type=allwordssubstrbug_file_loc=status_whiteboard_type=allwordssubstrstatus_whiteboard=keywords_type=allwordskeywords=bug_id=bug_id_type=anyexactversion=LibO+Masterop_sys=Windows+%28All%29emailassigned_to1=1emailtype1=substringemail1=emailassigned_to2=1emailreporter2=1emailqa_contact2=1emailcc2=1emailtype2=substringemail2=emailtype3=substringemail3=chfield=resolutionchfieldvalue=chfieldfrom=chfieldto=Nowfield0-0-0=nooptype0-0-0=noopvalue0-0-0=format=tableaction=wrap, and we should try to waste as few as many time as possible. For me it's annoying to have to check every day various folders whether we have new builds. currently I mostly search in vain, and sometimes I find something I can't use; how can I create a parallel installation with master~2011-11-28_12.06.44_libodev35.msi? I do not know. And what might be the difference to builds from older MinGW_cross-compilation? Those portable builds would have been very useful, if they would have had a better quality. What I need are reliable win builds 1 per day as we had on Windows_2008R2/, that can be used for 3.5 pre release tests in an effective way, and IMHO manpower should be concentrated on providing builds here. Everything else might have some value, but from QA point of view we have to do a cost/benefit calculation. Kind regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||43315 --- Comment #10 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2011-11-28 10:38:24 PST --- Nominate Bug 43315 - MinGW: No User interface at all in applications. Build can not be used. -- 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-qa] New Windows tinderbox: Windows 2008R2
Hi Rainer, On Mon, 2011-11-28 at 19:15 +0100, Rainer Bielefeld wrote: something I can't use; how can I create a parallel installation with master~2011-11-28_12.06.44_libodev35.msi? I do not know. Surely you can run it ? is it not possible to select a different installation directory with it ? Presumably with msiexec we could even script the install to some magic directory. What I need are reliable win builds 1 per day as we had on Windows_2008R2/, that can be used for 3.5 pre release tests in an effective way, and IMHO manpower should be concentrated on providing builds here. I believe we switched our packaging format from NSIS .exe's to the new .msi installs that you see now. It'd be great to better understand the problem with .msis - since this is our planned future exclusive packaging format. 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] Fix Kashida justification when there is no Kashida glyph
Hi Thorsten, On Mon, Nov 28, 2011 at 11:57:04AM +0100, Thorsten Behrens wrote: Khaled Hosny wrote: This patch removes the reasonable default value of mnMinKashida which makes no sense at all; either the font have a Kashida glyph and mnMinKashida is set to its width or it doesn't and mnMinKashida is kept 0. Hi Khaled, nice one, pushed - by any chance, do you have a small test document that demonstrates the problem, e.g. with a common font that lacks kashida support? Such that going forward, we don't break this again. It is really an edge case and I don't think there are fonts with Arabic coverage lacking Kashida, however I'm developing a font where I trick LibreOffice not to do Kashida justification by having a zero width Kashida glyphs (The font is pretty complex with many contextual forms and Kashida justification as implemented in LibreOffice, or other application for that matter, is guaranteed to always produce bad result). Anyway, the font can be obtained from here[1], and I'm attaching a test file that shows this issue. [1] https://sourceforge.net/projects/amiri/files/ Regards, Khaled lo_no_kashida.odt Description: application/vnd.oasis.opendocument.text attachment: 3.4.pngattachment: 3.5_patch.png signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Fwd: About Mozilla's final/override macros]
Hi Jeff, Thanks for the gory details :-) much appreciated; having said all that the idea of having 'virtual' at the beginning of a method, and 'final' at the end is (to me) pretty fugly but ... some great advice here. Thanks ! :-) Michael. Forwarded Message From: Jeff Walden jwal...@mit.edu To: michael.me...@suse.com Subject: About Mozilla's final/override macros Date: Mon, 28 Nov 2011 09:42:00 -0800 Via WordPress stats-webbug magic I see the final/override macros I added to Mozilla are being discussed. A few details worth noting (feel free to forward this to the list if you want): GCC 4.7 (unreleased) and Clang 3 (unreleased, but on its nth RC) support final/override. They require -std=c++0x or -std=gnu++0x to use final/override without warning -- except that GCC also added a |__final| extension, with the same use/semantics as |final|, which works warning-free without -std=c++0x. (Beats me why they did this for | final| but not |override|.) -Wno-c++0x-extensions disables the Clang warning; I know no equivalent for GCC. I doubt you have people using unreleased GCC for fun, but given the small but substantial Mozilla developer base compiling with Clang trunk, I'd bet you have at least a few people compiling LibreOffice with it. MSVC supports final/override since the 2005 (!) release, but spelling it |sealed| rather than |final| for now (C# bleed-over). Given that your Windows build instructions talk about MSVC 2008, you probably have a decent base of developers (and nightly build machines?) who'd test final/override macros in your cross-platform code. The static-analysis plugin was originally GCC-only but is now ported to LLVM/Clang. final/override validation only occurred in a special static-analysis build, not a normal developer or nightly build. Static-analysis builds haven't happened recently, and in fact our final-class annotations were flat-out wrong as a result! Clearly compiler- and language-implemented analyses are much more trustworthy, reliable, and less expensive in developer time (for projects, not for the compilers) than user-driven analyses. Plus they happen in regular builds on developers' machines. I personally don't see the benefit to making our plugins check final/override annotations, but it could happen. The __attribute__() we used for final/override must appear in a position different from the C++11 position. If you want both C++11 support *and* static-analysis validation without requiring GCC 4.7 or Clang 3, you'd need two macros, or one wrapping the entire declaration. #define OVERRIDE_METHOD(decl) __attribute__(...) decl override class Foo { OVERRIDE_METHOD(virtual void foo()); }; I dunno about you, but I would call this much worse hideous ugliness than just appending OVERRIDE or whatever after the declaration, and giving up on plugin-based validation until distro releases including GCC 4.7 saves you. Anyway, hope that helps. Jeff -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] final and override
On 11/28/2011 08:10 PM, Pierre-André Jacquod wrote: but since it seems that MSCV (according the same wiki) supports it / will support it, why not just wait a bit and then use it directly, setting a minimal compiler version ? This would allow a cleaner code, not having to take into account before implementation status. (would also be valid for other major features ) Most probably a too harsh approach ? We need to support rather old GCC version on Mac OS X. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I need some advice to fix fdo#40363
On Mon, 2011-11-28 at 13:43 +0100, Jean-Baptiste Faure wrote: Now, my question is what to do? Is it a good idea to modify Date::IsValid in tdate.cxx without knowing why it works in LibO 3.3 ? I can sense that you already know the answer to this question. :-) But I wouldn't modify IsValid() without first checking why the same thing worked in the 3.3 code base. Perhaps the 3.3 chart2 code didn't even call IsValid()? I'm just guessing that, but that's the sort of stuff we would need to find out in order to come up with how to fix this. Now, I know that building the 3.3 branch is not as easy as building master, due to the split repo that it still uses it lacks many nice features that we've added to our build system over the years. So, if you are willing to build and investigate why it worked in 3.3, great, and you would be more than welcome to do it. If not, then just leave it for now until we find someone (could be me) willing to look into it. Anyway... While I was writing this, I just decided to check the 3.3 code and see what it did back then. In the 3.3 code base, chart2 doesn't even have DateHelper.cxx file. Looks like chart's date handling has changed quite a lot since 3.3... In fact, in 3.3 chart2 doesn't seem to do anything date-specific; must be something that Oracle worked on post-3.3 to handle dates better, which in turn came caused this problem as a result... My conclusion? No idea what advice I should give you to get it fixed just yet. Maybe someone else knows the work that Oracle has done to the chart2 module after 3.3 give us some background? Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] GTK warnings on console when launching LO built from master
Le 28/11/11 14:55, Michael Meeks a écrit : Hi Michael, Sounds like a generic gtk+ file-selector bug I guess. Do you get it when using gedit ? Will have to wait til I'm back in front of my Linux box I'm afraid, but will report back later in the week. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I need some advice to fix fdo#40363
Hi Kohei, Kohei Yoshida schrieb: [..] My conclusion? No idea what advice I should give you to get it fixed just yet. Maybe someone else knows the work that Oracle has done to the chart2 module after 3.3 give us some background? From the release notes [1] I guess, that it is the feature to have date category axis [2]. That would be CWS chart46 from Ingrid Halama around 2010-11-30. [1] http://development.openoffice.org/releases/DEV300m106_snapshot.html [2] https://issues.apache.org/ooo/show_bug.cgi?id=25706 Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I need some advice to fix fdo#40363
On Mon, 2011-11-28 at 21:56 +0100, Regina Henschel wrote: Hi Kohei, Kohei Yoshida schrieb: [..] My conclusion? No idea what advice I should give you to get it fixed just yet. Maybe someone else knows the work that Oracle has done to the chart2 module after 3.3 give us some background? From the release notes [1] I guess, that it is the feature to have date category axis [2]. That would be CWS chart46 from Ingrid Halama around 2010-11-30. [1] http://development.openoffice.org/releases/DEV300m106_snapshot.html [2] https://issues.apache.org/ooo/show_bug.cgi?id=25706 Thanks for the info. So, they've added a date axis which is new post-3.3. Which also means we need to devise a new fix for this i.e. no need to look back into the 3.3 code base, which didn't have that feature. Hmm... Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Setting up a non-intrusive build cluster
Hi Marc-André, On 2011-11-21 at 11:50 +, Michael Meeks wrote: The expected candidate is, of course, icecream. So, more pragmatically, is there any way we could set it up so that the icecream daemon either shuts down or stops taking jobs when a user logs in, and have it get back to life when no users are logged in. This would have to include remote logins on SSH too. icecream currently runs at a very low CPU priority; Not only that, IIRC it limits its memory so that it does not get the computer swapping. Also, it checks the load of the build slaves, and sends the jobs to those with smallest load. So, if at all possible, I'd ask the people to allow you to turn it on, and hack it for this explicit switching off only when they complain ;-) [and even in that case, I'd first monitor the complainers with 'top', if it is really icecream ;-)] Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] errors in idl files
On 24/11/11 14:16, Tomas Hlavaty wrote: heh, i fixed that a lot on Monday, after discovering that a lot of its files were not listed in the makefile at all; please git pull and try again :) Ah, sorry I didn't have the most recent repo. However, after pulling, it is still not possible to resolve the following includes (udkapi/ and offapi/): #include com/sun/star/awt/XLayoutContainer.idl this was mentioned in offapi/com/sun/star/awt/MaxChildrenException.idl which is a remnant from the dialog layout attempt and i have removed it #include com/sun/star/awt/XLayoutUnit.idl #include com/sun/star/chart2/XLegendSymbolProvider.idl #include com/sun/star/chart2/ExplicitSubIncrement.idl #include com/sun/star/chart2/DataSequence.idl #include com/sun/star/chart2/XMutableDataSequence.idl #include com/sun/star/chart2/DataSource.idl #include com/sun/star/chart2/LegendSymbolStyle.idl #include com/sun/star/chart2/XUndoManager.idl #include com/sun/star/document/XVbaEventsHelper.idl git grep cannot find these except in the reference type-RDB blob #include com/sun/star/drawing/framework/XPaneController.idl #include com/sun/star/drawing/framework/XViewController.idl #include com/sun/star/drawing/framework/XResourceController.idl #include com/sun/star/drawing/framework/XResourceController.idl #include com/sun/star/drawing/framework/XPaneFactory.idl these were mentioned in offapi/com/sun/star/drawing/modules.idl, the interfaces were removed so i have removed the references from modules.idl. #include com/sun/star/linguistic2/SingleGrammarError.idl #include com/sun/star/script/XVBAMacroHelper.idl #include com/sun/star/script/XVBAMacroResolvedInfo.idl git grep cannot find these Thank you, Tomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I need some advice to fix fdo#40363
Hi Kohei, Kohei Yoshida schrieb: On Mon, 2011-11-28 at 21:56 +0100, Regina Henschel wrote: Hi Kohei, Kohei Yoshida schrieb: [..] My conclusion? No idea what advice I should give you to get it fixed just yet. Maybe someone else knows the work that Oracle has done to the chart2 module after 3.3 give us some background? From the release notes [1] I guess, that it is the feature to have date category axis [2]. That would be CWS chart46 from Ingrid Halama around 2010-11-30. [1] http://development.openoffice.org/releases/DEV300m106_snapshot.html [2] https://issues.apache.org/ooo/show_bug.cgi?id=25706 Thanks for the info. So, they've added a date axis which is new post-3.3. Which also means we need to devise a new fix for this i.e. no need to look back into the 3.3 code base, which didn't have that feature. This feature was first in DEV300m99 and it has this bug from the beginning. So it is nothing, that LibreOffice has introduced. Kind regards Regina ___ 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 Orion Poplawski or...@cora.nwra.com changed: What|Removed |Added Depends on||42958 --- Comment #236 from Orion Poplawski or...@cora.nwra.com 2011-11-28 14:13:05 UTC --- Nominate bug 42958 3.3 - 3.4 regression with xls formatting -- 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] [PATCH] fdo#42286, do not shrink the selected area
Hi Pierre-André, On Sunday, 2011-11-27 20:23:33 +0100, Pierre-André Jacquod wrote: I wouldn't say it's wrong unless I checked the original intention behind that code when GetDataArea() is called with bIncludeOld=false, maybe it's just the call in ExtendDataArea() that should pass true instead? Done, you're right. Finally, changed the call of the flags and documented the flags' meaning. If you could cherry-pick 88611e702a18d2 for 3.4.5, would be nice. Now you also changed bOnlyDown=false to bOnlyDown=true, which leads to not include newly appended columns of an area. Why? Further some tests have shown me that the behaviour (regarding area) is not the same, depending if the filter is activated with Data-Filter-AutoFilter or Standard filter. I fear some parts will need to be quite overhauled. And the difference exactly is ...? Visually: the standard filter adapts and shows the selected area at activation of the filter, the auto-filter does not reflect the fact that it will take into account a wider area. This area extension happens only when the drop-down button is activated and the list of possible value is calculated... and the area extended. Probably because people want a selection within an auto-filtered area to stay active and nevertheless filter for new values. Reselecting the entire data area in that moment isn't a good user-experience. Out of subject: from a user perspective, I am not convinced from te fact that the filter is allowed to change an area that has been user-defined. No problem to auto-extend an area if auto-determined. But if a user takes the time to do the area, this should be holly. But this point belongs to the user-interface list I guess... Grounded speculation: if user adds a column or row immediately adjacent to a data area it is usually related to the already existing data and she wants that to be included, maybe even doesn't know that earlier the filter was setup using a selection. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpNyoc15PpTQ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] numbers auto format as date
Hi Lior, On Sunday, 2011-11-27 11:32:47 +0200, Lior Kaplan wrote: I'd like to inquire about a group of related bugs which are all due to calc's auto format of numbers to date, which in some cases also changes the number itself. Do we target these for the 3.5 life time ? No, but I'm about to target it for master / next release (3.6) Thanks for the list of pointers, at least one of them was of my old reminder list ;-) search for NF-DATE in (A)OOo tracker. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp6fPbng4mN3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] I need some advice to fix fdo#40363
Hi Jean-Baptiste, On Monday, 2011-11-28 13:43:51 +0100, Jean-Baptiste Faure wrote: The bug described in fdo#40363 may occur if you make a typo when type some dates in Calc. Thanks for investigating, I'll dig into that. If I modify Date::IsValid so that only dates strictly between 1582-10-05 and 1582-10-15 are not valid, then the chart wizard works without problem. Interesting.. but probably similar problems arise when the date would go negative. Or earlier.. I do not understand why every dates before 1582-10-15 should not be valid when only dates from 1582-10-05 to 1582-10-14 do not exist due to the switch from julian calendar to gregorian calendar. Well, the Date class was never declared to work with dates earlier than when the Gregorian calendar sprang into existence ;-) Now, my question is what to do? Is it a good idea to modify Date::IsValid in tdate.cxx without knowing why it works in LibO 3.3 ? I don't think so. More promising probably would be to switch to a real calendar.. I may take a stab at that. But first investigate how Chart and Calc interface there. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp7j56TwqjML.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice