[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/worksheethelper.hxx |1 + sc/source/filter/oox/worksheetfragment.cxx |1 + sc/source/filter/oox/worksheethelper.cxx | 20 3 files changed, 22 insertions(+) New commits: commit 5249a2022aa7152cba5bb6541eade43b9e77b755 Author: Steve Yin stev...@apache.org Date: Fri Dec 27 05:30:08 2013 + Resolves: #i123910# reference in validation condition changed... to #REF! in exported xls file (cherry picked from commit 81912caea58b89f9490ba4b9e3a3127071e23190) Change-Id: Iab560847f4528ffdcc68b365951cc6c55ca9075c diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 9e23161..d93ccc4 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -152,6 +152,7 @@ struct ValidationModel ApiCellRangeListmaRanges; ApiTokenSequencemaTokens1; ApiTokenSequencemaTokens2; +OUString msRef; OUString maInputTitle; OUString maInputMessage; OUString maErrorTitle; diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 927eb2b..81b6411b 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -147,6 +147,7 @@ void DataValidationsContext::importDataValidation( const AttributeList rAttribs { mxValModel.reset( new ValidationModel ); getAddressConverter().convertToCellRangeList( mxValModel-maRanges, rAttribs.getString( XML_sqref, OUString() ), getSheetIndex(), true ); +mxValModel-msRef = rAttribs.getString( XML_sqref, OUString() ); mxValModel-maInputTitle = rAttribs.getXString( XML_promptTitle, OUString() ); mxValModel-maInputMessage = rAttribs.getXString( XML_prompt, OUString() ); mxValModel-maErrorTitle = rAttribs.getXString( XML_errorTitle, OUString() ); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 5974560..47b759d 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1103,6 +1103,26 @@ void WorksheetGlobals::finalizeValidationRanges() const { PropertySet aValProps( xValidation ); +try +{ +sal_Int32 nIndex = 0; +OUString aToken = aIt-msRef.getToken( 0, ' ', nIndex ); + +ReferenceXSpreadsheet xSheet = getSheetFromDoc( getCurrentSheetIndex() ); +ReferenceXCellRange xDBCellRange; +ReferenceXCell xCell; +xDBCellRange = xSheet-getCellRangeByName( aToken ); + +xCell = xDBCellRange-getCellByPosition( 0, 0 ); +ReferenceXCellAddressable xCellAddressable( xCell, UNO_QUERY_THROW ); +CellAddress aFirstCell = xCellAddressable-getCellAddress(); +ReferenceXSheetCondition xCondition( xValidation, UNO_QUERY_THROW ); +xCondition-setSourcePosition( aFirstCell ); +} +catch(const Exception) +{ +} + // convert validation type to API enum ValidationType eType = ValidationType_ANY; switch( aIt-mnType ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 7e/7e0c820f442e3a7ee1b5f6ad80fe7999a75f0b 81/912caea58b89f9490ba4b9e3a3127071e23190
7e/7e0c820f442e3a7ee1b5f6ad80fe7999a75f0b |1 + 81/912caea58b89f9490ba4b9e3a3127071e23190 |1 + 2 files changed, 2 insertions(+) New commits: commit 7666401467c777f9a62c1e705cb5b537e67e8747 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 08:32:31 2013 + Notes added by 'git notes add' diff --git a/81/912caea58b89f9490ba4b9e3a3127071e23190 b/81/912caea58b89f9490ba4b9e3a3127071e23190 new file mode 100644 index 000..ddb4c02 --- /dev/null +++ b/81/912caea58b89f9490ba4b9e3a3127071e23190 @@ -0,0 +1 @@ +merged as: 5249a2022aa7152cba5bb6541eade43b9e77b755 commit 7aeaabcabf0365fa0bb8b05b7dcf829834ef4a13 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 08:32:23 2013 + Notes added by 'git notes add' diff --git a/7e/7e0c820f442e3a7ee1b5f6ad80fe7999a75f0b b/7e/7e0c820f442e3a7ee1b5f6ad80fe7999a75f0b new file mode 100644 index 000..ddb4c02 --- /dev/null +++ b/7e/7e0c820f442e3a7ee1b5f6ad80fe7999a75f0b @@ -0,0 +1 @@ +merged as: 5249a2022aa7152cba5bb6541eade43b9e77b755 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/frame.hxx |2 +- sw/source/core/layout/layact.cxx |2 +- sw/source/core/layout/pagechg.cxx | 12 +++- 3 files changed, 13 insertions(+), 3 deletions(-) New commits: commit 24b89acffeafe4361a63121b8ec2463c97f863e9 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 00:47:02 2013 + valgrind: invalid read on deleted SwPageFrm VALGRIND=memcheck make CppunitTest_sw_ooxmlimport ==2829== Invalid read of size 2 ==2829==at 0x10B9A2CC: SwPageFrm::GetPhyPageNum() const (pagefrm.hxx:191) ==2829==by 0x1107A768: SwLayAction::InternalAction() (layact.cxx:573) ==2829==by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829==by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829==by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829==by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829==by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829==by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829==by 0xFC99A6B: CppUnit::TestCallertestN830205::runTest() (TestCaller.h:166) ==2829==by 0x4CAE1D3: CppUnit::TestCaseMethodFunctor::operator()() const (TestCase.cpp:32) ==2829==by 0xCF009E2: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (unobootstrapprotector.cxx:88) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0xBB0E535: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (unoexceptionprotector.cxx:64) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0x4C97C83: CppUnit::DefaultProtector::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (DefaultProtector.cpp:15) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0x4CA61A3: CppUnit::ProtectorChain::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (ProtectorChain.cpp:77) ==2829==by 0x4CBD3B9: CppUnit::TestResult::protect(CppUnit::Functor const, CppUnit::Test*, std::string const) (TestResult.cpp:181) ==2829==by 0x4CADCA3: CppUnit::TestCase::run(CppUnit::TestResult*) (TestCase.cpp:92) ==2829==by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829==by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829==by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829==by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829==by 0x4CC45A5: CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) (TestRunner.cpp:47) ==2829==by 0x4CBD0C3: CppUnit::TestResult::runTest(CppUnit::Test*) (TestResult.cpp:148) ==2829==by 0x4CC4803: CppUnit::TestRunner::run(CppUnit::TestResult, std::string const) (TestRunner.cpp:96) ==2829==by 0x403F3E: (anonymous namespace)::ProtectedFixtureFunctor::run() const (cppunittester.cxx:150) ==2829==by 0x4045C6: sal_main() (cppunittester.cxx:242) ==2829==by 0x40420E: main (cppunittester.cxx:166) ==2829== Address 0x2b4bbd48 is 312 bytes inside a block of size 320 free'd ==2829==at 0x4A074C4: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==2829==by 0x4F386E7: rtl_freeMemory_SYSTEM(void*) (alloc_global.cxx:276) ==2829==by 0x4F3899E: rtl_freeMemory (alloc_global.cxx:346) ==2829==by 0x4F37494: rtl_cache_free (alloc_cache.cxx:1231) ==2829==by 0x13D7EF6D: FixedMemPool::Free(void*) (mempool.cxx:48) ==2829==by 0x1106890F: SwPageFrm::operator delete(void*, unsigned long) (in /home/caolan/LibreOffice/core/instdir/program/libswlo.so) ==2829==by 0x110A113A: SwPageFrm::~SwPageFrm() (pagechg.cxx:301) ==2829==by 0x110A3713: SwFrm::CheckPageDescs(SwPageFrm*, unsigned char) (pagechg.cxx:1122) ==2829==by 0x1107A717: SwLayAction::InternalAction() (layact.cxx:566) ==2829==by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829==by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829==by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829==by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829==by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829==by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829==by 0xFC99A6B:
[Libreoffice-commits] core.git: sc/source
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b236154c3a664739761c22670729915116c1c74 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 30 10:54:25 2013 +0100 Resolves: fdo#73138 undo name for 'Chi Squared' is different Change-Id: Iedb01a2bd08f56befb351d00cebd0fb20b57def4 diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src index 5af2f07..1ab64d5 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src +++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src @@ -213,7 +213,7 @@ Resource RID_STATISTICS_DLGS }; String STR_DISTRIBUTION_CHI_SQUARED { -Text [ en-US ] = Geometric; +Text [ en-US ] = Chi Squared; }; String STR_DISTRIBUTION_GEOMETRIC { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx |5 + sc/source/ui/inc/CovarianceDialog.hxx |1 + 2 files changed, 6 insertions(+) New commits: commit b104133abe2a377f1397cce3fa6e1bc7d85d4020 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 30 11:37:00 2013 +0100 Resolves: fdo#73137 undo name for 'Covariance' is different Change-Id: I7e151ee99ef644090608fd861c9fae83c3206c1d diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index 432ca46..1054d77 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -28,6 +28,11 @@ ScCovarianceDialog::ScCovarianceDialog( CovarianceDialog, modules/scalc/ui/covariancedialog.ui ) {} +sal_Int16 ScCovarianceDialog::GetUndoNameId() +{ +return STR_COVARIANCE_UNDO_NAME; +} + sal_Bool ScCovarianceDialog::Close() { return DoClose( ScCovarianceDialogWrapper::GetChildWindowId() ); diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 9325af2..8361cd1 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -25,6 +25,7 @@ public: protected: virtual const OUString getLabel(); virtual const OUString getTemplate(); +virtual sal_Int16 GetUndoNameId(); }; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/inc/frame.hxx |2 +- sw/source/core/layout/layact.cxx |2 +- sw/source/core/layout/pagechg.cxx | 12 +++- 3 files changed, 13 insertions(+), 3 deletions(-) New commits: commit 582d3cb9346e0e1c1c3dc3188cd28976ac24e1bf Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 00:47:02 2013 + valgrind: invalid read on deleted SwPageFrm VALGRIND=memcheck make CppunitTest_sw_ooxmlimport ==2829== Invalid read of size 2 ==2829==at 0x10B9A2CC: SwPageFrm::GetPhyPageNum() const (pagefrm.hxx:191) ==2829==by 0x1107A768: SwLayAction::InternalAction() (layact.cxx:573) ==2829==by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829==by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829==by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829==by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829==by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829==by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829==by 0xFC99A6B: CppUnit::TestCallertestN830205::runTest() (TestCaller.h:166) ==2829==by 0x4CAE1D3: CppUnit::TestCaseMethodFunctor::operator()() const (TestCase.cpp:32) ==2829==by 0xCF009E2: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (unobootstrapprotector.cxx:88) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0xBB0E535: (anonymous namespace)::Prot::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (unoexceptionprotector.cxx:64) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0x4C97C83: CppUnit::DefaultProtector::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (DefaultProtector.cpp:15) ==2829==by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829==by 0x4CA61A3: CppUnit::ProtectorChain::protect(CppUnit::Functor const, CppUnit::ProtectorContext const) (ProtectorChain.cpp:77) ==2829==by 0x4CBD3B9: CppUnit::TestResult::protect(CppUnit::Functor const, CppUnit::Test*, std::string const) (TestResult.cpp:181) ==2829==by 0x4CADCA3: CppUnit::TestCase::run(CppUnit::TestResult*) (TestCase.cpp:92) ==2829==by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829==by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829==by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829==by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829==by 0x4CC45A5: CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) (TestRunner.cpp:47) ==2829==by 0x4CBD0C3: CppUnit::TestResult::runTest(CppUnit::Test*) (TestResult.cpp:148) ==2829==by 0x4CC4803: CppUnit::TestRunner::run(CppUnit::TestResult, std::string const) (TestRunner.cpp:96) ==2829==by 0x403F3E: (anonymous namespace)::ProtectedFixtureFunctor::run() const (cppunittester.cxx:150) ==2829==by 0x4045C6: sal_main() (cppunittester.cxx:242) ==2829==by 0x40420E: main (cppunittester.cxx:166) ==2829== Address 0x2b4bbd48 is 312 bytes inside a block of size 320 free'd ==2829==at 0x4A074C4: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==2829==by 0x4F386E7: rtl_freeMemory_SYSTEM(void*) (alloc_global.cxx:276) ==2829==by 0x4F3899E: rtl_freeMemory (alloc_global.cxx:346) ==2829==by 0x4F37494: rtl_cache_free (alloc_cache.cxx:1231) ==2829==by 0x13D7EF6D: FixedMemPool::Free(void*) (mempool.cxx:48) ==2829==by 0x1106890F: SwPageFrm::operator delete(void*, unsigned long) (in /home/caolan/LibreOffice/core/instdir/program/libswlo.so) ==2829==by 0x110A113A: SwPageFrm::~SwPageFrm() (pagechg.cxx:301) ==2829==by 0x110A3713: SwFrm::CheckPageDescs(SwPageFrm*, unsigned char) (pagechg.cxx:1122) ==2829==by 0x1107A717: SwLayAction::InternalAction() (layact.cxx:566) ==2829==by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829==by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829==by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829==by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829==by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829==by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829==by 0xFC99A6B:
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/pptx/cshapes.pptx |binary sd/qa/unit/import-tests.cxx | 26 ++ 2 files changed, 26 insertions(+) New commits: commit ee6eadfc617a1ce3bc2b489523ac713b99482404 Author: Muthu Subramanian sumu...@collabora.com Date: Mon Dec 30 18:05:48 2013 +0530 fdo#72998: Add unit test case. diff --git a/sd/qa/unit/data/pptx/cshapes.pptx b/sd/qa/unit/data/pptx/cshapes.pptx new file mode 100644 index 000..b546206 Binary files /dev/null and b/sd/qa/unit/data/pptx/cshapes.pptx differ diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index cd6f9b0..015b6e1 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -22,6 +22,7 @@ #include rsc/rscsfx.hxx #include svx/svdotext.hxx +#include svx/svdoashp.hxx #include animations/animationnodehelper.hxx #include com/sun/star/drawing/XDrawPage.hpp @@ -57,6 +58,7 @@ public: void testN828390_4(); void testN828390_5(); void testFdo68594(); +void testFdo72998(); CPPUNIT_TEST_SUITE(SdFiltersTest); CPPUNIT_TEST(testDocumentLayout); @@ -71,6 +73,7 @@ public: CPPUNIT_TEST(testN828390_4); CPPUNIT_TEST(testN828390_5); CPPUNIT_TEST(testFdo68594); +CPPUNIT_TEST(testFdo72998); CPPUNIT_TEST_SUITE_END(); }; @@ -389,6 +392,29 @@ void SdFiltersTest::testFdo68594() CPPUNIT_ASSERT_MESSAGE( Placeholder color mismatch, pC-GetValue().GetColor() == 0); } +void SdFiltersTest::testFdo72998() +{ +::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/cshapes.pptx)); +CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() ); +CPPUNIT_ASSERT_MESSAGE( not in destruction, !xDocShRef-IsInDestruction() ); + +SdDrawDocument *pDoc = xDocShRef-GetDoc(); +CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL ); +const SdrPage *pPage = pDoc-GetPage(1); +CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL ); +{ +SdrObjCustomShape *pObj = dynamic_castSdrObjCustomShape *(pPage-GetObj(2)); +const SdrCustomShapeGeometryItem rGeometryItem = (const SdrCustomShapeGeometryItem)pObj-GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); +CPPUNIT_ASSERT_MESSAGE( not a custom shape, pObj ); +const ::com::sun::star::uno::Any* pViewBox = ((SdrCustomShapeGeometryItem)rGeometryItem).GetPropertyValueByName( OUString( ViewBox ) ); +CPPUNIT_ASSERT_MESSAGE( Missing ViewBox, pViewBox ); +com::sun::star::awt::Rectangle aViewBox; +CPPUNIT_ASSERT( (*pViewBox = aViewBox ) ); +CPPUNIT_ASSERT_MESSAGE( Width should be zero - for forcing scale to 1, !aViewBox.Width ); +CPPUNIT_ASSERT_MESSAGE( Height should be zero - for forcing scale to 1, !aViewBox.Height ); +} +} + void SdFiltersTest::testFdo64512() { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc(/sd/qa/unit/data/fdo64512.odp)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/exportdata/rtf/pass/fdo70624.odt |binary sw/source/filter/ww8/rtfexport.cxx |6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 8591de009a4fed6264f236bbcafb2accae70754f Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Dec 30 14:14:38 2013 +0100 Related: fdo#70624 RTF export: fix crash when header contains a page break I don't even try to imagine how such a thing can be created and/or how layout should handle that; but it turns out that the ODT bugdoc indeed contains a fo:break-before=page in the header, and we at least should not crash on it. Fix the problem by simple moving the init of m_pSections before the WritePageDescTable() call. Change-Id: If414e2f6184c58fcfd8b761d3b43fa0fc22d3903 diff --git a/sw/qa/core/exportdata/rtf/pass/fdo70624.odt b/sw/qa/core/exportdata/rtf/pass/fdo70624.odt new file mode 100644 index 000..1b177e8 Binary files /dev/null and b/sw/qa/core/exportdata/rtf/pass/fdo70624.odt differ diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 89539ea..5113f93 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -525,6 +525,9 @@ void RtfExport::ExportDocument_Impl() // Record changes? if (nsRedlineMode_t::REDLINE_ON mnRedlineMode) Strm() OOO_STRING_SVTOOLS_RTF_REVISIONS; +// Init sections +m_pSections = new MSWordSections( *this ); + // Page description WritePageDescTable(); @@ -693,9 +696,6 @@ void RtfExport::ExportDocument_Impl() Strm() SAL_NEWLINE_STRING; -// Init sections -m_pSections = new MSWordSections( *this ); - WriteMainText(); Strm() '}'; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: internal compiler error: in connect_traces, at dwarf2cfi.c:2676
Hello, works fine by me. Did you try with another compiler / compiler version ? I have gcc version 4.7.2 20130108 [gcc-4_7-branch revision 195012] (SUSE Linux) and last commit in master being: d8dedc775cedf0e9daf9284bc7e3a0331ccd2963 EMF+: Integer coordinate values are signed. regards Pierre-André On 12/28/2013 10:52 AM, mcmurchy1917-libreoff...@yahoo.co.uk wrote: Quite early on in compilling LO I get the following error. Any suggestions on how to resolve. It seems to suggest it's a problem with gcc not with LO. /usr/bin/make -j 2 -rs -f /home/libreoffice/Downloads/core/Makefile.gbuild \ \ \ \ all [build DEP] LNK:Library/libbasegfxlo.so [build DEP] LNK:Library/libucbhelper.so [build LNK] Library/libucbhelper.so [build CXX] basegfx/source/polygon/b2dsvgpolypolygon.cxx [build CXX] basegfx/source/polygon/b3dpolygontools.cxx [build CXX] basegfx/source/polygon/b3dpolypolygon.cxx /home/libreoffice/Downloads/core/basegfx/source/polygon/b2dsvgpolypolygon.cx x: In function 'rtl::OUString basegfx::tools::exportToSvgD(const basegfx::B2DPolyPolygon, bool, bool, bool)': /home/libreoffice/Downloads/core/basegfx/source/polygon/b2dsvgpolypolygon.c xx:935:9: internal compiler error: in connect_traces, at dwarf2cfi.c:2676 } ^ Please submit a full bug report, with preprocessed source if appropriate. See http://gcc.gnu.org/bugs.html for instructions. make[1]: *** [/home/libreoffice/Downloads/core/workdir/CxxObject/basegfx/source/polygon/ b2dsvgpolypolygon.o] Error 1 make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 Alex ___ 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
Testing Firebird SDBC
I would like to join in the testing of the Firebird SDBC as I have been using both Firebird and OO/LO for many years and very happy to see them being properly integrated. Although I have been getting on well with the embedded files (i.e. fdb embedded in odb), I can't work out the URL format for connecting with a server using the Firebird File option in connect to an existing database. Thanks... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk|1 sc/inc/helpids.h|3 sc/inc/sc.hrc |2 sc/source/ui/inc/solveroptions.hxx | 12 - sc/source/ui/miscdlgs/solveroptions.cxx | 73 -- sc/source/ui/src/solveroptions.src | 92 sc/uiconfig/scalc/ui/solveroptionsdialog.ui | 200 8 files changed, 237 insertions(+), 147 deletions(-) New commits: commit 9f5df4cda93eb470fb79fc4b8014d9a6dde2284b Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 16:03:09 2013 + convert solver options dialog to .ui Change-Id: I319210233dd1b71f6e717c7322b953de8f093150 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 9bf3000..96be8cb 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/hdrcont.src \ sc/source/ui/src/scerrors.src \ sc/source/ui/src/simpref.src \ -sc/source/ui/src/solveroptions.src \ sc/source/ui/src/miscdlgs.src \ sc/source/ui/src/scstring.src \ sc/source/ui/src/filter.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 2473b25..e5dff59 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/sidebarnumberformat \ sc/uiconfig/scalc/ui/sidebarcellappearance \ sc/uiconfig/scalc/ui/solverdlg \ + sc/uiconfig/scalc/ui/solveroptionsdialog \ sc/uiconfig/scalc/ui/solverprogressdialog \ sc/uiconfig/scalc/ui/solversuccessdialog \ sc/uiconfig/scalc/ui/sortcriteriapage \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index e13c082..67c6156 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -160,9 +160,6 @@ #define HID_SC_DPDATEGROUP_LB SC_HID_SC_DPDATEGROUP_LB #define HID_SC_DPSHOWDETAIL SC_HID_SC_DPSHOWDETAIL -#define HID_SC_SOLVEROPTIONS SC_HID_SC_SOLVEROPTIONS -#define HID_SC_SOLVEROPTIONS_LB SC_HID_SC_SOLVEROPTIONS_LB - #define HID_SCDLG_CONFLICTS SC_HID_SCDLG_CONFLICTS #define HID_SC_HF_HL_DEFINED SC_HID_SC_HF_HL_DEFINED diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 7230fee..b592b51 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1093,8 +1093,6 @@ #define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136) #define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137) -#define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139) - #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145) #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146) #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148) diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 5ce5ec7..74925d7 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -37,15 +37,9 @@ namespace com { namespace sun { namespace star { class ScSolverOptionsDialog : public ModalDialog { -FixedText maFtEngine; -ListBox maLbEngine; -FixedText maFtSettings; -SvxCheckListBox maLbSettings; -PushButton maBtnEdit; -FixedLine maFlButtons; -HelpButton maBtnHelp; -OKButtonmaBtnOk; -CancelButtonmaBtnCancel; +ListBox* m_pLbEngine; +SvxCheckListBox* m_pLbSettings; +PushButton* m_pBtnEdit; SvLBoxButtonData* mpCheckButtonData; com::sun::star::uno::SequenceOUString maImplNames; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 256f334..94e53b3 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -113,32 +113,27 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, const uno::SequenceOUString rDescriptions, const OUString rEngine, const uno::Sequencebeans::PropertyValue rProperties ) -: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ), -maFtEngine ( this, ScResId( FT_ENGINE ) ), -maLbEngine ( this, ScResId( LB_ENGINE ) ), -maFtSettings( this, ScResId( FT_SETTINGS ) ), -maLbSettings( this, ScResId( LB_SETTINGS ) ), -maBtnEdit ( this, ScResId( BTN_EDIT ) ), -maFlButtons ( this, ScResId( FL_BUTTONS ) ), -maBtnHelp ( this, ScResId( BTN_HELP ) ), -maBtnOk ( this, ScResId( BTN_OK ) ), -maBtnCancel ( this, ScResId( BTN_CANCEL ) ), -mpCheckButtonData( NULL ), -maImplNames( rImplNames ), -maDescriptions(
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1a1dc8e5ba108e8973db5b95669bf882d4fcc67 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 16:10:01 2013 + Updated core Project: help 79adf10df7c9382177253ade928081b3c6de699c diff --git a/helpcontent2 b/helpcontent2 index df73415..79adf10 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit df73415915aa0159b7e1d4eb949b738e00044915 +Subproject commit 79adf10df7c9382177253ade928081b3c6de699c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|2 -- source/text/scalc/01/solver_options.xhp |7 --- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit 79adf10df7c9382177253ade928081b3c6de699c Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 16:10:01 2013 + update help ids for solver options dialog .ui conversion Change-Id: I24e84bc445d384901c0cec5a44211ebcfbdb983a diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1f3bb10..d3787d0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3121,8 +3121,6 @@ HID_SC_SHEET_CELL_UEB,58781, HID_SC_SHEET_CELL_UEB1,58782, HID_SC_SHEET_PAGE_REP,58789, HID_SC_SHEET_PAGE_STD,58788, -HID_SC_SOLVEROPTIONS,59016, -HID_SC_SOLVEROPTIONS_LB,59017, HID_SC_SORT_ACTION,58985, HID_SC_SORT_AUTHOR,58986, HID_SC_SORT_COMMENT,58988, diff --git a/source/text/scalc/01/solver_options.xhp b/source/text/scalc/01/solver_options.xhp index 3840b3f..91c2029 100644 --- a/source/text/scalc/01/solver_options.xhp +++ b/source/text/scalc/01/solver_options.xhp @@ -29,14 +29,15 @@ /topic /meta body +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/solveroptionsdialog/SolverOptionsDialog id=bm_id7214271 localize=false/ paragraph role=heading id=hd_id2794274 xml-lang=en-US level=1 l10n=NEWOptions/paragraph paragraph role=paragraph id=par_id6776940 xml-lang=en-US l10n=NEWThe Options dialog for the link href=text/scalc/01/solver.xhpSolver/link is used to set some options./paragraph section id=howtoget embed href=text/scalc/00/0406.xhp#solver_options/ /sectioncommentsolver engine/comment -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE id=bm_id7214270 localize=false/paragraph role=paragraph id=par_id393993 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions./ahelp/paragraphcommentsettings/comment -bookmark xml-lang=en-US branch=hid/SC_HID_SC_SOLVEROPTIONS_LB id=bm_id1331217 localize=false/paragraph role=paragraph id=par_id5871761 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenConfigure the current solver./ahelp/paragraphcommentedit/comment -bookmark xml-lang=en-US branch=hid/sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT id=bm_id2186346 localize=false/paragraph role=paragraph id=par_id6531266 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenIf the current entry in the Settings listbox allows to edit a value, you can click the Edit button. A dialog opens where you can change the value./ahelp/paragraphcommentedit settings spin box/comment +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/solveroptionsdialog/engine id=bm_id7214270 localize=false/paragraph role=paragraph id=par_id393993 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions./ahelp/paragraphcommentsettings/comment +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/solveroptionsdialog/settings id=bm_id1331217 localize=false/paragraph role=paragraph id=par_id5871761 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenConfigure the current solver./ahelp/paragraphcommentedit/comment +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/solveroptionsdialog/edit id=bm_id2186346 localize=false/paragraph role=paragraph id=par_id6531266 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenIf the current entry in the Settings listbox allows to edit a value, you can click the Edit button. A dialog opens where you can change the value./ahelp/paragraphcommentedit settings spin box/comment bookmark xml-lang=en-US branch=hid/modules/scalc/ui/doubledialog/DoubleDialog id=bm_id2761315 localize=false/ bookmark xml-lang=en-US branch=hid/modules/scalc/ui/integerdialog/IntegerDialog id=bm_id2761314 localize=false/paragraph role=paragraph id=par_id3912778 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter or change the value./ahelp/paragraph paragraph role=paragraph id=par_id3163853 xml-lang=en-US l10n=NEWUse the Options dialog to configure the current solver engine./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice most popular spam posts
Here's the list of spam posts in October, 2011. (The subject has [Libreoffice] at the start.) http://lists.freedesktop.org/archives/libreoffice/2011-October/018941.html http://lists.freedesktop.org/archives/libreoffice/2011-October/018951.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019110.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019148.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019169.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019199.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019250.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019251.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019260.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019262.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019289.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019301.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019384.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019412.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019414.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019458.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019459.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019535.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019612.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019697.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019757.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019840.html http://lists.freedesktop.org/archives/libreoffice/2011-October/019868.html -- Tae-Wong Seo Korea, Republic of ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source
cui/source/customize/selector.cxx | 28 + cui/source/inc/selector.hxx|8 +++ cui/uiconfig/ui/macroselectordialog.ui | 15 + extras/source/glade/libreoffice-catalog.xml.in |6 + 4 files changed, 41 insertions(+), 16 deletions(-) New commits: commit f42d83b986fda93ba54222b730eacd5d253fdae7 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 16:24:51 2013 + add borders to macro/configuration listboxes Change-Id: Ia028b19fa0e0eae0bb5e3cbc63bde2fac0785ef2 diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index ea8f32c..bb37627 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -73,8 +73,8 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent) -: SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP) +SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nStyle) +: SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP) , pCurEntry(0) , m_pDraggingEntry(0) { @@ -86,9 +86,15 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent) LINK( this, SvxConfigFunctionListBox, TimerHdl ) ); } -extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap ) +extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap rMap) { -return new SvxConfigFunctionListBox(pParent); +WinBits nWinBits = WB_TABSTOP; + +OString sBorder = VclBuilder::extractCustomProperty(rMap); +if (!sBorder.isEmpty()) + nWinBits |= WB_BORDER; + +return new SvxConfigFunctionListBox(pParent, nWinBits); } SvxConfigFunctionListBox::~SvxConfigFunctionListBox() @@ -187,8 +193,8 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent) -: SvTreeListBox(pParent, +SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) +: SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP) , m_bShowSlots(false) , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) @@ -206,9 +212,15 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent) ); } -extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap ) +extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap rMap) { -return new SvxConfigGroupListBox(pParent); +WinBits nWinBits = WB_TABSTOP; + +OString sBorder = VclBuilder::extractCustomProperty(rMap); +if (!sBorder.isEmpty()) + nWinBits |= WB_BORDER; + +return new SvxConfigGroupListBox(pParent, nWinBits); } SvxConfigGroupListBox::~SvxConfigGroupListBox() diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 9243010..fc10f54 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,8 +100,8 @@ friend class SvxConfigGroupListBox; virtual voidMouseMove( const MouseEvent rMEvt ); public: -SvxConfigFunctionListBox(Window* pParent); -~SvxConfigFunctionListBox(); +SvxConfigFunctionListBox(Window* pParent, WinBits nStyle); +~SvxConfigFunctionListBox(); voidClearAll(); OUStringGetHelpText( SvTreeListEntry *pEntry ); using Window::GetHelpText; @@ -161,8 +161,8 @@ protected: using SvListView::Expand; public: -SvxConfigGroupListBox(Window* pParent); -~SvxConfigGroupListBox(); +SvxConfigGroupListBox(Window* pParent, WinBits nStyle); +~SvxConfigGroupListBox(); voidInit(bool bShowSlots, const ::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame xFrame); diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index 1734426..5a2278d 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=MacroSelectorDialog property name=can_focusFalse/property property name=border_width6/property @@ -150,11 +151,14 @@ property name=top_padding6/property
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3bd52d8db21ca6a6e2b9d3edf533eebde55e7325 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 30 10:54:25 2013 +0100 Resolves: fdo#73138 undo name for 'Chi Squared' is different Change-Id: Iedb01a2bd08f56befb351d00cebd0fb20b57def4 Reviewed-on: https://gerrit.libreoffice.org/7231 Reviewed-by: Joren De Cuyper jore...@libreoffice.org Reviewed-by: Winfried Donkers winfrieddonk...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src index 26f7ace..dc180ca 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src +++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src @@ -213,7 +213,7 @@ Resource RID_STATISTICS_DLGS }; String STR_DISTRIBUTION_CHI_SQUARED { -Text [ en-US ] = Geometric; +Text [ en-US ] = Chi Squared; }; String STR_DISTRIBUTION_GEOMETRIC { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx |5 + sc/source/ui/inc/CovarianceDialog.hxx |1 + 2 files changed, 6 insertions(+) New commits: commit 82704f66b723cf8e3aafdb92cb74e5ec9cf9c636 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 30 11:37:00 2013 +0100 Resolves: fdo#73137 undo name for 'Covariance' is different Change-Id: I7e151ee99ef644090608fd861c9fae83c3206c1d Reviewed-on: https://gerrit.libreoffice.org/7232 Reviewed-by: Winfried Donkers winfrieddonk...@libreoffice.org Reviewed-by: Tomaž Vajngerl qui...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index 432ca46..1054d77 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -28,6 +28,11 @@ ScCovarianceDialog::ScCovarianceDialog( CovarianceDialog, modules/scalc/ui/covariancedialog.ui ) {} +sal_Int16 ScCovarianceDialog::GetUndoNameId() +{ +return STR_COVARIANCE_UNDO_NAME; +} + sal_Bool ScCovarianceDialog::Close() { return DoClose( ScCovarianceDialogWrapper::GetChildWindowId() ); diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 9325af2..8361cd1 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -25,6 +25,7 @@ public: protected: virtual const OUString getLabel(); virtual const OUString getTemplate(); +virtual sal_Int16 GetUndoNameId(); }; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: internal compiler error: in connect_traces, at dwarf2cfi.c:2676
Thanks for all the replys. It seems I may have became a victim of a regression in gcc http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 which helped me with this statement - it breaks with -march=i686 but works with -march=i586. I then noticed I hadn't set these flags - export LDFLAGS= export CXXFLAGS=-march=i486 -mtune=i486 export CFLAGS=-march=i486 -mtune=i486 Once I'd set the flags the compile went through to a successful conclusion Thanks to all. Alex On Saturday 28 Dec 2013 13:08:10 Pierre-André Jacquod wrote: Hello, works fine by me. Did you try with another compiler / compiler version ? I have gcc version 4.7.2 20130108 [gcc-4_7-branch revision 195012] (SUSE Linux) and last commit in master being: d8dedc775cedf0e9daf9284bc7e3a0331ccd2963 EMF+: Integer coordinate values are signed. regards Pierre-André On 12/28/2013 10:52 AM, mcmurchy1917-libreoff...@yahoo.co.uk wrote: Quite early on in compilling LO I get the following error. Any suggestions on how to resolve. It seems to suggest it's a problem with gcc not with LO. /usr/bin/make -j 2 -rs -f /home/libreoffice/Downloads/core/Makefile.gbuild \ \ \ \ all [build DEP] LNK:Library/libbasegfxlo.so [build DEP] LNK:Library/libucbhelper.so [build LNK] Library/libucbhelper.so [build CXX] basegfx/source/polygon/b2dsvgpolypolygon.cxx [build CXX] basegfx/source/polygon/b3dpolygontools.cxx [build CXX] basegfx/source/polygon/b3dpolypolygon.cxx /home/libreoffice/Downloads/core/basegfx/source/polygon/b2dsvgpolypolyg on .cx x: In function 'rtl::OUString basegfx::tools::exportToSvgD(const basegfx::B2DPolyPolygon, bool, bool, bool)': /home/libreoffice/Downloads/core/basegfx/source/polygon/b2dsvgpolypolyg on .c xx:935:9: internal compiler error: in connect_traces, at dwarf2cfi.c:2676 } ^ Please submit a full bug report, with preprocessed source if appropriate. See http://gcc.gnu.org/bugs.html for instructions. make[1]: *** [/home/libreoffice/Downloads/core/workdir/CxxObject/basegfx/source/polygo n/ b2dsvgpolypolygon.o] Error 1 make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 Alex ___ 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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/01/02230402.xhp |4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit aa41fc224274b62fd03c2a0581435cc001e30f16 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 17:09:26 2013 + update help ids for simple ref dialog .ui conversion Change-Id: I94ad17bd427faa5436dccb23971dddf7bb30a9b0 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index d3787d0..50f4528 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6003,7 +6003,6 @@ sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943, sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326, sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328, -sc_Edit_RID_SCDLG_SIMPLEREF_ED_ASSIGN,2568996875, sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637, sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233, sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, @@ -6019,7 +6018,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484, sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672, -sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604, sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, @@ -6070,7 +6068,6 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056, sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, -sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, diff --git a/source/text/shared/01/02230402.xhp b/source/text/shared/01/02230402.xhp index a54e984..c0ed902 100644 --- a/source/text/shared/01/02230402.xhp +++ b/source/text/shared/01/02230402.xhp @@ -86,7 +86,7 @@ /case /switch bookmark xml-lang=en-US branch=hid/sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN id=bm_id3147230 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN id=bm_id3151044 localize=false/paragraph role=heading id=hd_id3159149 xml-lang=en-US level=3 l10n=U oldref=20switchinline select=applcaseinline select=CALCShrink/Max +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/simplerefdialog/SimpleRefDialog id=bm_id3151044 localize=false/paragraph role=heading id=hd_id3159149 xml-lang=en-US level=3 l10n=U oldref=20switchinline select=applcaseinline select=CALCShrink/Max /caseinline/switchinline/paragraph switch select=appl case select=CALCtable id=tbl_id3158407 @@ -97,7 +97,7 @@ /image/paragraph /tablecell tablecell colspan= rowspan= -paragraph role=paragraph id=par_id3147287 xml-lang=en-US l10n=U oldref=21ahelp hid=SC:IMAGEBUTTON:RID_SCDLG_SIMPLEREF:RB_ASSIGNSelect the range of cells that you want to use as a filter, and then click this button to return to the filter list./ahelp/paragraph +paragraph role=paragraph id=par_id3147287 xml-lang=en-US l10n=U oldref=21ahelp hid=modules/scalc/ui/simplerefdialog/SimpleRefDialogSelect the range of cells that you want to use as a filter, and then click this button to return to the filter list./ahelp/paragraph /tablecell /tablerow /table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
helpcontent2|2 sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk|1 sc/inc/sc.hrc |1 sc/source/ui/inc/simpref.hrc| 30 -- sc/source/ui/inc/simpref.hxx| 11 +- sc/source/ui/miscdlgs/simpref.cxx | 68 +++ sc/source/ui/src/simpref.src| 73 sc/uiconfig/scalc/ui/simplerefdialog.ui | 139 9 files changed, 177 insertions(+), 149 deletions(-) New commits: commit bce780ded4459ed3b20fceda7fd8f1b0523b5227 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 16:53:35 2013 + convert simple reference dialog to .ui Change-Id: I4e58c86aa85b2e1639a047b07156b62c9900153c diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 96be8cb..cfc913c 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/sc.src \ sc/source/ui/src/hdrcont.src \ sc/source/ui/src/scerrors.src \ -sc/source/ui/src/simpref.src \ sc/source/ui/src/miscdlgs.src \ sc/source/ui/src/scstring.src \ sc/source/ui/src/filter.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index e5dff59..7ab5ca2 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -136,6 +136,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/sidebaralignment \ sc/uiconfig/scalc/ui/sidebarnumberformat \ sc/uiconfig/scalc/ui/sidebarcellappearance \ + sc/uiconfig/scalc/ui/simplerefdialog \ sc/uiconfig/scalc/ui/solverdlg \ sc/uiconfig/scalc/ui/solveroptionsdialog \ sc/uiconfig/scalc/ui/solverprogressdialog \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b592b51..1f38832 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1078,7 +1078,6 @@ #define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123) #define RID_SCPAGE_OPREDLINE(SC_DIALOGS_START + 124) -#define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) #define WID_SIMPLE_REF (SC_DIALOGS_START + 126) #define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc deleted file mode 100644 index 28262a7..000 --- a/sc/source/ui/inc/simpref.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include sc.hrc - -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_HELP4 -#define FT_ASSIGN 10 -#define ED_ASSIGN 11 -#define RB_ASSIGN 12 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index f8a113f..71ff5bc 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -45,13 +45,12 @@ private: LinkaAbortedHdl; LinkaChangeHdl; -FixedText aFtAssign; -formula::RefEditaEdAssign; -formula::RefButton aRbAssign; +FixedText* m_pFtAssign; +formula::RefEdit* m_pEdAssign; +formula::RefButton* m_pRbAssign; -OKButtonaBtnOk; -CancelButtonaBtnCancel; -HelpButton aBtnHelp; +OKButton* m_pBtnOk; +CancelButton* m_pBtnCancel; ScDocument* pDoc; diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 502b37d..69ba3a3 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -24,7 +24,6 @@ #include document.hxx #include scresid.hxx #include globstr.hrc -#include simpref.hrc #include rangenam.hxx #include simpref.hxx #include scmod.hxx @@ -37,33 +36,28 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -// -// class ScSimpleRefDlg -
[Bug 49168] Create a bugzilla bot that warns about changing the version field to something newer
https://bugs.freedesktop.org/show_bug.cgi?id=49168 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED CC||jore...@libreoffice.org --- Comment #4 from Jorendc jore...@libreoffice.org --- This is implemented :-). So lets close this one. -- 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] core.git: 4 commits - sc/inc sc/source
sc/inc/stringutil.hxx|3 sc/source/core/tool/stringutil.cxx | 150 +++ sc/source/ui/docshell/datastream.cxx | 334 +-- sc/source/ui/inc/datastream.hxx | 37 +++ 4 files changed, 387 insertions(+), 137 deletions(-) New commits: commit 9a623cdca281a682d39b423aefac392c2cc22cf7 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 12:16:35 2013 -0500 Parse CSV lines in the reader thread. Change-Id: I6329a0e6e6fa6576df2ed473482d558bfd6cce08 diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 08e5c1e..d275007 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -126,6 +126,9 @@ public: static bool parseSimpleNumber( const OUString rStr, sal_Unicode dsep, sal_Unicode gsep, double rVal); +static bool parseSimpleNumber( +const char* p, size_t n, char dsep, char gsep, double rVal); + static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString rIn, const OUString rQuotedPairs, sal_Unicode cTok = ';' ); static OUString SC_DLLPUBLIC GetQuotedToken(const OUString rIn, sal_Int32 nToken, const OUString rQuotedPairs, sal_Unicode cTok, sal_Int32 rIndex ); diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx index e711bcb..5bdc2c2 100644 --- a/sc/source/core/tool/stringutil.cxx +++ b/sc/source/core/tool/stringutil.cxx @@ -18,11 +18,13 @@ */ #include stringutil.hxx -#include rtl/ustrbuf.hxx -#include rtl/math.hxx #include global.hxx #include svl/zforlist.hxx +#include rtl/ustrbuf.hxx +#include rtl/strbuf.hxx +#include rtl/math.hxx + ScSetStringParam::ScSetStringParam() : mpNumFormatter(NULL), mbDetectNumberFormat(true), @@ -194,6 +196,150 @@ bool ScStringUtil::parseSimpleNumber( return true; } +bool ScStringUtil::parseSimpleNumber( +const char* p, size_t n, char dsep, char gsep, double rVal) +{ +// Actually almost the entire pre-check is unnecessary and we could call +// rtl::math::stringToDouble() just after having exchanged ascii space with +// non-breaking space, if it wasn't for check of grouped digits. The NaN +// and Inf cases that are accepted by stringToDouble() could be detected +// using rtl::math::isFinite() on the result. + +/* TODO: The grouped digits check isn't even valid for locales that do not + * group in thousands ... e.g. Indian locales. But that's something also + * the number scanner doesn't implement yet, only the formatter. */ + +OStringBuffer aBuf; + +size_t i = 0; +const char* pLast = p + (n-1); +sal_Int32 nPosDSep = -1, nPosGSep = -1; +sal_uInt32 nDigitCount = 0; +sal_Int32 nPosExponent = -1; + +// Skip preceding spaces. +for (i = 0; i n; ++i, ++p) +{ +char c = *p; +if (c != ' ') +// first non-space character. Exit. +break; +} + +if (i == n) +// the whole string is space. Fail. +return false; + +n -= i; // Subtract the length of the preceding spaces. + +// Determine the last non-space character. +for (; p != pLast; --pLast, --n) +{ +char c = *pLast; +if (c != ' ') +// Non space character. Exit. +break; +} + +for (i = 0; i n; ++i, ++p) +{ +char c = *p; + +if ('0' = c c = '9') +{ +// this is a digit. +aBuf.append(c); +++nDigitCount; +} +else if (c == dsep) +{ +// this is a decimal separator. + +if (nPosDSep = 0) +// a second decimal separator - not a valid number. +return false; + +if (nPosGSep = 0 i - nPosGSep != 4) +// the number has a group separator and the decimal sep is not +// positioned correctly. +return false; + +nPosDSep = i; +nPosGSep = -1; +aBuf.append(c); +nDigitCount = 0; +} +else if (c == gsep) +{ +// this is a group (thousand) separator. + +if (i == 0) +// not allowed as the first character. +return false; + +if (nPosDSep = 0) +// not allowed after the decimal separator. +return false; + +if (nPosGSep = 0 nDigitCount != 3) +// must be exactly 3 digits since the last group separator. +return false; + +if (nPosExponent = 0) +// not allowed in exponent. +return false; + +nPosGSep = i; +nDigitCount = 0; +} +else if (c == '-' || c == '+') +{ +// A sign must be the first character if it's given, or immediately +// follow the exponent character if present. +if (i == 0 ||
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||73162 --- Comment #46 from Cor Nouws c...@nouenoff.nl --- adding Bug 73162 - FORMATTING: The Entry # dissapears from the Entry in the TOC when adding text separators -- 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] core.git: sc/source
sc/source/ui/docshell/datastream.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4e85af9d9315fb72b868cc2b2c8f599fae6f7ec0 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 14:31:30 2013 -0500 This part requires orcus library presence. Change-Id: I6bfba9872deb7318721ce4d73795ef7569a24e89 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index a21cba4..35665a2 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -269,10 +269,11 @@ private: DataStream::Line rLine = (*pLines)[i]; rLine.maCells.clear(); mpStream-ReadLine(rLine.maLine); - +#if ENABLE_ORCUS CSVHandler aHdl(rLine, mnColCount); orcus::csv_parserCSVHandler parser(rLine.maLine.getStr(), rLine.maLine.getLength(), aHdl, maConfig); parser.parse(); +#endif } aGuard.reset(); // lock ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 5 commits - sc/inc sc/source
sc/inc/stringutil.hxx|3 sc/source/core/tool/stringutil.cxx | 150 +++ sc/source/ui/docshell/datastream.cxx | 338 +-- sc/source/ui/inc/datastream.hxx | 37 +++ 4 files changed, 388 insertions(+), 140 deletions(-) New commits: commit 6636050ee9427498537e4a76b0a2c8b7cd67420e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 14:31:30 2013 -0500 This part requires orcus library presence. Change-Id: I6bfba9872deb7318721ce4d73795ef7569a24e89 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index af11847..45bc637 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -269,10 +269,11 @@ private: DataStream::Line rLine = (*pLines)[i]; rLine.maCells.clear(); mpStream-ReadLine(rLine.maLine); - +#if ENABLE_ORCUS CSVHandler aHdl(rLine, mnColCount); orcus::csv_parserCSVHandler parser(rLine.maLine.getStr(), rLine.maLine.getLength(), aHdl, maConfig); parser.parse(); +#endif } aGuard.reset(); // lock commit add5b414df52dfc12cdd5004e97e7ab5707a163f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 12:16:35 2013 -0500 Parse CSV lines in the reader thread. Conflicts: sc/source/ui/docshell/datastream.cxx Change-Id: I6329a0e6e6fa6576df2ed473482d558bfd6cce08 diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 08e5c1e..d275007 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -126,6 +126,9 @@ public: static bool parseSimpleNumber( const OUString rStr, sal_Unicode dsep, sal_Unicode gsep, double rVal); +static bool parseSimpleNumber( +const char* p, size_t n, char dsep, char gsep, double rVal); + static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString rIn, const OUString rQuotedPairs, sal_Unicode cTok = ';' ); static OUString SC_DLLPUBLIC GetQuotedToken(const OUString rIn, sal_Int32 nToken, const OUString rQuotedPairs, sal_Unicode cTok, sal_Int32 rIndex ); diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx index e711bcb..5bdc2c2 100644 --- a/sc/source/core/tool/stringutil.cxx +++ b/sc/source/core/tool/stringutil.cxx @@ -18,11 +18,13 @@ */ #include stringutil.hxx -#include rtl/ustrbuf.hxx -#include rtl/math.hxx #include global.hxx #include svl/zforlist.hxx +#include rtl/ustrbuf.hxx +#include rtl/strbuf.hxx +#include rtl/math.hxx + ScSetStringParam::ScSetStringParam() : mpNumFormatter(NULL), mbDetectNumberFormat(true), @@ -194,6 +196,150 @@ bool ScStringUtil::parseSimpleNumber( return true; } +bool ScStringUtil::parseSimpleNumber( +const char* p, size_t n, char dsep, char gsep, double rVal) +{ +// Actually almost the entire pre-check is unnecessary and we could call +// rtl::math::stringToDouble() just after having exchanged ascii space with +// non-breaking space, if it wasn't for check of grouped digits. The NaN +// and Inf cases that are accepted by stringToDouble() could be detected +// using rtl::math::isFinite() on the result. + +/* TODO: The grouped digits check isn't even valid for locales that do not + * group in thousands ... e.g. Indian locales. But that's something also + * the number scanner doesn't implement yet, only the formatter. */ + +OStringBuffer aBuf; + +size_t i = 0; +const char* pLast = p + (n-1); +sal_Int32 nPosDSep = -1, nPosGSep = -1; +sal_uInt32 nDigitCount = 0; +sal_Int32 nPosExponent = -1; + +// Skip preceding spaces. +for (i = 0; i n; ++i, ++p) +{ +char c = *p; +if (c != ' ') +// first non-space character. Exit. +break; +} + +if (i == n) +// the whole string is space. Fail. +return false; + +n -= i; // Subtract the length of the preceding spaces. + +// Determine the last non-space character. +for (; p != pLast; --pLast, --n) +{ +char c = *pLast; +if (c != ' ') +// Non space character. Exit. +break; +} + +for (i = 0; i n; ++i, ++p) +{ +char c = *p; + +if ('0' = c c = '9') +{ +// this is a digit. +aBuf.append(c); +++nDigitCount; +} +else if (c == dsep) +{ +// this is a decimal separator. + +if (nPosDSep = 0) +// a second decimal separator - not a valid number. +return false; + +if (nPosGSep = 0 i - nPosGSep != 4) +// the number has a group separator and the decimal sep is not +// positioned correctly. +return false; + +nPosDSep = i; +
Jiwoong Youn's license statement
Hi all, It's great to be a member of this fabulous community! All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Thanks! Best, Jiwoong Youn -- View this message in context: http://nabble.documentfoundation.org/Jiwoong-Youn-s-license-statement-tp4090212.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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f248215bbb0e356a47c6cbe6a1388fe02e6c373 Author: Andras Timar andras.ti...@collabora.com Date: Mon Dec 30 20:45:10 2013 +0100 Updated core Project: translations f0b3bc66f11e1bc3718c032d93b6b9f1a3966b6b diff --git a/translations b/translations index dbe7e59..f0b3bc6 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit dbe7e598c32822da31e0555913f7ec7ff17bf36d +Subproject commit f0b3bc66f11e1bc3718c032d93b6b9f1a3966b6b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/globstr.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7f51933c4b01183f7da923b6ee1475a004cc3a5 Author: yjw9012 yjw9...@gmail.com Date: Mon Dec 30 10:21:34 2013 -0600 fdo#72995: Changed label to 'Formula cell must contain a formula.' Change-Id: Iaa8528985935549f0ef1bdc96edfbde7d9b104c9 Reviewed-on: https://gerrit.libreoffice.org/7234 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index ee46a95..1944470 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -2047,7 +2047,7 @@ Resource RID_GLOBSTR }; String STR_NOFORMULA { -Text [ en-US ] = Cell must contain a formula. ; +Text [ en-US ] = Formula cell must contain a formula. ; }; String STR_INVALIDINPUT { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 44f5e76a65aa9618f9250112164308a02145f0e3 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 20:19:41 2013 + Updated core Project: help cd9900154e62395d06bde777e49b8f5f0a55d8c5 diff --git a/helpcontent2 b/helpcontent2 index aa41fc2..cd99001 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aa41fc224274b62fd03c2a0581435cc001e30f16 +Subproject commit cd9900154e62395d06bde777e49b8f5f0a55d8c5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |6 -- 1 file changed, 6 deletions(-) New commits: commit cd9900154e62395d06bde777e49b8f5f0a55d8c5 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 20:19:41 2013 + drop unused help ids Change-Id: I47fd01db890549f59e4bca3414b6ad43e4985080 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 50f4528..7c1a572 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5965,7 +5965,6 @@ sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER,2567504925, sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS,2567504921, sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL,2567504923, sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924, -sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305, sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625, sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623, sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609, @@ -6001,8 +6000,6 @@ sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111, sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943, -sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326, -sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328, sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637, sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233, sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, @@ -6067,7 +6064,6 @@ sc_ModalDialog_RID_SCDLG_COLORROW,1494368256, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, -sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, @@ -6123,8 +6119,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909, sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098, sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097, sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099, -sc_RadioButton_RID_SCDLG_RETYPEPASS_INPUT_BTN_REMOVE_PASSWORD,1495679795, -sc_RadioButton_RID_SCDLG_RETYPEPASS_INPUT_BTN_RETYPE_PASSWORD,1495679794, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1 sc/inc/sc.hrc|1 sc/source/ui/inc/retypepassdlg.hrc |8 sc/source/ui/inc/retypepassdlg.hxx | 22 +- sc/source/ui/miscdlgs/retypepassdlg.cxx | 92 -- sc/source/ui/miscdlgs/retypepassdlg.src | 91 -- sc/source/ui/view/tabvwshh.cxx |6 sc/uiconfig/scalc/ui/retypepassworddialog.ui | 233 +++ 8 files changed, 285 insertions(+), 169 deletions(-) New commits: commit 131a01e0beac937b9b7f1b2beb9b61e5b0f2a4aa Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 20:16:03 2013 + convert retype password input dialog to .ui Change-Id: I97940629f93a5a1948a8771b9d9668bc28c49a91 diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 7ab5ca2..bd785c9 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/protectsheetdlg \ sc/uiconfig/scalc/ui/queryrunstreamscriptdialog \ sc/uiconfig/scalc/ui/randomnumbergenerator \ + sc/uiconfig/scalc/ui/retypepassworddialog \ sc/uiconfig/scalc/ui/rightfooterdialog \ sc/uiconfig/scalc/ui/rightheaderdialog \ sc/uiconfig/scalc/ui/rowheightdialog \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 1f38832..695bce6 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1096,7 +1096,6 @@ #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146) #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148) #define RID_SCDLG_RETYPEPASS(SC_DIALOGS_START + 150) -#define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151) #define RID_POPUP_FILTER(SC_DIALOGS_START + 153) #define RID_COND_ENTRY (SC_DIALOGS_START + 156) diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc index 2684a30..09c88ec 100644 --- a/sc/source/ui/inc/retypepassdlg.hrc +++ b/sc/source/ui/inc/retypepassdlg.hrc @@ -54,12 +54,4 @@ #define STR_HASH_GOOD 203 #define STR_HASH_REGENERATED204 -#define FT_PASSWORD1301 -#define ED_PASSWORD1302 -#define FT_PASSWORD2303 -#define ED_PASSWORD2304 -#define BTN_MATCH_OLD_PASSWORD 305 -#define BTN_RETYPE_PASSWORD 306 -#define BTN_REMOVE_PASSWORD 307 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index efb0872..90c4863 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -20,10 +20,11 @@ #ifndef SC_UI_RETYPEPASS_DLG_HXX #define SC_UI_RETYPEPASS_DLG_HXX -#include vcl/dialog.hxx #include vcl/button.hxx -#include vcl/fixed.hxx +#include vcl/dialog.hxx #include vcl/edit.hxx +#include vcl/fixed.hxx +#include vcl/layout.hxx #include vcl/scrbar.hxx #include svx/checklbx.hxx #include svtools/stdctrl.hxx @@ -140,20 +141,17 @@ private: void CheckPasswordInput(); private: -OKButtonmaBtnOk; -CancelButtonmaBtnCancel; -HelpButton maBtnHelp; +OKButton* m_pBtnOk; -RadioButton maBtnRetypePassword; +RadioButton*m_pBtnRetypePassword; -FixedText maPassword1Text; -EditmaPassword1Edit; -FixedText maPassword2Text; -EditmaPassword2Edit; +VclContainer* m_pPasswordGrid; +Edit* m_pPassword1Edit; +Edit* m_pPassword2Edit; -CheckBoxmaBtnMatchOldPass; +CheckBox* m_pBtnMatchOldPass; -RadioButton maBtnRemovePassword; +RadioButton*m_pBtnRemovePassword; DECL_LINK( OKHdl, void* ); DECL_LINK( RadioBtnHdl, RadioButton* ); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 7abf7e9..478b7f7 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -393,25 +393,19 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) // -ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) : -ModalDialog(pParent, ScResId(RID_SCDLG_RETYPEPASS_INPUT)), - -maBtnOk (this, ScResId(BTN_OK)), -maBtnCancel (this, ScResId(BTN_CANCEL)), -maBtnHelp (this, ScResId(BTN_HELP)), - -maBtnRetypePassword(this, ScResId(BTN_RETYPE_PASSWORD)), - -maPassword1Text (this, ScResId(FT_PASSWORD1)), -maPassword1Edit (this, ScResId(ED_PASSWORD1)), -maPassword2Text (this, ScResId(FT_PASSWORD2)), -maPassword2Edit (this, ScResId(ED_PASSWORD2)), -maBtnMatchOldPass(this, ScResId(BTN_MATCH_OLD_PASSWORD)), - -maBtnRemovePassword(this, ScResId(BTN_REMOVE_PASSWORD)), - -mpProtected(pProtected)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/miscdlgs/retypepassdlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4f5f49deb3a6eb549d3950cb4773f0601c1fd52c Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 20:24:20 2013 + free resource missing here Change-Id: Ibe4436f1d002123d455f447da1185d26591462ec diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 478b7f7..8079316 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -70,6 +70,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : meDesiredHash(PASSHASH_SHA1) { Init(); +FreeResource(); } ScRetypePassDlg::~ScRetypePassDlg() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - 2 commits - sc/source
sc/source/ui/docshell/datastream.cxx | 55 ++- sc/source/ui/inc/datastream.hxx |7 +++- 2 files changed, 22 insertions(+), 40 deletions(-) New commits: commit b4b0c48b9252e3899e00be9778bad8913a496e2c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 15:43:21 2013 -0500 Remove CallerThread and use Timer to do the same, on the main thread. This makes the UI more responsive in general. Change-Id: I5f8a4fab84a73812af868262cc7daa9d92cb3777 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 35665a2..04605e4 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -111,37 +111,6 @@ public: namespace datastreams { -class CallerThread : public salhelper::Thread -{ -DataStream *mpDataStream; -public: -osl::Condition maStart; -bool mbTerminate; - -CallerThread(DataStream *pData): -Thread(CallerThread) -,mpDataStream(pData) -,mbTerminate(false) -{} - -private: -virtual void execute() -{ -while (!mbTerminate) -{ -// wait for a small amount of time, so that -// painting methods have a chance to be called. -// And also to make UI more responsive. -TimeValue const aTime = {0, 1000}; -maStart.wait(); -maStart.reset(); -if (!mbTerminate) -while (mpDataStream-ImportData()) -wait(aTime); -}; -} -}; - void emptyLineQueue( std::queueDataStream::LinesType* rQueue ) { while (!rQueue.empty()) @@ -371,8 +340,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString rURL, const ScRange mfLastRefreshTime(0.0), mnCurRow(0) { -mxThread = new datastreams::CallerThread( this ); -mxThread-launch(); +maImportTimer.SetTimeout(0); +maImportTimer.SetTimeoutHdl( LINK(this, DataStream, ImportTimerHdl) ); Decode(rURL, rRange, nLimit, eMove, nSettings); } @@ -381,9 +350,7 @@ DataStream::~DataStream() { if (mbRunning) StopImport(); -mxThread-mbTerminate = true; -mxThread-maStart.set(); -mxThread-join(); + if (mxReaderThread.is()) { mxReaderThread-endThread(); @@ -487,7 +454,8 @@ void DataStream::StartImport() } mbRunning = true; maDocAccess.reset(); -mxThread-maStart.set(); + +maImportTimer.Start(); } void DataStream::StopImport() @@ -497,6 +465,7 @@ void DataStream::StopImport() mbRunning = false; Refresh(); +maImportTimer.Stop(); } void DataStream::SetRefreshOnEmptyLine( bool bVal ) @@ -618,7 +587,6 @@ void DataStream::Text2Doc() {} bool DataStream::ImportData() { -SolarMutexGuard aGuard; if (!mbValuesInLine) // We no longer support this mode. To be deleted later. return false; @@ -630,6 +598,14 @@ bool DataStream::ImportData() return mbRunning; } +IMPL_LINK_NOARG(DataStream, ImportTimerHdl) +{ +if (ImportData()) +maImportTimer.Start(); + +return 0; +} + } // namespace sc /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 5af2dc7..5600a09 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -14,6 +14,7 @@ #include rtl/ref.hxx #include rtl/ustring.hxx +#include vcl/timer.hxx #include address.hxx #include boost/noncopyable.hpp @@ -102,6 +103,8 @@ private: void Text2Doc(); void Refresh(); +DECL_LINK( ImportTimerHdl, void* ); + private: ScDocShell* mpDocShell; ScDocument* mpDoc; @@ -121,7 +124,9 @@ private: SCROW mnCurRow; ScRange maStartRange; ScRange maEndRange; -rtl::Referencedatastreams::CallerThread mxThread; + +Timer maImportTimer; + rtl::Referencedatastreams::ReaderThread mxReaderThread; }; commit 4fd4e494d0305e496a890f928b7602211ca4eb73 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 14:31:30 2013 -0500 This part requires orcus library presence. Change-Id: I6bfba9872deb7318721ce4d73795ef7569a24e89 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index a21cba4..35665a2 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -269,10 +269,11 @@ private: DataStream::Line rLine = (*pLines)[i]; rLine.maCells.clear(); mpStream-ReadLine(rLine.maLine); - +#if ENABLE_ORCUS CSVHandler aHdl(rLine, mnColCount); orcus::csv_parserCSVHandler parser(rLine.maLine.getStr(), rLine.maLine.getLength(), aHdl, maConfig); parser.parse(); +#endif } aGuard.reset(); // lock ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/miscdlgs/retypepassdlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e1f4de66afa5f0cf54f90a1fed150dc200680da2 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 30 20:24:20 2013 + free resource missing here (cherry picked from commit 4f5f49deb3a6eb549d3950cb4773f0601c1fd52c) Change-Id: Ibe4436f1d002123d455f447da1185d26591462ec diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 7abf7e9..307966b 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -70,6 +70,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : meDesiredHash(PASSHASH_SHA1) { Init(); +FreeResource(); } ScRetypePassDlg::~ScRetypePassDlg() @@ -413,6 +414,7 @@ ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectabl mpProtected(pProtected) { Init(); +FreeResource(); } ScRetypePassInputDlg::~ScRetypePassInputDlg() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Testing Firebird SDBC
There isn't any firebird server support yet -- however it shouldn't be hugely complicated to add -- what's needing doing is allowing setting and passing the required parameters (url/username/password/etc.) to firebird -- the passing of the parameters is actually already in place, we just need to add an easy way for the user to pass them in / parse them. I.e. I would suggest: 1. Adding a Firebird Server driver entry to allow entry of username/password in addition to url: connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu This would be pretty similar to any of the other remote server driver entries in the other connectivity/registry/*//Drivers.xcu files. (I suspect it's easiest to have separate driver entries, rather than try to have one entry dealing with both local files and servers, although we can probably share the same sdbc:firebird: prefix). 2. Add some supporting code to: connectivity/source/drivers/firebird/Connection.cxx I.e. we need to parse the username/password/url from the new driver configuration added above (the code to pass username/passwords/urls to firebird itself is already in place, so we just need to set the parameters appropriately based on user input). 3. Possibly adapt dbaccess/source/ui/dlg/ConnectionHelper.cxx To only apply the .fdb filter when we're configuring Firebird File and not for Firebird Server. (I suspect this wouldn't be necessary if we use a separate prefix though). This shouldn't be hugely complicated to do, the main issue is in setting up and/or getting access to a firebird server to test that it actually works, which is why is the main reason I haven't tried to do this yet -- all contributions in this area would be greatly appreciated :). Cheers, Andrzej On 30/12/13 15:34, iwbnwif yiw wrote: I would like to join in the testing of the Firebird SDBC as I have been using both Firebird and OO/LO for many years and very happy to see them being properly integrated. Although I have been getting on well with the embedded files (i.e. fdb embedded in odb), I can't work out the URL format for connecting with a server using the Firebird File option in connect to an existing database. Thanks... ___ 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
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source
sc/source/ui/miscdlgs/datastreamdlg.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 08938b3b13453764700f4b4b9fb683b3526f0aa8 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 16:50:02 2013 -0500 Display 3D address honor current reference address convension. Change-Id: I0c0f03807ddfadb5b9c17c81eeb86d51c877d4b4 diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 8f8aee9..2b6f023 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -100,7 +100,7 @@ ScRange DataStreamDlg::GetStartRange() OUString aStr = m_pEdRange-GetText(); ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange; -sal_uInt16 nRes = aRange.Parse(aStr, pDoc); +sal_uInt16 nRes = aRange.Parse(aStr, pDoc, pDoc-GetAddressConvention()); if ((nRes SCA_VALID) != SCA_VALID || !aRange.IsValid()) { // Invalid range. @@ -118,11 +118,12 @@ ScRange DataStreamDlg::GetStartRange() void DataStreamDlg::Init( const DataStream rStrm ) { m_pCbUrl-SetText(rStrm.GetURL()); +ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange = rStrm.GetRange(); ScRange aTopRange = aRange; aTopRange.aEnd.SetRow(aTopRange.aStart.Row()); -OUString aStr = aTopRange.Format(SCA_VALID); +OUString aStr = aTopRange.Format(SCR_ABS_3D, pDoc, pDoc-GetAddressConvention()); m_pEdRange-SetText(aStr); SCROW nRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: codemaker/Executable_cppumaker.mk
codemaker/Executable_cppumaker.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 2cea4c98c2b9eaf46498fb76b73f8dae8e859f3b Author: Isamu Mogi saturda...@gmail.com Date: Wed Dec 18 21:43:13 2013 +0900 Add sal_textenc dependency to cppumaker In Japanese localized Windows, cppumaker requires sal_textenclo.dll but that rule isn't written in .mk. It causes build failure. Change-Id: Icab74493a4a3b445144bb9d969b79636dbd17162 Reviewed-on: https://gerrit.libreoffice.org/7134 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 26347a0..049e0c7 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,cppumaker,\ sal \ +sal_textenc \ salhelper \ unoidl \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/op_math.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit b281014a584c266c396d5e6bbfc150e5e7584761 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Mon Dec 30 16:34:29 2013 -0600 GPU Calc: fix compiler warning Change-Id: Iaadf726cbece3d077667175f3f60bf2345179202 diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 7db5462..3422b3b 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -1344,7 +1344,6 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream ss, } else if(tmpCur-GetType() == formula::svDouble) { -printf(const\n); ss arg0=; ss tmpCur-GetDouble() ;\n; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Module_sc.mk
sc/Module_sc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d283f2ef291fff5c27fdc55874aaacc94a9453c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 17:58:00 2013 -0500 Move this opencl test to slowcheck. It's too slow. Change-Id: I0386f03c1893fed82bdf7df11dbea93bbad05dd2 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 6730163..094290a 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,12 +54,12 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ CppunitTest_sc_rangelst_test \ - CppunitTest_sc_opencl_test \ )) $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ +CppunitTest_sc_opencl_test \ )) # Disabled to allow the check tinderbox execute the sd tests ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/Module_sc.mk
sc/Module_sc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32cfbe47941d4e7cdda092d924a47c9b594b4c06 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 17:58:00 2013 -0500 Move this opencl test to slowcheck. It's too slow. Change-Id: I0386f03c1893fed82bdf7df11dbea93bbad05dd2 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 6730163..094290a 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,12 +54,12 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ CppunitTest_sc_rangelst_test \ - CppunitTest_sc_opencl_test \ )) $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ +CppunitTest_sc_opencl_test \ )) # Disabled to allow the check tinderbox execute the sd tests ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 115 ++- chart2/source/view/main/OpenGLRender.hxx |1 2 files changed, 55 insertions(+), 61 deletions(-) New commits: commit 8bea09624a72df755ff350b5a14b91f08f2b3201 Author: Michael Meeks michael.me...@collabora.com Date: Tue Dec 31 00:02:25 2013 + Fix a number of issues converting GL to BitmapEx. Change-Id: Ic6f0d4859f82d5afa4608a37697d2d10cc3f0cef diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx old mode 100644 new mode 100755 index c54ef8c..1d3a9f4 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -14,6 +14,7 @@ #include vcl/bitmapex.hxx #include vcl/bmpacc.hxx #include vcl/graph.hxx +#include vcl/pngwrite.hxx #include com/sun/star/awt/XBitmap.hpp #include com/sun/star/beans/XPropertySet.hpp #include com/sun/star/graphic/XGraphic.hpp @@ -430,6 +431,55 @@ int OpenGLRender::RenderModelf(float *vertexArray, unsigned int vertexArraySize, #endif return 0; } + +BitmapEx OpenGLRender::GetAsBitmap() +{ +boost::scoped_arraysal_uInt8 buf(new sal_uInt8[m_iWidth * m_iHeight * 4]); +glReadPixels(0, 0, m_iWidth, m_iHeight, GL_RGBA, GL_UNSIGNED_BYTE, buf.get()); + +Bitmap aBitmap( Size(m_iWidth, m_iHeight), 24 ); +AlphaMask aAlpha( Size(m_iWidth, m_iHeight) ); + +{ +Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); +AlphaMask::ScopedWriteAccess pAlphaWriteAccess( aAlpha ); + +size_t nCurPos = 0; +for( int y = 0; y m_iHeight; ++y) +{ +Scanline pScan = pWriteAccess-GetScanline(y); +Scanline pAlphaScan = pAlphaWriteAccess-GetScanline(y); +for( int x = 0; x m_iWidth; ++x ) +{ +*pScan++ = buf[nCurPos]; +*pScan++ = buf[nCurPos+1]; +*pScan++ = buf[nCurPos+2]; + +nCurPos += 3; + +*pAlphaScan++ = static_castsal_uInt8( 255 - buf[nCurPos++] ); +} +} +} + +BitmapEx aBmp(aBitmap, aAlpha); + +#if 0 // debug PNG writing +static int nIdx = 0; +OUString aName = OUString( file://c/temp/image ) + OUString::number( nIdx++ ) + .png; +try { +vcl::PNGWriter aWriter( aBmp ); +SvFileStream sOutput( aName, STREAM_WRITE ); +aWriter.Write( sOutput ); +sOutput.Close(); +} catch (...) { +SAL_INFO(slideshow.opengl, Error writing png to aName); +} +#endif + +return aBmp; +} + int OpenGLRender::RenderModelf2FBO(float *vertexArray, unsigned int vertexArraySize, float *colorArray, unsigned int colorArraySize) { char fileName[256] = {0}; @@ -507,37 +557,10 @@ int OpenGLRender::RenderModelf2FBO(float *vertexArray, unsigned int vertexArrayS fclose(pfile); #else -boost::scoped_arraysal_uInt8 buf(new sal_uInt8[m_iWidth * m_iHeight * 4]); -glReadPixels(0, 0, m_iWidth, m_iHeight, GL_RGBA, GL_UNSIGNED_BYTE, buf.get()); -BitmapEx aBmp; -aBmp.SetSizePixel(Size(m_iWidth, m_iHeight)); - -Bitmap aBitmap( aBmp.GetBitmap() ); -Bitmap aAlpha( aBmp.GetAlpha().GetBitmap() ); - -Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); -Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha ); - -size_t nCurPos = 0; -for( int y = 0; y m_iHeight; ++y) -{ -Scanline pScan = pWriteAccess-GetScanline(y); -Scanline pAlphaScan = pAlphaWriteAccess-GetScanline(y); - -for( int x = 0; x m_iWidth; ++x ) -{ -*pScan++ = buf[nCurPos]; -*pScan++ = buf[nCurPos+1]; -*pScan++ = buf[nCurPos+2]; - -nCurPos += 3; - -*pAlphaScan++ = static_castsal_uInt8( 255 - buf[nCurPos++] ); -} -} - -aBmp = BitmapEx(aBitmap, aAlpha); +fprintf( stderr, this RGBA guy ...\n); +BitmapEx aBmp = GetAsBitmap(); // unclear why we create then do nothing with this. #endif + glBindFramebuffer(GL_FRAMEBUFFER, 0); RenderTexture(m_TextureObj[0]); #if 0 @@ -649,37 +672,7 @@ int OpenGLRender::RenderLine2FBO(int wholeFlag) free(buf); fclose(pfile); #else -boost::scoped_arraysal_uInt8 buf(new sal_uInt8[m_iWidth * m_iHeight * 4]); -glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGR, GL_UNSIGNED_BYTE, buf.get()); -BitmapEx aBmp; -aBmp.SetSizePixel(Size(m_iWidth, m_iHeight)); - -Bitmap aBitmap( Size( m_iWidth, m_iHeight), 24 ); -Bitmap aAlpha( Size( m_iWidth, m_iHeight), 24 ); - -Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); -Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha ); - -size_t nCurPos = 0; -for( size_t y = 0; y size_t(m_iHeight); ++y) -{ -Scanline pScan = pWriteAccess-GetScanline(y); -Scanline pAlphaScan = pAlphaWriteAccess-GetScanline(y); - -for( size_t x = 0; x size_t(m_iWidth); ++x ) -{ -*pScan++ = buf[nCurPos]; -*pScan++ =
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 3 commits - sc/Module_sc.mk sc/source
sc/Module_sc.mk |2 - sc/source/ui/docshell/datastream.cxx| 52 sc/source/ui/inc/datastream.hxx |7 +++- sc/source/ui/miscdlgs/datastreamdlg.cxx |5 +-- 4 files changed, 24 insertions(+), 42 deletions(-) New commits: commit be100cd56aaf4fd761ed9b7131e5b6e6c754133e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 17:58:00 2013 -0500 Move this opencl test to slowcheck. It's too slow. Change-Id: I0386f03c1893fed82bdf7df11dbea93bbad05dd2 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 6730163..094290a 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,12 +54,12 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ CppunitTest_sc_rangelst_test \ - CppunitTest_sc_opencl_test \ )) $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ +CppunitTest_sc_opencl_test \ )) # Disabled to allow the check tinderbox execute the sd tests commit 85a358c0d0b8665cc95be467198dc2297294e02a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 16:50:02 2013 -0500 Display 3D address honor current reference address convension. Change-Id: I0c0f03807ddfadb5b9c17c81eeb86d51c877d4b4 diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 8a3bee5..b0cc2b0 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -100,7 +100,7 @@ ScRange DataStreamDlg::GetStartRange() OUString aStr = m_pEdRange-GetText(); ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange; -sal_uInt16 nRes = aRange.Parse(aStr, pDoc); +sal_uInt16 nRes = aRange.Parse(aStr, pDoc, pDoc-GetAddressConvention()); if ((nRes SCA_VALID) != SCA_VALID || !aRange.IsValid()) { // Invalid range. @@ -118,11 +118,12 @@ ScRange DataStreamDlg::GetStartRange() void DataStreamDlg::Init( const DataStream rStrm ) { m_pCbUrl-SetText(rStrm.GetURL()); +ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange = rStrm.GetRange(); ScRange aTopRange = aRange; aTopRange.aEnd.SetRow(aTopRange.aStart.Row()); -OUString aStr = aTopRange.Format(SCA_VALID); +OUString aStr = aTopRange.Format(SCR_ABS_3D, pDoc, pDoc-GetAddressConvention()); m_pEdRange-SetText(aStr); SCROW nRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1; commit a757bf33def84703bd9b494e03ff1df6e5b376ff Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 15:43:21 2013 -0500 Remove CallerThread and use Timer to do the same, on the main thread. This makes the UI more responsive in general. Change-Id: I5f8a4fab84a73812af868262cc7daa9d92cb3777 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 45bc637..c060660 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -111,37 +111,6 @@ public: namespace datastreams { -class CallerThread : public salhelper::Thread -{ -DataStream *mpDataStream; -public: -osl::Condition maStart; -bool mbTerminate; - -CallerThread(DataStream *pData): -Thread(CallerThread) -,mpDataStream(pData) -,mbTerminate(false) -{} - -private: -virtual void execute() -{ -while (!mbTerminate) -{ -// wait for a small amount of time, so that -// painting methods have a chance to be called. -// And also to make UI more responsive. -TimeValue const aTime = {0, 1000}; -maStart.wait(); -maStart.reset(); -if (!mbTerminate) -while (mpDataStream-ImportData()) -wait(aTime); -}; -} -}; - void emptyLineQueue( std::queueDataStream::LinesType* rQueue ) { while (!rQueue.empty()) @@ -371,8 +340,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString rURL, const ScRange mfLastRefreshTime(0.0), mnCurRow(0) { -mxThread = new datastreams::CallerThread( this ); -mxThread-launch(); +maImportTimer.SetTimeout(0); +maImportTimer.SetTimeoutHdl( LINK(this, DataStream, ImportTimerHdl) ); Decode(rURL, rRange, nLimit, eMove, nSettings); } @@ -381,9 +350,7 @@ DataStream::~DataStream() { if (mbRunning) StopImport(); -mxThread-mbTerminate = true; -mxThread-maStart.set(); -mxThread-join(); + if (mxReaderThread.is()) { mxReaderThread-endThread(); @@ -487,7 +454,8 @@ void DataStream::StartImport() } mbRunning = true; maDocAccess.reset(); -mxThread-maStart.set(); + +maImportTimer.Start(); } void DataStream::StopImport() @@ -497,6 +465,7 @@ void DataStream::StopImport() mbRunning = false;
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/docshell/datastream.cxx| 52 sc/source/ui/inc/datastream.hxx |7 +++- sc/source/ui/miscdlgs/datastreamdlg.cxx |5 +-- 3 files changed, 23 insertions(+), 41 deletions(-) New commits: commit fed8a0b291eca0565071da27d6fb7c7c5f331dcd Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 16:50:02 2013 -0500 Display 3D address honor current reference address convension. Change-Id: I0c0f03807ddfadb5b9c17c81eeb86d51c877d4b4 diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 8f8aee9..2b6f023 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -100,7 +100,7 @@ ScRange DataStreamDlg::GetStartRange() OUString aStr = m_pEdRange-GetText(); ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange; -sal_uInt16 nRes = aRange.Parse(aStr, pDoc); +sal_uInt16 nRes = aRange.Parse(aStr, pDoc, pDoc-GetAddressConvention()); if ((nRes SCA_VALID) != SCA_VALID || !aRange.IsValid()) { // Invalid range. @@ -118,11 +118,12 @@ ScRange DataStreamDlg::GetStartRange() void DataStreamDlg::Init( const DataStream rStrm ) { m_pCbUrl-SetText(rStrm.GetURL()); +ScDocument* pDoc = mpDocShell-GetDocument(); ScRange aRange = rStrm.GetRange(); ScRange aTopRange = aRange; aTopRange.aEnd.SetRow(aTopRange.aStart.Row()); -OUString aStr = aTopRange.Format(SCA_VALID); +OUString aStr = aTopRange.Format(SCR_ABS_3D, pDoc, pDoc-GetAddressConvention()); m_pEdRange-SetText(aStr); SCROW nRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1; commit 226f4f037c8492eca1050b0590169e85e61fb413 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 30 15:43:21 2013 -0500 Remove CallerThread and use Timer to do the same, on the main thread. This makes the UI more responsive in general. Change-Id: I5f8a4fab84a73812af868262cc7daa9d92cb3777 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 35665a2..04605e4 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -111,37 +111,6 @@ public: namespace datastreams { -class CallerThread : public salhelper::Thread -{ -DataStream *mpDataStream; -public: -osl::Condition maStart; -bool mbTerminate; - -CallerThread(DataStream *pData): -Thread(CallerThread) -,mpDataStream(pData) -,mbTerminate(false) -{} - -private: -virtual void execute() -{ -while (!mbTerminate) -{ -// wait for a small amount of time, so that -// painting methods have a chance to be called. -// And also to make UI more responsive. -TimeValue const aTime = {0, 1000}; -maStart.wait(); -maStart.reset(); -if (!mbTerminate) -while (mpDataStream-ImportData()) -wait(aTime); -}; -} -}; - void emptyLineQueue( std::queueDataStream::LinesType* rQueue ) { while (!rQueue.empty()) @@ -371,8 +340,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString rURL, const ScRange mfLastRefreshTime(0.0), mnCurRow(0) { -mxThread = new datastreams::CallerThread( this ); -mxThread-launch(); +maImportTimer.SetTimeout(0); +maImportTimer.SetTimeoutHdl( LINK(this, DataStream, ImportTimerHdl) ); Decode(rURL, rRange, nLimit, eMove, nSettings); } @@ -381,9 +350,7 @@ DataStream::~DataStream() { if (mbRunning) StopImport(); -mxThread-mbTerminate = true; -mxThread-maStart.set(); -mxThread-join(); + if (mxReaderThread.is()) { mxReaderThread-endThread(); @@ -487,7 +454,8 @@ void DataStream::StartImport() } mbRunning = true; maDocAccess.reset(); -mxThread-maStart.set(); + +maImportTimer.Start(); } void DataStream::StopImport() @@ -497,6 +465,7 @@ void DataStream::StopImport() mbRunning = false; Refresh(); +maImportTimer.Stop(); } void DataStream::SetRefreshOnEmptyLine( bool bVal ) @@ -618,7 +587,6 @@ void DataStream::Text2Doc() {} bool DataStream::ImportData() { -SolarMutexGuard aGuard; if (!mbValuesInLine) // We no longer support this mode. To be deleted later. return false; @@ -630,6 +598,14 @@ bool DataStream::ImportData() return mbRunning; } +IMPL_LINK_NOARG(DataStream, ImportTimerHdl) +{ +if (ImportData()) +maImportTimer.Start(); + +return 0; +} + } // namespace sc /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 5af2dc7..5600a09 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -14,6 +14,7 @@ #include rtl/ref.hxx #include rtl/ustring.hxx +#include vcl/timer.hxx #include
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/treelistbox.cxx | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) New commits: commit d6f9ddb0aaa3fd9e3877f94a3147c68dd64bc77e Author: Efe Gürkan YALAMAN efeyala...@gmail.com Date: Tue Dec 17 01:45:13 2013 +0200 fdo#70465 SvTreeListBox::GetLevelChildCount refactored Instead of iterating siblings returning count of parents child vector. This slightly improves loading performance of Expert Config when accessibility enabled. Change-Id: Ide1af3df19efaae9c0cc92086456bf3520ee5dd2 Reviewed-on: https://gerrit.libreoffice.org/7106 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 1602cd3..d1ec6dc 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -937,15 +937,16 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const { DBG_CHKTHIS(SvTreeListBox,0); -sal_uLong nCount = 0; +//if _pParent is 0, then pEntry is the first child of the root. SvTreeListEntry* pEntry = FirstChild( _pParent ); -while ( pEntry ) -{ -++nCount; -pEntry = NextSibling( pEntry ); -} -return nCount; +if( !pEntry )//there is only root, root don't have children +return 0; + +if( !_pParent )//root and children of root +return pEntry-pParent-maChildren.size(); + +return _pParent-maChildren.size(); } SvViewDataEntry* SvTreeListBox::GetViewDataEntry( SvTreeListEntry* pEntry ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 49168] Create a bugzilla bot that warns about changing the version field to something newer
https://bugs.freedesktop.org/show_bug.cgi?id=49168 Foss f...@openmailbox.org changed: What|Removed |Added Status|RESOLVED|VERIFIED Version|4.0.0.0.alpha0+ Master |4.0.6.2 release --- Comment #5 from Foss f...@openmailbox.org --- Wow this is awesome. Should save the QA team a lot of time. Thanks to all involved getting this setup! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 65836, which changed state. Bug 65836 Summary: FILESAVE: DOCX exporting picture inside canvas corrupts DOCX https://bugs.freedesktop.org/show_bug.cgi?id=65836 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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 Gerrit News for core on 2013-12-31
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Get bundled openssl to be used on OS X too, at least on OS X 10.7 in https://gerrit.libreoffice.org/7233 from Douglas Mencken about module build, external + Print fair message from CPPUnitTest in https://gerrit.libreoffice.org/7196 from Douglas Mencken about module solenv + Get bundled curl to be used on OS X too Don't force yes on Darwin. in https://gerrit.libreoffice.org/7197 from Douglas Mencken about module build, external + fdo#73034: Fix for Extra spacing in document. in https://gerrit.libreoffice.org/7216 from Rohit Deshmukh about module sw + fdo#69649 Fix for pre-rendered Table Of Contents in https://gerrit.libreoffice.org/7207 from Vinaya Mandke about module sc, sw, writerfilter End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#70465 SvTreeListBox::GetLevelChildCount refactored in https://gerrit.libreoffice.org/7106 from Efe Gürkan Yalaman + Various improvements Expert Config in https://gerrit.libreoffice.org/5714 from Efe Gürkan Yalaman + Add sal_textenc dependency to cppumaker in https://gerrit.libreoffice.org/7134 from Isamu Mogi + fdo#72995: Changed label to 'Formula cell must contain a formula.' in https://gerrit.libreoffice.org/7234 from Jiwoong Youn * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + remove BluetoothOperator wrapper in https://gerrit.libreoffice.org/7092 from Christian Lohmaier + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard + CID#736173: Out-of-bound read in https://gerrit.libreoffice.org/6973 from Julien Nabet + move from ActionBarSherlock to corresponding android support lib in https://gerrit.libreoffice.org/7082 from Christian Lohmaier + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sdremote: show notes also in landscape orientation in https://gerrit.libreoffice.org/6889 from Christian Lohmaier + fix Bluetooth lifecycle problems and respect UI guidelines in https://gerrit.libreoffice.org/7083 from Christian Lohmaier + get rid of custom all-caps ui widget in https://gerrit.libreoffice.org/6903 from Christian Lohmaier + Double toolbar icon size for HiDPI screens. in https://gerrit.libreoffice.org/6994 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72998, which changed state. Bug 72998 Summary: significant custom shape import regression ... https://bugs.freedesktop.org/show_bug.cgi?id=72998 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source
chart2/source/view/main/DummyXShape.cxx| 12 + chart2/source/view/main/OpenGLRender.cxx | 202 + chart2/source/view/main/OpenGLRender.hxx | 13 + chart2/source/view/main/OpenglShapeFactory.cxx |3 4 files changed, 229 insertions(+), 1 deletion(-) New commits: commit 140dc8560947e49ccc78d5ac3bf79d6232b779aa Author: YangZhang yangzh...@multicorewareinc.com Date: Mon Dec 30 17:20:18 2013 +0800 fix linux compilation Change-Id: I1631fe4abfd1a14d39410e6e75883949dfc15c18 Signed-off-by: shaochunfang shaoc...@multicorewareinc.com diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 6e88010..d76b4fa 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -996,6 +996,7 @@ void OpenGLRender::SetLine2DWidth(int width) m_fLineWidth = (m_fLineWidth 0.001) ? 0.001 : m_fLineWidth; } +#if defined( _WIN32 ) static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -1106,7 +1107,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd) DestroyWindow(hWnd); return m_iArbMultisampleSupported; } - +#endif int OpenGLRender::GetMSAASupport() { return m_iArbMultisampleSupported; @@ -1117,6 +1118,7 @@ int OpenGLRender::GetMSAAFormat() return m_iArbMultisampleFormat; } +#if defined( _WIN32 ) int OpenGLRender::InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR inPfd) { PIXELFORMATDESCRIPTOR pfd = inPfd; @@ -1157,7 +1159,6 @@ int OpenGLRender::InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATD } return 0; } - int OpenGLRender::WGLisExtensionSupported(const char *extension) { const size_t extlen = strlen(extension); @@ -1194,7 +1195,7 @@ int OpenGLRender::WGLisExtensionSupported(const char *extension) } return 1; } - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 5643bc9..70b05e0 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -124,7 +124,9 @@ public: void SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b); void SetLine2DWidth(int width); BitmapEx GetAsBitmap(); +#if defined( _WIN32 ) int InitMultisample(PIXELFORMATDESCRIPTOR pfd); +#endif int GetMSAASupport(); int GetMSAAFormat(); private: @@ -134,7 +136,9 @@ private: int CreateFrameBufferObj(); int RenderTexture(GLuint TexID); int RenderTexture2FBO(GLuint TexID); +#if defined( _WIN32 ) int InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR inPfd); +#endif int WGLisExtensionSupported(const char *extension); private: // Projection matrix : default 45 degree Field of View, 4:3 ratio, display range : 0.1 unit - 100 units commit a0fc1639bd544c48c121a4fff8e6109c8b164484 Author: Peilin pei...@multicorewareinc.com Date: Mon Dec 30 16:44:23 2013 +0800 add anti-aliasing init diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 335e0e2..64dc65a 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -825,7 +825,17 @@ bool DummyChart::initOpengl() 0, 0, 0 // Layer Masks Ignored }; -int WindowPix = ChoosePixelFormat(GLWin.hDC,PixelFormatFront); +// we must check whether can set the MSAA +int WindowPix; +m_GLRender.InitMultisample(PixelFormatFront); +if (m_GLRender.GetMSAASupport()) +{ +WindowPix = m_GLRender.GetMSAAFormat(); +} +else +{ +WindowPix = ChoosePixelFormat(GLWin.hDC,PixelFormatFront); +} SetPixelFormat(GLWin.hDC,WindowPix,PixelFormatFront); GLWin.hRC = wglCreateContext(GLWin.hDC); wglMakeCurrent(GLWin.hDC,GLWin.hRC); diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 1d3a9f4..6e88010 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -996,4 +996,205 @@ void OpenGLRender::SetLine2DWidth(int width) m_fLineWidth = (m_fLineWidth 0.001) ? 0.001 : m_fLineWidth; } +static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ +switch (message) +{ +case WM_CREATE: +return 0; +case WM_CLOSE: +PostQuitMessage(0); +return 0; +case WM_DESTROY: +return 0; +case WM_KEYDOWN: +switch(wParam) +{ +case VK_ESCAPE: +PostQuitMessage(0); +return 0; + +case VK_SPACE: +break; +} +default: +return DefWindowProc(hwnd, message, wParam, lParam); +} +} + + +int
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 216 + chart2/source/view/main/OpenGLRender.hxx | 43 chart2/source/view/main/OpenglShapeFactory.cxx |6 3 files changed, 265 insertions(+) New commits: commit 356fc4ffe09bb804068c5786d3b3c1f38b3a8690 Author: YangZhang yangzh...@multicorewareinc.com Date: Mon Dec 30 19:03:03 2013 +0800 add bubble chart Change-Id: Idfffb7ce8607964ecb71571546bfcc2544b4e00a Signed-off-by: shaochunfang shaoc...@multicorewareinc.com diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index cbb5af8..f039ffd 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -27,6 +27,13 @@ using namespace std; #define OPENGL_SHADER( ... )# __VA_ARGS__ +#define GL_PI 3.14159f + +#if defined( _WIN32 ) +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 +#define WGL_SAMPLES_ARB 0x2042 +#endif + const char *ColorFragmemtShader = OPENGL_SHADER ( varying vec3 fragmentColor; @@ -1226,5 +1233,185 @@ int OpenGLRender::CreateMultiSampleFrameBufObj() return 0; } +int OpenGLRender::Create2DCircle(int detail) +{ +float angle; +int idx = 2; +if (detail = 0) +{ +return -1; +} +m_Bubble2DCircle.bufLen = 2 * (detail + 3)* sizeof(float); +m_Bubble2DCircle.pointBuf = (float *)malloc(m_Bubble2DCircle.bufLen); +memset(m_Bubble2DCircle.pointBuf, 0, m_Bubble2DCircle.bufLen); +for(angle = 2.0f * GL_PI; angle -(2.0f * GL_PI / detail); angle -= (2.0f * GL_PI / detail)) +{ +m_Bubble2DCircle.pointBuf[idx++] = sin(angle); +m_Bubble2DCircle.pointBuf[idx++] = cos(angle); +} +return 0; +} + +int OpenGLRender::Bubble2DShapePoint(float x, float y, float directionX, float directionY) +{ +//check whether to create the circle data +if (!m_Bubble2DCircle.pointBuf) +{ +Create2DCircle(100); +} + +float actualX = (x / 10.0f) - ((float)m_iWidth / 2); +float actualY = (y / 10.0f) - ((float)m_iHeight / 2); +m_Bubble2DPointList.x = actualX; +m_Bubble2DPointList.y = actualY; +m_Bubble2DPointList.xScale = directionX / 10.0f; +m_Bubble2DPointList.yScale = directionY / 10.0f; + +m_fPicLeft = actualX m_fPicLeft ? actualX : m_fPicLeft; + +m_fPicRight = actualX m_fPicRight ? actualX : m_fPicRight; + +m_fPicBottom = actualY m_fPicBottom ? actualY : m_fPicBottom; + +m_fPicTop = actualY m_fPicTop ? actualY : m_fPicTop; + +m_Bubble2DShapePointList.push_back(m_Bubble2DPointList); +return 0; +} + +int OpenGLRender::RenderBubble2FBO(int wholeFlag) +{ +char fileName[256] = {0}; +GLenum status; +glViewport(0, 0, m_iWidth, m_iHeight); +glClearDepth(1.0f); +// Clear the screen +glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +if ((!m_FboID[0]) || (!m_FboID[1])) +{ +// create a texture object +CreateTextureObj(m_iWidth, m_iHeight); +//create render buffer object +CreateRenderObj(m_iWidth, m_iHeight); +//create fbo +CreateFrameBufferObj(); +if (m_iArbMultisampleSupported) +{ +CreateMultiSampleFrameBufObj(); +} +} +//bind fbo +if (m_iArbMultisampleSupported) +{ +glBindFramebuffer(GL_FRAMEBUFFER,m_frameBufferMS); +} +else +{ +glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[m_iFboIdx % 2]); +} +// Clear the screen +glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +if (wholeFlag) +{ +if (m_iFboIdx 0) +{ + RenderTexture2FBO(m_TextureObj[(m_iFboIdx - 1) % 2]); +} +} +int listNum = m_Bubble2DShapePointList.size(); +for (int i = 0; i listNum; i++) +{ +//move the circle to the pos, and scale using the xScale and Y scale +Bubble2DPointList pointList = m_Bubble2DShapePointList.front(); +PosVecf3 trans = {pointList.x, pointList.y, 0.0f}; +PosVecf3 angle = {0.0f, 0.0f, 0.0f}; +PosVecf3 scale = {pointList.xScale, pointList.yScale, 1.0f}; +MoveModelf(trans, angle, scale); +m_MVP = m_Projection * m_View * m_Model; +//render to fbo +//fill vertex buffer +glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); +if (!m_Bubble2DCircle.pointBuf) +{ +Create2DCircle(100); +} +glBufferData(GL_ARRAY_BUFFER, m_Bubble2DCircle.bufLen, m_Bubble2DCircle.pointBuf, GL_STATIC_DRAW); + +glUseProgram(m_CommonProID); + +glUniform4fv(m_2DColorID, 1, m_2DColor[0]); + +glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, m_MVP[0][0]); +// 1rst attribute buffer : vertices +glEnableVertexAttribArray(m_2DVertexID); +glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); +glVertexAttribPointer( +m_2DVertexID, // attribute. No particular reason for 0, but must match
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
0 files changed New commits: commit 513ded055a1883bb67b3f059601be6679bd2ae44 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Dec 31 10:26:37 2013 +0100 remove executable flag from source files Change-Id: I5612205d5a42a6778398c5fb8c6f37ded227a39e diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx old mode 100755 new mode 100644 diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] Adding Impress Remote on iOS to fdo
Hi all, Could it be possible to add Impress Remote on iOS component to fdo, it currently doesn't exist and have already a request. Thanks in advance! Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Alpha of android remote for impress available for feedback
Hi *, (please reply to the libreoffice-qa@lists.freedesktop.org list) First of all: The alpha contains code that is still in code-review in gerrit, it is not the code as it is from the master branch. (for this reason I won't announce it on the google+ community, but only to the mailing lists) Feedback is especially welcome regarding Bluetooth-Activation. I.e. do you find it annoying or do you expect the remote to ask whether to enable bluetooth when you launch the remote while bluetooth is turned off on your device? And also regarding the landscape mode in the presentation - do you need more room for notes? (Please state screen size/device and/or provide screenshots) Please don't post comments regarding this alpha as a review of the app - use the mailinglist for general feedback, and bugzilla for bugs you find. Some usage hints: In Bluetooth Mode the remote will list known devices (those that have already been paired and are known to android) only if there are any. The Computer doesn't have to be set to visible in this case. Swipe the slide preview to advance to the next/previous slide. Tap the slide-preview to advance to the next animation, Double-tap the slide-preview to go back one animation. (Whether to use the volume keys for this as well is now a setting) To get it: Method A) Become Tester and get access to the alpha version via google play As testers are restricted to members of google+ communities or google groups, this only works if you're member of the LibreOffice google+ community (with the same account that is used by google play/your device) https://plus.google.com/communities/105920160642200595669 If you are, you can opt-in for getting alpha/beta versions by visiting https://play.google.com/apps/testing/org.libreoffice.impressremote You can always opt-out again by visiting the same URL. Method B) Side-load the apk manually - you can download it from http://dev-downloads.libreoffice.org/sdremote/SDRemote_vc8_2.0.0_alpha.apk ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Adding Impress Remote on iOS to fdo
On Mon, Dec 30, 2013 at 7:23 AM, Sophie gautier.sop...@gmail.com wrote: Hi all, Could it be possible to add Impress Remote on iOS component to fdo, it currently doesn't exist and have already a request. Sounds reasonable to me, but I'm not sure if that's something we can do ourselves, or if we have to bug the FDO admins for help. Once we migrate to our own instance of bugzilla, the Android and iOS remotes should be proper top-level products (or one product, if they share a large amount of code) Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 --- Comment #1 from rob...@familiegrosskopf.de --- Created attachment 91319 -- https://bugs.freedesktop.org/attachment.cgi?id=91319action=edit Printout with LO 4.1.4.2 - look at the content of the tablecontrol -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 --- Comment #2 from rob...@familiegrosskopf.de --- Created attachment 91320 -- https://bugs.freedesktop.org/attachment.cgi?id=91320action=edit Printout with LO 3.3.4 - content of the tablecontrol is shown completely -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 --- Comment #3 from rob...@familiegrosskopf.de --- Created attachment 91321 -- https://bugs.freedesktop.org/attachment.cgi?id=91321action=edit Printout with LO 4.1.4.2 - red formatted currency-values. Tablecontrol shows content beginning with these values. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 --- Comment #4 from rob...@familiegrosskopf.de --- Created attachment 91322 -- https://bugs.freedesktop.org/attachment.cgi?id=91322action=edit Properties of the *.pdf-files, as I could see ith with the file-manager. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70502] VIEWING: Printing two tables on one form
https://bugs.freedesktop.org/show_bug.cgi?id=70502 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=73139 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=70502 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59924] EDITING: Printing Form : no data
https://bugs.freedesktop.org/show_bug.cgi?id=59924 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=73139 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=59924 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73138] UI: undo name for Random Number Generator with 'Chi Squared' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73138 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||gautier.sop...@gmail.com Ever confirmed|0 |1 --- Comment #1 from sophie gautier.sop...@gmail.com --- Confirmed with Version: 4.2.0.1 Build ID: 7bf567613a536ded11709b952950c9e8f7181a4a - string is also wrong for Redo - Set to New - Sophie -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73137] UI: undo name for 'Covariance' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73137 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||gautier.sop...@gmail.com Ever confirmed|0 |1 --- Comment #1 from sophie gautier.sop...@gmail.com --- Confirmed with Version: 4.2.0.1 Build ID: 7bf567613a536ded11709b952950c9e8f7181a4a - same for Redo - set to New - Sophie -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72322] Not possible to mark a part of text - table - text
https://bugs.freedesktop.org/show_bug.cgi?id=72322 gera...@libreoffice.org changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #5 from gera...@libreoffice.org --- Also ok in 4.2 RC1 Linux -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73074] PRINTING: Send via PDF to mail creates %20 in mail subject
https://bugs.freedesktop.org/show_bug.cgi?id=73074 --- Comment #3 from mar...@haybach.com --- It happens since a couple of month, but I didn't file the bug report before. Approximately one year ago I was on Ubuntu Linux and I think (but not 100% sure) it didn't happen there. The LO version was of course also lower there. Actually I'm using Korora 19 x64 (a Fedora fork). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73140] New: Macro not executing
https://bugs.freedesktop.org/show_bug.cgi?id=73140 Priority: medium Bug ID: 73140 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Macro not executing Severity: blocker Classification: Unclassified OS: All Reporter: mased...@email.it Hardware: Other Status: UNCONFIRMED Version: unspecified Component: BASIC Product: LibreOffice Created attachment 91323 -- https://bugs.freedesktop.org/attachment.cgi?id=91323action=edit Compose letters for my study The macro I send works fine in LIBO 4.0.5.2 and do not work in LIBO 4.1.4.2. All files must be in the same directory. It hungs at line 40 of Avvia Dialog1. Why? The variabile in LIBO 4.0.5.2 is defined and in LIBO 4.1.4.2 is nor defined. It seems abnormal. Cordial greetings to you. Marco -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73138] UI: undo name for Random Number Generator with 'Chi Squared' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73138 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard||target:4.3.0 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Julien Nabet committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b236154c3a664739761c22670729915116c1c74 Resolves: fdo#73138 undo name for 'Chi Squared' is different The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73138] UI: undo name for Random Number Generator with 'Chi Squared' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73138 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |serval2...@yahoo.fr |desktop.org | --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- For 4.2, https://gerrit.libreoffice.org/7231 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72968] EDITING: Unselecting of previously selected column, cause Calc to hang for some time (linux only)
https://bugs.freedesktop.org/show_bug.cgi?id=72968 sophie gautier.sop...@gmail.com changed: What|Removed |Added CC||gautier.sop...@gmail.com --- Comment #3 from sophie gautier.sop...@gmail.com --- I do not reproduce under Gnome/Ubuntu 13.10 x86_64 and Version: 4.2.0.1 Build ID: 7bf567613a536ded11709b952950c9e8f7181a4a. Sophie -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70307] EDITING: Input fields/lists are not updated in protected sections
https://bugs.freedesktop.org/show_bug.cgi?id=70307 --- Comment #7 from sylv...@ilm-informatique.fr --- Hi, the bug is still here in 4.1.4.2 on Windows 7. Another inconsistency is that if you try to edit fields in a read only section with clicking (not Ctrl+Shift+F9) then : - input fields are changed but only updated when you type F9 - input lists are not changed. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73140] Macro not executing
https://bugs.freedesktop.org/show_bug.cgi?id=73140 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Attachment #91323|text/plain |application/zip mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70307] EDITING: Input fields/lists are not updated in protected sections
https://bugs.freedesktop.org/show_bug.cgi?id=70307 --- Comment #8 from sylv...@ilm-informatique.fr --- Hi again, forgot to add : the reporter said that the last working version was 3.5 but I can't reproduce the bug with version 3.6.2.1 on Windows 7. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73137] UI: undo name for 'Covariance' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73137 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard||target:4.3.0 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Julien Nabet committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b104133abe2a377f1397cce3fa6e1bc7d85d4020 Resolves: fdo#73137 undo name for 'Covariance' is different The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73142] New: Charts - Up Down Bars not shown correctly
https://bugs.freedesktop.org/show_bug.cgi?id=73142 Priority: medium Bug ID: 73142 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Charts - Up Down Bars not shown correctly Severity: normal Classification: Unclassified OS: All Reporter: jore...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 91325 -- https://bugs.freedesktop.org/attachment.cgi?id=91325action=edit Comparison screenshot; Left LibreOffice, right word * Download attachment 90297 * Open it using LibreOffice Behavior: only 3 colored lines are displayed. Correct behavior: 3 colored lines + vertical bar charts starting from top of the chart-window (see comparison screenshot). Kind regards, Joren -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73142] Charts - Up Down Bars not shown correctly
https://bugs.freedesktop.org/show_bug.cgi?id=73142 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW Depends on||72345 Ever confirmed|0 |1 --- Comment #1 from Jorendc jore...@libreoffice.org --- See comment 6 from bug 72345 - reproduced with LibreOffice 4.2.0.0.beta2 and 4.3.0.0.alpha - NEW -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73142] Charts - Up Down Bars not shown correctly
https://bugs.freedesktop.org/show_bug.cgi?id=73142 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #91325|text/plain |image/png mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72202] FILEOPEN: xlsx chart fails to be correctly imported with LO 4.1.3. Data is not shown.
https://bugs.freedesktop.org/show_bug.cgi?id=72202 Jorendc jore...@libreoffice.org changed: What|Removed |Added Hardware|x86-64 (AMD64) |All OS|Linux (All) |All Status|UNCONFIRMED |NEW Severity|normal |major CC||jore...@libreoffice.org Ever confirmed|0 |1 --- Comment #4 from Jorendc jore...@libreoffice.org --- I can confirm this, tested using Windows 8.1 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 8102d45911bf3c47ce7ee15d3db89b0024c3bff8 TinderBox: Win-x86@39, Branch:master, Time: 2013-12-29_09:34:00 I can't confirm it is OK when you re-save it all again (so open , save , open , save open :-) )... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73137] UI: undo name for 'Covariance' is different
https://bugs.freedesktop.org/show_bug.cgi?id=73137 --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- For 4.2, https://gerrit.libreoffice.org/7232 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73143] New: Java null pointer exception when loading SmartDiagram extension
https://bugs.freedesktop.org/show_bug.cgi?id=73143 Priority: medium Bug ID: 73143 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Java null pointer exception when loading SmartDiagram extension Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ipla...@yahoo.co.uk Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Extensions Product: LibreOffice On master 4.3 alpha pulled and built on 29/12/2013 with --enable-ext-diagram 1) Start LO /instdir/program/soffice 2) Click on new Drawing 3) Click on SmartDiagram extension button. Console output : warn:legacy.osl:12872:1:unotools/source/config/moduleoptions.cxx:635: unknown factory warn:legacy.osl:12872:1:toolkit/source/helper/listenermultiplexer.cxx:143: ItemListenerMultiplexer::itemStateChanged: caught an exception! [jni_uno bridge error] UNO calling Java method callHandlerMethod: non-UNO exception occurred: java.lang.NullPointerException java stack trace: java.lang.NullPointerException at oxygenoffice.extensions.smart.Gui.setGalleryDialogText(Gui.java:323) at oxygenoffice.extensions.smart.Gui.setGalleryDialogText(Gui.java:287) at oxygenoffice.extensions.smart.Listener.callHandlerMethod(Listener.java:265) at com.sun.star.bridges.jni_uno.JNI_proxy.dispatch_call(Native Method) at com.sun.star.bridges.jni_uno.JNI_proxy.invoke(JNI_proxy.java:183) at com.sun.proxy.$Proxy29.selectItemPos(Unknown Source) at oxygenoffice.extensions.smart.Gui.createDiagramGallery2(Gui.java:231) at oxygenoffice.extensions.smart.Gui.executeGalleryDialog(Gui.java:191) at oxygenoffice.extensions.smart.Controller.executeGalleryDialog(Controller.java:175) at oxygenoffice.extensions.smart.SmartProtocolHandler.dispatch(SmartProtocolHandler.java:117) warn:legacy.osl:12872:1:toolkit/source/helper/listenermultiplexer.cxx:143: ItemListenerMultiplexer::itemStateChanged: caught an exception! [jni_uno bridge error] UNO calling Java method callHandlerMethod: non-UNO exception occurred: java.lang.NullPointerException java stack trace: java.lang.NullPointerException at oxygenoffice.extensions.smart.Gui.setGalleryDialogText(Gui.java:323) at oxygenoffice.extensions.smart.Gui.setGalleryDialogText(Gui.java:287) at oxygenoffice.extensions.smart.Listener.callHandlerMethod(Listener.java:265) at com.sun.star.bridges.jni_uno.JNI_proxy.dispatch_call(Native Method) at com.sun.star.bridges.jni_uno.JNI_proxy.invoke(JNI_proxy.java:183) at com.sun.proxy.$Proxy29.selectItemPos(Unknown Source) at oxygenoffice.extensions.smart.Gui.createDiagramGallery2(Gui.java:231) at oxygenoffice.extensions.smart.Gui.executeGalleryDialog(Gui.java:191) at oxygenoffice.extensions.smart.Controller.executeGalleryDialog(Controller.java:175) at oxygenoffice.extensions.smart.SmartProtocolHandler.dispatch(SmartProtocolHandler.java:117) warn:legacy.tools:12872:1:toolkit/source/helper/unowrapper.cxx:176: UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window! warn:legacy.tools:12872:1:toolkit/source/awt/vclxtoolkit.cxx:1147: VCLXToolkit::createWindow: did #133706# resurge? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62438] Graphics corruption on font rendering envolving LibreOffice, NVidia and Compiz
https://bugs.freedesktop.org/show_bug.cgi?id=62438 Walter Ribeiro wribeir...@gmail.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #3 from Walter Ribeiro wribeir...@gmail.com --- The problem still occurs, fortunately in a lower frequency. After I increase the video memory in the BIOS Setup, the BUG started to occur more occasionally. It just shows that it is related to the amount of resources available and suggests that LibreOffice uses more system resources than other programs. The issue is also related to nvidia driver (nvidia-304-updates - 304.88). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72995] Goal Seek when Formula cell does not contain formula it is unclear which cell is error message referenced at
https://bugs.freedesktop.org/show_bug.cgi?id=72995 --- Comment #4 from yjw9...@gmail.com --- Hi all, Can I assign this EasyHack to myself? This is my first contribution to the LibreOffice project, so I'd like to get a feel of how the process normally goes by working on this EasyHack. Thanks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73145] New: Other: Tab bug
https://bugs.freedesktop.org/show_bug.cgi?id=73145 Priority: medium Bug ID: 73145 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Tab bug Severity: normal Classification: Unclassified OS: Windows (All) Reporter: fireman...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.4.2 release Component: Writer Product: LibreOffice Created attachment 91329 -- https://bugs.freedesktop.org/attachment.cgi?id=91329action=edit This attachment show where LibreOffice sends me to write upon hitting the bag button. Problem description: When I press the Tab button (in order to create a new paragraph, instead of jumping a few spaces it sends me to the complete other end of the page. Operating System: Windows 8 Version: 4.1.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73129] Tesselation issues with Line Chart
https://bugs.freedesktop.org/show_bug.cgi?id=73129 --- Comment #3 from Jacques Guilleron guillero...@aol.com --- Hello Clemens, I don't reproduce with LO 4.1.3.2 or LO 4.3.0.0.alpha0+ Windows 7 Home Premium. Kind regards, Jacques -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73146] New: Add Excel 2010 functions PERCENTILE.INC, PERCENTRANK.INC, QUARTILE.INC, RANK.EQ
https://bugs.freedesktop.org/show_bug.cgi?id=73146 Priority: medium Bug ID: 73146 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Add Excel 2010 functions PERCENTILE.INC, PERCENTRANK.INC, QUARTILE.INC, RANK.EQ Severity: normal Classification: Unclassified OS: All Reporter: winfrieddonk...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Spreadsheet Product: LibreOffice -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73146] Add Excel 2010 functions PERCENTILE.INC, PERCENTRANK.INC, QUARTILE.INC, RANK.EQ
https://bugs.freedesktop.org/show_bug.cgi?id=73146 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |winfrieddonkers@libreoffice |desktop.org |.org Blocks||70798 Ever confirmed|0 |1 --- Comment #1 from Winfried Donkers winfrieddonk...@libreoffice.org --- See meta bug 70798 for details. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73147] New: Add Excel 2010 functions NETWORKDAYS.INTL, WORKDAY.INTL
https://bugs.freedesktop.org/show_bug.cgi?id=73147 Priority: medium Bug ID: 73147 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Add Excel 2010 functions NETWORKDAYS.INTL, WORKDAY.INTL Severity: normal Classification: Unclassified OS: All Reporter: winfrieddonk...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Spreadsheet Product: LibreOffice See meta bug 70798 for details. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73147] Add Excel 2010 functions NETWORKDAYS.INTL, WORKDAY.INTL
https://bugs.freedesktop.org/show_bug.cgi?id=73147 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |winfrieddonkers@libreoffice |desktop.org |.org Blocks||70798 Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73148] New: Add Excel 2010 function AGGREGATE
https://bugs.freedesktop.org/show_bug.cgi?id=73148 Priority: medium Bug ID: 73148 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Add Excel 2010 function AGGREGATE Severity: normal Classification: Unclassified OS: All Reporter: winfrieddonk...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Spreadsheet Product: LibreOffice See meta bug 70798 for details. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73148] Add Excel 2010 function AGGREGATE
https://bugs.freedesktop.org/show_bug.cgi?id=73148 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |winfrieddonkers@libreoffice |desktop.org |.org Blocks||70798 Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73145] Other: Tab bug
https://bugs.freedesktop.org/show_bug.cgi?id=73145 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME CC||gautier.sop...@gmail.com --- Comment #1 from sophie gautier.sop...@gmail.com --- Hi, the cursor jump where the tab stop is placed, as seen in your screenshot, it's at 13 cm in the ruler. To change it, just drag the one in place out of the ruler and click where you want yours. You can set it also under Format Paragraph Tabs. The default position is set under Tools Options LibreOffice Writer General Settings and is usually 1.25 cm. Set as Resolved worksforme - Sophie -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73149] Add Excel 2010 functions ERF.PRECISE, ERFC.PRECISE
https://bugs.freedesktop.org/show_bug.cgi?id=73149 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |winfrieddonkers@libreoffice |desktop.org |.org Blocks||70798 Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73149] New: Add Excel 2010 functions ERF.PRECISE, ERFC.PRECISE
https://bugs.freedesktop.org/show_bug.cgi?id=73149 Priority: medium Bug ID: 73149 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Add Excel 2010 functions ERF.PRECISE, ERFC.PRECISE Severity: normal Classification: Unclassified OS: All Reporter: winfrieddonk...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Spreadsheet Product: LibreOffice See meta bug 70798 for details. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73150] New: Some non-printing characters don't display in Build ID: 350m1(Build:2) [Ubuntu 12.04]
https://bugs.freedesktop.org/show_bug.cgi?id=73150 Priority: medium Bug ID: 73150 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Some non-printing characters don't display in Build ID: 350m1(Build:2) [Ubuntu 12.04] Severity: normal Classification: Unclassified OS: Linux (All) Reporter: s...@dedicatedresponse.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 3.5.7.2 release Component: Writer Product: LibreOffice Created attachment 91330 -- https://bugs.freedesktop.org/attachment.cgi?id=91330action=edit writer template with hidden text present Using either the toggle icon in the toolbar or CTRL-F10, only spaces, tabs, end-of-line marks and end-of-paragraph marks appear and disappear when viewing the attached file. Hidden text segments remain invisible. The same file can be viewed properly in the 32-bit build. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73151] New: Navigator, Gallery, StylesFormatting should open in the Sidebar
https://bugs.freedesktop.org/show_bug.cgi?id=73151 Priority: medium Bug ID: 73151 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Navigator, Gallery, StylesFormatting should open in the Sidebar Severity: normal Classification: Unclassified OS: All Reporter: s.mehrbr...@gmail.com Hardware: Other Status: UNCONFIRMED Version: Inherited From OOo Component: UI Product: LibreOffice Created attachment 91331 -- https://bugs.freedesktop.org/attachment.cgi?id=91331action=edit Navigator, Gallery, StylesFormatting still in its own window In Writer the Navigator, the gallery and the StylesFormatting window are integrated in the Sidebar. However, when you activate one of them via the menu/toolbar/shortcut, they still open in its own window (see attached screenshot). That brings some confusion. I suggest that they would always be opened in the Sidebar. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73151] Navigator, Gallery, StylesFormatting should open in the Sidebar
https://bugs.freedesktop.org/show_bug.cgi?id=73151 Samuel M. s.mehrbr...@gmail.com changed: What|Removed |Added Attachment #91331|text/plain |image/png mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73126] IDE: attempt to advance a dereferenceable iterator outside its valid range
https://bugs.freedesktop.org/show_bug.cgi?id=73126 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- On pc Debian x86-64 (testing) with master sources updated today, I don't reproduce this. Terrence: I don't have --enable-option-checking=fatal in my autogen.input but for the rest, it should be ok: --with-system-odbc --enable-ext-barcode --enable-ext-diagram --enable-ext-google-docs --enable-ext-hunart --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-postgresql-sdbc --enable-ext-typo --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher --enable-dbus --enable-graphite --enable-evolution2 --enable-werror --enable-debug --enable-dbgutil --enable-crashdump --enable-dependency-tracking --enable-online-update --enable-extra-sample --enable-extra-template --enable-extra-gallery --enable-python=internal --enable-ext-mariadb-connector --with-system-mariadb --enable-bundle-mariadb --enable-avahi --enable-eot I tried a gdb session but didn't even enter there: 2333 ::sal_Int32 ret = getSelectionType(nNewFirstPara, nNewFirstPos, nNewLastPara, nNewLastPos); (see http://opengrok.libreoffice.org/xref/core/accessibility/source/extended/textwindowaccessibility.cxx#2333) Did you enable something so we enter accessibility part? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70624] index order depend on the screen zoom and on chapter position
https://bugs.freedesktop.org/show_bug.cgi?id=70624 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard||target:4.3.0 --- Comment #5 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Miklos Vajna committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8591de009a4fed6264f236bbcafb2accae70754f Related: fdo#70624 RTF export: fix crash when header contains a page break The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73153] New: Editing Bibliography structure removes spacers
https://bugs.freedesktop.org/show_bug.cgi?id=73153 Priority: medium Bug ID: 73153 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Editing Bibliography structure removes spacers Severity: normal Classification: Unclassified OS: All Reporter: miker...@googlemail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.1 rc Component: Writer Product: LibreOffice Created attachment 91332 -- https://bugs.freedesktop.org/attachment.cgi?id=91332action=edit Example file for testing bibliography table structure editing Environment where found: LO 4.2RC1, Windows 8 It is no longer possible to edit the structure of a Bibliography without corruption. Steps to reproduce: 1. Create a new document and insert a bibliography entry (from document content). I.e. Insert-Indexes and Tables-Bibliography Entry... 2. Create a bibliography by Insert-Indexes and Tables-Indexes and Tables... then pick Bibliography from the Type dropdown 3. Press OK, the bibliography will be inserted with one entry created in step 1 above 4. Right click on the bibliography table (not the entry) and select Edit Index/Table 5. In the Insert Index/Table dialog, select the Entries tab 6. Move to the last location and select Edition from the Structure dialog 7. Click Insert then OK 8. Observe how the commas have been removed from the bibliography table 9. Try to re-insert the commas using the basic procedure described in steps 4-7 above but entering a ', ' in the spacer fields 10. Observe how any remaining fields in the structure are removed -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62689] Getting wrong 'double's from sql-DB with libreoffice-basic
https://bugs.freedesktop.org/show_bug.cgi?id=62689 Terrence Enger lo_b...@iseries-guru.com changed: What|Removed |Added Status|NEW |NEEDINFO CC||lo_b...@iseries-guru.com --- Comment #2 from Terrence Enger lo_b...@iseries-guru.com --- sbatto, It would help us if you give us some more information: (1) Does you problem still happen with a recent version of LibreOffice? You can get one from http://www.libreoffice.org/download/. (2) What database engine are you connecting to? By what method? (3) Please give us the definition of table items. Some sammple data would not hurt. (4) Please attach a .odb file with the macro. Remember that attachments are available to the whole world, so you may not want to create a new .odb which omits anything confidential. Thank you for helping us improve LibreOffice. Terry. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs