[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51278, which changed state. Bug 51278 Summary: Opening Report fails with Error Message https://bugs.freedesktop.org/show_bug.cgi?id=51278 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/attarray.hxx |3 +++
sc/inc/column.hxx|1 +
sc/source/core/data/attarray.cxx | 15 +++
sc/source/core/data/column.cxx |5 +
sc/source/core/data/table3.cxx |6 ++
sc/source/ui/dbgui/tpsort.cxx| 21 -
6 files changed, 46 insertions(+), 5 deletions(-)
New commits:
commit 0234b73de28098fc1cd37b55471ef924d2b584cc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jul 13 08:16:57 2012 +0200
don't use wrong sort direction in some cases
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 303d6c6..3dccaa0 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -227,6 +227,17 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet
rArgSet )
{
ScSortParam aNewSortData = aSortData;
+if (pDlg)
+{
+const SfxItemSet* pExample = pDlg-GetExampleSet();
+const SfxPoolItem* pItem;
+if ( pExample pExample-GetItemState( nWhichSort, sal_True, pItem
) == SFX_ITEM_SET )
+{
+ScSortParam aTempData = static_castconst
ScSortItem*(pItem)-GetSortData();
+aTempData.maKeyState = aNewSortData.maKeyState;
+aNewSortData = aTempData;
+}
+}
std::vectorsal_uInt16 nSortPos;
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
@@ -624,7 +635,8 @@ void ScTabPageSortOptions::Init()
// ---
-SfxTabPage* ScTabPageSortOptions::Create( Window* pParent,
+SfxTabPage* ScTabPageSortOptions::Create(
+Window* pParent,
const SfxItemSet rArgSet )
{
return ( new ScTabPageSortOptions( pParent, rArgSet ) );
@@ -707,6 +719,13 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet
rArgSet )
// Create local copy of ScParam
ScSortParam aNewSortData = aSortData;
+if (pDlg)
+{
+const SfxItemSet* pExample = pDlg-GetExampleSet();
+const SfxPoolItem* pItem;
+if ( pExample pExample-GetItemState( nWhichSort, sal_True, pItem
) == SFX_ITEM_SET )
+aNewSortData = static_castconst
ScSortItem*(pItem)-GetSortData();
+}
aNewSortData.bByRow = aBtnTopDown.IsChecked();
aNewSortData.bHasHeader = aBtnHeader.IsChecked();
aNewSortData.bCaseSens = aBtnCase.IsChecked();
commit 902082656655aeab559c0b5781907ff004179468
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jul 13 08:17:26 2012 +0200
don't delete ScPatternAttr from doc pool for swap, i#118877
the original apache commit is quite ugly and should not be used!!
Change-Id: Id02d2cf474e49b97bfe285fe76867d1b1d944ec3
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 9b81440..6ce325a 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -131,6 +131,9 @@ public:
voidSetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool
bPutToPool = false );
voidSetPatternArea( SCROW nStartRow, SCROW nEndRow, const
ScPatternAttr* pPattern,
bool bPutToPool = false, ScEditDataArray*
pDataArray = NULL );
+
+//swap two column patterns without adding and removing them from the pool
+voidSwapPattern( ScAttrArray pArray2, SCROW nRow1, SCROW nRow2, const
ScPatternAttr* pPattern1, const ScPatternAttr* pPattern2 );
voidApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
pStyle );
voidApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache*
pCache,
ScEditDataArray* pDataArray = NULL );
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6f776e1..49ab814 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -307,6 +307,7 @@ public:
ScEditDataArray* pDataArray = NULL );
boolSetAttrEntries(ScAttrEntry* pData, SCSIZE nSize);
voidSetPattern( SCROW nRow, const ScPatternAttr rPatAttr, bool
bPutToPool = false );
+voidSwapPattern( ScColumn rCol, SCROW nRow1, SCROW nRow2, const
ScPatternAttr rPatAttr1, const ScPatternAttr rPatAttr2 );
voidSetPatternArea( SCROW nStartRow, SCROW nEndRow,
const ScPatternAttr rPatAttr, bool bPutToPool
= false );
voidApplyPatternIfNumberformatIncompatible( const ScRange rRange,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 6cf487f..e166ea2 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -483,6 +483,21 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW
nEndRow, const ScPattern
#endif
}
+void ScAttrArray::SwapPattern( ScAttrArray rArray2, SCROW nRow1, SCROW nRow2,
const ScPatternAttr* pPattern1, const ScPatternAttr* pPattern2)
+{
+
Re: minutes of ESC call ...
On 12.07.2012 17:55, Michael Meeks wrote: + could we not send mails for committers' changes (Petr) + hard to do (Bjoern) If something is (really) hard to do is very often just an indication that one is doing something completely wrong ;-) In that specific case it is absolutely trivially to achive (indeed each and every gerrit user wants and expects that behaviour): 1. turn off dev ML firehose 2. subscribe to watched project in gerrit 3. done if someone would push now something to gerrit he wouldn't be notifed, all other do. Our problem atm is however, that substantial part of our core developers still do not have a gerrit account and thus can *not* realy check watch project option. How about to hande that problem first? Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit [was: minutes of ESC call ...]
On 07/13/2012 12:21 AM, Lionel Elie Mamane wrote: On Thu, Jul 12, 2012 at 04:55:50PM +0100, Michael Meeks wrote: + lots of supposed / bogus patch inter-dependency + multiple commits when pushed are marked dependent, even if they are not etc. I kinda understand where that's coming from, but frankly I find that too strict / restrictive from gerrit's part; if the patches commute purely on basis of do not touch the same lines (one applies cleanly without the other), then just make them independent. Yes, might miss semantic dependencies like added a function in a .hxx in one commit and use that function in another commit. But in case of doubt, err on the side of *not* annoying the user. Machine cannot determine dependency among patches, and I see no reason here to try to do so nevertheless, with whatever heuristic. Rather, I prefer if the user has to mark patches as dependent or not. If the current interface makes it too easy for users to erroneously mark patches as dependent, then we should consider redesigning the interface. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 07/13/2012 09:16 AM, David Ostrovsky wrote: On 12.07.2012 17:55, Michael Meeks wrote: + could we not send mails for committers' changes (Petr) + hard to do (Bjoern) If something is (really) hard to do is very often just an indication that one is doing something completely wrong ;-) In that specific case it is absolutely trivially to achive (indeed each and every gerrit user wants and expects that behaviour): 1. turn off dev ML firehose 2. subscribe to watched project in gerrit 3. done Quoting something I sent out re this the other day to the list of ESC attendees: At least in my understanding, firehosing information from gerrit to the ML was not only intended for the advanced reviewer crowd, but also for relative newcomers to the project, where the idea is that the discussion of other people's patches on the ML gave them a sense of how we treat those newcomers' patches, give them opportunity to pick up advice by osmosis, etc. (Whether or not that is what the average newcomer actually made use of the existing ML traffic.) But anyway, you win a little, you loose a little, there's no setup perfect for all. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 28d3e647ada2876b7463993d305fa2e8c44dce48
Author: Gokul gokul.c...@gmail.com
Date: Tue Jul 10 14:04:22 2012 +0300
Added ctrl+w for closing XML FILTER SETTING tool in DRAW
Change-Id: I37cee7027f674003ad4a600a4a36fc1a9eec2dc3
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 252c419..2e9e558 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1046,8 +1046,9 @@ long XMLFilterSettingsDialog::Notify( NotifyEvent rNEvt )
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt-GetKeyCode();
sal_uInt16 nKeyCode = aKeyCode.GetCode();
+sal_BoolbMod1 = pKEvt-GetKeyCode().IsMod1();
-if( nKeyCode == KEY_ESCAPE )
+if( nKeyCode == KEY_ESCAPE || (bMod1 (nKeyCode == KEY_W)))
{
Close();
return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Reviewer in Gerrit
Hi, On Fri, Jul 13, 2012 at 01:05:31AM +0530, gokul gokul.c...@gmail.com wrote: I had submitted an patch through gerrit. Their is an option for Adding Reviewer. Still my patch is not reviewed So i wonder do we need add an reviewer for our patch. I just pushed your patch, thanks! In general, your patch should be reviewed in a reasonable time without adding a reviewer. Could you please send a mail, containing I confirm that all my patches to LibreOffice are licensed under LGPL3+/GPL3+/MPL. to this list, what we can link from http://wiki.documentfoundation.org/Development/Developers? Thanks again! Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit [was: minutes of ESC call ...]
On Fri, Jul 13, 2012 at 9:29 AM, Stephan Bergmann sberg...@redhat.com wrote: Machine cannot determine dependency among patches, and I see no reason here to try to do so nevertheless, with whatever heuristic. Rather, I prefer if the user has to mark patches as dependent or not. If the current interface makes it too easy for users to erroneously mark patches as dependent, then we should consider redesigning the interface. Think of it as a graph. A set of patch based on a known base is presumed to be order-dependant, because they _could_ and typically are. so when gerrit receive a set of new patches on top of a given base he rightly assume that their order _is_ important. I know this is a problem for those whose workflow involve piling a bunch of unrelated patches and then pushing once a day or so. There are some scripting that has and can be done to accommodate this workflow. Norbert Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Reviewer in Gerrit
Hi Miklos, I just pushed your patch, thanks! In general, Thank you so much for reviewing and pushing my patch. your patch should be reviewed in a reasonable time without adding a reviewer. Ok, thanks for the information. Could you please send a mail, containing I confirm that all my patches to LibreOffice are licensed under LGPL3+/GPL3+/MPL. to this list, what we can link from http://wiki.documentfoundation.org/Development/Developers? I Confirm That All my past and Future Contributions to LibreOffice are licensed under LGPL3+/GPL3+/MPL.. With Regards S Gokul ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Spanish spell checker new release
On Thu, Jul 12, 2012 at 5:03 PM, Andras Timar ati...@suse.com wrote: I'll push this newer version into git. Please note, however, that thesaurus did not pass validation, please find the error log below. (I renamed it to th_es_ANY_v2.dat). thanks for reporting! -- Ismael Olea http://olea.org/diario/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/qa i18npool/source
i18npool/qa/cppunit/test_breakiterator.cxx | 24
i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
2 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 8ad1d4443e67784a8c0d3c1a3a72f089cb0cd3ec
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 09:49:02 2012 +0100
Resolves: fdo#52020 ICU breakiterator not used for Khmer
Change-Id: I4c99129cabe70f17aa223cf8ec0ae1529188b6b7
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index c191bbc..68dc1ef 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -59,6 +59,7 @@ public:
#if TODO
void testNorthernThai();
#endif
+void testKhmer();
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@@ -69,6 +70,7 @@ public:
#if TODO
CPPUNIT_TEST(testNorthernThai);
#endif
+CPPUNIT_TEST(testKhmer);
CPPUNIT_TEST_SUITE_END();
private:
uno::Referencei18n::XBreakIterator m_xBreak;
@@ -341,6 +343,28 @@ void TestBreakIterator::testNorthernThai()
}
#endif
+//A test to ensure that our khmer word boundary detection is useful
+//https://bugs.freedesktop.org/show_bug.cgi?id=52020
+void TestBreakIterator::testKhmer()
+{
+lang::Locale aLocale;
+aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(km));
+aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(KH));
+
+const sal_Unicode KHMER1[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
+
+::rtl::OUString aTest(KHMER1, SAL_N_ELEMENTS(KHMER1));
+i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 0 aBounds.endPos == 3);
+
+aBounds = m_xBreak-getWordBoundary(aTest, aBounds.endPos, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 3 aBounds.endPos == 5);
+}
+
void TestBreakIterator::setUp()
{
BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 2e32656..0669c01 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -133,7 +133,7 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice,
brk,
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
}
-else if ( rLocale.Language != th ) //use icu's breakiterator for
Thai
+else if (rLocale.Language != th rLocale.Language != km)
//use icu's breakiterator for Thai and Khmer
{
status = U_ZERO_ERROR;
OStringBuffer aUDName(64);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: boost/boost_1_44_0-gthreads.patch boost/makefile.mk
boost/boost_1_44_0-gthreads.patch | 12 boost/makefile.mk |4 2 files changed, 16 insertions(+) New commits: commit 8ecf7e2259681b7a0d26766ea4500a7a6313f56d Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 13 10:43:10 2012 +0200 Backport boost fix for threading detection in GCC 4.7 See http://svn.boost.org/svn/boost/trunk r76133 Fix threading detection in GCC-4.7 experimental. Without it, BOOST_DISABLE_THREADS would be defined when compiling with GCC 4.7, which in turn would cause boost/smart_ptr/detail/sp_counted_base.hpp to include a single-thread--mode boost/smart_ptr/detaul/sp_counted_base_nt.hpp which is not suitable in a multi-threaded scenario. Change-Id: Ia30a5c2c241e2e135858a5cab3dd855d05db50c8 diff --git a/boost/boost_1_44_0-gthreads.patch b/boost/boost_1_44_0-gthreads.patch new file mode 100644 index 000..d12b599 --- /dev/null +++ b/boost/boost_1_44_0-gthreads.patch @@ -0,0 +1,12 @@ +--- misc/boost_1_44_0/boost/config/stdlib/libstdcpp3.hpp 2010-06-11 13:16:34.0 +0200 misc/build/boost_1_44_0/boost/config/stdlib/libstdcpp3.hpp 2012-07-13 10:31:58.330127342 +0200 +@@ -31,7 +31,8 @@ + + #ifdef __GLIBCXX__ // gcc 3.4 and greater: + # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ +-|| defined(_GLIBCXX__PTHREADS) ++|| defined(_GLIBCXX__PTHREADS) \ ++|| defined(_GLIBCXX_HAS_GTHREADS) + // + // If the std lib has thread support turned on, then turn it on in Boost + // as well. We do this because some gcc-3.4 std lib headers define _REENTANT diff --git a/boost/makefile.mk b/boost/makefile.mk index 719a536..e223ddf 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -80,6 +80,10 @@ PATCH_FILES += boost_1_44_0-gcc4.7.patch # Clang warnings: PATCH_FILES += boost_1_44_0-clang-warnings.patch +# Backport http://svn.boost.org/svn/boost/trunk r76133 Fix threading detection +# in GCC-4.7 experimental: +PATCH_FILES += boost_1_44_0-gthreads.patch + ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk \ libs/date_time/src/gregorian/makefile.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] fdo#52020 use ICU word boundary break iterator for Khmer
Rather trivial patch to use the default icu rules for word boundary detection for Khmer as well as Thai. (we should try and get rid of our custom line and word-boundary rules but lets be conservative for 3-6). This makes Khmer spell-checking useful now that recent versions of icu have lovely new word boundary rules http://cgit.freedesktop.org/libreoffice/core/commit/?id=8ad1d4443e67784a8c0d3c1a3a72f089cb0cd3ec C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/qa i18npool/source
i18npool/qa/cppunit/test_breakiterator.cxx | 24
i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
2 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 5e3c37c8a3b567cf3d8c9a47b37155e3c2ffefb9
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 09:49:02 2012 +0100
Resolves: fdo#52020 ICU breakiterator not used for Khmer
Change-Id: I4c99129cabe70f17aa223cf8ec0ae1529188b6b7
(cherry picked from commit 8ad1d4443e67784a8c0d3c1a3a72f089cb0cd3ec)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index ffd590c..a8a050a 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -62,6 +62,7 @@ public:
#if TODO
void testNorthernThai();
#endif
+void testKhmer();
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@@ -72,6 +73,7 @@ public:
#if TODO
CPPUNIT_TEST(testNorthernThai);
#endif
+CPPUNIT_TEST(testKhmer);
CPPUNIT_TEST_SUITE_END();
private:
uno::Referencei18n::XBreakIterator m_xBreak;
@@ -344,6 +346,28 @@ void TestBreakIterator::testNorthernThai()
}
#endif
+//A test to ensure that our khmer word boundary detection is useful
+//https://bugs.freedesktop.org/show_bug.cgi?id=52020
+void TestBreakIterator::testKhmer()
+{
+lang::Locale aLocale;
+aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(km));
+aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(KH));
+
+const sal_Unicode KHMER1[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
+
+::rtl::OUString aTest(KHMER1, SAL_N_ELEMENTS(KHMER1));
+i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 0 aBounds.endPos == 3);
+
+aBounds = m_xBreak-getWordBoundary(aTest, aBounds.endPos, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 3 aBounds.endPos == 5);
+}
+
void TestBreakIterator::setUp()
{
BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 34e6918..e90c888 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -135,7 +135,7 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice,
brk,
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
}
-else if ( rLocale.Language != th ) //use icu's breakiterator for
Thai
+else if (rLocale.Language != th rLocale.Language != km)
//use icu's breakiterator for Thai and Khmer
{
status = U_ZERO_ERROR;
OStringBuffer aUDName(64);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] fdo#52020 use ICU word boundary break iterator for Khmer
On 07/13/2012 11:01 AM, Caolán McNamara wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8ad1d4443e67784a8c0d3c1a3a72f089cb0cd3ec test passes, so must be good :) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit: polishing web UI
No, I don't. -- View this message in context: http://nabble.documentfoundation.org/gerrit-polishing-web-UI-tp3994611p3995220.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51278, which changed state. Bug 51278 Summary: Opening Report fails with Error Message https://bugs.freedesktop.org/show_bug.cgi?id=51278 What|Old Value |New Value Status|REOPENED|ASSIGNED Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: reportbuilder/Jar_reportbuilder.mk reportbuilder/util
reportbuilder/Jar_reportbuilder.mk | 38 +++-- reportbuilder/util/manifest.mf |2 + 2 files changed, 38 insertions(+), 2 deletions(-) New commits: commit d7aa34ee91a8b23ef6e2f544beeec1dca0d69af7 Author: David Tardon dtar...@redhat.com Date: Fri Jul 13 11:11:32 2012 +0200 fdo#51278 fix reportbuilder manifest Change-Id: I34f229284611285e10a192f80b14b1e8b3fa618c diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index c74397f..1f7159d 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# TODO: fix manifest - $(eval $(call gb_Jar_Jar,sun-report-builder)) $(eval $(call gb_Jar_use_jars,sun-report-builder,\ @@ -52,6 +50,42 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\ sac \ )) +$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + $(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\ + commons-logging-1.1.1.jar \ + ) \ + $(if $(filter YES,$(SYSTEM_JFREEREPORT)),\ + $(foreach jar,\ + $(FLUTE_JAR) \ + $(JFREEREPORT_JAR) \ + $(LIBBASE_JAR) \ + $(LIBFONTS_JAR) \ + $(LIBFORMULA_JAR) \ + $(LIBLAYOUT_JAR) \ + $(LIBLOADER_JAR) \ + $(LIBREPOSITORY_JAR) \ + $(LIBSERIALIZER_JAR) \ + $(LIBXML_JAR) \ + $(SAC_JAR) \ + ,$(call gb_Helper_make_url,$(jar)) \ + ),\ + flow-engine-0.9.4.jar \ + flute-1.1.6.jar \ + libbase-1.1.6.jar \ + libfonts-1.1.6.jar \ + libformula-1.1.7.jar \ + liblayout-0.2.10.jar \ + libloader-1.1.6.jar \ + librepository-1.1.6.jar \ + libserializer-1.1.6.jar \ + libxml-1.1.7.jar \ + sac.jar \ + ) \ +)) + +$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf)) + $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com)) $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\ diff --git a/reportbuilder/util/manifest.mf b/reportbuilder/util/manifest.mf new file mode 100644 index 000..fb497ae --- /dev/null +++ b/reportbuilder/util/manifest.mf @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory +UNO-Type-Path: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW: 3-6] fdo#51278 reportbuilder fails with error msg
Hi, On Fri, Jul 13, 2012 at 12:28:55AM +0200, Lionel Elie Mamane wrote: Nope, after a full make clean make make dev-install, I get error message: The document ReportName could not be opened. Cannot activate implementation (...)solver/unxlngx6/installation/opt/program/..share/extensions/report-builder/sun-report-builder.jar: Cannot activate jar (...)solver/unxlngx6/installation/opt/program/..share/extensions/report-builder/sun-report-builder.jar: java stack trace: com.sun.star.loader.CannotActivateFactoryException: cannot activate jar (...)solver/unxlngx6/installation/opt/program/..share/extensions/report-builder/sun-report-builder.jar at com.sun.star.comp.loader.JavaLoader.activate(JavaLoader.java:282) This is fixed by commit d7aa34ee91a8b23ef6e2f544beeec1dca0d69af7 . D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - shell/source
shell/source/all/xml_parser.cxx|3 ++-
shell/source/win32/shlxthandler/util/utilities.cxx | 17 -
2 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit d6ee925423ef00dc16ad3cd939bc64d19e7fc922
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 00:08:36 2012 +0200
shell: remove dead SaveDebugInfoToFile
Change-Id: I18655247f0e836cefd2791e1c78cf9f49e396d02
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 214d63e..f426869 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -110,23 +110,6 @@ bool is_windows_xp_or_above()
}
//-
-/**
-*/
-
-void SaveDebugInfoToFile( const std::wstring str )
-{
- int handle;
-
- if ((handle = open(c:\\temp\\SHELLRESULT.$$$, O_CREAT | O_RDWR | O_APPEND
)) == -1)
- {
- perror(Error: open file error);
- return;
- }
- write(handle, str.c_str(), str.length() );
- close(handle);
-}
-
-//-
/** helper function to judge if the string is only has spaces.
@returns
TRUEif the provided string contains only but at least one space
commit b8c1742c400ab79887cc068635227616cf528fe4
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 00:06:00 2012 +0200
warning C4267: conversion from 'size_t' to 'int'
Change-Id: I00e5e4f959c351004d8c1181c124cc6a1058b666
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 6c2daaa..24a3ce9 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -177,7 +177,8 @@ void xml_parser::init()
void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal)
{
-if (XML_STATUS_ERROR == XML_Parse(xml_parser_, XmlData, Length, IsFinal))
+if (XML_STATUS_ERROR ==
+XML_Parse(xml_parser_, XmlData, static_castint(Length), IsFinal))
{
throw xml_parser_exception(
(char*)XML_ErrorString(XML_GetErrorCode(xml_parser_)),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51278, which changed state. Bug 51278 Summary: Opening Report fails with Error Message https://bugs.freedesktop.org/show_bug.cgi?id=51278 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - reportbuilder/Extension_reportbuilder.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/util
reportbuilder/Extension_reportbuilder.mk |1 reportbuilder/Jar_reportbuilder.mk | 38 +-- reportbuilder/util/description.xml |2 - reportbuilder/util/manifest.mf |2 + reportbuilder/util/manifest.xml | 31 + 5 files changed, 71 insertions(+), 3 deletions(-) New commits: commit e2fe00eba3a293311451a4b1f96eaa0fd3bab61b Author: David Tardon dtar...@redhat.com Date: Thu Jul 12 13:29:17 2012 +0200 fdo#51278 make reportbuilder work again squash of three master branch commits: - fix oxt manifest - fix jar manifest - bump version to force update of package cache diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index 22cd0fb..649a961 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -77,6 +77,7 @@ $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\ + $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ )) diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index c74397f..1f7159d 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# TODO: fix manifest - $(eval $(call gb_Jar_Jar,sun-report-builder)) $(eval $(call gb_Jar_use_jars,sun-report-builder,\ @@ -52,6 +50,42 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\ sac \ )) +$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + $(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\ + commons-logging-1.1.1.jar \ + ) \ + $(if $(filter YES,$(SYSTEM_JFREEREPORT)),\ + $(foreach jar,\ + $(FLUTE_JAR) \ + $(JFREEREPORT_JAR) \ + $(LIBBASE_JAR) \ + $(LIBFONTS_JAR) \ + $(LIBFORMULA_JAR) \ + $(LIBLAYOUT_JAR) \ + $(LIBLOADER_JAR) \ + $(LIBREPOSITORY_JAR) \ + $(LIBSERIALIZER_JAR) \ + $(LIBXML_JAR) \ + $(SAC_JAR) \ + ,$(call gb_Helper_make_url,$(jar)) \ + ),\ + flow-engine-0.9.4.jar \ + flute-1.1.6.jar \ + libbase-1.1.6.jar \ + libfonts-1.1.6.jar \ + libformula-1.1.7.jar \ + liblayout-0.2.10.jar \ + libloader-1.1.6.jar \ + librepository-1.1.6.jar \ + libserializer-1.1.6.jar \ + libxml-1.1.7.jar \ + sac.jar \ + ) \ +)) + +$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf)) + $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com)) $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\ diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index 131793a..13e1c72 100644 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -5,7 +5,7 @@ display-name name lang=en-USReport Builder/name /display-name - version value=1.2.2/ + version value=1.2.3/ identifier value=com.sun.reportdesigner/ dependencies OpenOffice.org-minimal-version value=3.2 d:name=OpenOffice.org 3.2/ diff --git a/reportbuilder/util/manifest.mf b/reportbuilder/util/manifest.mf new file mode 100644 index 000..fb497ae --- /dev/null +++ b/reportbuilder/util/manifest.mf @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory +UNO-Type-Path: diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml index cf92064..30b9f6c 100644 --- a/reportbuilder/util/manifest.xml +++ b/reportbuilder/util/manifest.xml @@ -3,3 +3,34 @@ manifest:manifest xmlns:manifest=http://openoffice.org/2001/manifest; manifest:file-entry manifest:media-type=application/vnd.sun.star.uno-components manifest:full-path=components.rdb/ + manifest:file-entry manifest:media-type=application/vnd.sun.star.configuration-data + manifest:full-path=registry/data/org/openoffice/Office/Accelerators.xcu/ + manifest:file-entry manifest:media-type=application/vnd.sun.star.configuration-data +
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51278, which changed state. Bug 51278 Summary: Opening Report fails with Error Message https://bugs.freedesktop.org/show_bug.cgi?id=51278 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b49bb29ad608fa7bb5623890ac136584ed2bdd7c
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 13 12:02:47 2012 +0200
DocxAttributeOutput: unneeded sal_Bool
Change-Id: Iad1f2323c91c91a6f8e43414cddb78cf7e739a0d
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e5b35c5..e5af719 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -675,7 +675,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos
rInfos )
}
}
-void DocxAttributeOutput::StartField_Impl( FieldInfos rInfos, sal_Bool
bWriteRun )
+void DocxAttributeOutput::StartField_Impl( FieldInfos rInfos, bool bWriteRun )
{
if ( rInfos.pField rInfos.eType == ww::eUNKNOWN )
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index d8c52a0..99265a0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -523,7 +523,7 @@ private:
void WritePostponedGraphic();
void WritePostponedMath();
-void StartField_Impl( FieldInfos rInfos, sal_Bool bWriteRun = sal_False );
+void StartField_Impl( FieldInfos rInfos, bool bWriteRun = sal_False );
void DoWriteCmd( String rCmd );
void CmdField_Impl( FieldInfos rInfos );
void EndField_Impl( FieldInfos rInfos );
@@ -548,7 +548,7 @@ private:
sal_Int32 m_nRedlineId;
/// Flag indicating that the section properties are being written
-sal_Bool m_bOpenedSectPr;
+bool m_bOpenedSectPr;
/// Field data to remember in the text run
std::vector FieldInfos m_Fields;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit b32fcb79af8fdf905c8e09f987f7754a43079901
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 11:10:45 2012 +0100
skip khmer test on older 'broken' icu versions
Change-Id: Iab813f5288af1f0e054c022c4e4a99b92c7ce1ce
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 68dc1ef..57c70e4 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -38,6 +38,8 @@
#include com/sun/star/i18n/WordType.hpp
#include unotest/bootstrapfixturebase.hxx
+#include unicode/uvernum.h
+
#include rtl/strbuf.hxx
#include rtl/ustrbuf.hxx
@@ -59,7 +61,9 @@ public:
#if TODO
void testNorthernThai();
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
void testKhmer();
+#endif
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@@ -70,7 +74,9 @@ public:
#if TODO
CPPUNIT_TEST(testNorthernThai);
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
CPPUNIT_TEST(testKhmer);
+#endif
CPPUNIT_TEST_SUITE_END();
private:
uno::Referencei18n::XBreakIterator m_xBreak;
@@ -343,8 +349,12 @@ void TestBreakIterator::testNorthernThai()
}
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
//A test to ensure that our khmer word boundary detection is useful
//https://bugs.freedesktop.org/show_bug.cgi?id=52020
+//
+//icu doesn't have the Khmer word boundary dictionaries in = 4.0.0 but does in
+//the current 49.x.y . Not sure which version first had them introduced.
void TestBreakIterator::testKhmer()
{
lang::Locale aLocale;
@@ -364,6 +374,7 @@ void TestBreakIterator::testKhmer()
CPPUNIT_ASSERT(aBounds.startPos == 3 aBounds.endPos == 5);
}
+#endif
void TestBreakIterator::setUp()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx | 24 ++--
1 file changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 2e7702fb704133bad6a534a166e96599347cf6b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jul 13 11:55:53 2012 +0200
fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException
...as some client code catches just the former and thus fails now. (This
was a
regression introduced with the recent
cppuhelper/source/defaultbootstrap.cxx.)
Change-Id: I8306797f8331d894ab4e7695478e3824e9f79197
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 4edd7a1..078ee29 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -872,15 +872,9 @@ void ServiceManager::loadImplementation(
if (!prefix.isEmpty()) {
prefix += _;
}
-try {
-f0 = cppu::loadSharedLibComponentFactory(
-uri, rtl::OUString(), info-name, this,
-css::uno::Reference css::registry::XRegistryKey (), prefix);
-} catch (css::loader::CannotActivateFactoryException e) {
-throw css::uno::DeploymentException(
-Cannot activate implementation + uri + : + e.Message,
-static_cast cppu::OWeakObject * (this));
-}
+f0 = cppu::loadSharedLibComponentFactory(
+uri, rtl::OUString(), info-name, this,
+css::uno::Reference css::registry::XRegistryKey (), prefix);
} else {
SAL_INFO_IF(
!info-prefix.isEmpty(), cppuhelper,
@@ -900,15 +894,9 @@ void ServiceManager::loadImplementation(
css::uno::Reference css::loader::XImplementationLoader loader(
smgr-createInstanceWithContext(info-loader, ctxt),
css::uno::UNO_QUERY_THROW);
-try {
-f0 = loader-activate(
-info-name, rtl::OUString(), uri,
-css::uno::Reference css::registry::XRegistryKey ());
-} catch (css::loader::CannotActivateFactoryException e) {
-throw css::uno::DeploymentException(
-Cannot activate implementation + uri + : + e.Message,
-static_cast cppu::OWeakObject * (this));
-}
+f0 = loader-activate(
+info-name, rtl::OUString(), uri,
+css::uno::Reference css::registry::XRegistryKey ());
}
factory1-set(f0, css::uno::UNO_QUERY);
if (!factory1-is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] fdo#51143 crash if online update not installed
https://bugs.freedesktop.org/show_bug.cgi?id=51143 CONFIGURATION: crash if online update not installed is fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=2e7702fb704133bad6a534a166e96599347cf6b4 fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException. Please consider for integration into libreoffice-3-6. (All the code paths that currently wrapped CannotActivateFactoryException (derived from css::uno::Exception) in DeploymentException (derived from css::uno::RuntimeException) can legitimately throw every css::uno::Exception---and did so in the past, so the fix should be safe.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx | 24 ++--
1 file changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 2714a433d6c52ebc5030c4b956ff0f06e1533e84
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jul 13 11:55:53 2012 +0200
fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException
...as some client code catches just the former and thus fails now. (This
was a
regression introduced with the recent
cppuhelper/source/defaultbootstrap.cxx.)
Change-Id: I8306797f8331d894ab4e7695478e3824e9f79197
(cherry picked from commit 2e7702fb704133bad6a534a166e96599347cf6b4)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 4edd7a1..078ee29 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -872,15 +872,9 @@ void ServiceManager::loadImplementation(
if (!prefix.isEmpty()) {
prefix += _;
}
-try {
-f0 = cppu::loadSharedLibComponentFactory(
-uri, rtl::OUString(), info-name, this,
-css::uno::Reference css::registry::XRegistryKey (), prefix);
-} catch (css::loader::CannotActivateFactoryException e) {
-throw css::uno::DeploymentException(
-Cannot activate implementation + uri + : + e.Message,
-static_cast cppu::OWeakObject * (this));
-}
+f0 = cppu::loadSharedLibComponentFactory(
+uri, rtl::OUString(), info-name, this,
+css::uno::Reference css::registry::XRegistryKey (), prefix);
} else {
SAL_INFO_IF(
!info-prefix.isEmpty(), cppuhelper,
@@ -900,15 +894,9 @@ void ServiceManager::loadImplementation(
css::uno::Reference css::loader::XImplementationLoader loader(
smgr-createInstanceWithContext(info-loader, ctxt),
css::uno::UNO_QUERY_THROW);
-try {
-f0 = loader-activate(
-info-name, rtl::OUString(), uri,
-css::uno::Reference css::registry::XRegistryKey ());
-} catch (css::loader::CannotActivateFactoryException e) {
-throw css::uno::DeploymentException(
-Cannot activate implementation + uri + : + e.Message,
-static_cast cppu::OWeakObject * (this));
-}
+f0 = loader-activate(
+info-name, rtl::OUString(), uri,
+css::uno::Reference css::registry::XRegistryKey ());
}
factory1-set(f0, css::uno::UNO_QUERY);
if (!factory1-is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] fdo#51143 crash if online update not installed
On Fri, 2012-07-13 at 12:17 +0200, Stephan Bergmann wrote: https://bugs.freedesktop.org/show_bug.cgi?id=51143 CONFIGURATION: crash if online update not installed is fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=2e7702fb704133bad6a534a166e96599347cf6b4 fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException. pushed to 3-6. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/src/optsolver.src | 84 -
1 file changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 7502b75aa9c6410753c92464693be1bccb3ab0f1
Author: Andras Timar ati...@suse.com
Date: Thu Jul 12 15:01:26 2012 +0200
fdo#35953 resize controls on Solver dialog of Calc
Change-Id: Ia1130d241f6c01079449e670e26054bbc1a798ea
(cherry picked from commit 7444b258df32638876257bab588f8d3513602781)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index e5954f5..1b8e600 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -33,7 +33,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpId = CMD_SID_OPENDLG_OPTSOLVER ;
Hide = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 230 , 210 ) ;
+Size = MAP_APPFONT ( 250 , 210 ) ;
Text [ en-US ] = Solver ;
Moveable = TRUE ;
Closeable = FALSE ;
@@ -48,14 +48,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL;
Border = TRUE ;
-Pos = MAP_APPFONT ( 67 , 6 ) ;
+Pos = MAP_APPFONT ( 87 , 6 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_OBJECTIVECELL
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL;
-Pos = MAP_APPFONT ( 199 , 5 ) ;
+Pos = MAP_APPFONT ( 219 , 5 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -64,13 +64,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_DIRECTION
{
Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 59 , 8 ) ;
+Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = Optimize result to ;
};
RadioButton RB_MAX
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX;
-Pos = MAP_APPFONT ( 67 , 24 ) ;
+Pos = MAP_APPFONT ( 87 , 24 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = Maximum ;
TabStop = TRUE ;
@@ -78,7 +78,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_MIN
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN;
-Pos = MAP_APPFONT ( 67 , 38 ) ;
+Pos = MAP_APPFONT ( 87 , 38 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = Minimum ;
TabStop = TRUE ;
@@ -86,7 +86,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_VALUE
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE;
-Pos = MAP_APPFONT ( 67 , 52 ) ;
+Pos = MAP_APPFONT ( 87 , 52 ) ;
Size = MAP_APPFONT ( 59 , 10 ) ;
Text [ en-US ] = Value of ;
TabStop = TRUE ;
@@ -95,14 +95,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET;
Border = TRUE ;
-Pos = MAP_APPFONT ( 128 , 50 ) ;
+Pos = MAP_APPFONT ( 148 , 50 ) ;
Size = MAP_APPFONT ( 69 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_TARGET
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET;
-Pos = MAP_APPFONT ( 199 , 49 ) ;
+Pos = MAP_APPFONT ( 219 , 49 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -111,21 +111,21 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_VARIABLECELLS
{
Pos = MAP_APPFONT ( 6 , 68 ) ;
-Size = MAP_APPFONT ( 59 , 8 ) ;
+Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = By changing cells ;
};
Edit ED_VARIABLECELLS
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 67 , 66 ) ;
+Pos = MAP_APPFONT ( 87 , 66 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_VARIABLECELLS
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS;
-Pos = MAP_APPFONT ( 199 , 65 ) ;
+Pos = MAP_APPFONT ( 219 , 65 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -146,13 +146,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
};
FixedText FT_OPERATOR
{
-Pos = MAP_APPFONT ( 84 , 102 ) ;
+Pos = MAP_APPFONT ( 104 , 102 ) ;
Size = MAP_APPFONT ( 38 , 8 ) ;
Text [ en-US ] = Operator ;
};
FixedText FT_CONSTRAINT
{
-Pos = MAP_APPFONT ( 128 , 102 ) ;
+Pos = MAP_APPFONT ( 148 , 102 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = Value ;
};
@@ -162,13 +162,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 114 ) ;
-Size = MAP_APPFONT ( 53 , 12 ) ;
+Size =
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit d22ec2d67e82ebc7723f018172911ff4e567c006
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 11:10:45 2012 +0100
skip khmer test on older 'broken' icu versions
Change-Id: Iab813f5288af1f0e054c022c4e4a99b92c7ce1ce
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a8a050a..3a64c31 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -41,6 +41,8 @@
#include com/sun/star/i18n/WordType.hpp
#include unotest/bootstrapfixturebase.hxx
+#include unicode/uvernum.h
+
#include rtl/strbuf.hxx
#include rtl/ustrbuf.hxx
@@ -62,7 +64,9 @@ public:
#if TODO
void testNorthernThai();
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
void testKhmer();
+#endif
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@@ -73,7 +77,9 @@ public:
#if TODO
CPPUNIT_TEST(testNorthernThai);
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
CPPUNIT_TEST(testKhmer);
+#endif
CPPUNIT_TEST_SUITE_END();
private:
uno::Referencei18n::XBreakIterator m_xBreak;
@@ -346,8 +352,12 @@ void TestBreakIterator::testNorthernThai()
}
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 4)
//A test to ensure that our khmer word boundary detection is useful
//https://bugs.freedesktop.org/show_bug.cgi?id=52020
+//
+//icu doesn't have the Khmer word boundary dictionaries in = 4.0.0 but does in
+//the current 49.x.y . Not sure which version first had them introduced.
void TestBreakIterator::testKhmer()
{
lang::Locale aLocale;
@@ -367,6 +377,7 @@ void TestBreakIterator::testKhmer()
CPPUNIT_ASSERT(aBounds.startPos == 3 aBounds.endPos == 5);
}
+#endif
void TestBreakIterator::setUp()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements2' - sc/qa sd/qa test/inc test/source
sc/qa/extras/regression-test.cxx |5 --
sd/qa/unit/regression-test.cxx |9 ++--
test/inc/test/xmldiff.hxx| 70 +---
test/source/diff/diff.cxx| 84 ++-
4 files changed, 94 insertions(+), 74 deletions(-)
New commits:
commit 87c6beddfb684cee702ec1c9225497b8541a780d
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 12:29:03 2012 +0200
test: move XMLDiff implementation details to cxx file
This makes it unnecessary to link clients against libxml2.
Change-Id: Ifd295623c01bdc6f579afbf81d5b609a2b29f4bf
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 2c28105..e909467 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -73,9 +73,8 @@ bool checkDumpAgainstFile( const rtl::OUString rDump, const
rtl::OUString aFile
CPPUNIT_ASSERT_MESSAGE(dump is empty, !rDump.isEmpty());
rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
-XMLDiff aDiff(aOFile.getStr(),
aDump.getStr(),static_castint(rDump.getLength()), aToleranceFile.getStr());
-
-return aDiff.compare();
+return doXMLDiff(aOFile.getStr(), aDump.getStr(),
+static_castint(rDump.getLength()), aToleranceFile.getStr());
}
}
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index 7cb0609..0b1dee1 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -214,10 +214,13 @@ void SdFiltersTest::testStuff(::sd::DrawDocShellRef
xDocShRef, const rtl::OStrin
rtl::OString aFileName = aFileNameBuf.makeStringAndClear();
-XMLDiff aDiff(aFileName.getStr(), rtl::OUStringToOString(aString,
RTL_TEXTENCODING_UTF8).getStr(), static_castint(aString.getLength()),
-
rtl::OUStringToOString(getPathFromSrc(/sd/qa/unit/data/tolerance.xml),
RTL_TEXTENCODING_UTF8).getStr());
std::cout aString std::endl;
-aDiff.compare();
+doXMLDiff(aFileName.getStr(),
+rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(),
+static_castint(aString.getLength()),
+rtl::OUStringToOString(
+getPathFromSrc(/sd/qa/unit/data/tolerance.xml),
+RTL_TEXTENCODING_UTF8).getStr());
}
xDocShRef-DoClose();
}
diff --git a/test/inc/test/xmldiff.hxx b/test/inc/test/xmldiff.hxx
index 0d768ae..cdba298 100644
--- a/test/inc/test/xmldiff.hxx
+++ b/test/inc/test/xmldiff.hxx
@@ -26,74 +26,10 @@
* instead of those above.
*/
-#include libxml/parser.h
-#include libxml/tree.h
-#include libxml/xmlmemory.h
-#include string
-#include set
#include test/testdllapi.hxx
-#define USE_CPPUNIT 1
-
-struct tolerance
-{
-~tolerance()
-{
-xmlFree(elementName);
-xmlFree(attribName);
-}
-
-tolerance()
-{
-elementName = NULL;
-attribName = NULL;
-}
-
-tolerance(const tolerance tol)
-{
-elementName = xmlStrdup(tol.elementName);
-attribName = xmlStrdup(tol.attribName);
-relative = tol.relative;
-value = tol.value;
-}
-
-xmlChar* elementName;
-xmlChar* attribName;
-bool relative;
-double value;
-bool operator==(const tolerance rTol) const { return
xmlStrEqual(elementName, rTol.elementName) xmlStrEqual(attribName,
rTol.attribName); }
-bool operator(const tolerance rTol) const
-{
-int cmp = xmlStrcmp(elementName, rTol.elementName);
-if(cmp == 0)
-{
-cmp = xmlStrcmp(attribName, rTol.attribName);
-}
-
-if(cmp=0)
-return false;
-else
-return true;
-}
-};
-
-class OOO_DLLPUBLIC_TEST XMLDiff
-{
-public:
-XMLDiff(const char* pFileName, const char* pContent, int size, const char*
pToleranceFileName);
-~XMLDiff();
-
-bool compare();
-private:
-typedef std::settolerance ToleranceContainer;
-
-void loadToleranceFile(xmlDocPtr xmlTolerance);
-bool compareAttributes(xmlNodePtr node1, xmlNodePtr node2);
-bool compareElements(xmlNodePtr node1, xmlNodePtr node2);
-
-ToleranceContainer toleranceContainer;
-xmlDocPtr xmlFile1;
-xmlDocPtr xmlFile2;
-};
+bool OOO_DLLPUBLIC_TEST
+doXMLDiff(const char* pFileName, const char* pContent, int size,
+ const char* pToleranceFileName);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 00e1444..048e783 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -26,10 +26,16 @@
* instead of those above.
*/
+#define USE_CPPUNIT 1
#include test/xmldiff.hxx
+
#include libxml/xpath.h
-#include rtl/math.hxx
+#include libxml/parser.h
+#include libxml/tree.h
+#include libxml/xmlmemory.h
+
+#include set
#include cstring
#include sstream
#include cmath
@@ -39,6 +45,73 @@
#include
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/src/optsolver.src | 84 -
1 file changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 9f902a5901c2593d2a4255194fd93caeac6b41e6
Author: Andras Timar ati...@suse.com
Date: Thu Jul 12 15:01:26 2012 +0200
fdo#35953 resize controls on Solver dialog of Calc
Change-Id: Ia1130d241f6c01079449e670e26054bbc1a798ea
(cherry picked from commit 7444b258df32638876257bab588f8d3513602781)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index e5954f5..1b8e600 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -33,7 +33,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpId = CMD_SID_OPENDLG_OPTSOLVER ;
Hide = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 230 , 210 ) ;
+Size = MAP_APPFONT ( 250 , 210 ) ;
Text [ en-US ] = Solver ;
Moveable = TRUE ;
Closeable = FALSE ;
@@ -48,14 +48,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL;
Border = TRUE ;
-Pos = MAP_APPFONT ( 67 , 6 ) ;
+Pos = MAP_APPFONT ( 87 , 6 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_OBJECTIVECELL
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL;
-Pos = MAP_APPFONT ( 199 , 5 ) ;
+Pos = MAP_APPFONT ( 219 , 5 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -64,13 +64,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_DIRECTION
{
Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 59 , 8 ) ;
+Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = Optimize result to ;
};
RadioButton RB_MAX
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX;
-Pos = MAP_APPFONT ( 67 , 24 ) ;
+Pos = MAP_APPFONT ( 87 , 24 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = Maximum ;
TabStop = TRUE ;
@@ -78,7 +78,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_MIN
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN;
-Pos = MAP_APPFONT ( 67 , 38 ) ;
+Pos = MAP_APPFONT ( 87 , 38 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = Minimum ;
TabStop = TRUE ;
@@ -86,7 +86,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_VALUE
{
HelpID = sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE;
-Pos = MAP_APPFONT ( 67 , 52 ) ;
+Pos = MAP_APPFONT ( 87 , 52 ) ;
Size = MAP_APPFONT ( 59 , 10 ) ;
Text [ en-US ] = Value of ;
TabStop = TRUE ;
@@ -95,14 +95,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET;
Border = TRUE ;
-Pos = MAP_APPFONT ( 128 , 50 ) ;
+Pos = MAP_APPFONT ( 148 , 50 ) ;
Size = MAP_APPFONT ( 69 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_TARGET
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET;
-Pos = MAP_APPFONT ( 199 , 49 ) ;
+Pos = MAP_APPFONT ( 219 , 49 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -111,21 +111,21 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_VARIABLECELLS
{
Pos = MAP_APPFONT ( 6 , 68 ) ;
-Size = MAP_APPFONT ( 59 , 8 ) ;
+Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = By changing cells ;
};
Edit ED_VARIABLECELLS
{
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 67 , 66 ) ;
+Pos = MAP_APPFONT ( 87 , 66 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_VARIABLECELLS
{
HelpID = sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS;
-Pos = MAP_APPFONT ( 199 , 65 ) ;
+Pos = MAP_APPFONT ( 219 , 65 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -146,13 +146,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
};
FixedText FT_OPERATOR
{
-Pos = MAP_APPFONT ( 84 , 102 ) ;
+Pos = MAP_APPFONT ( 104 , 102 ) ;
Size = MAP_APPFONT ( 38 , 8 ) ;
Text [ en-US ] = Operator ;
};
FixedText FT_CONSTRAINT
{
-Pos = MAP_APPFONT ( 128 , 102 ) ;
+Pos = MAP_APPFONT ( 148 , 102 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = Value ;
};
@@ -162,13 +162,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 114 ) ;
-Size = MAP_APPFONT ( 53 , 12 ) ;
+Size =
Re: [PUSHED 3-5][PUSHED 3-6] fdo#35953 truncated strings on localized Solver dialog
On Thu, 2012-07-12 at 15:12 +0200, Andras Timar wrote: Hi, I made the dialog a bit wider, so French text will fit now. http://cgit.freedesktop.org/libreoffice/core/commit/?id=7444b258df32638876257bab588f8d3513602781 pushed to 3-6 and 3-5 now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc's tab colors and GTK tabs
Hi Ruslan, Thanks so much for working on this! I'm cc'ing the UX-advise guys, I am sure they'll be able to create a mockup for the generic tab look in Calc. IIRC, they even proposed a different ordering of the tabs and the buttons to move them, but I am not exactly sure if it is documented somewhere. UX people - please see the details below :-) It is about the tabs that are in bottom left part of the Calc window to switch sheets; Ruslan made them to render natively (ie. uses the Gtk+ theme to render them), but unfortunately this does not allow their coloring. On 2012-07-12 at 18:35 +0400, Ruslan Kabatsayev wrote: It seems there's no easy way for this. Some themes, e.g. QtCurve and oxygen-gtk, don't have special color inside tabs (like Clearlooks or Glossy have), and all we can do with them is rendering the colored background and then the tabs, so we'll get ugly squares under tabs (and I'm not sure if QtCurve has similar translucent tabs with respect to background as oxygen-gtk). One way around this might be to render translucent rounded rectangle fading to its borders under the text, but I guess this would look ugly for most themes. So, maybe it was a bad idea to render tabs in native way at all. Maybe we should just try to develop a generic tab look, which wouldn't look as prehistoric as old ones did, and not follow native style (native styles already don't have trapezoid shaped tabs)? Do you think this regression would be something you could take care of, should someone else tackle this? I think I'll take care of it as soon as I have some ideas on how to do this best. I'd like to hear from someone else what they think. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51143, which changed state. Bug 51143 Summary: CONFIGURATION: crash if online update not installed https://bugs.freedesktop.org/show_bug.cgi?id=51143 What|Old Value |New Value Status|NEW |ASSIGNED Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/gridwin.hxx | 11 ---
sc/source/ui/view/dbfunc3.cxx | 12
sc/source/ui/view/gridwin.cxx |8
sc/source/ui/view/gridwin2.cxx |2 --
sc/source/ui/view/gridwin5.cxx | 28
sc/source/ui/view/viewfun2.cxx |4
sc/source/ui/view/viewfun3.cxx | 27 ---
sc/source/ui/view/viewfunc.cxx |4
8 files changed, 96 deletions(-)
New commits:
commit 76d07ffc5f87790865d9ea1a5c3c1093d0d01fe6
Author: Thomas Arnhold tho...@arnhold.org
Date: Fri Jul 13 10:58:21 2012 +0100
Resolves: fdo#48256 clean out Hide/Show Cursor
Change-Id: I0249d42f06f9c1168c2c0c59af927c4a0535c39e
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index bb1d2ad..63cbbe1 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -81,17 +81,6 @@ struct SpellCallbackInfo;
#define SC_PD_BREAK_V 32
-class ScHideTextCursor
-{
-private:
-ScViewData* pViewData;
-ScSplitPos eWhich;
-
-public:
-ScHideTextCursor( ScViewData* pData, ScSplitPos eW );
-~ScHideTextCursor();
-};
-
// ---
// predefines
namespace sdr { namespace overlay { class OverlayObjectList; }}
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 26c00cc..cf7d96a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -202,9 +202,7 @@ void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord )
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, false );
-ShowCursor();
if (bOk)
UpdateScrollBars();
@@ -236,9 +234,7 @@ void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16
nLevel, sal_Bool bReco
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint,
false );
-ShowCursor();
if (bOk)
UpdateScrollBars();
@@ -252,9 +248,7 @@ void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16
nLevel, sal_uInt16 nEn
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord,
bPaint, false );
-ShowCursor();
if ( bOk bPaint )
UpdateScrollBars();
@@ -268,9 +262,7 @@ void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16
nLevel, sal_uInt16 nEn
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord,
bPaint, false );
-ShowCursor();
if ( bOk bPaint )
UpdateScrollBars();
@@ -359,9 +351,7 @@ void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
{
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, false );
-ShowCursor();
if (bDone)
UpdateScrollBars();
}
@@ -378,9 +368,7 @@ void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord )
{
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
-HideCursor();
sal_Bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord, false );
-ShowCursor();
if (bDone)
UpdateScrollBars();
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1a6b9f9..d5400f3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -735,9 +735,7 @@ void ScGridWindow::RefreshAutoFilterButton(const ScAddress
rPos)
bool bFilterActive = IsAutoFilterActive(rPos.Col(), rPos.Row(),
rPos.Tab());
mpFilterButton-setHasHiddenMember(bFilterActive);
mpFilterButton-setPopupPressed(false);
-HideCursor();
mpFilterButton-draw();
-ShowCursor();
}
}
@@ -4683,11 +4681,9 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked,
const ScRange rMarkRange)
{
if ( bMarked != bAutoMarkVisible || ( bMarked rMarkRange.aEnd !=
aAutoMarkPos ) )
{
-HideCursor();
bAutoMarkVisible = bMarked;
if ( bMarked )
aAutoMarkPos = rMarkRange.aEnd;
-ShowCursor();
UpdateAutoFillOverlay();
}
@@ -5116,8 +5112,6 @@ bool ScGridWindow::GetEditUrlOrError( bool bSpellErr,
const Point rPos,
if( !bFound )
return false;
-ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea
(MapMode is changed)
-
const ScPatternAttr* pPattern = pDoc-GetPattern( nPosX, nPosY, nTab );
// bForceToTop = sal_False,
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/app.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d2afe08450ad041afa21adf48d6c6d90e8cc4e0
Author: Laurent Godard lgodard.li...@laposte.net
Date: Wed Jul 11 17:07:23 2012 +0200
change Exit menu entry to Exit %PRODUCTNAME fdo#51944
Some user do not understand that Exit is for exiting all libreoffice
modules and not exiting the current window
Change-Id: If3a88a1e7f79c5c19f3011ba65dde3cda11462a4
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index de7368a..bcb19cb 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -257,7 +257,7 @@ ToolBox RID_FULLSCREENTOOLBOX
String STR_QUITAPP
{
-Text [ en-US ] = E~xit ;
+Text [ en-US ] = E~xit %PRODUCTNAME ;
};
String RID_STR_HELP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH][PUSHED] fdo 51944, modify exit menu wording
On Wed, 2012-07-11 at 17:21 +0200, Laurent Godard wrote: Hi all here is a small patch that adds LibreOffice to the Exit label in the menu some user, especially comming from other known office suite, do not understand why their calc documents are closed when they exit from a writer one The proposed menu is more explicit pushed to master, seems fairly reasonable. would be great if it could be also part of 3.5.x branch translation changes and so on == pain, so didn't do that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] fdo 51944, modify exit menu wording
Hi Caolan thanks a lot for pushing and, yes i understand the translation impact for 3.5.x branch thanks again Laurent ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx | 43 +
1 file changed, 43 insertions(+)
New commits:
commit 52280c29880c2d6bc533692d3f0cdff37f35790d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 12:49:28 2012 +0100
Related: fdo#49629 add test case for #i11993#
Change-Id: I4466b57514352620fd26072544ec6e50bf08708c
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 57c70e4..a65d0b6 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -54,6 +54,7 @@ public:
virtual void tearDown();
void testLineBreaking();
+void testWordBoundaries();
void testGraphemeIteration();
void testWeak();
void testAsian();
@@ -67,6 +68,7 @@ public:
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
+CPPUNIT_TEST(testWordBoundaries);
CPPUNIT_TEST(testGraphemeIteration);
CPPUNIT_TEST(testWeak);
CPPUNIT_TEST(testAsian);
@@ -125,6 +127,47 @@ void TestBreakIterator::testLineBreaking()
}
}
+//See https://bugs.freedesktop.org/show_bug.cgi?id=49629
+void TestBreakIterator::testWordBoundaries()
+{
+lang::Locale aLocale;
+aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(en));
+aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(US));
+
+i18n::Boundary aBounds;
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=11993
+{
+::rtl::OUString aTest(abcd ef ghi??? KLM);
+
+CPPUNIT_ASSERT(!m_xBreak-isBeginWord(aTest, 4, aLocale,
i18n::WordType::DICTIONARY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 4, aLocale,
i18n::WordType::DICTIONARY_WORD));
+aBounds = m_xBreak-getWordBoundary(aTest, 4, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 0 aBounds.endPos == 4);
+
+CPPUNIT_ASSERT(!m_xBreak-isBeginWord(aTest, 8, aLocale,
i18n::WordType::DICTIONARY_WORD));
+CPPUNIT_ASSERT(!m_xBreak-isEndWord(aTest, 8, aLocale,
i18n::WordType::DICTIONARY_WORD));
+
+//next word
+aBounds = m_xBreak-getWordBoundary(aTest, 8, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 9 aBounds.endPos == 12);
+
+//previous word
+aBounds = m_xBreak-getWordBoundary(aTest, 8, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 5 aBounds.endPos == 7);
+
+CPPUNIT_ASSERT(!m_xBreak-isBeginWord(aTest, 12, aLocale,
i18n::WordType::DICTIONARY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 12, aLocale,
i18n::WordType::DICTIONARY_WORD));
+aBounds = m_xBreak-getWordBoundary(aTest, 12, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 9 aBounds.endPos == 12);
+
+CPPUNIT_ASSERT(m_xBreak-isBeginWord(aTest, 16, aLocale,
i18n::WordType::DICTIONARY_WORD));
+CPPUNIT_ASSERT(!m_xBreak-isEndWord(aTest, 16, aLocale,
i18n::WordType::DICTIONARY_WORD));
+aBounds = m_xBreak-getWordBoundary(aTest, 16, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 16 aBounds.endPos == 19);
+}
+}
+
//See http://qa.openoffice.org/issues/show_bug.cgi?id=52
//See https://bugs.freedesktop.org/show_bug.cgi?id=40292
void TestBreakIterator::testGraphemeIteration()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source sfx2/source
extensions/source/plugin/base/manager.cxx |1 - extensions/source/plugin/base/xplugin.cxx |1 - sfx2/source/appl/app.cxx |1 - sfx2/source/bastyp/fltfnc.cxx |1 - 4 files changed, 4 deletions(-) New commits: commit 023513fb7186e8837d716e4ed3814d7fdf555fd2 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 13 13:54:45 2012 +0200 Remove unused #includes Change-Id: I041feabb7ee94b33caebb67a380b8f3694d09e82 diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index e2c5488..12ff1a4 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -55,7 +55,6 @@ #include com/sun/star/container/XElementAccess.hpp #include com/sun/star/container/XIndexAccess.hpp #include com/sun/star/loader/XImplementationLoader.hpp -#include com/sun/star/loader/CannotActivateFactoryException.hpp PluginManager* PluginManager::pManager = NULL; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 4d2b042..f799aca 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -41,7 +41,6 @@ #include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/lang/XSingleServiceFactory.hpp #include com/sun/star/loader/XImplementationLoader.hpp -#include com/sun/star/loader/CannotActivateFactoryException.hpp #include com/sun/star/plugin/PluginManager.hpp #include comphelper/componentcontext.hxx diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 412475b..318c4ab 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -53,7 +53,6 @@ #include com/sun/star/frame/FrameActionEvent.hpp #include com/sun/star/frame/FrameAction.hpp #include com/sun/star/loader/XImplementationLoader.hpp -#include com/sun/star/loader/CannotActivateFactoryException.hpp #include com/sun/star/mozilla/XPluginInstance.hpp #include com/sun/star/frame/XFramesSupplier.hpp #include com/sun/star/container/XIndexAccess.hpp diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 2088750..4fe7602 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -66,7 +66,6 @@ #include com/sun/star/frame/XLoadEventListener.hpp #include com/sun/star/frame/XFilterDetect.hpp #include com/sun/star/loader/XImplementationLoader.hpp -#include com/sun/star/loader/CannotActivateFactoryException.hpp #include comphelper/processfactory.hxx #include sal/types.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 2cf6778842d259d4e6e1a1f0e4c6c2ceab874eee
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 13:00:29 2012 +0100
Related: fdo#49629 add test case for #i21907#
Change-Id: Ie1dd9091e4d8ee09c9a75eecf28fd6cd06ea1839
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a65d0b6..491681c 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -166,6 +166,23 @@ void TestBreakIterator::testWordBoundaries()
aBounds = m_xBreak-getWordBoundary(aTest, 16, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT(aBounds.startPos == 16 aBounds.endPos == 19);
}
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=21907
+{
+::rtl::OUString aTest(b a?);
+
+CPPUNIT_ASSERT(m_xBreak-isBeginWord(aTest, 1, aLocale,
i18n::WordType::ANY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isBeginWord(aTest, 2, aLocale,
i18n::WordType::ANY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isBeginWord(aTest, 3, aLocale,
i18n::WordType::ANY_WORD));
+
+CPPUNIT_ASSERT(m_xBreak-isBeginWord(aTest, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES));
+
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 1, aLocale,
i18n::WordType::ANY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 2, aLocale,
i18n::WordType::ANY_WORD));
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 3, aLocale,
i18n::WordType::ANY_WORD));
+
+CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES));
+}
}
//See http://qa.openoffice.org/issues/show_bug.cgi?id=52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - shell/source ucb/source
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx| 12
+-
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |2 -
shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx |4 +--
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx|2 -
ucb/source/ucp/cmis/cmis_content.cxx |2 -
ucb/source/ucp/cmis/cmis_repo_content.cxx |4 +--
6 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit 09a5a74956b96b69ec93687f5a902b1c4f937d9e
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 14:01:11 2012 +0200
warning C4267: conversion from 'size_t' to 'unsigned long'
Change-Id: I1d922e5b3c7959022b6f57c33b9a4976a16305f6
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index e4ace54..1ce8dfb 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -127,7 +127,7 @@ FileStream::~FileStream()
unsigned long FileStream::sread (unsigned char *buf, unsigned long size)
{
if (file)
-return fread(buf, 1, size, file);
+return static_castunsigned long(fread(buf, 1, size, file));
return 0;
}
commit 48ab773e681b1f129e9196c11f5d44b0caf3dbe9
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 12:41:42 2012 +0200
warning C4101: unreferenced local variable
Change-Id: I627c2641dcebea1daa5a9264d8b4a5771bf8155f
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 3349e0f..8404203 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -375,7 +375,7 @@ namespace cmis
else
SAL_INFO( cmisucp, Looking for unsupported property
rProp.Name );
}
-catch ( const libcmis::Exception e )
+catch (const libcmis::Exception)
{
xRow-appendVoid( rProp );
}
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index af501b3..233b2f0 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -128,7 +128,7 @@ namespace cmis
SAL_INFO( cmisucp, Looking for unsupported property
rProp.Name );
}
}
-catch ( const libcmis::Exception e )
+catch (const libcmis::Exception)
{
xRow-appendVoid( rProp );
}
@@ -156,7 +156,7 @@ namespace cmis
{
m_aRepositories =
libcmis::SessionFactory::getRepositories( params );
}
-catch ( const libcmis::Exception e )
+catch (const libcmis::Exception)
{
}
}
commit e61c550342457e93372aa6b03ea299e53722
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 13 12:26:51 2012 +0200
warning C4267: conversion from 'size_t' to 'DWORD'
Change-Id: Idd467f2963099e2ae6bb76f405124dfa32c8cc9a
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 1e7499e..9f37b3b 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -341,7 +341,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK *
pStat)
continue;
}
m_pwsBuffer = m_pContentReader -
getChunkBuffer()[m_ChunkPosition].second;
-m_ulUnicodeBufferLen = m_pwsBuffer.length();
+m_ulUnicodeBufferLen = static_castULONG(m_pwsBuffer.length());
DWORD ChunkLCID = LocaleSetToLCID( m_pContentReader -
getChunkBuffer()[m_ChunkPosition].first );
// Set chunk description
pStat-idChunk = m_ulChunkID;
@@ -1241,7 +1241,7 @@ namespace /* private */
0,
REG_MULTI_SZ,
reinterpret_castconst
BYTE*(DllsToRegisterList),
-DllList.length() + 2);
+static_castDWORD(DllList.length() + 2));
RegCloseKey(hSubKey);
}
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 2312c26..45918f5 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -247,7 +247,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Stat(STATSTG
*pstatstg, DWORD grfSt
pstatstg-type = STGTY_LOCKBYTES;
ULARGE_INTEGER uli;
-uli.LowPart = ref_zip_buffer_.size();
+uli.LowPart =
Android / Impress timeline / plan ...
Hi Andrzej, As agreed; the plan is to work the weeks: July 16th to end Sep 24th; and we have the following breakdown / task ordering with time estimates. The estimates are primarily for practising estimating things, and of course switching things about is just fine; but it's nice to get a gauge of how long things take :-) My view is that they are under-estimates, but I hope to being wrong :-) It's an exciting project for sure, and I look forward to it's completion using it myself. Thanks, Michael. Tasks refer rather succinctly to the beautiful design from the UX team that is here: https://wiki.documentfoundation.org/Design/Whiteboards/Impress_remote#Tentative_Design A. sync. issues with protocol, tracking slide changes, protocol / priority issues = queue of requests to process. [ 3md ] B. Thumbnail view [ 2md ] C. 3D slide / next-slide view [ 5md ] D. Red bar at top + timer [ 2md ] E. Options / blank-screen etc. [ 2md ] F. Notes export as XHTML rendering [ 2md ] G. pairing / discovery / selection + PIN UI [ 5md ] H. Error / dis-connection screen [ 1md ] I. Rotated views [ 1md ] J. touch navigation via volume controls [ 1md ] K. Credits screen [ 1md ] L. bluetooth discovery / integration [ 5md ] M. debugging / polish / etc. - [ remainder ] -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC-UPDATE] Impress Remote
On Thu, 2012-07-12 at 22:18 +0100, Andrzej J. R. Hunt wrote: My latest update: Nice work :-) -Json dependency removed (no more pkg-config here). David T. will be happy no doubt :-) (-Setup sound for my IRC client!) Good to be able to ping you ;-) A screenshot of the test client with image preview working is attached! This is beautiful; it'd be nice to de-Microsoft-ise it (the MS slide is just a rather nice test-case but that doesn't sell so well), and blog this so people are aware of what is going on. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED: 3-6] fdo#51278 reportbuilder fails with error msg
Pushed the tree commits (squashed) to libreoffice-3-6. On Thu, Jul 12, 2012 at 02:02:54PM +0200, David Tardon wrote: report builder does not work at all after gbuildification (mea culpa). Commit 10a6cf99d3a44e0b2c5e984e0145b5163b9ed852 fixes it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: pyuno/Library_pyuno_wrapper.mk
pyuno/Library_pyuno_wrapper.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e9c6367cd546e6cf69cc2212b5a8771599bc54d8 Author: David Tardon dtar...@redhat.com Date: Fri Jul 13 14:21:43 2012 +0200 fdo#51948 do not link with dl on *BSD Change-Id: If623e9a0d909ce6a7e260b0d4beed3fb0c74cf8b diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index eba06d6..0f46bea 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -49,10 +49,10 @@ $(eval $(call gb_Library_set_include,pyuno_wrapper,\ endif ifneq ($(GUI)$(COM),WNTMSC) -ifneq ($(OS),MACOSX) +ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Library_add_libs,pyuno_wrapper,\ - -ldl \ +$(eval $(call gb_Library_use_libraries,pyuno_wrapper,\ + dl \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: shiny uno version, Desktop IDL
On 06/22/2012 04:13 PM, Michael Meeks wrote: On Fri, 2012-06-22 at 11:21 +0200, Michael Stahl wrote: there are reasons why some methods look like this, it's because you can't have all 3 of: 1. statically typed interface 2. binary backward compatibility of interface 3. ability to extend existing interface with new optional parameters I disagree :-) if we allow a hetrodox understanding of type information for the same interface, and we compile that in rather than having it in types.rdb (with all it's performance, size lookup problems) -and- we forcibly bridge all in-process extensions that are not native: certainly we can have all three - it is mostly a matter of clever bridging, and choosing of good back-compat defaults (that map to zero / whatever we pad with). If we make UNO more powerful in that way, we can improve things quite a bit here. I'm not sold on the applicability/usefulness of such automatic bridging between API versions. For example, in general there are no good back-compat defaults for additional method parameters, say, so you would end up with arguments of type OptionalT, which in turn could make code implementing such interfaces awkward (while the intention for changing the API is making code less awkward, at least some of the time). Manual bridging, by writing explicit code that tells UNO how to bridge among API versions, might help there, but at the cost of adding more, typically little-tested code. Anyway, I'll turn in a LOCon paper on whether/how to do stuff like that and at what prize. So - syntactic sugar sounds good to me ;-) I'd particularly like a built-in UNO, efficient signal/slot mechanism and native language bindings for each language [ but particularly C++ ]. can you point me to something existing that is like this signal/slot thing you want? Sure - tools' IMPL_LINK - would be the broken, degenerate, gross case :-) More attractive versions would be g_signal or Qt's signals slots[1], I've used the rather sweet C# bindings of these too to good effect; boost has a nice implementation as well anyhow checkout: http://en.wikipedia.org/wiki/Signals_and_slots Not sure what improvements you are looking for over UNO's existing listener mechanisms. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 413554a3bd3e7236bd60e4e36f063351f3d31293
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 13 13:28:14 2012 +0100
Related: fdo#49629 add test case for #i14904#
Change-Id: I2bed0272eade44ab988f2cd9becb1f8ef0f232a9
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 491681c..3c2ba50 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -183,6 +183,43 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES));
}
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=14904
+{
+const sal_Unicode TEST1[] =
+{
+'W', 'o', 'r', 'k', 'i', 'n', 'g', ' ', 0x201C, 'W', 'o', 'r',
'd', 's',
+' ', 's', 't', 'a', 'r', 't', 'i', 'n', 'g', ' ', 'w', 'i', 't',
+'h', ' ', 'q', 'u', 'o', 't', 'e', 's', 0x201D, ' ', 'W', 'o',
'r', 'k',
+'i', 'n', 'g', ' ', 0x2018, 'B', 'r', 'o', 'k', 'e', 'n', 0x2019,
' ',
+'?', 'S', 'p', 'a', 'n', 'i', 's', 'h', '?', ' ', 'd', 'o', 'e',
+'s', 'n', 0x2019, 't', ' ', 'w', 'o', 'r', 'k', '.', ' ', 'N', 'o',
+'t', ' ', 'e', 'v', 'e', 'n', ' ' , 0x00BF, 'r', 'e', 'a', 'l',
'?', ' ',
+'S', 'p', 'a', 'n', 'i', 's', 'h'
+};
+::rtl::OUString aTest(TEST1, SAL_N_ELEMENTS(TEST1));
+
+aBounds = m_xBreak-getWordBoundary(aTest, 4, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 0 aBounds.endPos == 7);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 12, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 9 aBounds.endPos == 14);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 40, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 37 aBounds.endPos == 44);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 49, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 46 aBounds.endPos == 52);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 58, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 55 aBounds.endPos == 62);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 67, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 64 aBounds.endPos == 71);
+
+aBounds = m_xBreak-getWordBoundary(aTest, 90, aLocale,
i18n::WordType::DICTIONARY_WORD, false);
+CPPUNIT_ASSERT(aBounds.startPos == 88 aBounds.endPos == 92);
+}
}
//See http://qa.openoffice.org/issues/show_bug.cgi?id=52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Spanish spell checker new release
Hi Ismael, 2012.07.11. 19:44 keltezéssel, Ismael Olea írta: I'm writing on behalf of the RLA-ES[1] project which is in charge of the Spanish spellchecker for LibreOffice, Ooo, Mozilla, hunspell, etc. I'm just reporting Santiago Bosio made a new release[2] in April. For your convenience the files are accessible by [3] too. I've updated the language support wiki page[4]. The releases includes spell checker, hyphenation rules and thesaurus and there is one for each Spanish spoken country plus a es_ANY.oxt common one. Please show me if there is a particular process to reporting new releases other than this maillist. Thanks for your time. [1] https://forja.rediris.es/projects/rla-es/ [2] http://forja.rediris.es/frs/?group_id=341release_id=1899 [3] http://ftp.rediris.es/mirror/forja-rediris/rla-es/OpenOffice.org3.x-LibreOffice/ [4] https://wiki.documentfoundation.org/index.php?title=Language_support_of_LibreOfficeaction=historysubmitdiff=52619oldid=48342 Thanks for letting us know about newer Spanish dictionary release. It is OK to write a mail to libreoffice@lists.freedesktop.org, even better to file a bug in bugzilla.freedestop.org (and to assign the bug to me). I'll push this newer version into git. Please note, however, that thesaurus did not pass validation, please find the error log below. (I renamed it to th_es_ANY_v2.dat). Best regards, Andras th_es_ANY_v2.dat:9505: balón defined to have 2 but seems to have 1 (next word (belcebú) found on line 9507 th_es_ANY_v2.dat:9507: belcebú defined to have 2 but seems to have 1 (next word (biblia) found on line 9509 th_es_ANY_v2.dat:9923: balón previously defined on 9505 th_es_ANY_v2.dat:9505: balón defined to have 2 but seems to have 1 (next word (balsa) found on line 9925 th_es_ANY_v2.dat:10797: belcebú previously defined on 9507 th_es_ANY_v2.dat:9507: belcebú defined to have 2 but seems to have 1 (next word (beldad) found on line 10799 th_es_ANY_v2.dat:12838: creador defined to have 4 but seems to have 1 (next word (creador, constructor, demiurgo, artista) found on line 12840 th_es_ANY_v2.dat:18854: creador previously defined on 12838 th_es_ANY_v2.dat:12838: creador defined to have 4 but seems to have 3 (next word (crear) found on line 18858 th_es_ANY_v2.dat:19559: dios defined to have 4 but seems to have 3 (next word (dable) found on line 19563 th_es_ANY_v2.dat:22721: dios previously defined on 19559 th_es_ANY_v2.dat:19559: dios defined to have 4 but seems to have 1 (next word (diócesis) found on line 22723 th_es_ANY_v2.dat:33174: gloria defined to have 12 but seems to have 1 (next word (guardia civil) found on line 33176 th_es_ANY_v2.dat:34339: gloria previously defined on 33174 th_es_ANY_v2.dat:33174: gloria defined to have 12 but seems to have 11 (next word (gloriar) found on line 34351 th_es_ANY_v2.dat:35922: hacedor defined to have 2 but seems to have 1 (next word (haba) found on line 35924 th_es_ANY_v2.dat:36028: hacedor previously defined on 35922 th_es_ANY_v2.dat:35922: hacedor defined to have 2 but seems to have 1 (next word (hacendado) found on line 36030 th_es_ANY_v2.dat:40635: leviatán defined to have 4 but seems to have 1 (next word (lp) found on line 40637 th_es_ANY_v2.dat:40639: lucifer defined to have 3 but seems to have 1 (next word (luzbel) found on line 40641 th_es_ANY_v2.dat:40641: luzbel defined to have 2 but seems to have 1 (next word (labe) found on line 40643 th_es_ANY_v2.dat:41763: leviatán previously defined on 40635 th_es_ANY_v2.dat:40635: leviatán defined to have 4 but seems to have 3 (next word (levita) found on line 41767 th_es_ANY_v2.dat:43081: lucifer previously defined on 40639 th_es_ANY_v2.dat:40639: lucifer defined to have 3 but seems to have 2 (next word (luciferino) found on line 43084 th_es_ANY_v2.dat:43261: luzbel previously defined on 40641 th_es_ANY_v2.dat:40641: luzbel defined to have 2 but seems to have 1 (next word (lúbrico) found on line 43263 th_es_ANY_v2.dat:46444: nazareno defined to have 2 but seems to have 1 (next word (nuevo testamento) found on line 46446 th_es_ANY_v2.dat:46718: nazareno previously defined on 46444 th_es_ANY_v2.dat:46444: nazareno defined to have 2 but seems to have 1 (next word (nazi) found on line 46720 th_es_ANY_v2.dat:47569: oscilación defined to have 4 but seems to have 1 (next word (o) found on line 47571 th_es_ANY_v2.dat:48759: oscilación previously defined on 47569 th_es_ANY_v2.dat:47569: oscilación defined to have 4 but seems to have 3 (next word (oscilar) found on line 48763 th_es_ANY_v2.dat:48957: padre defined to have 3 but seems to have 1 (next word (paliar) found on line 48959 th_es_ANY_v2.dat:48959: paliar defined to have 2 but seems to have 1 (next word (paraíso) found on line 48961 th_es_ANY_v2.dat:48961: paraíso defined to have 5 but seems to have 1 (next word (pc) found on line 48963 th_es_ANY_v2.dat:48965: pelota defined to have 2 but seems to have 1 (next word (perplejidad) found on line 48967 th_es_ANY_v2.dat:48967: perplejidad defined
Java api
hi...i can not find java api which are already converted into c++...i am trying to convert one of them...so can anyone tell what is exact parh of those converted apiwell i am beginner and trying to contribute code... Thanks a lot... Sent from my Nokia phone ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/fonthdl.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit fc508908f55cc1fe5a22adcba710cebb75fc979c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 15:15:57 2012 +0200
fix a crash with empty string
If it's named nLast, then it's supposed to point to the last character,
which, with an empty string, logically means it should point before
the start of the string.
Change-Id: I248fbe80c1c4b1c2c8d39f0bcf772f9b85415e4a
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 3d58197..f4d1705 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -85,12 +85,10 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const
OUString rStrImpValue, uno:
{
sal_Int32 nFirst = nPos;
nPos = ::sax::Converter::indexOfComma( rStrImpValue, nPos );
-sal_Int32 nLast = (-1 == nPos ? rStrImpValue.getLength() : nPos);
-if( nLast 0 )
-nLast--;
+sal_Int32 nLast = (-1 == nPos ? rStrImpValue.getLength() - 1 : nPos -
1);
// skip trailing blanks
-while( sal_Unicode(' ') == rStrImpValue[nLast] nLast nFirst )
+while( nLast nFirst sal_Unicode(' ') == rStrImpValue[nLast] )
nLast--;
// skip leading blanks
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|51554 | --- Comment #41 from Michael Meeks michael.me...@novell.com 2012-07-13 13:21:46 PDT --- move 51554 back to 3.5 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - sw/source writerfilter/source
sw/source/core/unocore/unofield.cxx |3 -
sw/source/filter/ww8/attributeoutputbase.hxx |6 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 29 +
sw/source/filter/ww8/docxattributeoutput.hxx | 10
sw/source/filter/ww8/wrtw8nds.cxx | 21 --
writerfilter/source/dmapper/DomainMapper.cxx |6 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 46 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10
writerfilter/source/ooxml/model.xml | 16 ++-
9 files changed, 139 insertions(+), 8 deletions(-)
New commits:
commit c097f7a3743246360bbae10e85a10eb00760edde
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 13 12:22:31 2012 +0200
dmapper: remove last paragraph of annotations
See commit 94855fbbb977d6acd42c32e157af664d0ede9739 for rationale.
Change-Id: I34838ea9dd60f24d20ac48e6089915b506f5d790
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ec7bf74..e02f53b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1517,6 +1517,8 @@ void DomainMapper_Impl::PopFootOrEndnote()
void DomainMapper_Impl::PopAnnotation()
{
+RemoveLastParagraph();
+
m_aTextAppendStack.pop();
// See if the annotation will be a single position or a range.
commit 423433ee105faea7775a3869dbf4054ab960480c
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 13 11:42:28 2012 +0200
DocxAttributeOutput: overwrite WritePostitFieldStart/End
Change-Id: If8ecbc9a831f26cab81ba47af9114b608592524b
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e5af719..4d14585 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -566,6 +566,7 @@ void DocxAttributeOutput::EndRun()
}
DoWriteBookmarks( );
+WriteCommentRanges();
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND ); //
merges with postponed run start, see above
@@ -593,6 +594,22 @@ void DocxAttributeOutput::EndRun()
EndRedline();
}
+void DocxAttributeOutput::WriteCommentRanges()
+{
+if (m_bPostitStart)
+{
+m_bPostitStart = false;
+OString idstr = OString::valueOf( sal_Int32( m_postitFieldsMaxId ));
+m_pSerializer-singleElementNS( XML_w, XML_commentRangeStart, FSNS(
XML_w, XML_id ), idstr.getStr(), FSEND );
+}
+if (m_bPostitEnd)
+{
+m_bPostitEnd = false;
+OString idstr = OString::valueOf( sal_Int32( m_postitFieldsMaxId ));
+m_pSerializer-singleElementNS( XML_w, XML_commentRangeEnd, FSNS(
XML_w, XML_id ), idstr.getStr(), FSEND );
+}
+}
+
void DocxAttributeOutput::DoWriteBookmarks()
{
// Write the start bookmarks
@@ -3323,6 +3340,16 @@ void DocxAttributeOutput::WritePostitFieldReference()
}
}
+void DocxAttributeOutput::WritePostitFieldStart()
+{
+m_bPostitStart = true;
+}
+
+void DocxAttributeOutput::WritePostitFieldEnd()
+{
+m_bPostitEnd = true;
+}
+
void DocxAttributeOutput::WritePostitFields()
{
for( unsigned int i = 0;
@@ -4301,6 +4328,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_bOpenedSectPr( false ),
m_sFieldBkm( ),
m_nNextMarkId( 0 ),
+ m_bPostitStart(false),
+ m_bPostitEnd(false),
m_pTableWrt( NULL ),
m_bTableCellOpen( false ),
m_nTableDepth( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 99265a0..ca863ae 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -98,6 +98,10 @@ public:
virtual void WritePostitFieldReference();
+virtual void WritePostitFieldStart();
+
+virtual void WritePostitFieldEnd();
+
/// Output text (inside a run).
virtual void RunText( const String rText, rtl_TextEncoding eCharSet =
RTL_TEXTENCODING_UTF8 );
@@ -522,6 +526,7 @@ private:
void DoWriteBookmarks( );
void WritePostponedGraphic();
void WritePostponedMath();
+void WriteCommentRanges();
void StartField_Impl( FieldInfos rInfos, bool bWriteRun = sal_False );
void DoWriteCmd( String rCmd );
@@ -559,6 +564,11 @@ private:
std::vectorrtl::OString m_rMarksStart;
std::vectorrtl::OString m_rMarksEnd;
+/// Is there a postit start to output?
+bool m_bPostitStart;
+/// Is there a postit end to output?
+bool m_bPostitEnd;
+
/// Maps of the bookmarks ids
std::maprtl::OString, sal_uInt16 m_rOpenedMarksIds;
commit 2e6f9dff530f16db33c52ab289efe18f96f71bb0
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 13 11:41:40 2012 +0200
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 91404d1d379fbdc3b1c7286dafd2519b68b08c97
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jul 13 15:27:13 2012 +0200
Hide information about failure during very early startup a little less
Change-Id: I4ecbcf7e19c642bbb98f66d127050361fdb6136a
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 812613a..3ee805b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -26,6 +26,10 @@
*
/
+#include sal/config.h
+
+#include iostream
+
#include app.hxx
#include desktop.hrc
#include cmdlineargs.hxx
@@ -712,9 +716,11 @@ void Desktop::ensureProcessServiceFactory()
}
catch (const css::uno::Exception e)
{
-SAL_WARN(desktop, UNO Exception: e.Message);
-// let exceptions escape and tear down the process, it is
-// completely broken anyway
+// Application::ShowNativeErrorBox would only work after InitVCL,
so
+// all we can realistically do here is hope the user can see
stderr:
+std::cerr UNO Exception: e.Message std::endl;
+// Let exceptions escape and tear down the process, it is
completely
+// broken anyway:
throw;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/gsicheck.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05a0aaa25efc53c4cfa8a955dbf96bbb63b8bc98 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 13 15:35:42 2012 +0200 fdo#51954: More tools-rtl string conversion regressions Change-Id: If9c5b0a0876540e9546617faaa5dcb4ae1e5a2cb diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 98e4b31..b2981a3 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -479,7 +479,7 @@ sal_Bool GSIBlock::HasSuspiciousChars( GSILine* pTestee, GSILine* pSource ) rtl::OStringToOUString( pTestee-GetText().copy(0, nPos), RTL_TEXTENCODING_UTF8)); sal_Int32 nErrorPos = aUTF8Tester.getLength(); -rtl::OString aContext( pTestee-GetText().copy( nPos, 20 ) ); +rtl::OString aContext( helper::abbreviate( pTestee-GetText(), nPos, 20 ) ); PrintError(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(Found double questionmark in translation only. Looks like an encoding problem at Position )) .append(nErrorPos).getStr(), Text format, aContext, pTestee-GetLineNumber(), pTestee-GetUniqId()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source vcl/source
cui/source/dialogs/about.cxx | 21 +
cui/source/dialogs/about.src |3 ---
vcl/source/app/brand.cxx |3 ++-
3 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit debfb21c927e39ab18aafb1895f343840967e16a
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jul 13 15:36:28 2012 +0200
Fix the About dialog rendering when librsvg is not available / functional.
Change-Id: Ib460f3cbf44114ef74065168b218daca51f2f0e9
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 6dc820d..cdf63a5 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -74,7 +74,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
aDescriptionText ( this, ResId( ABOUT_DESCRIPTION_TEXT,
*rId.GetResMgr() ) ),
aCopyrightText ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
-aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr()
) ),
+aLogoImage ( this ),
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS,
*rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE,
*rId.GetResMgr() ) ),
aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr()
) ),
@@ -191,15 +191,20 @@ void AboutDialog::LayoutControls()
Size aDialogSize ( aIdealTextWidth + aDialogBorder * 2, 0);
// Render and Position Logo
+Size aLogoSize( aIdealTextWidth, aIdealTextWidth / 20 );
+Point aLogoPos( aDialogBorder, aDialogBorder );
+
vcl::RenderGraphicRasterizer aRasterizerLogo =
Application::LoadBrandSVG(flat_logo);
-float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
-
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+if ( !aRasterizerLogo.GetRenderGraphic().IsEmpty()
+ aRasterizerLogo.GetDefaultSizePixel().Width() 0
aRasterizerLogo.GetDefaultSizePixel().Height() 0 )
+{
+const float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+aLogoSize = Size( aIdealTextWidth, aIdealTextWidth /
aLogoWidthHeightRatio );
-Size aLogoSize( aIdealTextWidth, aIdealTextWidth / aLogoWidthHeightRatio );
-Point aLogoPos( aDialogBorder, aDialogBorder );
-aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
-aLogoImage.SetImage( Image( aLogoBitmap ) );
-aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
+aLogoImage.SetImage( Image( aLogoBitmap ) );
+aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+}
// Position version text
sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index ab853c6..3793864 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -114,7 +114,4 @@ ModalDialog RID_DEFAULTABOUT
DefButton = TRUE ;
Text [ en-US ] = ~Close;
};
-FixedImage ABOUT_IMAGE_LOGO
-{
-};
};
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index f1c27ac..5113cf0 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -122,8 +122,9 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG
(const char* pName)
aRasterizer = loadSvg ($BRAND_BASE_DIR/program/edition, aName);
if (!aRasterizer.GetRenderGraphic().IsEmpty())
return aRasterizer;
+
aRasterizer = loadSvg ($BRAND_BASE_DIR/program, aName);
-return aRasterizer;
+return aRasterizer;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/crossmsi' - setup_native/source
setup_native/source/win32/wintools/makecab/makecab.c | 66 ++-
1 file changed, 35 insertions(+), 31 deletions(-)
New commits:
commit e47b6388eed41616e36fff139d45ec19c63350fa
Author: Eilidh McAdam eil...@lanedo.com
Date: Fri Jul 13 14:41:17 2012 +0100
Use lcab to generate cabinets for now.
lcab is expected in the sys. path.
Change-Id: Ie1cd8a45966bbd84ce84f2ad1d86da492eafa321
diff --git a/setup_native/source/win32/wintools/makecab/makecab.c
b/setup_native/source/win32/wintools/makecab/makecab.c
index b822cd6..3cca945 100644
--- a/setup_native/source/win32/wintools/makecab/makecab.c
+++ b/setup_native/source/win32/wintools/makecab/makecab.c
@@ -298,6 +298,8 @@ int main(int argc, char *argv[])
DDFSRCFILE *srcListCurr = NULL;
HFCI fci = NULL;
ERF erf;
+char * cmd = NULL;
+unsigned int cmdSize = 0;
while (argv[1] (argv[1][0] == '-' || argv[1][0] == '/'))
{
@@ -324,44 +326,45 @@ int main(int argc, char *argv[])
}
CabVerb = v;
-srcList = srcListCurr;
-if (ddfFile != NULL)
+if (ddfFile == NULL)
{
-cabLog(CABLOG_MSG, === Parsing directive file \%s\===, ddfFile);
-switch(ParseDdf(ddfFile, ddfVars, srcListCurr, v))
-{
-case DDFERR_UNREAD: cabLog(CABLOG_ERR, Could not open directive
file.); break;
-}
-getcwd(ddfVars.szCabPath, MAX_PATH-1);
-strcat(ddfVars.szCabPath, /);
+cabLog(CABLOG_ERR, No DDF file specified.);
+return 1;
}
-if (srcListCurr != NULL)
+cabLog(CABLOG_MSG, === Parsing directive file \%s\===, ddfFile);
+switch(ParseDdf(ddfFile, ddfVars, srcListCurr, v))
{
-cabLogCCAB(ddfVars);
-fci = FCICreate(erf, fnFilePlaced, fnMemAlloc, fnMemFree, fnOpen,
fnRead,
-fnWrite, fnClose, fnSeek, fnDelete, fnGetTempFile,
ddfVars, NULL);
+case DDFERR_UNREAD: cabLog(CABLOG_ERR, Could not open directive file.);
break;
+}
+getcwd(ddfVars.szCabPath, MAX_PATH-1);
+strcat(ddfVars.szCabPath, /);
-if (fci != NULL)
-{
-cabLog(CABLOG_MSG, === Adding files to cabinet ===);
-for (;srcListCurr != NULL; srcListCurr = srcListCurr-next)
-{
-cabLog(CABLOG_MSG, Adding file: %s%s (%s),
ddfVars.szCabPath, srcListCurr-fileName, srcListCurr-cabName);
-if (!FCIAddFile(fci, srcListCurr-fileName,
srcListCurr-cabName, srcListCurr-extract, fnGetNextCab, fnStatus,
fnGetOpenInfo, srcListCurr-cmpType))
-cabLogErr(erf, A problem occurred while adding a file);
-}
+srcList = srcListCurr;
+if (srcList == NULL)
+{
+cabLog(CABLOG_ERR, No input files were specified.);
+return 2;
+}
-cabLog(CABLOG_MSG, === Flushing the cabinet ===);
-if (!FCIFlushCabinet(fci, FALSE, fnGetNextCab, fnStatus))
-cabLogErr(erf, A problem occurred while flushing the
cabinet);
-FCIDestroy(fci);
-}
-else
-{
-cabLogErr(erf, Could not get FCI context);
-}
+/* Construct system call to lcab */
+for(srcListCurr = srcList; srcListCurr != NULL; srcListCurr =
srcListCurr-next)
+cmdSize += strlen(srcListCurr-fileName) + 1;
+cmdSize += strlen(ddfVars.szCabPath) + strlen(ddfVars.szCab);
+cmdSize += 6; /* room for lcab and \0 */
+cmd = malloc(cmdSize);
+strcpy(cmd, lcab );
+for (srcListCurr = srcList; srcListCurr != NULL; srcListCurr =
srcListCurr-next)
+{
+strcat(cmd, srcListCurr-fileName);
+strcat(cmd, );
}
+strcat(cmd, ddfVars.szCabPath);
+strcat(cmd, ddfVars.szCab);
+
+cabLog(CABLOG_MSG, syscall: %s\n, cmd);
+system(cmd);
+free(cmd);
cabLog(CABLOG_MSG, === Cleaning up resources ===);
/* Free list of cab source files */
@@ -371,5 +374,6 @@ int main(int argc, char *argv[])
free(srcListCurr);
srcListCurr = next;
}
+cabLog(CABLOG_MSG, Cabinet file %s/%s created., ddfVars.szCabPath,
ddfVars.szCab);
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: shiny uno version, events / signals / slots
On Fri, 2012-07-13 at 14:27 +0200, Stephan Bergmann wrote: Sure - tools' IMPL_LINK - would be the broken, degenerate, gross case :-) More attractive versions would be g_signal or Qt's signals slots[1], I've used the rather sweet C# bindings of these too to good effect; boost has a nice implementation as well anyhow checkout: http://en.wikipedia.org/wiki/Signals_and_slots Not sure what improvements you are looking for over UNO's existing listener mechanisms. Ease of declaration, use, type safe argument passing and succinctness. [snip] IDL: event somethingChanged([in] string aName, [in] long nValue); C++ to emit: inteface-somethingChanged.emit( foo, 3 ); C++ to listen: void handleChanged( const rtl::OUString aName, long nValue); ... interface-somethingChanged.connect(mem_func(*this, handleChanged)); [/snip] Where the C++ piece is inspired by the std::sigc bindings - which are somewhat complicated, but potentially re-usable. The above is notably less verbose than the existing DECL_LINK horror, and should work nicely cross-platform too (like sigc). Of course, it would need/want some per-language binding work, and of course it suffers from all the familiar intrinsic thread / ordering problems that all existing listener methods suffer from :-) but that's not new. IMHO that makes a rather pleasant contrast with the existing UNO listener implementation logic - but perhaps I'm missing something there; IIRC you need to declare and implement misc. interfaces on either side, your a custom listener interface, and more (?). ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44628, which changed state. Bug 44628 Summary: unopkg.exe does not find VC runtime during install (extension registration) https://bugs.freedesktop.org/show_bug.cgi?id=44628 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- 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: [FIXED] make check fails in chart2_unoapi (probably hyphen problem)
On Thu, Jul 12, 2012 at 04:36:54PM +0100, Caolán McNamara caol...@redhat.com wrote: Yup, I believe this is now fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=e3ae44e512dc08cce9d9cecaab2be93a94458431 In hyphen upstream I had collapsed an optimized for size X branches with the size = X branch, and it turns out that size = X branch was always wrong. So a great success all round :-), a rare bug became a less rare bug. You rock, make check now passes again here. ;-) Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/odftok/data/empty-svg-family-name.odt |binary
sw/qa/extras/odftok/odftok.cxx |8
2 files changed, 8 insertions(+)
New commits:
commit f7f4e9a823adc20cb4136d7ff6f83b943f23b3b6
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 16:06:56 2012 +0200
add testcase for fc508908f55cc1fe5a22adcba710cebb75fc979c
Change-Id: I02ce120143f94fc477ccabaea8d8d2cbf33af42e
diff --git a/sw/qa/extras/odftok/data/empty-svg-family-name.odt
b/sw/qa/extras/odftok/data/empty-svg-family-name.odt
new file mode 100644
index 000..b4b5516
Binary files /dev/null and b/sw/qa/extras/odftok/data/empty-svg-family-name.odt
differ
diff --git a/sw/qa/extras/odftok/odftok.cxx b/sw/qa/extras/odftok/odftok.cxx
index efbadb3..bb62a18 100644
--- a/sw/qa/extras/odftok/odftok.cxx
+++ b/sw/qa/extras/odftok/odftok.cxx
@@ -33,10 +33,12 @@ class Test : public SwModelTestBase
{
public:
void testHello();
+void testEmptySvgFamilyName();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
CPPUNIT_TEST(testHello);
+CPPUNIT_TEST(testEmptySvgFamilyName);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -56,6 +58,12 @@ void Test::testHello()
CPPUNIT_ASSERT_EQUAL(12, getLength());
}
+void Test::testEmptySvgFamilyName()
+{
+// .odt import did crash on the empty font list (which I think is valid
according SVG spec)
+load( empty-svg-family-name.odt );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-5]: fdo#47071: Undocked toolbars do not show all icons in specia...
From Jan Holesovsky ke...@suse.cz: Jan Holesovsky has submitted this change and it was merged. Change subject: fdo#47071: Undocked toolbars do not show all icons in special ratio .. fdo#47071: Undocked toolbars do not show all icons in special ratio restore the old behaviour (pre-1703501a100cd6d52578baeb4e8097218b285ffb) for floating toolbars. Change-Id: I8435bd94a44744c5af7a3abdbeb99e8f7cf0af24 (cherry picked from commit 89de7eef5090c5efdca1314f8838bdc977001e5d) --- M vcl/source/window/toolbox.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/279 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8435bd94a44744c5af7a3abdbeb99e8f7cf0af24 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/window/toolbox.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 768cb747ee11a85d2f209f46fad95c4d6ce76537
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Jul 9 17:24:54 2012 +0400
fdo#47071: Undocked toolbars do not show all icons in special ratio
restore the old behaviour (pre-1703501a100cd6d52578baeb4e8097218b285ffb)
for floating toolbars.
Change-Id: I8435bd94a44744c5af7a3abdbeb99e8f7cf0af24
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index a055c6a..6e3228b 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2190,7 +2190,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long*
pMaxLineWidth, sal_Bool b
else if ( it-meType == TOOLBOXITEM_SEPARATOR )
{
nCurWidth = it-mnSepSize;
-if ( ( it != lastVisible ) (nLineWidth+nCurWidth+nMenuWidth
nWidthTotal) )
+if ( !ImplIsFloatingMode() ( it != lastVisible )
(nLineWidth+nCurWidth+nMenuWidth nWidthTotal) )
bBreak = sal_True;
}
// treat breaks as separators, except when using old style
toolbars (ie. no menu button)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source cppuhelper/source desktop/source extensions/source fpicker/source l10ntools/source oox/source sc/source shell/source svtools/source ucb/source
connectivity/source/parse/sqlnode.cxx |4 ++--
cppuhelper/source/shlib.cxx | 21 -
desktop/source/app/dispatchwatcher.cxx |6 +++---
extensions/source/plugin/base/nfuncs.cxx|2 +-
fpicker/source/office/ServerDetailsControls.cxx |4 ++--
l10ntools/source/export.cxx |4 ++--
l10ntools/source/merge.cxx |4 ++--
oox/source/drawingml/chart/axisconverter.cxx|2 +-
oox/source/drawingml/chart/seriesconverter.cxx |2 +-
sc/source/filter/xml/xmlcondformat.cxx |6 +++---
sc/source/ui/vba/vbafilesearch.cxx |2 +-
shell/source/backends/gconfbe/gconfaccess.cxx |2 +-
shell/source/tools/lngconvex/lngconvex.cxx |2 +-
svtools/source/contnr/contentenumeration.cxx|2 +-
ucb/source/ucp/webdav/NeonSession.cxx |2 +-
uui/source/iahndl-ssl.cxx |2 +-
vbahelper/source/vbahelper/vbalineformat.cxx|2 +-
17 files changed, 28 insertions(+), 41 deletions(-)
New commits:
commit a7674482254ee996b1c4fee60f3064778be369aa
Author: Christophe JAILLET christophe.jail...@wanadoo.fr
Date: Thu Jul 12 22:10:17 2012 +0200
Search for char instead of 1 char long string, when possible.
It is faster and even avoid memory allocation somtimes.
Change-Id: Ic12ff70e95953de44ef5798131150669d07a5445
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index a2c273d..e2afd6a 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1078,10 +1078,10 @@ OSQLParseNode*
OSQLParser::buildNode_STR_NUM(OSQLParseNode* _pLiteral)
if((aResult.TokenType KParseType::IDENTNAME) aResult.EndPos
== _rValue.getLength())
{
aValue = ::rtl::OUString::valueOf(aResult.Value);
-sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString(.));
+sal_Int32 nPos = aValue.lastIndexOf('.');
if((nPos+_nScale) aValue.getLength())
aValue =
aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString());
-aValue =
aValue.replaceAt(aValue.lastIndexOf(::rtl::OUString(.)),1,s_xLocaleData-getLocaleItem(m_pData-aLocale).decimalSeparator);
+aValue =
aValue.replaceAt(aValue.lastIndexOf('.'),1,s_xLocaleData-getLocaleItem(m_pData-aLocale).decimalSeparator);
return aValue;
}
}
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index fe295b1..1ed73d5 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -434,8 +434,8 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const
DispatchList aDispatch
Reference XStorable xStorable( xDoc, UNO_QUERY );
if ( xStorable.is() ) {
rtl::OUString aParam =
aDispatchRequest.aPrinterName;
-sal_Int32 nPathIndex = aParam.lastIndexOfAsciiL(
;, 1 );
-sal_Int32 nFilterIndex = aParam.indexOfAsciiL(
:, 1 );
+sal_Int32 nPathIndex = aParam.lastIndexOf( ';' );
+sal_Int32 nFilterIndex = aParam.indexOf( ':' );
if( nPathIndex nFilterIndex )
nFilterIndex = -1;
rtl::OUString aFilterOut=aParam.copy( nPathIndex+1
);
@@ -493,7 +493,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const
DispatchList aDispatch
}
} else if ( aDispatchRequest.aRequestType ==
REQUEST_BATCHPRINT ) {
rtl::OUString aParam = aDispatchRequest.aPrinterName;
-sal_Int32 nPathIndex = aParam.lastIndexOfAsciiL( ;,
1 );
+sal_Int32 nPathIndex = aParam.lastIndexOf( ';' );
rtl::OUString aFilterOut;
rtl::OUString aPrinterName;
diff --git a/extensions/source/plugin/base/nfuncs.cxx
b/extensions/source/plugin/base/nfuncs.cxx
index b06665b..b37a1c9 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -142,7 +142,7 @@ NPNetscapeFuncs aNPNFuncs =
static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const
::rtl::OString url )
{
::rtl::OString aLoadURL;
-if( url.indexOf( : ) == -1 )
+if( url.indexOf( ':' ) == -1 )
{
aLoadURL = ::rtl::OUStringToOString( plugin-getCreationURL(),
plugin-getTextEncoding() );
int nPos;
diff --git a/fpicker/source/office/ServerDetailsControls.cxx
b/fpicker/source/office/ServerDetailsControls.cxx
index 69dfa4f..93e02f8 100644
--- a/fpicker/source/office/ServerDetailsControls.cxx
+++
[PUSHED] Search for char instead of 1 char long string, when possible...
From Eike Rathke er...@redhat.com: Eike Rathke has submitted this change and it was merged. Change subject: Search for char instead of 1 char long string, when possible. It is faster and even avoid memory allocation somtimes. .. Search for char instead of 1 char long string, when possible. It is faster and even avoid memory allocation somtimes. Untested as I don't have a working build environment yet. Change-Id: Ic12ff70e95953de44ef5798131150669d07a5445 --- M connectivity/source/parse/sqlnode.cxx M desktop/source/app/dispatchwatcher.cxx M extensions/source/plugin/base/nfuncs.cxx M fpicker/source/office/ServerDetailsControls.cxx M l10ntools/source/export.cxx M l10ntools/source/merge.cxx M oox/source/drawingml/chart/axisconverter.cxx M oox/source/drawingml/chart/seriesconverter.cxx M sc/source/filter/xml/xmlcondformat.cxx M sc/source/ui/vba/vbafilesearch.cxx M shell/source/backends/gconfbe/gconfaccess.cxx M shell/source/tools/lngconvex/lngconvex.cxx M svtools/source/contnr/contentenumeration.cxx M ucb/source/ucp/webdav/NeonSession.cxx M uui/source/iahndl-ssl.cxx M vbahelper/source/vbahelper/vbalineformat.cxx 16 files changed, 24 insertions(+), 24 deletions(-) Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/299 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic12ff70e95953de44ef5798131150669d07a5445 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.6.0 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.0. The upcoming 3.6.0 will be our fourth major release in two years, and comes with a nice set of new features. Please be aware that LibreOffice 3.6.0 RC1 is not ready for production use, you should continue to use LibreOffice 3.5.5 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ The (still growing) list of features for the upcoming 3.6.0 is on our wiki - please help filling gaps there, e.g. by providing more screenshots: http://wiki.documentfoundation.org/ReleaseNotes/3.6 Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://challenge.documentfoundation.org/ A list of known issues and fixed bugs with 3.6.0 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.0/RC1 Please find the list of changes against LibreOffice 3.6.0 Beta3 here: http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-6-release-3.6.0.1.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint pgpUqaM0YXHyu.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: shiny uno version, events / signals / slots
On 07/13/2012 03:53 PM, Michael Meeks wrote: On Fri, 2012-07-13 at 14:27 +0200, Stephan Bergmann wrote: Sure - tools' IMPL_LINK - would be the broken, degenerate, gross case :-) More attractive versions would be g_signal or Qt's signals slots[1], I've used the rather sweet C# bindings of these too to good effect; boost has a nice implementation as well anyhow checkout: http://en.wikipedia.org/wiki/Signals_and_slots Not sure what improvements you are looking for over UNO's existing listener mechanisms. Ease of declaration, use, type safe argument passing and succinctness. [snip] IDL: event somethingChanged([in] string aName, [in] long nValue); C++ to emit: inteface-somethingChanged.emit( foo, 3 ); C++ to listen: void handleChanged( const rtl::OUString aName, long nValue); ... interface-somethingChanged.connect(mem_func(*this, handleChanged)); [/snip] Where the C++ piece is inspired by the std::sigc bindings - which are somewhat complicated, but potentially re-usable. The above is notably less verbose than the existing DECL_LINK horror, and should work nicely cross-platform too (like sigc). ...where DECL_LINK is independent of UNO [...] IMHO that makes a rather pleasant contrast with the existing UNO listener implementation logic - but perhaps I'm missing something there; IIRC you need to declare and implement misc. interfaces on either side, your a custom listener interface, and more (?). Right, what you save compared to current UNO is that on the listener's end you do not need to explicitly implement a specific UNO interface (instead, you only need to explicitly implement a function with a specific signature). So what one would gain is improvement in ease of declaration and use (by increased succinctness). Type safe argument passing would be just as type safe as today. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'update' - check.php
check.php |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit cee1b6ebd6cba8c53fd3d7a5cd744ae9fac7fb03
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jul 13 16:51:49 2012 +0200
Offer update to 3.6.0.1 (RC1).
diff --git a/check.php b/check.php
index 0d82b14..b627fac 100644
--- a/check.php
+++ b/check.php
@@ -130,7 +130,8 @@ $update_versions = array(
# 3.6.0 versions
'1f1cdd8-e28082e-41df8bf-b153627-a97a84' = 'LO-3.6-pre', # 3.6.0 Beta1
'f010139-41cc8cc-da4127d-d2bb4b0-f433b8' = 'LO-3.6-pre', # 3.6.0 Beta2
-#'3e2b862-dd05a58-d67668b-8ec3f67-dfb62d' = 'LO-3.6-pre', # 3.6.0 Beta3
+'3e2b862-dd05a58-d67668b-8ec3f67-dfb62d' = 'LO-3.6-pre', # 3.6.0 Beta3
+#'73f9fb6-115b9dc-d7b744e-21dd070-d656a7' = 'LO-3.6-pre', # 3.6.0 RC1
);
# Descriptions of the target versions
@@ -151,9 +152,9 @@ $update_map = array(
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
-'LO-3.6-pre' = array('gitid' =
'3e2b862-dd05a58-d67668b-8ec3f67-dfb62d',
- 'id' = 'LibreOffice 3.6.0 Beta3',
- 'version' = '3.6.0 Beta3',
+'LO-3.6-pre' = array('gitid' =
'73f9fb6-115b9dc-d7b744e-21dd070-d656a7',
+ 'id' = 'LibreOffice 3.6.0 RC1',
+ 'version' = '3.6.0 RC1',
'update_type' = 'text/html',
'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] Hide information about failure during very early startup a little less
Not that epic early failure should ever happen anyway (cf https://bugs.freedesktop.org/show_bug.cgi?id=51685#c6 crash on start / duplicate component registration issue ...). But if it /does/ happen, http://cgit.freedesktop.org/libreoffice/core/commit/?id=91404d1d379fbdc3b1c7286dafd2519b68b08c97 Hide information about failure during very early startup a little less is a helpless attempt at getting at least a little more useful information than just doesn't start (at least on Linux and Mac OS X, where one could ask an affected user to run soffice from a shell and see if it reports anything to stderr). Please consider for integration into libreoffice-3-6. (I consider the fix very low risk.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
dev/null |binary sw/qa/extras/odfimport/data/empty-svg-family-name.odt |binary 2 files changed New commits: commit 897485d81e4637f3cb98dcfa8431f93f186722aa Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 13 17:21:10 2012 +0200 forgot to rename this one Change-Id: Ia8bb3cad10c8639216f2a15bd4470012f5be6b29 diff --git a/sw/qa/extras/odfimport/data/empty-svg-family-name.odt b/sw/qa/extras/odfimport/data/empty-svg-family-name.odt new file mode 100644 index 000..b4b5516 Binary files /dev/null and b/sw/qa/extras/odfimport/data/empty-svg-family-name.odt differ diff --git a/sw/qa/extras/odftok/data/empty-svg-family-name.odt b/sw/qa/extras/odftok/data/empty-svg-family-name.odt deleted file mode 100644 index b4b5516..000 Binary files a/sw/qa/extras/odftok/data/empty-svg-family-name.odt and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - fpicker/source
fpicker/source/office/PlacesListBox.cxx | 43 +-
fpicker/source/office/PlacesListBox.hxx |5 ++
fpicker/source/office/iodlg.cxx | 73 ++--
fpicker/source/office/iodlg.hrc |3 -
fpicker/source/office/iodlg.hxx |7 ++-
fpicker/source/office/iodlg.src | 24 +++---
fpicker/source/office/iodlgimp.cxx |4 -
fpicker/source/office/iodlgimp.hxx |2
8 files changed, 109 insertions(+), 52 deletions(-)
New commits:
commit f4dcec24a829cf4b6899ee2703ac4181cebb762f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Jul 13 17:16:40 2012 +0200
fpicker: moved + and - buttons in the places list control
It is visually more logical to have them in the control than ouside it
and it also avoids weird display when moving the splitter too far on the
left.
Change-Id: I1183b1e81eb0135d376dce5a728c6be9f4250b19
diff --git a/fpicker/source/office/PlacesListBox.cxx
b/fpicker/source/office/PlacesListBox.cxx
index b870f75..efcf506 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -78,6 +78,8 @@ PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const
rtl::OUString rTit
maPlaces( ),
mpDlg( pFileDlg ),
mpImpl( NULL ),
+mpAddBtn( ),
+mpDelBtn( ),
mnNbEditables( 0 ),
mbUpdated( false ),
mbSelectionChanged( false )
@@ -86,11 +88,23 @@ PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg,
const rtl::OUString rTit
mpImpl-SetSelectHdl( LINK( this, PlacesListBox, Selection ) );
mpImpl-SetDoubleClickHdl( LINK( this, PlacesListBox, DoubleClick ) ) ;
+
+mpAddBtn = new ImageButton( this, 0 );
+mpAddBtn-SetText( rtl::OUString( + ) );
+mpAddBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) );
+mpAddBtn-Show();
+
+mpDelBtn = new ImageButton( this, 0 );
+mpDelBtn-SetText( rtl::OUString( - ) );
+mpDelBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) );
+mpDelBtn-Show();
}
PlacesListBox::~PlacesListBox( )
{
delete mpImpl;
+delete mpAddBtn;
+delete mpDelBtn;
}
void PlacesListBox::AppendPlace( PlacePtr pPlace )
@@ -139,10 +153,31 @@ void PlacesListBox::RemoveSelectedPlace() {
RemovePlace(mpImpl-GetCurrRow());
}
+void PlacesListBox::SetAddHdl( const Link rHdl )
+{
+mpAddBtn-SetClickHdl( rHdl );
+}
+
+void PlacesListBox::SetDelHdl( const Link rHdl )
+{
+mpDelBtn-SetClickHdl( rHdl );
+}
+
+void PlacesListBox::SetDelEnabled( bool enabled )
+{
+mpDelBtn-Enable( enabled );
+}
+
void PlacesListBox::SetSizePixel( const Size rNewSize )
{
Control::SetSizePixel( rNewSize );
-mpImpl-SetSizePixel( rNewSize );
+Size aListSize( rNewSize );
+aListSize.Height() -= 26 + 18;
+mpImpl-SetSizePixel( aListSize );
+
+sal_Int32 nBtnY = rNewSize.Height() - 26;
+mpAddBtn-SetPosPixel( Point( 3, nBtnY ) );
+mpDelBtn-SetPosPixel( Point( 6 + 24, nBtnY ) );
}
Image PlacesListBox::getEntryIcon( PlacePtr pPlace )
diff --git a/fpicker/source/office/PlacesListBox.hxx
b/fpicker/source/office/PlacesListBox.hxx
index 26daca4..f115aba 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -94,6 +94,8 @@ class PlacesListBox : public Control
std::vector PlacePtr maPlaces;
SvtFileDialog* mpDlg;
PlacesListBox_Impl* mpImpl;
+PushButton* mpAddBtn;
+PushButton* mpDelBtn;
sal_Int32mnNbEditables;
bool mbUpdated;
bool mbSelectionChanged;
@@ -109,6 +111,9 @@ class PlacesListBox : public Control
bool IsUpdated();
const std::vectorPlacePtr GetPlaces();
+void SetAddHdl( const Link rHdl );
+void SetDelHdl( const Link rHdl );
+void SetDelEnabled( bool enabled );
void SetSizePixel( const Size rNewSize );
void updateView( );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 84b46e7..6b53152 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -568,14 +568,6 @@ void SvtFileDialog::Init_Impl
_pImp-_pBtnConnectToServer = new PushButton ( this, SvtResId (
BTN_EXPLORERFILE_CONNECT_TO_SERVER ) );
_pImp-_pBtnConnectToServer-SetAccessibleName(
_pImp-_pBtnConnectToServer-GetQuickHelpText() );
-_pImp-_pBtnAddPlace = new PushButton ( this, SvtResId (
BTN_EXPLORERFILE_ADD_PLACE ) );
-_pImp-_pBtnAddPlace-SetAccessibleName(
_pImp-_pBtnAddPlace-GetQuickHelpText() );
-_pImp-_pBtnAddPlace-SetClickHdl( STATIC_LINK ( this, SvtFileDialog,
AddPlacePressed_Hdl ) );
-
-_pImp-_pBtnRemovePlace = new PushButton ( this, SvtResId (
BTN_EXPLORERFILE_REMOVE_PLACE ) );
-_pImp-_pBtnRemovePlace-SetAccessibleName(
_pImp-_pBtnRemovePlace-GetQuickHelpText() );
-_pImp-_pBtnRemovePlace-SetClickHdl( STATIC_LINK (
Re: minutes of ESC call ...
On Fri, 2012-07-13 at 09:36 +0200, Stephan Bergmann wrote: At least in my understanding, firehosing information from gerrit to the ML was not only intended for the advanced reviewer crowd, but also for relative newcomers to the project, where the idea is that the discussion of other people's patches on the ML gave them a sense of how we treat those newcomers' patches, give them opportunity to pick up advice by osmosis, etc. Yep - there is clearly value in that :-) assuming we're kind and helpful to newbies. My concern was that so much of the mail was utterly banal - these: +1 but not merged with no concievably useful comment content, embedded in a huge mess of a mail with duplicated information etc. etc. is clearly just noise. But anyway, you win a little, you loose a little, there's no setup perfect for all. Perhaps having a check-box / setting somewhere to 'send this comment to the list' for when we did a substantive review I guess; or ... some other magic way of both de-cruftifying the E-mails down to just the useful content or ... :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Excel Function Meta Bug?
Hi Joel, On Wednesday, 2012-07-11 15:53:07 -0700, Joel Madero wrote: I'd like to make a meta bug for functions that Excel has but that aren't currently supported or are problematic in Calc. This stems from FDO 47164: https://bugs.freedesktop.org/show_bug.cgi?id=47164 Taking Regina's answer this actually was about https://bugs.freedesktop.org/show_bug.cgi?id=46918 For my takes on this topic see the mail I just sent to you and the QA list. And now we have the situation that cross-posting to multiple lists isn't always a good idea because each list doesn't know how things evolve on the other list, as answers on the QA list apparently did not include the dev list and vice versa. So, I'm including my answer here again: | On Friday, 2012-07-13 07:46:36 -0700, Joel Madero wrote: | | Thanks for responding Eike. Summary is that I was bug triaging and came | across a bug that had a list of functions in excel that are currently not | supported in LO. | | Cross-reading the dev list I found | https://bugs.freedesktop.org/show_bug.cgi?id=46918 | with a nice attachment listing functions. | | 1. Leave excel bugs as is, keep that bug open with the list of functions, | in the comments I'll confirm individual functions as problematic in LO | (harder to track progress, harder for devs to pick up individual functions | out of the list) | | Better close the bug that otherwise would live for months and years and | end up with 300 comments or so that no one would read anyway.. better | add the there attached list (that would be outdated already after the | first function was implemented) to the wiki from which individual bugs | or implementation notes could be linked then. Such implement dozens of | features bugs weren't helpful at any time. | | 2. Leave excel bugs as is, close bug that has so many functions in one, | tell user that we need them as individual bug reports (easier to track | progress this way) | | We really don't need dozens of bugs open one for each function not | implemented. I'd rather prefer to open a bug for a specific function | only once a developer starts to implement it so we can (discuss if | necessary and) refer it in the commit summary when done. Also, if users | open bugs for functions they actually miss in their daily work it helps | us more than doing that ourself in advance for all functions we know. | | 3. Make a meta excel bug just for the functions, then I'll create | individual bugs for each bug listed by the user and make the meta bug | dependent on them (similar to most annoying) | | See above about my take on creating individual bugs, plus I don't see an | advantage in having a meta bug for this unless it would be there to have | a quick listing of its dependents. | | 4. Make a meta excel bug, separate the function bug into individual bug and | make meta bug dependent on ALL excel bugs (not just the functions one from | the original FDO) | | We might also use something like an interoperability whiteboard keyword | or some such to query for instead. | | Well, you may have deduced from my answers that I'm not a friend of meta | bugs, unless they are there to mail a pointer to the dev list like the | most annoying meta bugs. In short, it's ok for me if QA wants to create | a meta bug to track existing things, but opening a bunch of bugs to be | tracked just for the sake of having everything in that we _might_ want | to implement over time of years doesn't make sense to me. | | Michael CC'ed you on it because he said you're currently the go to for | excel compatibility. My argument is that anything to make it easier to be | fully compatible with Excel is a plus if the goal is to convince MS Office | users that we can provide a better product than MS can. | | Specifically when having dozens of bugs open for functions that only | a very minority of users would use anyway it would be counterproductive | pointing potential users to deficiencies they otherwise would even never | have noticed or heard of ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpEfOAVu8lrE.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Excel Function Meta Bug?
I closed the bug as INVALID and put a comment on there. I also will move the list to the wiki, not sure where it's preferred to go or if I'm making a new wiki page. Thanks for the feedback Joel On Fri, Jul 13, 2012 at 8:56 AM, Eike Rathke er...@redhat.com wrote: Hi Joel, On Wednesday, 2012-07-11 15:53:07 -0700, Joel Madero wrote: I'd like to make a meta bug for functions that Excel has but that aren't currently supported or are problematic in Calc. This stems from FDO 47164: https://bugs.freedesktop.org/show_bug.cgi?id=47164 Taking Regina's answer this actually was about https://bugs.freedesktop.org/show_bug.cgi?id=46918 For my takes on this topic see the mail I just sent to you and the QA list. And now we have the situation that cross-posting to multiple lists isn't always a good idea because each list doesn't know how things evolve on the other list, as answers on the QA list apparently did not include the dev list and vice versa. So, I'm including my answer here again: | On Friday, 2012-07-13 07:46:36 -0700, Joel Madero wrote: | | Thanks for responding Eike. Summary is that I was bug triaging and came | across a bug that had a list of functions in excel that are currently not | supported in LO. | | Cross-reading the dev list I found | https://bugs.freedesktop.org/show_bug.cgi?id=46918 | with a nice attachment listing functions. | | 1. Leave excel bugs as is, keep that bug open with the list of functions, | in the comments I'll confirm individual functions as problematic in LO | (harder to track progress, harder for devs to pick up individual functions | out of the list) | | Better close the bug that otherwise would live for months and years and | end up with 300 comments or so that no one would read anyway.. better | add the there attached list (that would be outdated already after the | first function was implemented) to the wiki from which individual bugs | or implementation notes could be linked then. Such implement dozens of | features bugs weren't helpful at any time. | | 2. Leave excel bugs as is, close bug that has so many functions in one, | tell user that we need them as individual bug reports (easier to track | progress this way) | | We really don't need dozens of bugs open one for each function not | implemented. I'd rather prefer to open a bug for a specific function | only once a developer starts to implement it so we can (discuss if | necessary and) refer it in the commit summary when done. Also, if users | open bugs for functions they actually miss in their daily work it helps | us more than doing that ourself in advance for all functions we know. | | 3. Make a meta excel bug just for the functions, then I'll create | individual bugs for each bug listed by the user and make the meta bug | dependent on them (similar to most annoying) | | See above about my take on creating individual bugs, plus I don't see an | advantage in having a meta bug for this unless it would be there to have | a quick listing of its dependents. | | 4. Make a meta excel bug, separate the function bug into individual bug and | make meta bug dependent on ALL excel bugs (not just the functions one from | the original FDO) | | We might also use something like an interoperability whiteboard keyword | or some such to query for instead. | | Well, you may have deduced from my answers that I'm not a friend of meta | bugs, unless they are there to mail a pointer to the dev list like the | most annoying meta bugs. In short, it's ok for me if QA wants to create | a meta bug to track existing things, but opening a bunch of bugs to be | tracked just for the sake of having everything in that we _might_ want | to implement over time of years doesn't make sense to me. | | Michael CC'ed you on it because he said you're currently the go to for | excel compatibility. My argument is that anything to make it easier to be | fully compatible with Excel is a plus if the goal is to convince MS Office | users that we can provide a better product than MS can. | | Specifically when having dozens of bugs open for functions that only | a very minority of users would use anyway it would be counterproductive | pointing potential users to deficiencies they otherwise would even never | have noticed or heard of ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.6.0-rc2 from libreoffice-3-6 branch
Hi, please note that the commit deadline for 3.6.0-rc2 is on Monday, July 16, 2012. IMPORTANT: The tag and branch libreoffice-3-6-0 is going to be created the day after. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#3.6_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] Fix for performance loss due to recalc of volatile cells
Hi Daniel, On Thursday, 2012-07-12 03:46:02 -0500, Daniel Bankston wrote: My changes in the attached diff prevent this from happening, which gives us back our performance. Is this approach ok? I first had the gut feeling that due to the situation commented there // Setting the new token actually forces an empty result at this top // left cell, so have that recalculated. that would leave us with a state of the top left cell of the matrix being undefined or its value not really determined. However, Markus said you had tested that and also a specific case I asked him to check (enter a formula after the document was loaded that refers the top left cell) produced the correct result. Which actually made me wonder ;-) knowing the code of ScFormulaResutl::SetToken() in this case of a matrix. So, after import, is a complete matrix already set as a result when SetMatColsRows() is called? And if so, how? Or are only individual results set at the cells? In which case setting the formula cell's matrix dimension indeed should overwrite the result of the top left cell until that is interpreted. I guess to get a complete grasp of this I'd have to step through such case, but I don't have a build of that branch now. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpK0olwXEa2m.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
sw/source/filter/ww8/docxexport.cxx |6 ++
sw/source/filter/ww8/docxexport.hxx |5 +++--
sw/source/filter/ww8/wrtww8.hxx |2 +-
sw/source/filter/ww8/ww8atr.cxx |2 +-
5 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 15af925c254f27046427de70a59011e2ac3d6bdb
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 18:22:27 2012 +0200
do not write default tab stop into the default style in .docx
Use w:defaultTabStop in w:settings instead.
Change-Id: I7056ff0ee8574fd942e2f330a1f76bae657a825e
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4d14585..773078c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3757,7 +3757,12 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem rTabStop )
sal_uInt16 nCount = rTabStop.Count();
for (sal_uInt16 i = 0; i nCount; i++ )
-impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft );
+{
+if( rTabStop[i].GetAdjustment() != SVX_TAB_ADJUST_DEFAULT )
+impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft );
+else
+GetExport().setDefaultTabStop( rTabStop[i].GetTabPos());
+}
m_pSerializer-endElementNS( XML_w, XML_tabs );
}
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index b6dde35..94dd34f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -678,6 +678,9 @@ void DocxExport::WriteSettings()
rtl::OString
aZoom(rtl::OString::valueOf(sal_Int32(pViewShell-GetViewOptions()-GetZoom(;
pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent),
aZoom.getStr(), FSEND);
+if( settings.defaultTabStop != 0 )
+pFS-singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val
),
+rtl::OString::valueOf( sal_Int32( settings.defaultTabStop
)).getStr(), FSEND );
if( settings.evenAndOddHeaders )
pFS-singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND );
@@ -824,6 +827,7 @@ DocxExport::~DocxExport()
DocxSettingsData::DocxSettingsData()
: evenAndOddHeaders( false )
+, defaultTabStop( 0 )
{
}
@@ -831,6 +835,8 @@ bool DocxSettingsData::hasData() const
{
if( evenAndOddHeaders )
return true;
+if( defaultTabStop != 0 )
+return true;
return false;
}
diff --git a/sw/source/filter/ww8/docxexport.hxx
b/sw/source/filter/ww8/docxexport.hxx
index e71896b..56399e6 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -53,6 +53,7 @@ struct DocxSettingsData
DocxSettingsData();
bool hasData() const; /// returns true if there are any non-default
settings (i.e. something to write)
bool evenAndOddHeaders;
+int defaultTabStop;
};
/// The class that does all the actual DOCX export-related work.
@@ -217,8 +218,8 @@ public:
/// Reference to the VMLExport instance for the main document.
oox::vml::VMLExport VMLExporter();
-/// Data to be exported in the settings part of the document
-DocxSettingsData settingsData();
+/// Set the document default tab stop.
+void setDefaultTabStop( int stop ) { settings.defaultTabStop = stop; }
private:
/// No copying.
commit 7e9e8834b52b684262262b02a86d6a4d5ce07b9c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 16:52:51 2012 +0200
add const
Change-Id: I5c7c88e0359dae9691f4cb70e2ad9a139618e701
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 830aebe..28cda40 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1523,7 +1523,7 @@ public:
/// Get id of the style (rFmt).
sal_uInt16 GetSlot( const SwFmt rFmt ) const;
-SwFmt* GetSwFmt() { return (*pFmtA); }
+const SwFmt* GetSwFmt() const { return (*pFmtA); }
};
sal_Int16 GetWordFirstLineOffset(const SwNumFmt rFmt);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index f00e784..900900e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3650,7 +3650,7 @@ void WW8AttributeOutput::SectionBreak( sal_uInt8 nC,
const WW8_SepInfo* /*pSecti
sal_uInt32 AttributeOutputBase::GridCharacterPitch( const SwTextGridItem
rGrid ) const
{
MSWordStyles * pStyles = GetExport().pStyles;
-SwFmt * pSwFmt = pStyles-GetSwFmt();
+const SwFmt * pSwFmt = pStyles-GetSwFmt();
sal_uInt32 nPageCharSize = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] Do not write default tab stop as custom in .docx
Hello, can somebody please backport http://cgit.freedesktop.org/libreoffice/core/commit/?id=15af925c25 to 3-6? It's consistent with what the RTF export does and otherwise the default style ends up with a custom tab stop. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6] Use paragraph's numbering if explicitly specified (.docx)
Hello, please review and backport http://cgit.freedesktop.org/libreoffice/core/commit/?id=e7ab4bb6b0 for 3-6. When a paragraph refered to a style which referenced a numbering and the paragraph itself did so as well, they were mixed up. PROP_NUMBERING_STYLE_NAME should not be set if PROP_NUMBERING_RULES is set for the paragraph. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/remote' - android/sdremote sd/Library_sd.mk sd/source
android/sdremote/src/org/libreoffice/impressremote/TestClient.java | 17 +-
sd/Library_sd.mk |1
sd/source/ui/remotecontrol/Receiver.cxx| 33 ++--
sd/source/ui/remotecontrol/Receiver.hxx|9 -
sd/source/ui/remotecontrol/Server.cxx | 43 ++---
sd/source/ui/remotecontrol/Server.hxx |5
sd/source/ui/remotecontrol/Transmitter.cxx | 82
++
sd/source/ui/remotecontrol/Transmitter.hxx | 47 +
8 files changed, 191 insertions(+), 46 deletions(-)
New commits:
commit fe02a263c6515e64f291c52f0fe187b098f73bcf
Author: Andrzej J. R. Hunt andr...@ahunt.org
Date: Fri Jul 13 17:34:49 2012 +0100
Transmitter for queuing of messages (Client-Server), fixed protocol.
Change-Id: I Idcf6cf33b75dde2f921bec6c64e394e91994aba0
diff --git a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
index 83f4c71..1b0f749 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
@@ -1,6 +1,5 @@
package org.libreoffice.impressremote;
-import java.util.ArrayList;
import java.util.HashMap;
import org.libreoffice.impressremote.communication.CommunicationService;
@@ -24,7 +23,8 @@ import android.widget.TextView;
public class TestClient extends Activity {
- HashMapInteger, Bitmap aPreviewImages = new HashMapInteger,
Bitmap();
+ private HashMapInteger, Bitmap mPreviewImages = new HashMapInteger,
Bitmap();
+ private boolean mCurrentPreviewImageMissing = false;
private boolean mIsBound = false;
@@ -141,14 +141,23 @@ public class TestClient extends Activity {
case CommunicationService.MSG_SLIDE_CHANGED:
int newSlide = aData.getInt(slide_number);
mSlideLabel.setText(Slide + newSlide);
- // TODO: set slide;
+ if (mPreviewImages.containsKey(newSlide)) {
+
mImageView.setImageBitmap(mPreviewImages.get(newSlide));
+ mCurrentPreviewImageMissing = false;
+ } else {
+ mCurrentPreviewImageMissing = true;
+ }
break;
case CommunicationService.MSG_SLIDE_PREVIEW:
int aSlideNumber = aData.getInt(slide_number);
byte[] aPreviewImage =
aData.getByteArray(preview_image);
Bitmap aBitmap =
BitmapFactory.decodeByteArray(aPreviewImage,
0, aPreviewImage.length);
- aPreviewImages.put(aSlideNumber, aBitmap);
+ mPreviewImages.put(aSlideNumber, aBitmap);
+ if (mCurrentPreviewImageMissing) {
+ mImageView.setImageBitmap(aBitmap);
+ mCurrentPreviewImageMissing = false;
+ }
mImageView.setImageBitmap(aBitmap);
// TODO: remove above line, use slide changed
to show image.
break;
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 9deaefb..2b43a36 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -323,6 +323,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/Server \
sd/source/ui/remotecontrol/Receiver \
sd/source/ui/remotecontrol/Listener \
+sd/source/ui/remotecontrol/Transmitter \
sd/source/ui/slideshow/PaneHider \
sd/source/ui/slideshow/SlideShowRestarter \
sd/source/ui/slideshow/showwin \
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 7b527ac..87eee7f 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -19,6 +19,7 @@
#include xmlsec/base64.h
#include rtl/ustrbuf.hxx
#include sax/tools/converter.hxx
+#include rtl/strbuf.hxx
using namespace sd;
using namespace ::com::sun::star;
@@ -27,16 +28,22 @@ using rtl::OString;
using namespace ::osl;
using namespace std;
-Receiver::Receiver()
+Receiver::Receiver( Transmitter *aTransmitter )
{
+mTransmitter = aTransmitter;
}
Receiver::~Receiver()
{
}
-void Receiver::parseCommand( std::vectorOString aCommand, osl::StreamSocket
aStreamSocket )
+void Receiver::parseCommand( std::vectorOString aCommand )
{
+fprintf( stderr, Parsing:\n);
+for (int i = 0; i
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlexport/data/empty.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15 +++
2 files changed, 15 insertions(+)
New commits:
commit d74b14892486a401682a2b33cd12812354220e59
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 19:20:06 2012 +0200
testcase for the recent fix with (not) exporting default tab stop to style
Change-Id: I112fe5d21ad25b7f37c0ebc08ee28e6efebaa960
diff --git a/sw/qa/extras/ooxmlexport/data/empty.odt
b/sw/qa/extras/ooxmlexport/data/empty.odt
new file mode 100644
index 000..ba68860
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/empty.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e9657dd..96be2a7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -28,6 +28,7 @@
#include ../swmodeltestbase.hxx
#include com/sun/star/frame/XStorable.hpp
+#include com/sun/star/style/TabStop.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
#include unotools/tempfile.hxx
@@ -38,10 +39,12 @@ class Test : public SwModelTestBase
{
public:
void testZoom();
+void defaultTabStopNotInStyles();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
CPPUNIT_TEST(testZoom);
+CPPUNIT_TEST(defaultTabStopNotInStyles);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -76,6 +79,18 @@ void Test::testZoom()
CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue);
}
+void Test::defaultTabStopNotInStyles()
+{
+roundtrip( empty.odt );
+// The default tab stop was mistakenly exported to a style.
+// xray ThisComponent.StyleFamilies(1)(0).ParaTabStop
+uno::Reference container::XNameAccess paragraphStyles = getStyles(
ParagraphStyles );
+uno::Reference beans::XPropertySet properties(
paragraphStyles-getByName( Standard ), uno::UNO_QUERY );
+uno::Sequence style::TabStop stops;
+properties-getPropertyValue( ParaTabStops ) = stops;
+CPPUNIT_ASSERT_EQUAL( 0, stops.getLength());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/qa
sw/qa/extras/README | 19 +++ sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 - sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 75 +-- sw/qa/extras/swmodeltestbase.hxx | 35 ++ sw/qa/extras/ww8export/ww8export.cxx |3 - 5 files changed, 61 insertions(+), 75 deletions(-) New commits: commit 76fd08ed822e791c812dd674265d977a4b3c59bb Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Jul 13 20:18:52 2012 +0200 getParagraph helper Change-Id: I8170f95e01b98db2fe79070dacfd7436e37019a2 diff --git a/sw/qa/extras/README b/sw/qa/extras/README index b65a2b0..75d45bb 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -159,6 +159,11 @@ uno::Referencecontainer::XEnumeration paraEnum = paraEnumAccess-createEnumera // get the 2nd paragraph uno::Referenceuno::XInterface paragraph(paraEnum-nextElement(), uno::UNO_QUERY); +Note that for paragraphs it's easier to use getParagraph(), which gets the given +paragraph (counted from 1) and optionally checks the paragraph text. + +uno::Reference text::XTextRange paragraph = getParagraph( 2, TEXT ) + === XNamedAccess (e.g. get a bookmark named 'position1'): Basic: diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index fab93b1..cfbd45f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -269,22 +269,10 @@ para = enum.NextElement xray para.String xray para.PageStyleName */ -uno::Referencetext::XTextDocument textDocument(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XEnumerationAccess paraEnumAccess(textDocument-getText(), uno::UNO_QUERY); -// list of paragraphs -uno::Referencecontainer::XEnumeration paraEnum = paraEnumAccess-createEnumeration(); -// go to 1st paragraph -(void) paraEnum-nextElement(); -// get the 2nd paragraph -uno::Referenceuno::XInterface paragraph(paraEnum-nextElement(), uno::UNO_QUERY); -// text of the paragraph -uno::Referencetext::XTextRange text(paragraph, uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL( OUString( TEXT1 ), text-getString()); +uno::Referenceuno::XInterface paragraph = getParagraph( 2, TEXT1 ); // we want to test the paragraph is on the first page (it was put onto another page without the fix), // use a small trick and instead of checking the page layout, check the page style -uno::Referencebeans::XPropertySet paragraphProperties(paragraph, uno::UNO_QUERY); -OUString pageStyle; -paragraphProperties-getPropertyValue( PageStyleName ) = pageStyle; +OUString pageStyle = getProperty OUString ( paragraph, PageStyleName ); CPPUNIT_ASSERT_EQUAL( OUString( First Page ), pageStyle ); } @@ -385,24 +373,11 @@ para2 = enum.nextElement xray para2.String xray para2.PageStyleName */ -uno::Referencetext::XTextDocument textDocument(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XEnumerationAccess paraEnumAccess(textDocument-getText(), uno::UNO_QUERY); -// list of paragraphs -uno::Referencecontainer::XEnumeration paraEnum = paraEnumAccess-createEnumeration(); -// go to 1st paragraph -(void) paraEnum-nextElement(); // get the 2nd and 3rd paragraph -uno::Referenceuno::XInterface paragraph1(paraEnum-nextElement(), uno::UNO_QUERY); -uno::Referenceuno::XInterface paragraph2(paraEnum-nextElement(), uno::UNO_QUERY); -uno::Referencetext::XTextRange text1(paragraph1, uno::UNO_QUERY); -uno::Referencetext::XTextRange text2(paragraph2, uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL( OUString( one ), text1-getString()); -CPPUNIT_ASSERT_EQUAL( OUString( two ), text2-getString()); -uno::Referencebeans::XPropertySet paragraphProperties1(paragraph1, uno::UNO_QUERY); -uno::Referencebeans::XPropertySet paragraphProperties2(paragraph2, uno::UNO_QUERY); -OUString pageStyle1, pageStyle2; -paragraphProperties1-getPropertyValue( PageStyleName ) = pageStyle1; -paragraphProperties2-getPropertyValue( PageStyleName ) = pageStyle2; +uno::Referenceuno::XInterface paragraph1 = getParagraph( 2, one ); +uno::Referenceuno::XInterface paragraph2 = getParagraph( 3, two ); +OUString pageStyle1 = getProperty OUString ( paragraph1, PageStyleName ); +OUString pageStyle2 = getProperty OUString ( paragraph2, PageStyleName ); CPPUNIT_ASSERT_EQUAL( OUString( Converted1 ), pageStyle1 ); CPPUNIT_ASSERT_EQUAL( OUString( Converted2 ), pageStyle2 ); @@ -424,24 +399,11 @@ para2 = enum.nextElement xray para2.String xray para2.PageStyleName */ -uno::Referencetext::XTextDocument textDocument(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XEnumerationAccess paraEnumAccess(textDocument-getText(), uno::UNO_QUERY); -// list of paragraphs -uno::Referencecontainer::XEnumeration paraEnum = paraEnumAccess-createEnumeration(); // get the 2nd and 4th paragraph -
[REVIEW-3-6] fix for i#118877, don't remove ScPAtternAttr from doc pool when swapping rows/cols
Hey, [1] is a fix for i#118877. I did not like the idea from the apache bug fix to manipulate the manual ref count and decided to implement a cleaner solution for swapping rows/columns. In case of swapping we don't need all the special cases of ScAttrArray for finding the right place and inserting removing from the doc pool, we can just exchange the two pointers which is faster and does not require manual manipulation of ref counts. Regards, Markus [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=902082656655aeab559c0b5781907ff004179468 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] Fix for performance loss due to recalc of volatile cells
On 07/13/2012 11:14 AM, Eike Rathke wrote: So, after import, is a complete matrix already set as a result when SetMatColsRows() is called? And if so, how? Or are only individual results set at the cells? In which case setting the formula cell's matrix dimension indeed should overwrite the result of the top left cell until that is interpreted. Hi, Eike, During import when the matrix formula cell is encountered, ScMyTables::AddMatrixRange-ScDocument::InsertMatrixFormula calls ScFormulaCell::SetMatColsRows then (InsertMatrixFormula) sets the matrix formula cell (top left) and then the matrix reference cells. http://opengrok.libreoffice.org/xref/core/sc/source/core/data/documen4.cxx#121 . After this, the top left matrix formula result is set with ScFormulaCell::SetHybridString or SetHybridDouble. As the matrix reference cells are encountered during import, their result is also set with ScFormulaCell::SetHybridString or SetHybridDouble. --Daniel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Excel Function Meta Bug?
Hi Joel, On Friday, 2012-07-13 09:00:28 -0700, Joel Madero wrote: I closed the bug as INVALID and put a comment on there. I also will move the list to the wiki, not sure where it's preferred to go or if I'm making a new wiki page. Thanks for the feedback Please create a new page, i.e. http://wiki.documentfoundation.org/Development/Calc/Spreadsheet_Functions and link to it from http://wiki.documentfoundation.org/Development/Calc For overview, in http://wiki.documentfoundation.org/Development/Calc/Spreadsheet_Functions also place pointers to the pages that Regina mentioned in this thread, so we'll have it all in one place. Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpDBacWCIpm2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 37559 pixel artefacts in graphic objects in exported PDF
On Wed, 2012-07-11 at 21:51 +0200, Johannes Sixt wrote: Thanks. The artefacts seem to be connected to VclProcessor2D::RenderPolygonStrokePrimitive2D(). If I comment out all mpOutputDevice-DrawPolyLine() calls in that function, the artefacts vanish (the lines vanish, too, of course). Some antialiasing type thing stuff bleeding out which might go away with the addition of some clipping area. Just a complete guess. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source vcl/source
cui/source/dialogs/about.cxx | 21 +
cui/source/dialogs/about.src |3 ---
vcl/source/app/brand.cxx |3 ++-
3 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 1d5c3861ba788042eecef7610f58956cdf56cb83
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jul 13 15:36:28 2012 +0200
Fix the About dialog rendering when librsvg is not available / functional.
Change-Id: Ib460f3cbf44114ef74065168b218daca51f2f0e9
(cherry picked from commit debfb21c927e39ab18aafb1895f343840967e16a)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21e4592..eff0e6b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -73,7 +73,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
aDescriptionText ( this, ResId( ABOUT_DESCRIPTION_TEXT,
*rId.GetResMgr() ) ),
aCopyrightText ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
-aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr()
) ),
+aLogoImage ( this ),
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS,
*rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE,
*rId.GetResMgr() ) ),
aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr()
) ),
@@ -213,15 +213,20 @@ void AboutDialog::LayoutControls()
Size aDialogSize ( aIdealTextWidth + aDialogBorder * 2, 0);
// Render and Position Logo
+Size aLogoSize( aIdealTextWidth, aIdealTextWidth / 20 );
+Point aLogoPos( aDialogBorder, aDialogBorder );
+
vcl::RenderGraphicRasterizer aRasterizerLogo =
Application::LoadBrandSVG(flat_logo);
-float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
-
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+if ( !aRasterizerLogo.GetRenderGraphic().IsEmpty()
+ aRasterizerLogo.GetDefaultSizePixel().Width() 0
aRasterizerLogo.GetDefaultSizePixel().Height() 0 )
+{
+const float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+aLogoSize = Size( aIdealTextWidth, aIdealTextWidth /
aLogoWidthHeightRatio );
-Size aLogoSize( aIdealTextWidth, aIdealTextWidth / aLogoWidthHeightRatio );
-Point aLogoPos( aDialogBorder, aDialogBorder );
-aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
-aLogoImage.SetImage( Image( aLogoBitmap ) );
-aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
+aLogoImage.SetImage( Image( aLogoBitmap ) );
+aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+}
// Position version text
sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index ab853c6..3793864 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -114,7 +114,4 @@ ModalDialog RID_DEFAULTABOUT
DefButton = TRUE ;
Text [ en-US ] = ~Close;
};
-FixedImage ABOUT_IMAGE_LOGO
-{
-};
};
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index f1c27ac..5113cf0 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -122,8 +122,9 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG
(const char* pName)
aRasterizer = loadSvg ($BRAND_BASE_DIR/program/edition, aName);
if (!aRasterizer.GetRenderGraphic().IsEmpty())
return aRasterizer;
+
aRasterizer = loadSvg ($BRAND_BASE_DIR/program, aName);
-return aRasterizer;
+return aRasterizer;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3.6] About dialog behaving wrong when librsvg not available / functional
On Fri, 2012-07-13 at 15:48 +0200, Jan Holesovsky wrote: Hi, Can we get http://cgit.freedesktop.org/libreoffice/core/commit/?id=debfb21c927e39ab18aafb1895f343840967e16a to 3.6, please? It is mostly an error handling, to still present something reasonable when we fail to load the image. Pushed to 3-6 now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] Extend Database Range Unit test
On Mon, 2012-06-11 at 03:15 -0500, Daniel Bankston wrote: Hi, Markus, I extended the current sc database range unit test to also check xlsx and xls. I mainly did this for when I eventually do more work on EasyHack fdo48140 Marking this as pushed, seeing as it's pushed for ages but I don't seem to have a mail to indicate that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
sw/source/filter/ww8/docxexport.cxx |6 ++
sw/source/filter/ww8/docxexport.hxx |5 +++--
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit d34d2c1a026ce99c3f6e2730efbf8c41dcbcd3e1
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 18:22:27 2012 +0200
do not write default tab stop into the default style in .docx
Use w:defaultTabStop in w:settings instead.
Change-Id: I7056ff0ee8574fd942e2f330a1f76bae657a825e
(cherry picked from commit 15af925c254f27046427de70a59011e2ac3d6bdb)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2d1bb23..4737501 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3788,7 +3788,12 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem rTabStop )
sal_uInt16 nCount = rTabStop.Count();
for (sal_uInt16 i = 0; i nCount; i++ )
-impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft );
+{
+if( rTabStop[i].GetAdjustment() != SVX_TAB_ADJUST_DEFAULT )
+impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft );
+else
+GetExport().setDefaultTabStop( rTabStop[i].GetTabPos());
+}
m_pSerializer-endElementNS( XML_w, XML_tabs );
}
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index de50add..418589d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -687,6 +687,9 @@ void DocxExport::WriteSettings()
rtl::OString
aZoom(rtl::OString::valueOf(sal_Int32(pViewShell-GetViewOptions()-GetZoom(;
pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent),
aZoom.getStr(), FSEND);
+if( settings.defaultTabStop != 0 )
+pFS-singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val
),
+rtl::OString::valueOf( sal_Int32( settings.defaultTabStop
)).getStr(), FSEND );
if( settings.evenAndOddHeaders )
pFS-singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND );
@@ -833,6 +836,7 @@ DocxExport::~DocxExport()
DocxSettingsData::DocxSettingsData()
: evenAndOddHeaders( false )
+, defaultTabStop( 0 )
{
}
@@ -840,6 +844,8 @@ bool DocxSettingsData::hasData() const
{
if( evenAndOddHeaders )
return true;
+if( defaultTabStop != 0 )
+return true;
return false;
}
diff --git a/sw/source/filter/ww8/docxexport.hxx
b/sw/source/filter/ww8/docxexport.hxx
index 8963cd3..c89afc7 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -64,6 +64,7 @@ struct DocxSettingsData
DocxSettingsData();
bool hasData() const; /// returns true if there are any non-default
settings (i.e. something to write)
bool evenAndOddHeaders;
+int defaultTabStop;
};
/// The class that does all the actual DOCX export-related work.
@@ -228,8 +229,8 @@ public:
/// Reference to the VMLExport instance for the main document.
oox::vml::VMLExport VMLExporter();
-/// Data to be exported in the settings part of the document
-DocxSettingsData settingsData();
+/// Set the document default tab stop.
+void setDefaultTabStop( int stop ) { settings.defaultTabStop = stop; }
private:
/// No copying.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] Do not write default tab stop as custom in .docx
On Fri, 2012-07-13 at 18:30 +0200, Lubos Lunak wrote: Hello, can somebody please backport http://cgit.freedesktop.org/libreoffice/core/commit/?id=15af925c25 to 3-6? It's consistent with what the RTF export does and otherwise the default style ends up with a custom tab stop. Seems reasonable, pushed to 3-6. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6] fix for i#118877, don't remove ScPAtternAttr from doc pool when swapping rows/cols
Hi Markus, On Friday, 2012-07-13 20:39:07 +0200, Markus Mohrhard wrote: In case of swapping we don't need all the special cases of ScAttrArray for finding the right place and inserting removing from the doc pool, we can just exchange the two pointers which is faster and does not require manual manipulation of ref counts. But, exchanging pointers works correctly only if both patterns cover exactly one row each, not if one or both apply to more rows. So, while inserting/removing from docpool may not be needed, splitting or merging the area still is. Or what do I miss? I didn't try the patch. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpxsH4ExI3mL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 62a6b49aa78b0d55342e79aad2ebb60d46349b3b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jul 11 12:15:40 2012 +0200
do not let a style override paragraph's numbering
If a paragraph has its own w:numPr, do not let w:pStyle override that.
Change-Id: I7cea0d1c8bf59804f8c56382ee68c7fad5ed3ef6
(cherry picked from commit e7ab4bb6b0e83f0114841e8c5eaa0c5ba0a4)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ac52d07..8634644 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1533,6 +1533,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
{
uno::Any aRules = uno::makeAny( pList-GetNumberingRules(
) );
rContext-Insert( PROP_NUMBERING_RULES, true, aRules );
+// erase numbering from pStyle if already set
+rContext-erase( PropertyDefinition(
PROP_NUMBERING_STYLE_NAME, true ));
}
}
else if ( !m_pImpl-IsStyleSheetImport( ) )
@@ -2990,17 +2992,21 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
const ::rtl::OUString sConvertedStyleName =
pStyleTable-ConvertStyleName( sStringValue, true );
if (m_pImpl-GetTopContext() m_pImpl-GetTopContextType() !=
CONTEXT_SECTION)
m_pImpl-GetTopContext()-Insert( PROP_PARA_STYLE_NAME, true,
uno::makeAny( sConvertedStyleName ));
-const StyleSheetEntryPtr pEntry =
pStyleTable-FindStyleSheetByISTD(sStringValue);
-//apply numbering to paragraph if it was set at the style
-OSL_ENSURE( pEntry.get(), no style sheet found );
-const StyleSheetPropertyMap* pStyleSheetProperties =
dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() :
0);
+//apply numbering to paragraph if it was set at the style, but only if
the paragraph itself
+//does not specify the numbering
+if( rContext-find( PropertyDefinition( PROP_NUMBERING_RULES, true ))
== rContext-end()) // !contains
+{
+const StyleSheetEntryPtr pEntry =
pStyleTable-FindStyleSheetByISTD(sStringValue);
+OSL_ENSURE( pEntry.get(), no style sheet found );
+const StyleSheetPropertyMap* pStyleSheetProperties =
dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() :
0);
-if( pStyleSheetProperties pStyleSheetProperties-GetListId() = 0 )
-rContext-Insert( PROP_NUMBERING_STYLE_NAME, true, uno::makeAny(
-ListDef::GetStyleName(
pStyleSheetProperties-GetListId( ) ) ), false);
+if( pStyleSheetProperties pStyleSheetProperties-GetListId() =
0 )
+rContext-Insert( PROP_NUMBERING_STYLE_NAME, true,
uno::makeAny(
+ListDef::GetStyleName(
pStyleSheetProperties-GetListId( ) ) ), false);
-if( pStyleSheetProperties pStyleSheetProperties-GetListLevel() =
0 )
-rContext-Insert( PROP_NUMBERING_LEVEL, true,
uno::makeAny(pStyleSheetProperties-GetListLevel()), false);
+if( pStyleSheetProperties pStyleSheetProperties-GetListLevel()
= 0 )
+rContext-Insert( PROP_NUMBERING_LEVEL, true,
uno::makeAny(pStyleSheetProperties-GetListLevel()), false);
+}
}
break;
case NS_ooxml::LN_EG_RPrBase_rStyle:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] Use paragraph's numbering if explicitly specified (.docx)
On Fri, 2012-07-13 at 18:36 +0200, Lubos Lunak wrote: Hello, please review and backport http://cgit.freedesktop.org/libreoffice/core/commit/?id=e7ab4bb6b0 PROP_NUMBERING_STYLE_NAME should not be set if PROP_NUMBERING_RULES is set for the paragraph. fair enough, pushed to 3-6. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6] Hide information about failure during very early startup a little less
Hi Stephan, On Friday, 2012-07-13 17:08:54 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=91404d1d379fbdc3b1c7286dafd2519b68b08c97 Pushed to 3-6 with my sign-off http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=8cf61d06e2a3f79514322214743230c489080814 Note that on Windows there isn't stdio for a GUI application, even not when started from a terminal, so we don't win anything there (but also don't lose anything, so ... ;) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpnvhBwDEgV1.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC-UPDATE] Impress Remote
Hi all, The latest from today: -Basic caching of preview images, and image updating on slide change (untested until server starts sending this data). -Added transmitter with command queueing to the server. -Fixed threading and mutex issues in the above. -Fixed protocol parsing bug in the server. -Slight cleanup of the Server/Receiver/Transmitter hierarchy. (-Learned some things about how LO GUIs are written.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/ConversionHelper.cxx | 14 -
writerfilter/source/dmapper/DomainMapper.cxx |2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 34 +-
writerfilter/source/dmapper/GraphicImport.cxx | 10 +++---
writerfilter/source/dmapper/NumberingManager.cxx |5 +--
writerfilter/source/dmapper/SettingsTable.cxx |2 -
writerfilter/source/dmapper/StyleSheetTable.cxx |6 +--
7 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit 424d0fedd55699910830a5a342d54b8516b7b5c7
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 13 22:25:44 2012 +0200
dmapper: drop unnecessary explicit OUString ctors in rebased code
Change-Id: Ibaf2211425ff2ab6fc7647c159ec6b1f095e843a
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 3b89630..9ede979 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -287,7 +287,7 @@ bool lcl_IsNotAM(::rtl::OUString rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of
the string!
aNewFormat[nI] = 'Y';
aNewFormat[nI + 1] = 'Y';
-aNewFormat.insert(nI + 2, ::rtl::OUString(YY));
+aNewFormat.insert(nI + 2, YY);
nLen+=2;
nI+=3;
}
@@ -300,7 +300,7 @@ bool lcl_IsNotAM(::rtl::OUString rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of
the string!
aNewFormat[nI] = 'y';
aNewFormat[nI + 1] = 'y';
-aNewFormat.insert(nI + 2, ::rtl::OUString(yy));
+aNewFormat.insert(nI + 2, yy);
nLen+=2;
nI+=3;
}
@@ -311,7 +311,7 @@ bool lcl_IsNotAM(::rtl::OUString rFmt, sal_Int32 nPos)
// MM We have to escape '/' in case it's used as a char
//todo: this cannot be the right way to replace a part of the
string!
aNewFormat[nI] = '\\';
-aNewFormat.insert(nI + 1, ::rtl::OUString(/));
+aNewFormat.insert(nI + 1, /);
nI++;
nLen++;
}
@@ -324,18 +324,18 @@ bool lcl_IsNotAM(::rtl::OUString rFmt, sal_Int32 nPos)
if (bForceJapanese)
{
-rLocale.Language = ::rtl::OUString(ja);
-rLocale.Country = ::rtl::OUString(JP);
+rLocale.Language = ja;
+rLocale.Country = JP;
}
if (bForceNatNum)
{
-aNewFormat.insert( 0, ::rtl::OUString([NatNum1][$-411]));
+aNewFormat.insert( 0, [NatNum1][$-411]);
}
if (bHijri)
{
-aNewFormat.insert( 0, ::rtl::OUString([~hijri]));
+aNewFormat.insert( 0, [~hijri]);
}
return aNewFormat.makeStringAndClear();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index d6589bb..26cec36 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -113,7 +113,7 @@ LoggedStream(dmapper_logger, DomainMapper),
(comphelper::OStorageHelper::GetStorageOfFormatFromInputStream(OFOPXML_STORAGE_FORMAT_STRING,
xInputStream));
uno::Reference uno::XInterface xTemp =
xContext-getServiceManager()-createInstanceWithContext(
-
::rtl::OUString(com.sun.star.document.OOXMLDocumentPropertiesImporter),
+
com.sun.star.document.OOXMLDocumentPropertiesImporter,
xContext);
uno::Reference document::XOOXMLDocumentPropertiesImporter
xImporter( xTemp, uno::UNO_QUERY_THROW );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e02f53b..ca19d9b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -233,7 +233,7 @@ uno::Reference container::XNameContainer
DomainMapper_Impl::GetPageStyles(
{
uno::Reference style::XStyleFamiliesSupplier xSupplier(
m_xTextDocument, uno::UNO_QUERY );
if (xSupplier.is())
-
xSupplier-getStyleFamilies()-getByName(::rtl::OUString(PageStyles)) =
m_xPageStyles;
+xSupplier-getStyleFamilies()-getByName(PageStyles) =
m_xPageStyles;
}
return m_xPageStyles;
}
@@ -254,7 +254,7 @@ uno::Reference beans::XPropertySet
DomainMapper_Impl::GetDocumentSettings()
if( !m_xDocumentSettings.is() m_xTextFactory.is())
{
m_xDocumentSettings = uno::Reference beans::XPropertySet (
-
m_xTextFactory-createInstance(::rtl::OUString(com.sun.star.document.Settings)),
uno::UNO_QUERY );
+
Question about OUString::compareToAscii
Hi, according to my understanding, OUString::compareToAscii(RTL_CONSTASCII_STRINGPARAM(A string)) gives exactly the same result as OUString::compareToAscii(A string) However, the first one: - is harder to read - uses the deprecated RTL_CONSTASCII_STRINGPARAM macro - is a bit slower If you agree with that, I will provide a patch to clean it. Moreover, and as a 2nd step, I plan to propose a patch that turns: s.compareToAscii(A string) == 0 into s.equalsAscii(A string) and ! s.compareToAscii(A string) into s.equalsAscii(A string) I think that equalsAscii is better because: - shorter - more meaningful - doing some ! on sal_Int32 is not as clean as using sal_Bool directly Do you think that such a clean-up is interesting ? Best regards, Christophe Jaillet ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
