Re: Glade UI Dialogs and UNO extensions
Hi Noel Em 08-01-2014 04:45, Noel Grandin escreveu: > On 2014-01-08 00:13, Olivier Hallot wrote: >> I know I can pick a UI file, rearrange it with Glade, and put back in >> place, even in hot mode. If I can do it with an extension (knowing the >> caveats), it will get another degree of freedom in my UI. > > But why? What is keeping you from just pushing these changes to LO itself ? My changes may not please others users and can possibly ingnite flames wars (UI is a sensitive issue). Extensions allows some customization to be carried out of the core development. My hope was to carry ui files tweaks. -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failing slowcheck in openSUSE build of 4.2.0.1
2014/1/7 Miklos Vajna > Hi Tomáš, > > On Tue, Jan 07, 2014 at 05:32:06PM +0100, Tomáš Chvátal < > tomas.chva...@gmail.com> wrote: > > in the process of cleaning up openSUSE spec I moved the checks properly > to > > %check phase but some fail to build. > > > > Could somebody who has time and knowledge investingate those out? > > > > How to trigger the issue: > > > > osc co LibreOffice:Factory/libreoffice > > cd LibreOffice:Factory/libreoffice > > vi libreoffice.spec # uncomment here the make slowcheck line > > osc build --ccache > > > > some tests on MSXML failed > > osc chroot > > > > Can you provide a bit more info, the workdir/CppunitTest/foo.log of the > failed test, and the exact name of it? > > Will attach as I will run it with the fonts bellow. > Also, do you have the required fonts in the chroot so that the tests can > actually pass? > Hmm might be it, will add them and see results in couple of hours :P Thanks Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Glade UI Dialogs and UNO extensions
On 2014-01-08 00:13, Olivier Hallot wrote: I know I can pick a UI file, rearrange it with Glade, and put back in place, even in hot mode. If I can do it with an extension (knowing the caveats), it will get another degree of freedom in my UI. But why? What is keeping you from just pushing these changes to LO itself ? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-01-08
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Keep in sync with desktop_strings[] in salplug.cxx in https://gerrit.libreoffice.org/7288 from Maxim Monastirsky about module vcl + Translated German comments in https://gerrit.libreoffice.org/7303 from Luc Castermans about module svtools + Export MailMerge cancel functionality via UNO. in https://gerrit.libreoffice.org/7190 from Jan-Marek Glogowski about module offapi, sw + translated German comments in https://gerrit.libreoffice.org/7300 from Luc Castermans about module svtools + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt about module connectivity + translated German comments in https://gerrit.libreoffice.org/7296 from Luc Castermans about module svtools + fdo#73227: Fix for corruption after RT in https://gerrit.libreoffice.org/7292 from Pallavi Jadhav about module sw + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn about module cui + API remove image : change document state #i74651# in https://gerrit.libreoffice.org/7286 from Maxime de Roucy about module svx End of freshness * Merged changes on master for project core changed in the last 25 hours: + Fix fdo#70807: Page Style method isInUse() broken in https://gerrit.libreoffice.org/7295 from Marcos Souza + fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4 in https://gerrit.libreoffice.org/7287 from Maxim Monastirsky + Linux file pickers are not here anymore in https://gerrit.libreoffice.org/7289 from Maxim Monastirsky + translated german comments in https://gerrit.libreoffice.org/7275 from Luc Castermans * 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: + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + 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 + fix Bluetooth lifecycle problems and respect UI guidelines in https://gerrit.libreoffice.org/7083 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 + 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
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 4 commits - sc/inc sc/source
sc/inc/dpresfilter.hxx | 12 ++
sc/inc/dputil.hxx |2 -
sc/source/core/data/dpdimsave.cxx |4 +-
sc/source/core/data/dpgroup.cxx |2 -
sc/source/core/data/dpobject.cxx| 17 +---
sc/source/core/data/dpresfilter.cxx | 69
sc/source/core/data/dptabsrc.cxx| 28 ++
sc/source/core/data/dputil.cxx | 13 --
8 files changed, 119 insertions(+), 28 deletions(-)
New commits:
commit 5428ccf34d212c2d38b159cfa0902dfba3e0f15a
Author: Kohei Yoshida
Date: Tue Jan 7 22:13:07 2014 -0500
fdo#72774: Generate correct group items for the year group.
This changes bring it back to the same algorithm used in 3.5.
Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781
(cherry picked from commit c2e88a32314012afb799e321ec1d658f99f71781)
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index e4ed831..9568e95 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -45,7 +45,7 @@ public:
SvNumberFormatter* pFormatter);
static sal_Int32 getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
SvNumberFormatter* pFormatter);
static OUString getDisplayedMeasureName(const OUString& rName,
ScSubTotalFunc eFunc);
diff --git a/sc/source/core/data/dpdimsave.cxx
b/sc/source/core/data/dpdimsave.cxx
index 16f68b8..2db4023 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -338,8 +338,8 @@ void fillDateGroupDimension(
{
case sheet::DataPilotFieldGroupBy::YEARS:
nStart = ScDPUtil::getDatePartValue(
-fSourceMin, rDateInfo, sheet::DataPilotFieldGroupBy::YEARS,
pFormatter);
-nEnd = ScDPUtil::getDatePartValue(fSourceMax, rDateInfo,
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
+fSourceMin, NULL, sheet::DataPilotFieldGroupBy::YEARS,
pFormatter);
+nEnd = ScDPUtil::getDatePartValue(fSourceMax, NULL,
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
break;
case sheet::DataPilotFieldGroupBy::QUARTERS: nStart = 1; nEnd = 4;
break;
case sheet::DataPilotFieldGroupBy::MONTHS: nStart = 1; nEnd = 12;
break;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 1e8059a..6a9f824 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -911,7 +911,7 @@ void ScDPGroupTableData::FillGroupValues(vector&
rItems, const vectorGetFormatTable();
sal_Int32 nPartValue = ScDPUtil::getDatePartValue(
-pData->GetValue(), *pNumInfo, nDatePart, pFormatter);
+pData->GetValue(), pNumInfo, nDatePart, pFormatter);
ScDPItemData aItem(nDatePart, nPartValue);
rItems[i] = pCache->GetIdByItemData(nColumn, aItem);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index e34bc79..558e189 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -294,16 +294,19 @@ OUString ScDPUtil::getNumGroupName(
}
sal_Int32 ScDPUtil::getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
SvNumberFormatter* pFormatter)
{
// Start and end are inclusive
// (End date without a time value is included, with a time value it's not)
-if (fValue < rInfo.mfStart && !rtl::math::approxEqual(fValue,
rInfo.mfStart))
-return ScDPItemData::DateFirst;
-if (fValue > rInfo.mfEnd && !rtl::math::approxEqual(fValue, rInfo.mfEnd))
-return ScDPItemData::DateLast;
+if (pInfo)
+{
+if (fValue < pInfo->mfStart && !rtl::math::approxEqual(fValue,
pInfo->mfStart))
+return ScDPItemData::DateFirst;
+if (fValue > pInfo->mfEnd && !rtl::math::approxEqual(fValue,
pInfo->mfEnd))
+return ScDPItemData::DateLast;
+}
sal_Int32 nResult = 0;
commit ee5c8db96bf353b158461e4ca516f338b5086d2f
Author: Kohei Yoshida
Date: Tue Jan 7 16:36:55 2014 -0500
fdo#72774: Ensure that all the group fields are in cache upon file load.
This resolves the originally reported issue in that bug (in Comment 1).
Change-Id: I6fb85cff1eafb78d784605aa08e7d992a1ac36e0
(cherry picked from commit 256e4ccba8a331f2d30c6b5da9dca70206deadae)
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f9344aa..3ade4cf 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2858,6 +2858,9 @@ const ScDPCache*
ScDPCollection::SheetCaches::getCache(const ScRange& rRange, co
return NULL;
}
+if (pDimData)
+pDimData->WriteToCache(*itCache->second);
+
return itCach
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/dputil.hxx |2 -
sc/qa/unit/subsequent_filters-test.cxx | 57 +
sc/source/core/data/dpdimsave.cxx |4 +-
sc/source/core/data/dpgroup.cxx|2 -
sc/source/core/data/dputil.cxx | 13 ---
5 files changed, 69 insertions(+), 9 deletions(-)
New commits:
commit fb7899e2423d26710200e46f66cf85894525afec
Author: Kohei Yoshida
Date: Tue Jan 7 23:00:19 2014 -0500
fdo#72774: Write test to ensure correct group items in pivot cache on load.
Change-Id: Ib9656b8e321a12a6f971f5775aaed235eac8df58
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index fd0ae76..220e6b4 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1741,6 +1741,7 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS()
bool bHasYears = false;
bool bHasMonths = false;
+std::vector aMemberIds;
for (long nGrpDim = 9; nGrpDim <= 10; ++nGrpDim)
{
@@ -1748,10 +1749,66 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS()
switch (nGrpType)
{
case sheet::DataPilotFieldGroupBy::MONTHS:
+{
bHasMonths = true;
+aMemberIds.clear();
+pCache->GetGroupDimMemberIds(nGrpDim, aMemberIds);
+
+// There should be a total of 14 items for the month group: 12
+// months plus the start and end value items.
+
+CPPUNIT_ASSERT_EQUAL(static_cast(14),
aMemberIds.size());
+
+std::vector aGrpValues;
+for (size_t i = 0, n = aMemberIds.size(); i < n; ++i)
+{
+const ScDPItemData* pItem =
pCache->GetItemDataById(nGrpDim, aMemberIds[i]);
+CPPUNIT_ASSERT_MESSAGE("Failed to get pivot item.", pItem);
+CPPUNIT_ASSERT_EQUAL(ScDPItemData::GroupValue,
pItem->GetType());
+ScDPItemData::GroupValueAttr aGrpVal =
pItem->GetGroupValue();
+CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldGroupBy::MONTHS,
aGrpVal.mnGroupType);
+aGrpValues.push_back(aGrpVal.mnValue);
+}
+
+std::sort(aGrpValues.begin(), aGrpValues.end());
+std::vector aChecks;
+aChecks.push_back(ScDPItemData::DateFirst);
+for (sal_Int32 i = 1; i <= 12; ++i)
+aChecks.push_back(i); // January through December.
+aChecks.push_back(ScDPItemData::DateLast);
+CPPUNIT_ASSERT_MESSAGE("Unexpected group values for the month
group.", aGrpValues == aChecks);
+}
break;
case sheet::DataPilotFieldGroupBy::YEARS:
+{
bHasYears = true;
+aMemberIds.clear();
+pCache->GetGroupDimMemberIds(nGrpDim, aMemberIds);
+
+// There should be a total of 4 items and they should be 2012,
+// 2013 and the start and end value items.
+
+CPPUNIT_ASSERT_EQUAL(static_cast(4),
aMemberIds.size());
+
+std::vector aGrpValues;
+for (size_t i = 0, n = aMemberIds.size(); i < n; ++i)
+{
+const ScDPItemData* pItem =
pCache->GetItemDataById(nGrpDim, aMemberIds[i]);
+CPPUNIT_ASSERT_MESSAGE("Failed to get pivot item.", pItem);
+CPPUNIT_ASSERT_EQUAL(ScDPItemData::GroupValue,
pItem->GetType());
+ScDPItemData::GroupValueAttr aGrpVal =
pItem->GetGroupValue();
+CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldGroupBy::YEARS,
aGrpVal.mnGroupType);
+aGrpValues.push_back(aGrpVal.mnValue);
+}
+
+std::sort(aGrpValues.begin(), aGrpValues.end());
+std::vector aChecks;
+aChecks.push_back(ScDPItemData::DateFirst);
+aChecks.push_back(2012);
+aChecks.push_back(2013);
+aChecks.push_back(ScDPItemData::DateLast);
+CPPUNIT_ASSERT_MESSAGE("Unexpected group values for the year
group.", aGrpValues == aChecks);
+}
break;
default:
;
commit c2e88a32314012afb799e321ec1d658f99f71781
Author: Kohei Yoshida
Date: Tue Jan 7 22:13:07 2014 -0500
fdo#72774: Generate correct group items for the year group.
This changes bring it back to the same algorithm used in 3.5.
Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index e4ed831..9568e95 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -45,7 +45,7 @@ public:
SvNumberFormatter* pFormatter);
static sal_Int32 getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+doubl
Re: Glade UI Dialogs and UNO extensions
Hi Michael, All Em 07-01-2014 19:32, Michael Meeks escreveu: > Hi Olivier, > > On Tue, 2014-01-07 at 17:37 -0200, Olivier Hallot wrote: >>> On 01/07/2014 06:05 PM, Olivier Hallot wrote: I have a demand to tweak some dialogs with better layout or widgets positions. In order to avoid disruption with the core development, I would like to know if these .ui dialogs can be packed into UNO extensions. >>> >>> No, there is no support for .ui files in .oxt extensions. > > So - just to confirm; it's not that you want to add new dialogs, but > you want to clobber / override existing application .ui dialogs with > changes / tweaks using an extension ? :-) > > Sounds like an interesting idea; but - extremely dangerous code-wise; > liable to introduce SEGV's all over the place if widgets are not there I > think. > I have converted tens of SRC file to UI, so I know you can rearrange the widgets but you can't add nor drop any of them without touching the dialog ctors. >> OK, so this is a fact today. Is it doable or are we going to die trying? >> GSoC 2014? (I know I can get what I want by changing the ui file at >> installation time) > > It's not 100% clear what you'd like - is it that you want to use the > new .ui file stuff inside an extension [ if so, that's rather do-able I > think ]. If it is overriding / tweaking existing files it's more > problematic. I know I can pick a UI file, rearrange it with Glade, and put back in place, even in hot mode. If I can do it with an extension (knowing the caveats), it will get another degree of freedom in my UI. I have one (easy) situation, which I already sent to UI list, but no decision was made... It refers to the position of the default button in Save As dialog. In this dialog, the "keep as MS format" button is the default and is on the left. IMHO it should be on the right and "Save As ODF" should be emphasized. Perhaps I should have open a enhancement UI bug Kind regards -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source officecfg/registry sfx2/inc sfx2/source sfx2/util
framework/source/uielement/recentfilesmenucontroller.cxx |5
officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu |5
sfx2/inc/backingcomp.hxx | 13 ++
sfx2/source/dialog/backingcomp.cxx| 54
+-
sfx2/source/dialog/backingwindow.cxx |5
sfx2/source/dialog/backingwindow.hxx |2
sfx2/util/sfx.component |1
7 files changed, 82 insertions(+), 3 deletions(-)
New commits:
commit d930cefbe65d8b7f21100fcbf2ddcd977dd15cb1
Author: Zolnai Tamás
Date: Tue Jan 7 22:57:58 2014 +0100
Startcenter: Refresh RecentDocsView when select 'Clear list' menu option
Change-Id: I9cbe647563699b9b610661003084d2cd16093f9a
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 586a9af..3866355 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -281,7 +281,12 @@ void SAL_CALL RecentFilesMenuController::itemSelected(
const css::awt::MenuEvent
OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8
).getStr() );
if ( aCommand.startsWith( CMD_CLEAR_LIST ) )
+{
SvtHistoryOptions().Clear( ePICKLIST );
+dispatchCommand(
+"vnd.org.libreoffice.recentdocs:ClearRecentFileList",
+::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >() );
+}
else
executeEntry( rEvent.MenuId-1 );
}
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 8bb848a..62f7566 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -70,5 +70,10 @@
vnd.com.sun.star.comp.PresentationMinimizer:*
+
+
+vnd.org.libreoffice.recentdocs:*
+
+
diff --git a/sfx2/inc/backingcomp.hxx b/sfx2/inc/backingcomp.hxx
index d4d86fe..7d1b38e 100644
--- a/sfx2/inc/backingcomp.hxx
+++ b/sfx2/inc/backingcomp.hxx
@@ -30,6 +30,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -57,6 +59,8 @@ class BackingComp : public css::lang::XTypeProvider
, public css::lang::XInitialization
, public css::frame::XController // => XComponent
, public css::awt::XKeyListener // => XEventListener
+ , public css::frame::XDispatchProvider
+ , public css::frame::XDispatch
, public ::cppu::OWeakObject
{
//__
@@ -119,6 +123,15 @@ class BackingComp : public css::lang::XTypeProvider
virtual void SAL_CALL addEventListener ( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException);
+// XDispatchProvider
+virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch
> > SAL_CALL queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& lDescriptions) throw(
css::uno::RuntimeException );
+
+// XDispatch
+virtual void SAL_CALL dispatch( const css::util::URL& aURL, const
css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(
css::uno::RuntimeException );
+virtual void SAL_CALL addStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(
css::uno::RuntimeException );
+virtual void SAL_CALL removeStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(
css::uno::RuntimeException );
+
//__
// helper
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index c34e6dc..5e357e3 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -102,7 +102,9 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/
const css::uno::Type&
static_cast< css::frame::XController* >(this),
static_cast< css::lang::XComponent* >(this),
static_cast< css::lang::XEventListener* >(this),
-static_cast< css::awt::XKeyListener* >(static_cast<
css
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/dpcache.hxx | 12 +
sc/inc/dpobject.hxx|3 --
sc/qa/unit/subsequent_filters-test.cxx | 43 +
sc/source/core/data/dpcache.cxx| 10 +++
sc/source/core/data/dpobject.cxx |3 ++
5 files changed, 69 insertions(+), 2 deletions(-)
New commits:
commit 331518c39551afa3c63d0c2fc394af0e9566aa43
Author: Kohei Yoshida
Date: Tue Jan 7 16:39:20 2014 -0500
fdo#72774: Add test for group field cache population on file load.
Change-Id: Iddde39da57db0d6be9f066f3e2bdb0526932edc6
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 707749c..b35fa3b 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -139,6 +139,15 @@ public:
void GetGroupDimMemberIds(long nDim, std::vector& rIds) const;
void ClearGroupFields();
const ScDPNumGroupInfo* GetNumGroupInfo(long nDim) const;
+
+/**
+ * Return a group type identifier. The values correspond with
+ * com::sun::star::sheet::DataPilotFieldGroupBy constant values.
+ *
+ * @param nDim 0-based dimension index.
+ *
+ * @return group type identifier, or 0 on failure.
+ */
sal_Int32 GetGroupType(long nDim) const;
SCCOL GetDimensionIndex(const OUString& sName) const;
@@ -163,6 +172,9 @@ public:
const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const;
+size_t GetFieldCount() const;
+size_t GetGroupFieldCount() const;
+
ScDPCache(ScDocument* pDoc);
~ScDPCache();
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 6c0a64d..05a063d 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -287,8 +287,7 @@ public:
void updateReference(
UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz);
-private:
-ScDPCache* getExistingCache(const ScRange& rRange);
+SC_DLLPUBLIC ScDPCache* getExistingCache(const ScRange& rRange);
void updateCache(const ScRange& rRange, std::set& rRefs);
bool remove(const ScDPCache* p);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2bb1dff..fd0ae76 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -46,11 +46,13 @@
#include "cellvalue.hxx"
#include "attrib.hxx"
#include "dpsave.hxx"
+#include "dpshttab.hxx"
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -1718,6 +1720,47 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS()
ScDPCollection::SheetCaches& rSheetCaches = pDPs->GetSheetCaches();
CPPUNIT_ASSERT_EQUAL(static_cast(1), rSheetCaches.size());
+// Make sure that the cache contains all group field data upon load.
+const ScSheetSourceDesc* pDesc = pDPObj->GetSheetDesc();
+CPPUNIT_ASSERT_MESSAGE("Failed to get the pivot source description
instance.", pDesc);
+const ScDPCache* pCache =
rSheetCaches.getExistingCache(pDesc->GetSourceRange());
+CPPUNIT_ASSERT_MESSAGE("Pivot cache should exist for this range.", pCache);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(9), pCache->GetFieldCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pCache->GetGroupFieldCount());
+
+SCCOL nDim = pCache->GetDimensionIndex("StartDate");
+CPPUNIT_ASSERT_MESSAGE("Dimension 'StartDate' doesn't exist in the
cache.", nDim >= 0);
+sal_Int32 nGrpType = pCache->GetGroupType(nDim);
+CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldGroupBy::DAYS, nGrpType);
+const ScDPNumGroupInfo* pInfo = pCache->GetNumGroupInfo(nDim);
+CPPUNIT_ASSERT_MESSAGE("Number group info doesn't exist in cache for
'StartDate'.", pInfo);
+
+// We should have two additional group fields and one should be years and
+// the other should be month. The order is not guaranteed.
+
+bool bHasYears = false;
+bool bHasMonths = false;
+
+for (long nGrpDim = 9; nGrpDim <= 10; ++nGrpDim)
+{
+nGrpType = pCache->GetGroupType(nGrpDim);
+switch (nGrpType)
+{
+case sheet::DataPilotFieldGroupBy::MONTHS:
+bHasMonths = true;
+break;
+case sheet::DataPilotFieldGroupBy::YEARS:
+bHasYears = true;
+break;
+default:
+;
+}
+}
+
+CPPUNIT_ASSERT_MESSAGE("Pivot cache doesn't have an additional year
group.", bHasYears);
+CPPUNIT_ASSERT_MESSAGE("Pivot cache doesn't have an additional month
group.", bHasMonths);
+
xDocSh->DoClose();
}
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 49e5d8f..1226878 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -821,6 +821,16 @@ const ScDPItemData* ScDPCache::GetItemDataById(long nDim,
SCROW nId) const
return &rGI[nItemId];
}
+size_t ScDPCache::GetFieldCount() const
+{
+return maFields.size();
+}
+
+size_t ScDPCache::GetGr
Re: Glade UI Dialogs and UNO extensions
Hi Olivier, On Tue, 2014-01-07 at 17:37 -0200, Olivier Hallot wrote: > > On 01/07/2014 06:05 PM, Olivier Hallot wrote: > >> I have a demand to tweak some dialogs with better layout or widgets > >> positions. In order to avoid disruption with the core development, I > >> would like to know if these .ui dialogs can be packed into UNO > >> extensions. > > > > No, there is no support for .ui files in .oxt extensions. So - just to confirm; it's not that you want to add new dialogs, but you want to clobber / override existing application .ui dialogs with changes / tweaks using an extension ? :-) Sounds like an interesting idea; but - extremely dangerous code-wise; liable to introduce SEGV's all over the place if widgets are not there I think. > OK, so this is a fact today. Is it doable or are we going to die trying? > GSoC 2014? (I know I can get what I want by changing the ui file at > installation time) It's not 100% clear what you'd like - is it that you want to use the new .ui file stuff inside an extension [ if so, that's rather do-able I think ]. If it is overriding / tweaking existing files it's more problematic. HTH, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/mdds
external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch |
54 ++
external/mdds/UnpackedTarball_mdds.mk|
1
2 files changed, 55 insertions(+)
New commits:
commit 47a7565315dcfc4271c2b2c205225d914a1a5094
Author: Kohei Yoshida
Date: Tue Jan 7 15:47:43 2014 -0500
Patch mdds to make available a method to empty multiple elements in one
call.
This is for multi_type_matrix.
Change-Id: I7b1fcf6b16b5addbb76078506536542cddede25f
diff --git
a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
b/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
new file mode 100644
index 000..c905cea
--- /dev/null
+++ b/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
@@ -0,0 +1,54 @@
+From d0a006ad2fcabd1e785787b9a5c84b32edbab780 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida
+Date: Tue, 7 Jan 2014 15:43:36 -0500
+Subject: [PATCH] Add a method to set empty to a span of elements.
+
+---
+ include/mdds/multi_type_matrix.hpp | 9 +
+ include/mdds/multi_type_matrix_def.inl | 10 ++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/include/mdds/multi_type_matrix.hpp
b/include/mdds/multi_type_matrix.hpp
+index a30393f..0574466 100644
+--- a/include/mdds/multi_type_matrix.hpp
b/c/d/include/mdds/multi_type_matrix.hpp
+@@ -377,6 +377,15 @@ public:
+ void set_empty(size_type row, size_type col);
+
+ /**
++ * Set specified range of elements empty.
++ *
++ * @param row row position of the first element.
++ * @param col column position of the first element.
++ * @param length length of the range to set empty.
++ */
++void set_empty(size_type row, size_type col, size_type length);
++
++/**
+ * Set element referenced by the position object empty.
+ *
+ * @param pos position object that references element.
+diff --git a/include/mdds/multi_type_matrix_def.inl
b/include/mdds/multi_type_matrix_def.inl
+index 21fe866..36f5448 100644
+--- a/include/mdds/multi_type_matrix_def.inl
b/c/d/include/mdds/multi_type_matrix_def.inl
+@@ -240,6 +240,16 @@ void multi_type_matrix<_String>::set_empty(size_type row,
size_type col)
+ }
+
+ template
++void multi_type_matrix<_String>::set_empty(size_type row, size_type col,
size_type length)
++{
++if (length == 0)
++throw general_error("multi_type_matrix::set_empty: length of zero is
not permitted.");
++
++size_type pos1 = get_pos(row, col);
++m_store.set_empty(pos1, pos1+length-1);
++}
++
++template
+ typename multi_type_matrix<_String>::position_type
+ multi_type_matrix<_String>::set_empty(const position_type& pos)
+ {
+--
+1.8.1.4
+
diff --git a/external/mdds/UnpackedTarball_mdds.mk
b/external/mdds/UnpackedTarball_mdds.mk
index 1ccfc2a..6e9185b 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/mdds_0.6.0.patch \
external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \
+
external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch \
))
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/charmapacc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94227ec32e4736d4a85e4d82be195eaef5ce45f1 Author: Stephan Bergmann Date: Tue Jan 7 21:34:35 2014 +0100 -Werror,-Wformat Change-Id: If251feecff0cef5af4cb8f28cc40f7cf65fc55ab diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 36f493f..4068de0 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -709,7 +709,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() c_Shifted >>= 4; } if( c < 256 ) -snprintf( buf+6, 10, " (%d)", c ); +snprintf( buf+6, 10, " (%" SAL_PRIuUINT32 ")", c ); sDescription += " " + OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US); return sDescription; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx |3
writerfilter/source/doctok/resources.xmi | 314 --
2 files changed, 317 deletions(-)
New commits:
commit ddf30fb628c7fa5834eeb4169ac605e119723afe
Author: Miklos Vajna
Date: Tue Jan 7 21:07:41 2014 +0100
writerfilter: drop unused rtf:{fdg,shpdgg,shpfbse,shpfHaveSpt} tokens
Change-Id: I2783cb18a14ebf9835016102da42277d7716c4e4
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 55e512e..ee2417f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -455,7 +455,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_LCB: break;//byte count
case NS_rtf::LN_CBHEADER: break;//ignored
case NS_rtf::LN_MFP: //MetafilePict
-case NS_rtf::LN_shpfbse: //BLIP store entry
case NS_rtf::LN_BRCTOP: //top border
case NS_rtf::LN_BRCLEFT: //left border
case NS_rtf::LN_BRCBOTTOM: //bottom border
@@ -609,8 +608,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break;// Shape has an anchor of some kind
case NS_rtf::LN_shpfBackground:
break;// Background shape
-case NS_rtf::LN_shpfHaveSpt:
-break;// Shape has a shape type property
case NS_rtf::LN_shpfBid:
break; //ignored
case NS_rtf::LN_shpfComplex:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index cde5930..5a35ac9 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -39104,64 +39104,6 @@
-
-
-
- Shape has a shape type
property
-
-
-
-
-
-
-
- 0x0c
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 0x800
-
-
-
-
-
-
-
- 11
-
-
-
-
-
-
-
-
rtf:shpfHaveSpt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -39229,184 +39171,6 @@
-
-
-
-
- 0xf006
-
-
-
-
-
-
-
-
-
- the dgg
structure
-
-
-
-
-
-
-
- 0x8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
rtf:shpdgg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
rtf:shpdgg
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0xf007
-
-
-
-
-
-
-
-
-
- the FBSE
structure
-
[Libreoffice-commits] core.git: Changes to 'private/tml/crack-1'
New branch 'private/tml/crack-1' available with the following commits: commit 067ab11deec364b5d65d410587fbf88d77d0fd51 Author: Tor Lillqvist Date: Tue Jan 7 17:23:14 2014 +0200 Revert "Revert "No need for implbase1.hxx to include XComponentContext.hpp"" This reverts commit e1157e7c588fad0c2b9319a794898c4dae705376. commit df9c584fed7b71e9e53411f5bce22df6ae4870c3 Author: Tor Lillqvist Date: Tue Jan 7 17:12:36 2014 +0200 Revert "Allow setting environment value directly in .component files" This reverts commit b1d65c9f1535c9ef283d2a91a225359e5983f747. commit cd883fbb4c9cb80512920e5ffc2fc3d3ad09ec28 Author: Tor Lillqvist Date: Tue Jan 7 17:12:16 2014 +0200 Revert "Keep using component_getImplementationEnvironment in extensions" This reverts commit fa2a7c1c95f78d20ed572091e12700fd4d852835. commit e96867b5333d1e51e6202c800b7aad2b65e38167 Author: Tor Lillqvist Date: Tue Jan 7 17:11:56 2014 +0200 Revert "Adapt all (non-extension, SharedLibrary) .components to environment="..."" This reverts commit 9ed364774c6e26e14409bd927e03e6da7fe01b60. commit e1157e7c588fad0c2b9319a794898c4dae705376 Author: Tor Lillqvist Date: Tue Jan 7 17:05:09 2014 +0200 Revert "No need for implbase1.hxx to include XComponentContext.hpp" This reverts commit 8233226fe4614d5cebe474a0d1b026084e023e4c. commit e326b0fb83adc87a0af6f414c4f394955fe1a27d Author: Tor Lillqvist Date: Tue Jan 7 17:05:07 2014 +0200 Revert "css.xml.sax service ctor clean-up" This reverts commit 71eb27376a92f61c91567f2bfc2a74dba7192aab. commit 7c61224064db572e76486fb3c941b1df1ddc4359 Author: Tor Lillqvist Date: Tue Jan 7 17:05:05 2014 +0200 Revert "workaround rather maddening endian-specific template bustage" This reverts commit 982db648c4fb7b72ab2797ba2cca00e10ddf055d. commit bb626cce4c8da33c28e10fa099b7073dd9cebd79 Author: Tor Lillqvist Date: Tue Jan 7 15:58:57 2014 +0200 Revert "Allow UNO component libraries to have each implementation in its own function." This reverts commit b6cebf4a3e2997e6489bba77b358b306f8f435ce. commit 90e9e61221104d56de4a89a97762f668dbad40e5 Author: Tor Lillqvist Date: Tue Jan 7 15:58:43 2014 +0200 Revert "Deduplicate some foo_component_getFactory declarations." This reverts commit 562b21949f4ed986d11270bd6203741487795343. commit 1c3009aa90af64d0d5dbfaa0d76f3af423c2f457 Author: Tor Lillqvist Date: Tue Jan 7 15:58:36 2014 +0200 Revert "Revert "Need to have native-code.cxx as a separate file for the LibreOffice app"" This reverts commit d3d037db064d28771d69df0d29ea3beadde39b4e. commit 3c7da931e6d9afaafd00a7fa6f2a2b0e59baec17 Author: Tor Lillqvist Date: Tue Jan 7 15:50:16 2014 +0200 Revert "sax: various clean up. Move _getFactory next to the implementation." This reverts commit 291e846db9840b9f82bc28e495b54ae5ac51d0fc. commit 98381dbb9ab7ddc3241a88f14ae863163e38872a Author: Tor Lillqvist Date: Tue Jan 7 15:49:54 2014 +0200 Revert "fastparser: fix load regression" This reverts commit 59003de73eff0da22d01f2fd3cddc78bf3a3a3f8. commit a63ec4f8f7fa338a86bf86f3a607f59f2e5b86ed Author: Tor Lillqvist Date: Tue Jan 7 15:49:47 2014 +0200 Revert "fastparser:: move Entity:: code into the anonymous namespace." This reverts commit 169eb25c86c28aae02345c92e04572abbf08d77a. commit 08ce8db977e80805584d1e410b4e8e84145ad18f Author: Tor Lillqvist Date: Tue Jan 7 15:49:39 2014 +0200 Revert "fastparser: move lclGetErrorMessage into the anonymous namespace." This reverts commit 838a6011c19870ea36695aab4b4497dcbd1880f5. commit a880736f4ec7f615a44bf3883ca2cbccc12f2a11 Author: Tor Lillqvist Date: Tue Jan 7 15:49:30 2014 +0200 Revert "fastparser: avoid std::stack::top() - cache it's results." This reverts commit 4754b8ac5074d86234cafe1b1401f6d22f14b929. commit 8d3d8b28ddefad2451653a4210f764ca1d86dc7f Author: Tor Lillqvist Date: Tue Jan 7 15:49:21 2014 +0200 Revert "don't call top on an empty stack" This reverts commit c6aea0bac0b168c3b0e5172d10e2d974cf5fd331. commit 84432718740c0eb37dc03cbf7f7752bc5196ca84 Author: Tor Lillqvist Date: Tue Jan 7 15:49:14 2014 +0200 Revert "WaE: C4101: 'e' : unreferenced local variable" This reverts commit 308fdfb1a9176f65c11d82b95e3aa73b87e2fe47. commit d69ee12be3715ffe9f29754b27a3b2fd2a97ebd2 Author: Tor Lillqvist Date: Tue Jan 7 15:41:40 2014 +0200 Revert "Change from ServiceManager- to ComponentContext-based implementations" This reverts commit 71f33636dae11f3a53740ce73437255ad53641ed. commit 5e91fb3fa75b9b966b9fd2c389a2793360dc0b2f Author: Tor Lillqvist Date: Tue Jan 7 15:40:18 2014 +0200 Revert "bootstrap component: Split into implementation functions." This reverts commit e20f27f0a04a3c0c0ba38a2b78f5c2591e27bbc0. commit c2a5f26c49148f1d2aa82e916cf3ac46c6fb2053 Author: Tor Lillqvist Date: Tue Jan 7
Re: Failing slowcheck in openSUSE build of 4.2.0.1
Hi Tomáš, On Tue, Jan 07, 2014 at 05:32:06PM +0100, Tomáš Chvátal wrote: > in the process of cleaning up openSUSE spec I moved the checks properly to > %check phase but some fail to build. > > Could somebody who has time and knowledge investingate those out? > > How to trigger the issue: > > osc co LibreOffice:Factory/libreoffice > cd LibreOffice:Factory/libreoffice > vi libreoffice.spec # uncomment here the make slowcheck line > osc build --ccache > > some tests on MSXML failed > osc chroot > Can you provide a bit more info, the workdir/CppunitTest/foo.log of the failed test, and the exact name of it? Also, do you have the required fonts in the chroot so that the tests can actually pass? See http://pkgs.fedoraproject.org/cgit/libreoffice.git/tree/libreoffice.spec#n237 for a hint. HTH, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Glade UI Dialogs and UNO extensions
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Stephan Em 07-01-2014 15:16, Stephan Bergmann escreveu: > On 01/07/2014 06:05 PM, Olivier Hallot wrote: >> I have a demand to tweak some dialogs with better layout or widgets >> positions. In order to avoid disruption with the core development, I >> would like to know if these .ui dialogs can be packed into UNO >> extensions. > > No, there is no support for .ui files in .oxt extensions. > > Stephan OK, so this is a fact today. Is it doable or are we going to die trying? GSoC 2014? (I know I can get what I want by changing the ui file at installation time) - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSzFeUAAoJEJp3R7nH3vLxbUsH/0AsXymjdm1xNo4LW/T12ojg d8ifRAxjxiL1jjgrHYIJgqu7HlOf2FXO90vwypABNFCOo8cLJuj8li167yNQ0dkS xjk7gWdEcihgfMBIbZhxM41JMIReN6l+7kiJmITkVoVxkTvqr1LdgTErNHrP6VFN QCY7OJd1mqwL4qEH8iHwIdwQGWu5az2p8n3kogAHm5GU1rvftBv4mTaP9DhqRrcT eB/M8H4hekMS4//2A19T/jYk2Uq/KeqGj3tsYtBo8qpc12lh77w5D4ZWnSYDbE3r 4QBw5tl+8oBqqddhNsgxGsBWqvshdPClnAqfAzJ2JfoiCVz6VblVPgHDoy3Co3Y= =ENzW -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c2850eabb4cf9f6a661ccbc3eb7012999eec0faa Author: Christian Lohmaier Date: Tue Jan 7 20:16:44 2014 +0100 bump product version to 4.2.1.0.0+ Change-Id: Ib3d71f4f2d502b07be7e563d83e58d60eb6dc618 diff --git a/configure.ac b/configure.ac index 3fbc362..637b3d9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.1.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ 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-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b19a7b9e013e3eb8a7986586637bb81ef846c32 Author: Christian Lohmaier Date: Tue Jan 7 20:13:28 2014 +0100 bump product version to 4.2.0.2.0+ Change-Id: I56a4f95018b5b15ec5b7f8f77675db13ca37c982 diff --git a/configure.ac b/configure.ac index 75d0054..3fbc362 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.0.2'
Tag 'libreoffice-4.2.0.2' created by Christian Lohmaier at 2014-01-07 18:39 -0800 Tag libreoffice-4.2.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSzEn+AAoJEPQ0oe+v7q6jgAMQAIwknVAvWlNEkWtoqkTEPkBB hzs3SZcz6Oos+tvwG+t8FF6mvJeVzYlq/rS5A+tpS2QwkFf74fVhveXdvSP/fXu9 PsD6avEBteuVZkxQoagRzSVznfR9klUXESb9B8PCsbsIOpUo+cKLX+mL49j8TOhk WQFaO8H0T9HuML9xbhJv7yxbU3o3Z7iJjNx5y7G+oew9qKNy0gJdAbDdKWdmM9Pg +SGg1TeaRfDKtmMF3FtlW/UBRr+4fcoOsIN914/4SEarAkUTxNUAz2ajN+1Wiz2K +wt0OF1/G+8rCQli3npVcLvbtOO8Pmi9t9Td9rdu6jE7+KlaZToIIo61QrL73XgP 5UuXMv8lPZtm81L06YDbexBDAg8wu9qG55LFE/sgdYFMuPB4835wm3aErSrZi+kQ sCCHIM/V9CEZqE/z5jbsXYU4UQUpOapbmQefJpRTlUR3Yupv/CX8y/b1dmbwkLag xs/GwS2QT26dLGnFwSeuZZMKd9J+/TmRQZapnNDjOWtMWzbnxExtjTyFdQXQH0nv HO3vFuZl6SGw/Gu1lfqHG7GpeUdiuyihxxwnMKztlw7RbXtTFeNpgCzy3UD7ji2v L4TUOMcMBriQL9fy1TlHIiNklcvaysAOd0h+6BlAdPJY3fxxg/3AAHlmWH3ejz2F djVmEtx+Q4thN/wooBiC =JqRe -END PGP SIGNATURE- Changes since libreoffice-4-2-milestone-5-410: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.0.2'
Tag 'libreoffice-4.2.0.2' created by Christian Lohmaier at 2014-01-07 18:39 -0800 Tag libreoffice-4.2.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSzEn6AAoJEPQ0oe+v7q6jJPgP/1lEkJN5dFRdmpVJNyVaZS3+ U1CWCsQrjK/cDBdcDMqI/Pr3BE6/obiQ/jQqVK1Gw1WtDR55Rok4ptXW2lDxAQ8V ec7oU2h6jTOHtr/wpuDDT9qrNC5EnhIo7Sj9SRM4OnSy1HgEtlQGkxmJtuLZk7/T K3T3n4HaqAA8sNg4fkMAyamVD7vwDactoBJ8P1sVkAYpjsd8wdLDWmNxHbJdo4Nw toccKEjGdSSx5ZB5NRcGB6Df2Gu+QprEZu/hbcDhX8828tHZDKvLhmhY3fGjqOdi 9miywBEAIJWa4/N8yAl8nv8UgRMHTCCKpT0JyoEkU/wMaDHsN0DkFuqcHRhZ+XSn PECMKm1aedk6HR0zORexZdFVCPmNsKlDet/Wpy85KFtc7kETmttngc3N73boFmHA r6MEzGd7bhQiINdmE2NVTK2jWR82hcR/Hi2B7hnoQ4GwKOb4vHrKmiTNOBHrG3Eh 0/klhHlWqE32gJkK4qxwJs/OlzgjIYfROTmLXWgzBj/lLld/NIKuI7qf8UwK0R96 iAsb6Z3oHIbTPQ5t81N6GNxc1RKvQ102/xAeEZ9klx6yplYWoX330FvhkONiHGu/ wFfbkL30F5JJyIBIsUExRbgFJ/pE3sZ1diX90n30PzGre3IT4WG1J4v9Vvmuaubm FY6Yc+zOwXJ4k192LGty =ci3i -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.0.2'
Tag 'libreoffice-4.2.0.2' created by Christian Lohmaier at 2014-01-07 18:39 -0800 Tag libreoffice-4.2.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSzEn2AAoJEPQ0oe+v7q6j5gsP/ji2D+lb2aaUk+k47Kzi6Zb3 MbZ++S+c8kY8kuMA7Rud4myUODdGn2utFdWnxq5kM/y75IMlmsUuh+AkV6bgnSqu p/siBLSqJ5W6e15RkxlnIMseIvjDhKLdYoAed9oMUMs3/18tJcD3ho87DxTd1t5m VZfmZ+2uQ1Qsp9flWOkhQ3m7t8lwo5poCwkOcVIcNxNu1i2jB1/8Eud8gL7A0gza 53HSiRwbl7aYx2Emt+cJc9tOI3OH9gJpA+MP1crB361GWrBHx1Wm5/+QyGpErzTh jrHSdyoFQ961zjPyNO3DFELNuRNk7BRTdnwglAcETQWh+wPMiEXPPgSoHVTOAKMX NpdGLKzSFM+eoClbDRc69fUGmrZDXE7oVEQW4k0/4EI9HCIXSaOrL5NEFiB//XGs xZXGAiPrjCfN/hKOgzG6Kjrg3BoLl0LyMxy59hJ6g4gV4dB6Aso50SJLV0xQ5u1W IpyuGHbOBQPiGJ3KKih6h7ri5aAz3UCNXgx4sOqLF+lTdphBygWmaiIQJKvcKqaG 2qdA/CFknxL+096MVglljLjngFSjMTlm6z50CI+SP6QT3Hawny+iqoC6uyc7mLfW WzWEYh0jRDD5oGUITdU5+TI1qOafV3/gMTXKdSSgxZoMfcadpRxq4MuNMSoJlh9H Mz6Dkj04rv8Ia/tGA+iZ =gbOp -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.0.2'
Tag 'libreoffice-4.2.0.2' created by Christian Lohmaier at 2014-01-07 18:39 -0800 Tag libreoffice-4.2.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSzEnwAAoJEPQ0oe+v7q6jP5sQAJnTSidXOjsAxylsq3i+xUcA xQLlfYqaiBzED6O6rLgRj1QSgdEktZArj8kGLPlEG1SOXpCgrp2CqNZtWkkPoEyV KFD5QT/sLQxrDZNJvIeZ2O4dKyr5GObaI9B4eKBeJ5CdtrgK5KREXn6AO9HXzpiQ dDkcmydgIaUMQQH8mwiaydc5WNDnFxYH5h6oR+sTUlfPVOu/UbZh9U0sDbip8dIl T2OyAMIQ6NxLJV7+igbYNrCav7wLZMfkGbJGpri9Ousoq8eniJ6Rev5Y1gleasAD LwqKC3gY53LxxbzQHXMMEcznmRsUxxwR40lDPfjUUF8+tRdvHRAt5DV+2ygkZxL6 nlt0y9IN+CTWSCg43bscVpREfVW5u2BY7NgsQ6MlaKHyK9SgQZUrHdMf4ZFe9b6G 4uycaPudgCcGeyF4hKXJqQiin/xQHzVOvnpMav6+Weaku+QH7Suq3fNx/6AQid0N lAjBtOF09nUGRTs8jh7wYOpLT8dQMJh+YZB35pq34s4ulNQb6X8iAzTPY/DDJIhG ny6B0+wtBkb2uUBMZ8iZ5mITWO9tUACZ9DU0hSvzjaYliJ5fmLfTJAXDcrKc8JcC iBDS4mOkM9Jd85RX6gexDniYcJwdeSEDz9g7DLYtGFmZRDrjitrmVHjngh/2zIcW 5i/PGlcsC6Q5idfu/E65 =FxmU -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-9: --- 0 files changed --- ___ 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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 668adad0e74668f7d8145d169dca9ec591e2 Author: Christian Lohmaier Date: Tue Jan 7 19:34:28 2014 +0100 bump product version to 4.2.0.2.0+ Change-Id: Ib23ca2668b48aa88358210a3b42699b3f1b0e154 diff --git a/configure.ac b/configure.ac index 75d0054..3fbc362 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-0'
New branch 'libreoffice-4-2-0' available with the following commits: commit a809a568a3331e1479c21a6681f468ab2f5bcc83 Author: Christian Lohmaier Date: Tue Jan 7 19:31:26 2014 +0100 Branch libreoffice-4-2-0 This is 'libreoffice-4-2-0' - the stable branch for the 4.2.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I9cb15babf75ba0a854ea822810e665b34434f2e5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-2-0'
New branch 'libreoffice-4-2-0' available with the following commits: commit 1cdd621dcee55813db4f80e26ecc206e070d7355 Author: Christian Lohmaier Date: Tue Jan 7 19:31:19 2014 +0100 Branch libreoffice-4-2-0 This is 'libreoffice-4-2-0' - the stable branch for the 4.2.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I6312ca633a2431a8d8c93f3c734259200ea4b1e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-0'
New branch 'libreoffice-4-2-0' available with the following commits: commit eabd000697c136fccf4be5e7fbdb20f3101de7a1 Author: Christian Lohmaier Date: Tue Jan 7 19:32:10 2014 +0100 Branch libreoffice-4-2-0 This is 'libreoffice-4-2-0' - the stable branch for the 4.2.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I6866855506970d17d4085b84ae9ef78947a9cd37 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-2-0'
New branch 'libreoffice-4-2-0' available with the following commits: commit 7cf30c2b3454e97ca342ffb655b08fe51bdaae65 Author: Christian Lohmaier Date: Tue Jan 7 19:31:20 2014 +0100 Branch libreoffice-4-2-0 This is 'libreoffice-4-2-0' - the stable branch for the 4.2.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I96d06ae92e4994c2f16ca0933c6377ab19a1d1c6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac3c6de70409ab3a14d92a0644c29323e47605bf Author: Stephan Bergmann Date: Tue Jan 7 15:37:16 2014 +0100 No serviceNames attribute in Loader Change-Id: I6cc001d18683fc412f0ec0b6a33054d6e745463f (cherry picked from commit 431b49fbec68c17c7a486ef0f577107d3dd27e55) Reviewed-on: https://gerrit.libreoffice.org/7294 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 3074d0f..1d1b7de 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -157,7 +157,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): return g_implementationName def supportsService( self, ServiceName ): -return ServiceName in self.serviceNames +return ServiceName in self.getSupportedServiceNames() def getSupportedServiceNames( self ): return g_supportedServices ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c85056cd3d0f002ce13cf6d9de34598d3bf28781 Author: Christian Lohmaier Date: Tue Jan 7 16:50:25 2014 +0100 Updated core Project: translations c9c7a45a631a5f523ebcc242bf97625466844b4d diff --git a/translations b/translations index 4417e4d..c9c7a45 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 4417e4d92cb27c5712dafdb9b22fd54d7554d600 +Subproject commit c9c7a45a631a5f523ebcc242bf97625466844b4d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/layout/pagedesc.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 63c2990d0e67e90f5445dac10c8c1f7919031482
Author: Marcos Paulo de Souza
Date: Tue Jan 7 12:42:25 2014 -0200
Fix fdo#70807: Page Style method isInUse() broken
We need to check m_FirstMaster and m_FirstLeft too to verify is a style is
used
Thanks a lot mst__ for pointing how to fix this!
Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8
Reviewed-on: https://gerrit.libreoffice.org/7295
Reviewed-by: Michael Stahl
Tested-by: Olivier Hallot
(cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08)
Signed-off-by: Michael Stahl
diff --git a/sw/source/core/layout/pagedesc.cxx
b/sw/source/core/layout/pagedesc.cxx
index 05a24d1..1f7addb 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -156,13 +156,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
|*
*/
-
-// gets information from Modify
+// gets information from Modify
bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
{
if( !aMaster.GetInfo( rInfo ) )
-return false; // found
-return aLeft.GetInfo( rInfo );
+return false; // found
+if ( !aLeft.GetInfo( rInfo ) )
+return false ;
+if ( !m_FirstMaster.GetInfo( rInfo ) )
+return false;
+return m_FirstLeft.GetInfo( rInfo );
}
/*
___
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/layout/pagedesc.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit c47f102d8df5e413dbf70e9968ed913f2855787d
Author: Marcos Paulo de Souza
Date: Tue Jan 7 12:42:25 2014 -0200
Fix fdo#70807: Page Style method isInUse() broken
We need to check m_FirstMaster and m_FirstLeft too to verify is a style is
used
Thanks a lot mst__ for pointing how to fix this!
Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8
Reviewed-on: https://gerrit.libreoffice.org/7295
Reviewed-by: Michael Stahl
Tested-by: Olivier Hallot
(cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08)
diff --git a/sw/source/core/layout/pagedesc.cxx
b/sw/source/core/layout/pagedesc.cxx
index c450a8c..a10ffcd 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -157,13 +157,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
|*
*/
-
-// gets information from Modify
+// gets information from Modify
bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
{
if( !aMaster.GetInfo( rInfo ) )
-return false; // found
-return aLeft.GetInfo( rInfo );
+return false; // found
+if ( !aLeft.GetInfo( rInfo ) )
+return false ;
+if ( !m_FirstMaster.GetInfo( rInfo ) )
+return false;
+return m_FirstLeft.GetInfo( rInfo );
}
/*
___
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/layout/pagedesc.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 6131787afbb32e1e12aac4cf4f65625d11d39f08
Author: Marcos Paulo de Souza
Date: Tue Jan 7 12:42:25 2014 -0200
Fix fdo#70807: Page Style method isInUse() broken
We need to check m_FirstMaster and m_FirstLeft too to verify is a style is
used
Thanks a lot mst__ for pointing how to fix this!
Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8
Reviewed-on: https://gerrit.libreoffice.org/7295
Reviewed-by: Michael Stahl
Tested-by: Olivier Hallot
diff --git a/sw/source/core/layout/pagedesc.cxx
b/sw/source/core/layout/pagedesc.cxx
index c450a8c..a10ffcd 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -157,13 +157,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
|*
*/
-
-// gets information from Modify
+// gets information from Modify
bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
{
if( !aMaster.GetInfo( rInfo ) )
-return false; // found
-return aLeft.GetInfo( rInfo );
+return false; // found
+if ( !aLeft.GetInfo( rInfo ) )
+return false ;
+if ( !m_FirstMaster.GetInfo( rInfo ) )
+return false;
+return m_FirstLeft.GetInfo( rInfo );
}
/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/databasedocument.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1f44df47a57006f72abf4853995cf76928ac6049
Author: Stephan Bergmann
Date: Tue Jan 7 18:11:48 2014 +0100
Fix build
Change-Id: I7a5a647d0c0c5d86f0c7add7977c00f741d0ee40
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index ba0a589..5dbf3a1 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1615,7 +1615,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
{ OUString("BaseURI"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("Version"), 0,&::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("Version"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa
framework/qa/complex/framework/autosave/ConfigHelper.java | 24 --
1 file changed, 24 deletions(-)
New commits:
commit 87d5f408180c0292fbf71ed71f564473beffe29a
Author: Stephan Bergmann
Date: Tue Jan 7 17:04:21 2014 +0100
Remove unused methods
Change-Id: Ib1fb65981151ef1c0c1cd316790e9906d1072dfc
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java
b/framework/qa/complex/framework/autosave/ConfigHelper.java
index 701b4bf..8de6e87 100644
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
@@ -106,28 +106,4 @@ class ConfigHelper
catch(com.sun.star.uno.Exception ex)
{}
}
-
-//---
-public static Object readDirectKey(XMultiServiceFactory xSMGR ,
- String sConfigFile,
- String sRelPath ,
- String sKey )
-throws com.sun.star.uno.Exception
-{
-ConfigHelper aConfig = new ConfigHelper(xSMGR, sConfigFile, true);
-return aConfig.readRelativeKey(sRelPath, sKey);
-}
-
-//---
-public static void writeDirectKey(XMultiServiceFactory xSMGR ,
- String sConfigFile,
- String sRelPath ,
- String sKey ,
- Object aValue )
-throws com.sun.star.uno.Exception
-{
-ConfigHelper aConfig = new ConfigHelper(xSMGR, sConfigFile, false);
-aConfig.writeRelativeKey(sRelPath, sKey, aValue);
-aConfig.flush();
-}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Glade UI Dialogs and UNO extensions
On 01/07/2014 06:05 PM, Olivier Hallot wrote: I have a demand to tweak some dialogs with better layout or widgets positions. In order to avoid disruption with the core development, I would like to know if these .ui dialogs can be packed into UNO extensions. No, there is no support for .ui files in .oxt extensions. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Glade UI Dialogs and UNO extensions
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi I have a demand to tweak some dialogs with better layout or widgets positions. In order to avoid disruption with the core development, I would like to know if these .ui dialogs can be packed into UNO extensions. If affirmative, can someone point me to an example? Thanks! - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSzDPoAAoJEJp3R7nH3vLxZdgH/24Vidgff9Q13LdH5cdAMyNa BpqR7LTRm2gvqjAN2MZSKl5zMojSPWKOK9tuSUUcIlx9vZ2iZY9t3I5Hf/URvqLT eebXjHQ0ucKW0/YzTZztNhv5ftP97Y90RHPXIIwCQ3Y/GlggzZHT1D/diabuLprZ vifs1mIlX313/0rOJq/G1kLl3Kk9uRLuM7X9JQ/LQsmEq2WLVTAmWqX7jTXINwR9 gCxSQDu9i5GMfVzhs96JEOHaEMVNkAsW9PoRV66EbQg77I3L0r4SKkDNzaRKnQUt pL329ShJxpMYcbu5FzZtNR83fjhJnWzfGKARx6UsUXv7OLlGSWr+bLk/Td7BTI0= =gcWn -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: odb ODF standard conformance [was: minutes of ESC call ...]
On 01/06/2014 09:45 PM, Michael Stahl wrote: On 20/12/13 14:40, Lionel Elie Mamane wrote: 1) fdo36288-2.odb/forms/Obj42/content.xml[2,17145]: Error: attribute "xlink:href" has a bad value: ".uno:FormController/saveRecord" does not satisfy the "anyURI" type What is the "right" way to put a .uno URI? anyURI is actually an IRI reference in ODF (not that it makes a difference here). RFC3987 says: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) ... so the problem is that it starts with "." where only ALPHA is allowed. was that perhaps legal in a previous URI RFC or how did we end up with this? Yes, RFC 1738 had scheme = 1*[ lowalpha | digit | "+" | "-" | "." ] so that's how those "private" .uno and .component URL schemes got cooked up. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Failing slowcheck in openSUSE build of 4.2.0.1
Hello guys, in the process of cleaning up openSUSE spec I moved the checks properly to %check phase but some fail to build. Could somebody who has time and knowledge investingate those out? How to trigger the issue: osc co LibreOffice:Factory/libreoffice cd LibreOffice:Factory/libreoffice vi libreoffice.spec # uncomment here the make slowcheck line osc build --ccache some tests on MSXML failed osc chroot Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: 2 commits - dbaccess/source
On Tue, Jan 07, 2014 at 05:27:13PM +0100, Michael Stahl wrote:
> On 07/01/14 17:18, Lionel Elie Mamane wrote:
>> commit 4933d0578e73130d9b06a849139934d952338155
>> Author: Lionel Elie Mamane
>> Date: Sat Dec 21 10:41:51 2013 +0100
>> ODB ODF standard conformance: xlink:href needs xlink:type
>> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
>> b/dbaccess/source/filter/xml/xmlExport.cxx
>> index f1b9350..d66ec0c 100644
>> --- a/dbaccess/source/filter/xml/xmlExport.cxx
>> +++ b/dbaccess/source/filter/xml/xmlExport.cxx
>> @@ -651,6 +651,7 @@ void ODBExport::exportConnectionData()
>> else
>> {
>> AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
>> +AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
>> SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
>> XML_CONNECTION_RESOURCE, sal_True, sal_True);
>> }
>> }
>> @@ -861,6 +862,7 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
>> sValue = "reports/" + sValue;
>>
>> AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
>> +AddAttribute(XML_NAMESPACE_DB, XML_TYPE, XML_SIMPLE);
> should this not be XML_NAMESPACE_XLINK ?
Yes. Thanks for the review. Fixed.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/filter/xml/xmlExport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7b7e3e48b88f168a5e16f645ca603df23a066b60 Author: Lionel Elie Mamane Date: Tue Jan 7 17:30:00 2014 +0100 typo: type attribute of xlink:href is also in xlinkk namespace Change-Id: I229358f80a47d5644b068a9813faf60a3a7bd419 diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index d66ec0c..63e80fb 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -861,8 +861,8 @@ void ODBExport::exportComponent(XPropertySet* _xProp) else sValue = "reports/" + sValue; -AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue); -AddAttribute(XML_NAMESPACE_DB, XML_TYPE, XML_SIMPLE); +AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sValue); +AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); sal_Bool bAsTemplate = sal_False; _xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate; AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE : XML_FALSE); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: odb ODF standard conformance [was: minutes of ESC call ...]
On Mon, Jan 06, 2014 at 09:45:54PM +0100, Michael Stahl wrote: > On 20/12/13 14:40, Lionel Elie Mamane wrote: >> On Thu, Dec 19, 2013 at 08:24:29PM +, Michael Meeks wrote: >>> * Crashtest update (Markus) >>> + cf. http://dev-builds.libreoffice.org/crashtest/ >>> new crash testing result is available (cf. the date & git hash) >>> All files tested, and the results are complete for the 1st time. >>> and that all odb files are not valid according to the validator >>> + need to look at the standard (Lionel) >>> + presumably some silly error ... >> Here are the main classes of "low hanging fruit" conformance errors I >> see: >> 1) xlink:href without xlink:type >>Easy to fix if (as I assume) I can always put "simple" in these >>places. I have a patch sitting in my tree to do that. > sounds good. Pushed. > > 2) manifest:manifest without version attribute: I have no clue what > >version I should put there. Any hint? > to expand on Thorsten's answer, "1.2", but only if that's the ODF > version; the attribute did not exist in ODF 1.1/1.0. I don't find how to set the manifest:manifest version. It seems to be in the GetVersion() of the m_pRootFolder of ZipPackage (package/source/zippackage/ZipPackage.cxx), but I don't see how that is ever set except when reading the file (that is, parsing the manifest). So where/when is it set when *writing* the file? I pushed a maybe-related fix, but in my testing it still does not set the version in the manifest... See http://cgit.freedesktop.org/libreoffice/core/commit/?id=67db0c190ed2fe0629380ca32d153d3f5ab475dc Help appreciated. >> 3) ODF mimetype 'application/vnd.oasis.opendocument.base' is invalid >>Well, >> >> http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1420388_253892949 >>lists this as the "recommended" mimetype but that the >>RFC4288-registration is "in progress". Shouldn't we rather move >>forward on the registration... which has been stalled... why? > it's more complicated than that: there is a MIME type registration, but > unfortunately the MIME type registered with IANA is different from the > one given in the ODF specification... not sure what to do about that. OK, doing nothing for now. >> I need help on these: >> 1) fdo36288-2.odb/forms/Obj42/content.xml[2,17145]: Error: attribute >>"xlink:href" has a bad value: ".uno:FormController/saveRecord" does >>not satisfy the "anyURI" type >>What is the "right" way to put a .uno URI? > anyURI is actually an IRI reference in ODF (not that it makes a > difference here). RFC3987 says: >scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) > ... so the problem is that it starts with "." where only ALPHA is > allowed. was that perhaps legal in a previous URI RFC or how did we end > up with this? I don't know the history, but as far as I can see, that's how UNO commands are stored as a URI; that's also used extensively within LibreOffice, e.g. to give the action of a toolbar button. >> 2) ooo103006-1.odb/reports/Obj131/content.xml[2,6115]: Error: element >>"form:hidden" is missing "id" attribute >>This one probably just needs an ID generated. Shall we just call >>something like BASE64ENCODE(RANDOM(give me 9 bytes))? Or is there a >>more structured system in LibreOffice? > it's a mandatory xml:id attribute with an optional form:id (with same > value as xml:id) for backward compatibility with ODF 1.1. the only > correct way to implement that is via com.sun.star.rdf.XMetadatable, > which will take care of both uniqueness and persistence. could possibly > be tricky though, since no form thingy supports this currently; adding > whatever hack is used for other form:* may be easier. Dunno. I'll try to take another look one of these days in the indeterminate future. >> I doubt that these actually come from base-specific code, but who >> knows: >> 1) forms/Obj11/styles.xml: Error: unexpected attribute >> "style:layout-grid-snap-to-characters" > see c1e1ef80e8428514499b061e00801a6a6298d0b0 OK, doing nothing about that. >> 2) fdo36288-2.odb/content.xml[2,2887]: Error: tag name >>"db:font-charset" is not allowed. Possible tag names are: >>, > dbaccess/source/filter/xml/xmlExport.cxx:SvXMLElementExport > aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, sal_True, sal_True); > guessing maybe it should be db:character-set? Dunno. I'll try to take another look one of these days in the indeterminate future. Don't want to blindly change it without understanding it a bit. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: 2 commits - dbaccess/source
On 07/01/14 17:18, Lionel Elie Mamane wrote:
> commit 4933d0578e73130d9b06a849139934d952338155
> Author: Lionel Elie Mamane
> Date: Sat Dec 21 10:41:51 2013 +0100
>
> ODB ODF standard conformance: xlink:href needs xlink:type
>
> Change-Id: Ide0fc9331a62c1ddb1f7fe9aaee8a27ed35af8e7
>
> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
> b/dbaccess/source/filter/xml/xmlExport.cxx
> index f1b9350..d66ec0c 100644
> --- a/dbaccess/source/filter/xml/xmlExport.cxx
> +++ b/dbaccess/source/filter/xml/xmlExport.cxx
> @@ -651,6 +651,7 @@ void ODBExport::exportConnectionData()
> else
> {
> AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
> +AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
> SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
> XML_CONNECTION_RESOURCE, sal_True, sal_True);
> }
> }
> @@ -861,6 +862,7 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
> sValue = "reports/" + sValue;
>
> AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
> +AddAttribute(XML_NAMESPACE_DB, XML_TYPE, XML_SIMPLE);
should this not be XML_NAMESPACE_XLINK ? there is also a db:type
attribute in the schema but it doesn't have hard-coded "simple" value...
> sal_Bool bAsTemplate = sal_False;
> _xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate;
> AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE :
> XML_FALSE);
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - dbaccess/source
dbaccess/source/core/dataaccess/databasedocument.cxx |1 +
dbaccess/source/filter/xml/xmlExport.cxx |2 ++
2 files changed, 3 insertions(+)
New commits:
commit 67db0c190ed2fe0629380ca32d153d3f5ab475dc
Author: Lionel Elie Mamane
Date: Tue Jan 7 17:06:15 2014 +0100
to set version property, it should exist...
Change-Id: I1ca20da284f61c54ea04a27e5a27a84041c505e5
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c7b9110..ba0a589 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1615,6 +1615,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
{ OUString("BaseURI"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("Version"), 0,&::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
commit 4933d0578e73130d9b06a849139934d952338155
Author: Lionel Elie Mamane
Date: Sat Dec 21 10:41:51 2013 +0100
ODB ODF standard conformance: xlink:href needs xlink:type
Change-Id: Ide0fc9331a62c1ddb1f7fe9aaee8a27ed35af8e7
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index f1b9350..d66ec0c 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -651,6 +651,7 @@ void ODBExport::exportConnectionData()
else
{
AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
+AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
XML_CONNECTION_RESOURCE, sal_True, sal_True);
}
}
@@ -861,6 +862,7 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
sValue = "reports/" + sValue;
AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
+AddAttribute(XML_NAMESPACE_DB, XML_TYPE, XML_SIMPLE);
sal_Bool bAsTemplate = sal_False;
_xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate;
AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE :
XML_FALSE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDESalGraphics.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit a62a80ac6cc0e337f4ff6d862bccc13c720d41ac Author: Maxim Monastirsky Date: Tue Jan 7 13:03:14 2014 +0200 fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4 Change-Id: I92a781a1e0f0adcb779155f8c477595e0dd762b1 Reviewed-on: https://gerrit.libreoffice.org/7287 Reviewed-by: Jan-Marek Glogowski Tested-by: Jan-Marek Glogowski diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 9caeae9..cf72dcd 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -779,7 +779,11 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p break; } case PART_BUTTON_DOWN: -//the entire control can be used as the "down" button +contentRect = kapp->style()->subControlRect( +QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxArrow ); + +contentRect.translate( boundingRect.left(), boundingRect.top() ); + retVal = true; break; case PART_SUB_EDIT: ___ 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' - svx/source
svx/source/accessibility/charmapacc.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit b95a10423dfb52ec0d502a4f3ea85e17e15f2073
Author: Herbert Dürr
Date: Tue Jan 7 08:45:56 2014 +
Resolves: #i123986# fix charmap accessibility for...
code points beyond the unicode baseplane
(cherry picked from commit 5a81299b05da6f1f9ec81246abe54c55f49793a4)
Conflicts:
svx/source/accessibility/charmapacc.cxx
Change-Id: I29eaf14211be633a8dd354aac9f308e4a18ba27b
(cherry picked from commit 8fad6d99650c63dcc4a4ca4910d34dc4b901c00d)
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 7b65526..7f0487b 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -698,18 +698,21 @@ OUString SAL_CALL
SvxShowCharSetItemAcc::getAccessibleDescription()
ensureAlive();
OUString sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
-sal_Unicode c = mpParent->maText[0];
+const OUString aCharStr( mpParent->maText);
+sal_Int32 nStrIndex = 0;
+const sal_UCS4 c = aCharStr.iterateCodePoints( &nStrIndex );
+const int tmp_len = (c < 0x1) ? 4 : 6;
char buf[16] = "0x";
-sal_Unicode c_Shifted = c;
-for( int i = 0; i < 4; ++i )
+sal_UCS4 c_Shifted = c;
+for( int i = 0; i < tmp_len; ++i )
{
char h = (char)(c_Shifted & 0x0F);
-buf[5-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
+buf[tmp_len+1-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
c_Shifted >>= 4;
}
if( c < 256 )
snprintf( buf+6, 10, " (%d)", c );
-sDescription += OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US);
+sDescription += " " + OUString(buf, strlen(buf),
RTL_TEXTENCODING_ASCII_US);
return sDescription;
}
___
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' - 6b/4710c48566b06c4b709f4a5a6019f76c8bc202
6b/4710c48566b06c4b709f4a5a6019f76c8bc202 |1 + 1 file changed, 1 insertion(+) New commits: commit 520ea1259887275e071acaef8902f045cd3923f0 Author: Caolán McNamara Date: Tue Jan 7 16:01:17 2014 + Notes added by 'git notes add' diff --git a/6b/4710c48566b06c4b709f4a5a6019f76c8bc202 b/6b/4710c48566b06c4b709f4a5a6019f76c8bc202 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/6b/4710c48566b06c4b709f4a5a6019f76c8bc202 @@ -0,0 +1 @@ +ignore: fixed ___ 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' - 04/d077d34bd6ed991a279ea5921a8afbcd3993f2
04/d077d34bd6ed991a279ea5921a8afbcd3993f2 |1 + 1 file changed, 1 insertion(+) New commits: commit 1448404d52c6ad8b6cb0cf62c5b6947466ebfcc4 Author: Caolán McNamara Date: Tue Jan 7 16:00:16 2014 + Notes added by 'git notes add' diff --git a/04/d077d34bd6ed991a279ea5921a8afbcd3993f2 b/04/d077d34bd6ed991a279ea5921a8afbcd3993f2 new file mode 100644 index 000..5caad05 --- /dev/null +++ b/04/d077d34bd6ed991a279ea5921a8afbcd3993f2 @@ -0,0 +1 @@ +prefer: 350fa6154cada01aac8170be0f3cf2dbb690eca4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - download.lst external/boost svx/source
download.lst |2
external/boost/UnpackedTarball_boost.mk |4
external/boost/boost.9397.warnings.patch.0| 91
external/boost/boost.endian.patch | 24 -
external/boost/boost.std.move.patch |6
external/boost/boost.wshadow.patch| 32 -
external/boost/boost.wundef.patch | 42 --
external/boost/boost.wunused-local-typedefs.patch | 258
external/boost/boost.wunused.patch| 30 -
external/boost/boost_1_44_0-clang-warnings.patch | 11
external/boost/boost_1_44_0-gcc4.8.patch | 448 --
svx/source/accessibility/charmapacc.cxx | 13
12 files changed, 386 insertions(+), 575 deletions(-)
New commits:
commit 85ecb74a6ace6b53e065e23df3ac502d136d1cd9
Author: Caolán McNamara
Date: Tue Jan 7 15:32:49 2014 +
reduce warnings patches
Change-Id: I7a861758236bbae7f82292123ff012de97e2f4de
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index 966d33a..d73ee50 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -34,7 +34,7 @@ endif
# Clang warnings:
boost_patches += boost_1_44_0-clang-warnings.patch
-boost_patches += boost_1_44_0-gcc4.8.patch
+boost_patches += boost.wunused-local-typedefs.patch
boost_patches += boost.auto_link.patch
boost_patches += boost.endian.patch
diff --git a/external/boost/boost_1_44_0-gcc4.8.patch
b/external/boost/boost.wunused-local-typedefs.patch
similarity index 68%
rename from external/boost/boost_1_44_0-gcc4.8.patch
rename to external/boost/boost.wunused-local-typedefs.patch
index 695f8ac..ced3195 100644
--- a/external/boost/boost_1_44_0-gcc4.8.patch
+++ b/external/boost/boost.wunused-local-typedefs.patch
@@ -256,120 +256,3 @@
typedef typename ScannerT::iterator_t iterator_t;
iterator_t const s(scan.first);
misc/boost_1_44_0/boost/date_time/time_facet.hpp
-+++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
-@@ -439,31 +439,31 @@
- time_dur_arg.get_rep().as_special());
- }
-
-- string_type format(m_time_duration_format);
-+ string_type lcl_format(m_time_duration_format);
- if (time_dur_arg.is_negative()) {
- // replace %- with minus sign. Should we use the numpunct facet?
--boost::algorithm::replace_all(format,
-+boost::algorithm::replace_all(lcl_format,
- duration_sign_negative_only,
- negative_sign);
- // remove all the %+ in the string with '-'
--boost::algorithm::replace_all(format,
-+boost::algorithm::replace_all(lcl_format,
- duration_sign_always,
- negative_sign);
- }
- else { //duration is positive
- // remove all the %- combos from the string
--boost::algorithm::erase_all(format, duration_sign_negative_only);
-+boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
- // remove all the %+ in the string with '+'
--boost::algorithm::replace_all(format,
-+boost::algorithm::replace_all(lcl_format,
- duration_sign_always,
- positive_sign);
- }
-
- // %T and %R have to be replaced here since they are not standard
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- boost::as_literal(formats_type::full_24_hour_time_format),
- boost::as_literal(formats_type::full_24_hour_time_expanded_format));
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- boost::as_literal(formats_type::short_24_hour_time_format),
- boost::as_literal(formats_type::short_24_hour_time_expanded_format));
-
-@@ -476,22 +476,22 @@
-* here ourself.
-*/
- string_type hours_str;
-- if (format.find(unrestricted_hours_format) != string_type::npos) {
-+ if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
- hours_str = hours_as_string(time_dur_arg);
--boost::algorithm::replace_all(format, unrestricted_hours_format,
hours_str);
-+boost::algorithm::replace_all(lcl_format, unrestricted_hours_format,
hours_str);
- }
- // We still have to process restricted hours format specifier. In order
to
- // support parseability of durations in ISO format (%H%M%S), we'll have
to
- // restrict the stringified hours length to 2 characters.
-- if (format.find(hours_format) != string_type::npos) {
-+ if (lcl_format.find(hours_format) != string_type::npos) {
- if (hours_str.empty())
- hours_str = hours_as_st
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5a/81299b05da6f1f9ec81246abe54c55f49793a4
5a/81299b05da6f1f9ec81246abe54c55f49793a4 |1 + 1 file changed, 1 insertion(+) New commits: commit 31578c336ea2f529855ab821f9af05e105d2adf6 Author: Caolán McNamara Date: Tue Jan 7 15:59:46 2014 + Notes added by 'git notes add' diff --git a/5a/81299b05da6f1f9ec81246abe54c55f49793a4 b/5a/81299b05da6f1f9ec81246abe54c55f49793a4 new file mode 100644 index 000..2203bd0 --- /dev/null +++ b/5a/81299b05da6f1f9ec81246abe54c55f49793a4 @@ -0,0 +1 @@ +merged as: 8fad6d99650c63dcc4a4ca4910d34dc4b901c00d ___ 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' - pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd60d3fb5885d8dd3f409894fc37a3e42b57eee0 Author: Stephan Bergmann Date: Tue Jan 7 15:37:16 2014 +0100 No serviceNames attribute in Loader Change-Id: I6cc001d18683fc412f0ec0b6a33054d6e745463f (cherry picked from commit 431b49fbec68c17c7a486ef0f577107d3dd27e55) Reviewed-on: https://gerrit.libreoffice.org/7293 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 3074d0f..1d1b7de 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -157,7 +157,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): return g_implementationName def supportsService( self, ServiceName ): -return ServiceName in self.serviceNames +return ServiceName in self.getSupportedServiceNames() def getSupportedServiceNames( self ): return g_supportedServices ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 431b49fbec68c17c7a486ef0f577107d3dd27e55 Author: Stephan Bergmann Date: Tue Jan 7 15:37:16 2014 +0100 No serviceNames attribute in Loader Change-Id: I6cc001d18683fc412f0ec0b6a33054d6e745463f diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 3074d0f..1d1b7de 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -157,7 +157,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): return g_implementationName def supportsService( self, ServiceName ): -return ServiceName in self.serviceNames +return ServiceName in self.getSupportedServiceNames() def getSupportedServiceNames( self ): return g_supportedServices ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Avahi Support on Linux
Hello all, During this summer I've implemented Zeroconf service with Avahi on Linux distro, though it worked on my Ubuntu box, it doesn't seem to be supported on "all" distributions, and it has thus broken quite a lot of tinderboxes at that time... Tor pushed a quick fix for that and disabled avahi temporarily so that it doesn't get compiled unless specified. I'm thinking of fixing that but not sure how to load Avahi dynamically depending on the presence of Avahi library on the distribution. Any pointers on how to achieve that? Thanks! -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 72645, which changed state. Bug 72645 Summary: LibreOffice Calc inconsitent results from GETPIVOTDATA https://bugs.freedesktop.org/show_bug.cgi?id=72645 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
Re: Help in the issue fdo#70807
On 16/12/13 15:33, Marcos Souza wrote: > Hi guys! > > I'm trying to solve the issues fdo#70807. I putted some points in the > bug, but I need to understand where the code set a style as used. i've hoped that somebody else would answer this, but since nobody did i now actually looked at the bug and it is actually in Writer - please add the title of the bug in mails so lazy people like me dont skip it :) > Can someone point to me where a style is set as used inside the code base? apparently this works via some method SwClient::GetInfo (and subclasses' overrides) which walk the registered listeners to find a node; have added a comment to the bug about one suspicious method. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60924] move libraries to autoinstallation in scp2
https://bugs.freedesktop.org/show_bug.cgi?id=60924 --- Comment #63 from Michael Stahl --- (In reply to comment #62) > How we can do now? > > Looking at scp2/source/ooo/file_library_ooo.scp we have some third party > libs like rasqal, raptor, lcms, opensll and others... > > How we can handle these? as a first step they can be changed from referencing the libraries directly to referencing Packages (like commit 6d9026f7a7ebad02b57fcd2dd15f66adeba361af ) which gets rid of lots of #ifdefs already. we could probably go a bit further and add something like auto-installed libraries also for packages, so that the packages are listed in Repository.mk with the scp2 package, just like libraries, but that requires some new functions in AutoInstall.mk. -- 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: fpicker/README
fpicker/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00808a7b375c665f58c5c50a94405b37020950a9 Author: Maxim Monastirsky Date: Tue Jan 7 14:29:58 2014 +0200 Linux file pickers are not here anymore Change-Id: I0748afe45c2ff42c840e792df9ceba980dcdbed6 Reviewed-on: https://gerrit.libreoffice.org/7289 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/fpicker/README b/fpicker/README index 8c09487..e0366e0 100644 --- a/fpicker/README +++ b/fpicker/README @@ -1 +1 @@ -Native file pickers for Unix and Windows (file open dialog) GTK+, KDE, Windows. +Native file pickers for OS X and Windows (file open dialog). ___ 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' - 4 commits - sc/inc sc/source
sc/inc/clkernelthread.hxx| 16 ++-
sc/inc/formulacell.hxx |6 --
sc/source/core/data/formulacell.cxx | 58 +--
sc/source/core/opencl/formulagroupcl.cxx | 15 ++-
sc/source/core/opencl/opbase.hxx | 66 ++-
sc/source/core/tool/clkernelthread.cxx | 16 ---
sc/source/core/tool/formulaopt.cxx |4 +
7 files changed, 127 insertions(+), 54 deletions(-)
New commits:
commit d7f899bc56affad4ddd1672d3bfb354dc5966196
Author: Tor Lillqvist
Date: Tue Jan 7 14:08:09 2014 +0200
Drop the check of the SC_BACKGROUND_COMPILATION env var
Change-Id: Ia33002819023c79160d921fbc1cca7a5c12d143a
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 531c7e5..721f268 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -415,18 +415,14 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
mbSubTotal(false),
meCalcState(sc::GroupCalcEnabled)
{
-static bool bBackgroundCompilation = getenv("SC_BACKGROUND_COMPILATION")
!= NULL;
-if (bBackgroundCompilation)
+if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
{
-if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
+if (snCount++ == 0)
{
-osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
-if (snCount++ == 0)
-{
-assert(!sxCompilationThread.is());
-sxCompilationThread.set(new sc::CLBuildKernelThread);
-sxCompilationThread->launch();
-}
+assert(!sxCompilationThread.is());
+sxCompilationThread.set(new sc::CLBuildKernelThread);
+sxCompilationThread->launch();
}
}
}
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index ebeece1..e954423 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -412,10 +412,9 @@ void ScFormulaCfg::UpdateFromProperties( const
Sequence& aNames )
{
sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] >>= bVal;
-#if 0 // Don't remove please unless the SC_BACKGROUND_COMPILATION env var
thing goes away.
+#if 0 // Don't remove please.
// The intent here is that tml when running CppunitTest_sc_opencl_test
turns this on.
-if (getenv("SC_BACKGROUND_COMPILATION") != NULL)
-bVal = sal_True;
+bVal = sal_True;
#endif
GetCalcConfig().mbOpenCLEnabled = bVal;
}
commit 0c7309cfa5cbf295aae2917d1ccd73d5ab8ed026
Author: Tor Lillqvist
Date: Tue Jan 7 11:53:12 2014 +0200
Add some more logging
Change-Id: I637c365626242142a0f6fc0ac002fa9dd5f1340a
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index c15710f..531c7e5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3501,13 +3501,15 @@ bool ScFormulaCell::InterpretFormulaGroup()
aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
ScGroupTokenConverter aConverter(aCode, *pDocument, *this,
mxGroup->mpTopCell->aPos);
if (!aConverter.convert(*pCode))
-{
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+{
+SAL_INFO("sc.opencl", "conversion of group " << this << " failed,
disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
mxGroup->meCalcState = sc::GroupCalcRunning;
if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument,
mxGroup->mpTopCell->aPos, mxGroup, aCode))
{
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state
" << mxGroup->meCalcState << ") failed, disabling");
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
}
@@ -3517,10 +3519,11 @@ bool ScFormulaCell::InterpretFormulaGroup()
{
ScTokenArray aDummy;
if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument,
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
-{
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+{
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state
" << mxGroup->meCalcState << ") failed, disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
}
return true;
commit d90fa180dd76e55f5d480f63ce5e484e31307783
Author: Tor Lillqvist
Date: Tue Jan 7 11:33:08 2014 +0200
Avoid assertion failure if group has been disabled
Change-Id:
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/df5309eb591a7ced0e249df7ec94a358a29274
0e/df5309eb591a7ced0e249df7ec94a358a29274 |1 + 1 file changed, 1 insertion(+) New commits: commit 5158353ed180fdd9e761b29c926b19c7264b0fcd Author: Caolán McNamara Date: Tue Jan 7 12:22:10 2014 + Notes added by 'git notes add' diff --git a/0e/df5309eb591a7ced0e249df7ec94a358a29274 b/0e/df5309eb591a7ced0e249df7ec94a358a29274 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/0e/df5309eb591a7ced0e249df7ec94a358a29274 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RESOLVED][Bug 72598] [Easyhack] Remove SunStudio cruft from code base
On Sat, 2014-01-04 at 12:06 +0100, Philipp Riemer wrote: > > Now I was wondering, if the empty OR at the end might bring any > complications? Wouldn't it be better to remove these characters as > well? I submitted a change request to gerrit: > https://gerrit.libreoffice.org/#/c/7269/ Marking this good catch as resolved seeing as the above got pushed C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc.cxx|2 --
sc/source/core/data/formulacell.cxx | 16 ++--
sc/source/core/tool/formulaopt.cxx |5 ++---
3 files changed, 8 insertions(+), 15 deletions(-)
New commits:
commit f3f71d1d64e8d05260a4a49ba3e0191a089324b0
Author: Tor Lillqvist
Date: Tue Jan 7 14:08:09 2014 +0200
Drop the check of the SC_BACKGROUND_COMPILATION env var
Change-Id: Ia33002819023c79160d921fbc1cca7a5c12d143a
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5196c98..7c1d72d 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -137,8 +137,6 @@ ScDocShell& Test::getDocShell()
void Test::setUp()
{
-osl_clearEnvironment(OUString("SC_BACKGROUND_COMPILATION").pData);
-
BootstrapFixture::setUp();
ScDLL::Init();
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 531c7e5..721f268 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -415,18 +415,14 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
mbSubTotal(false),
meCalcState(sc::GroupCalcEnabled)
{
-static bool bBackgroundCompilation = getenv("SC_BACKGROUND_COMPILATION")
!= NULL;
-if (bBackgroundCompilation)
+if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
{
-if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
+if (snCount++ == 0)
{
-osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
-if (snCount++ == 0)
-{
-assert(!sxCompilationThread.is());
-sxCompilationThread.set(new sc::CLBuildKernelThread);
-sxCompilationThread->launch();
-}
+assert(!sxCompilationThread.is());
+sxCompilationThread.set(new sc::CLBuildKernelThread);
+sxCompilationThread->launch();
}
}
}
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index ebeece1..e954423 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -412,10 +412,9 @@ void ScFormulaCfg::UpdateFromProperties( const
Sequence& aNames )
{
sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] >>= bVal;
-#if 0 // Don't remove please unless the SC_BACKGROUND_COMPILATION env var
thing goes away.
+#if 0 // Don't remove please.
// The intent here is that tml when running CppunitTest_sc_opencl_test
turns this on.
-if (getenv("SC_BACKGROUND_COMPILATION") != NULL)
-bVal = sal_True;
+bVal = sal_True;
#endif
GetCalcConfig().mbOpenCLEnabled = bVal;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Cor Nouws changed: What|Removed |Added Depends on||73355 --- Comment #49 from Cor Nouws --- adding Bug 73355 - FILEOPEN: Draw 4.2 corrupts figures combined in previous version -- 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
[RESOLVED] Re: About pt_BR dictionary update
On Thu, 2014-01-02 at 10:42 -0200, Marcos Paulo de souza wrote: > Hi people, > > I send an update of the pt_BR dictionary to gerrit, and it needs to be > back ported to version 4.2. Done as http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?h=libreoffice-4-2&id=f0c5d826b67db7e906288461453d15232291a76f now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6b6aeddde04164ca33f2726335fdcefd9c1c69c Author: Niklas Johansson Date: Thu Jan 2 15:16:50 2014 +0100 Updated core Project: dictionaries 02314dc1d63277226f048527d7fb843f751e84e8 diff --git a/dictionaries b/dictionaries index 45db0b3..02314dc 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 45db0b3b3d689609c0d3773e1c1accc32e7e71f3 +Subproject commit 02314dc1d63277226f048527d7fb843f751e84e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - boost/boost_1_48_0.patch boost/boost_1_55_0.patch boost/boost_freebsd.patch boost/boost-os2.patch boost/makefile.mk svx/source
boost/boost-os2.patch | 22 --
boost/boost_1_48_0.patch| 323 --
boost/boost_1_55_0.patch| 164 +++
boost/boost_freebsd.patch | 335
boost/makefile.mk |1
svx/source/accessibility/charmapacc.cxx |9
6 files changed, 170 insertions(+), 684 deletions(-)
New commits:
commit 6b4710c48566b06c4b709f4a5a6019f76c8bc202
Author: Herbert Dürr
Date: Tue Jan 7 10:05:01 2014 +
#i123817# WaE: fix the most annoying compile warnings for boost-1.55
some boost headers have the problem that parameter/variable names shadow
other class member/method names. These headers get included so often that a
full build reports almost 17000 warnings about that. This change fixes the
shadowing problem by making the local names not conflict with the class-wide
names.
diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
new file mode 100644
index 000..9730232
--- /dev/null
+++ b/boost/boost_1_55_0.patch
@@ -0,0 +1,164 @@
+--- misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp2012-12-05
23:06:57.0 +0100
misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp
2014-01-07 10:33:59.550621750 +0100
+@@ -534,11 +534,11 @@
+ }
+
+ node_pointer first_node = static_cast(prev->next_);
+-link_pointer end = first_node->group_prev_->next_;
++link_pointer end_var = first_node->group_prev_->next_;
+
+-std::size_t count = this->delete_nodes(prev, end);
++std::size_t count_var = this->delete_nodes(prev, end_var);
+ this->fix_bucket(bucket_index, prev);
+-return count;
++return count_var;
+ }
+
+ iterator erase(c_iterator r)
+@@ -557,21 +557,21 @@
+ return iterator(r2.node_);
+ }
+
+-link_pointer erase_nodes(node_pointer begin, node_pointer end)
++link_pointer erase_nodes(node_pointer begin_arg, node_pointer end_arg)
+ {
+-std::size_t bucket_index = this->hash_to_bucket(begin->hash_);
++std::size_t bucket_index = this->hash_to_bucket(begin_arg->hash_);
+
+-// Split the groups containing 'begin' and 'end'.
++// Split the groups containing 'begin_arg' and 'end_arg'.
+ // And get the pointer to the node before begin while
+ // we're at it.
+-link_pointer prev = split_groups(begin, end);
++link_pointer prev = split_groups(begin_arg, end_arg);
+
+-// If we don't have a 'prev' it means that begin is at the
++// If we don't have a 'prev' it means that begin_arg is at the
+ // beginning of a block, so search through the blocks in the
+ // same bucket.
+ if (!prev) {
+ prev = this->get_previous_start(bucket_index);
+-while (prev->next_ != begin)
++while (prev->next_ != begin_arg)
+ prev =
static_cast(prev->next_)->group_prev_;
+ }
+
+@@ -581,24 +581,24 @@
+
static_cast(prev->next_)->group_prev_->next_;
+ this->delete_nodes(prev, group_end);
+ bucket_index = this->fix_bucket(bucket_index, prev);
+-} while(prev->next_ != end);
++} while(prev->next_ != end_arg);
+
+ return prev;
+ }
+
+-static link_pointer split_groups(node_pointer begin, node_pointer end)
++static link_pointer split_groups(node_pointer begin_arg, node_pointer
end_arg)
+ {
+-node_pointer prev = begin->group_prev_;
+-if (prev->next_ != begin) prev = node_pointer();
++node_pointer prev = begin_arg->group_prev_;
++if (prev->next_ != begin_arg) prev = node_pointer();
+
+-if (end) {
+-node_pointer first = end;
+-while (first != begin && first->group_prev_->next_ == first) {
++if (end_arg) {
++node_pointer first = end_arg;
++while (first != begin_arg && first->group_prev_->next_ ==
first) {
+ first = first->group_prev_;
+ }
+
+-boost::swap(first->group_prev_, end->group_prev_);
+-if (first == begin) return prev;
++boost::swap(first->group_prev_, end_arg->group_prev_);
++if (first == begin_arg) return prev;
+ }
+
+ if (prev) {
+@@ -606,7 +606,7 @@
+ while (first->group_prev_->next_ == first) {
+ first = first->group_prev_;
+ }
+-boost::swap(first->group_prev_, begin->group_prev_);
++boost::swap(first->group_prev_, begin_arg->group_prev_);
+ }
+
+ return prev;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst external/python3
configure.ac|2
download.lst|2
external/python3/ExternalPackage_python3.mk | 14 +-
external/python3/UnpackedTarball_python3.mk | 11 -
external/python3/i100492-freebsd.patch.1|2
external/python3/python-3.3.0-15833.patch.1 | 28
external/python3/python-3.3.0-aix.patch.1 | 156
external/python3/python-3.3.0-elf-rpath.patch.1 | 13 --
external/python3/python-3.3.0-ffi-clang.patch.1 | 40 --
external/python3/python-3.3.3-aix.patch.1 | 145 ++
external/python3/python-3.3.3-elf-rpath.patch.1 | 13 ++
11 files changed, 170 insertions(+), 256 deletions(-)
New commits:
commit c5ab946abfe3b2c60253e3c724eee2be0bda0b81
Author: Michael Stahl
Date: Mon Jan 6 16:05:56 2014 +0100
fdo#73087: python3: upgrade to version 3.3.3
- drop obsolete/upstreamed patches:
python-3.3.0-ffi-clang.patch.1
python-3.3.0-15833.patch.1
one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in
Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot
Reviewed-by: Michael Stahl
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)
Reviewed-on: https://gerrit.libreoffice.org/7283
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/configure.ac b/configure.ac
index c3b6918..75d0054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8123,7 +8123,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
diff --git a/download.lst b/download.lst
index 444d6dc..aaa4da6 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export PIXMAN_TARBALL :=
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POPPLER_TARBALL :=
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL :=
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index ac8e856..1b83bd2 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -114,6 +114,13 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+ LO_lib/_sysconfigdata.py \
+))
+endif
+
# packages not shipped:
# dbm, sqlite3 - need some database stuff
# curses - need curses to build the C module
@@ -148,13 +155,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/plat-aix4/IN.py \
))
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
- Lib/_sysconfigdata.py \
-))
-endif
-
$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 62cc55e..200a9e13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -22,28 +22,21 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
- external/python3/python-3.3.0-aix.patch.1 \
+ external/python3/python-3.3.3-aix.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-msvc2012.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
external/python3/python-3.3.0-implicit-int.patch.1 \
- external/python3/python-3.3.0-ffi-clang.patch.1 \
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/formulacell.cxx| 19 +++
sc/source/core/tool/clkernelthread.cxx |4 +++-
2 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 49bc2ac28fed51425f257558db4ed1e9c3522e6f
Author: Tor Lillqvist
Date: Tue Jan 7 11:53:12 2014 +0200
Add some more logging
Change-Id: I637c365626242142a0f6fc0ac002fa9dd5f1340a
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index c15710f..531c7e5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3501,13 +3501,15 @@ bool ScFormulaCell::InterpretFormulaGroup()
aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
ScGroupTokenConverter aConverter(aCode, *pDocument, *this,
mxGroup->mpTopCell->aPos);
if (!aConverter.convert(*pCode))
-{
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+{
+SAL_INFO("sc.opencl", "conversion of group " << this << " failed,
disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
mxGroup->meCalcState = sc::GroupCalcRunning;
if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument,
mxGroup->mpTopCell->aPos, mxGroup, aCode))
{
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state
" << mxGroup->meCalcState << ") failed, disabling");
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
}
@@ -3517,10 +3519,11 @@ bool ScFormulaCell::InterpretFormulaGroup()
{
ScTokenArray aDummy;
if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument,
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
-{
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+{
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state
" << mxGroup->meCalcState << ") failed, disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
}
return true;
commit 3c37db6db90564431ebaf85afef1d8c30ddd8f61
Author: Tor Lillqvist
Date: Tue Jan 7 11:33:08 2014 +0200
Avoid assertion failure if group has been disabled
Change-Id: I918f2716778ddd9ede56b5df731a531f97a3b24d
diff --git a/sc/source/core/tool/clkernelthread.cxx
b/sc/source/core/tool/clkernelthread.cxx
index 651d369..2a619c5 100644
--- a/sc/source/core/tool/clkernelthread.cxx
+++ b/sc/source/core/tool/clkernelthread.cxx
@@ -48,7 +48,9 @@ void CLBuildKernelThread::execute()
switch (aWorkItem.meWhatToDo)
{
case CLBuildKernelWorkItem::COMPILE:
-SAL_INFO("sc.opencl.thread", "told to compile group " <<
aWorkItem.mxGroup << " to binary");
+SAL_INFO("sc.opencl.thread", "told to compile group " <<
aWorkItem.mxGroup << " (state " << aWorkItem.mxGroup->meCalcState << ") to
binary");
+if (aWorkItem.mxGroup->meCalcState == sc::GroupCalcDisabled)
+break;
assert(aWorkItem.mxGroup->meCalcState ==
sc::GroupCalcOpenCLKernelCompilationScheduled);
aWorkItem.mxGroup->mpCompiledFormula =
sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(*aWorkItem.mxGroup->mpTopCell->GetDocument(),
___
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' - 68/792ef189457094eb0fa1790c5895d7031571da
68/792ef189457094eb0fa1790c5895d7031571da |1 + 1 file changed, 1 insertion(+) New commits: commit 84ab590f01cfd7f81dca8a785168f883969e1c9a Author: Caolán McNamara Date: Tue Jan 7 09:43:45 2014 + Notes added by 'git notes add' diff --git a/68/792ef189457094eb0fa1790c5895d7031571da b/68/792ef189457094eb0fa1790c5895d7031571da new file mode 100644 index 000..5cc05b4 --- /dev/null +++ b/68/792ef189457094eb0fa1790c5895d7031571da @@ -0,0 +1 @@ +merged as: a75ed48dcd7c00881773afec53bb89f4f01d8462 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk helpcontent2 sc/source
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/dlg_DataSource.cxx | 63 +
chart2/source/controller/dialogs/dlg_DataSource.src | 42 -
chart2/source/controller/inc/HelpIds.hrc|1
chart2/source/controller/inc/dlg_DataSource.hxx |4
chart2/uiconfig/ui/datarangedialog.ui | 92
helpcontent2|2
sc/source/ui/Accessibility/AccessibleDocument.cxx |1
9 files changed, 122 insertions(+), 85 deletions(-)
New commits:
commit db666bdf0c048cec17669096cda414c4b48fc1ec
Author: Caolán McNamara
Date: Tue Jan 7 09:39:57 2014 +
convert data range tabdialog to .ui
Change-Id: I70e9064a13a751f6b0dae153522953eaf2ac53a5
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index 1250e2a..d15c4f5 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/dlg_DataEditor.src \
-chart2/source/controller/dialogs/dlg_DataSource.src \
chart2/source/controller/dialogs/res_BarGeometry.src \
chart2/source/controller/dialogs/Strings_AdditionalControls.src \
chart2/source/controller/dialogs/Strings_ChartTypes.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index a497720..38f1beb 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/3dviewdialog \
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/chardialog \
+ chart2/uiconfig/ui/datarangedialog \
chart2/uiconfig/ui/dlg_DataLabel \
chart2/uiconfig/ui/dlg_InsertErrorBars \
chart2/uiconfig/ui/insertaxisdlg \
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 74f8973..7384b1a 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -29,8 +29,8 @@
#include "tp_RangeChooser.hxx"
#include "tp_DataSource.hxx"
-// for RET_OK
-#include
+#include
+#include // for RET_OK
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -85,8 +85,7 @@ Reference< chart2::XChartTypeTemplate >
DocumentChartTypeTemplateProvider::getCu
class DataSourceTabControl : public TabControl
{
public:
-DataSourceTabControl( Window* pParent, const ResId& rResId );
-~DataSourceTabControl();
+DataSourceTabControl(Window* pParent);
virtual long DeactivatePage();
@@ -97,13 +96,11 @@ private:
bool m_bTogglingEnabled;
};
-DataSourceTabControl::DataSourceTabControl( Window* pParent, const ResId&
rResId ) :
-TabControl( pParent, rResId ),
-m_bTogglingEnabled( true )
-{}
-
-DataSourceTabControl::~DataSourceTabControl()
-{}
+DataSourceTabControl::DataSourceTabControl(Window* pParent)
+: TabControl(pParent)
+, m_bTogglingEnabled(true)
+{
+}
// Note that the result is long, but is intended to be a bool
long DataSourceTabControl::DeactivatePage()
@@ -127,31 +124,25 @@ void DataSourceTabControl::EnableTabToggling()
sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
-DataSourceDialog::DataSourceDialog(
-Window * pParent,
+DataSourceDialog::DataSourceDialog(Window * pParent,
const Reference< XChartDocument > & xChartDocument,
-const Reference< uno::XComponentContext > & xContext ) :
-
-TabDialog( pParent, SchResId( DLG_DATA_SOURCE )),
-
-m_xChartDocument( xChartDocument ),
-m_xContext( xContext ),
-m_apDocTemplateProvider( new DocumentChartTypeTemplateProvider(
xChartDocument )),
-m_apDialogModel( new DialogModel( xChartDocument, xContext )),
-
-m_pTabControl( new DataSourceTabControl( this, SchResId( TABCTRL ) )),
-m_aBtnOK( this, SchResId( BTN_OK ) ),
-m_aBtnCancel( this, SchResId( BTN_CANCEL ) ),
-m_aBtnHelp( this, SchResId( BTN_HELP ) ),
-
-m_pRangeChooserTabePage(0),
-m_pDataSourceTabPage(0),
-m_bRangeChooserTabIsValid( true ),
-m_bDataSourceTabIsValid( true )
+const Reference< uno::XComponentContext > & xContext)
+: TabDialog(pParent, "DataRangeDialog",
+"modules/schart/ui/datarangedialog.ui")
+, m_xChartDocument(xChartDocument)
+, m_xContext(xContext)
+, m_apDocTemplateProvider(new
DocumentChartTypeTemplateProvider(xChartDocument))
+, m_apDialogModel(new DialogModel(xChartDocument, xContext))
+, m_pTabControl(new DataSourceTabControl(get_content_area()))
+, m_pRangeChooserTabePage(0)
+, m_pDataSourceTabPage(0)
+,
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |1 - 1 file changed, 1 deletion(-) New commits: commit 2fb21267953bd0f2f2509080cb8de86a50fc0f3f Author: Caolán McNamara Date: Tue Jan 7 09:42:40 2014 + drop unused help ids Change-Id: I1b4403f3fd2a9ca0956d6b5368ae48333bb71539 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4100183..c77a451 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3000,7 +3000,6 @@ HID_SCH_CTL_VARIANT,63294, HID_SCH_CT_INDICATE,63291, HID_SCH_DATA_RANGES_LIST,63296, HID_SCH_DATA_SERIES_LABEL,63367, -HID_SCH_DLG_RANGES,63327, HID_SCH_LB_BAR_GEOMETRY,63325, HID_SCH_LEGEND_POS_BOTTOM,63343, HID_SCH_LEGEND_POS_LEFT,63340, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: padmin/source
padmin/source/salglyphid.hxx | 48 --- 1 file changed, 48 deletions(-) New commits: commit 4a8814e45ffac6a4cc14a3d7a183c11fd7c3f330 Author: Khaled Hosny Date: Tue Jan 7 11:21:06 2014 +0200 This duplicated files does not seem to be needed It was added in a16aacd6474f02307341646ec08f9e1608a8615d, but is not used anywhere and build completes fine without it. Change-Id: Iac036332157d5afa89a8e9735541e48cbd3b40fd diff --git a/padmin/source/salglyphid.hxx b/padmin/source/salglyphid.hxx deleted file mode 100644 index dc79d4f..000 --- a/padmin/source/salglyphid.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 . - */ -// This header file is a verbatim copy of its counterpart in vcl. -// With spadmin being on its way out (#i123863i#) a cleaner solution isn't worth the effort - -#ifndef _SV_SALGLYPHID_HXX -#define _SV_SALGLYPHID_HXX - -// TODO: sal_GlyphId should become a class... -typedef sal_uInt32 sal_GlyphId; - -// Glyph Flags -#define GF_NONE 0x -#define GF_FLAGMASK 0xFF80 -#define GF_IDXMASK ~GF_FLAGMASK -#define GF_ISCHAR 0x0080 -#define GF_ROTL 0x0100 -// caution !!! -#define GF_VERT 0x0200 -// GF_VERT is only for windows implementation -// (win/source/gdi/salgdi3.cxx, win/source/gdi/winlayout.cxx) -// don't use this elsewhere !!! -#define GF_ROTR 0x0300 -#define GF_ROTMASK 0x0300 -#define GF_UNHINTED 0x0400 -#define GF_GSUB 0x0800 -#define GF_FONTMASK 0xF000 -#define GF_FONTSHIFT 28 - -#define GF_DROPPED 0x - -#endif // _SV_SALGLYPHID_HXX - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/source
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 92644eecd0d3b17ad4778961030d4f02eb6359ea
Author: Stephan Bergmann
Date: Tue Jan 7 10:27:42 2014 +0100
Grammar fix
Change-Id: I714326ef7fe5c3fc632f6fae31d7e686bc61a834
diff --git
a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index 15c1d96..cba767f 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -515,7 +515,7 @@ JNICALL
Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
{
ThrowException(env,
"com/sun/star/io/IOException",
- "native pipe is failed to write");
+ "native pipe: failed to write");
goto error;
}
}
___
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' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ca3006cea58d2b35e773e6954e80b1c16bf0c379 Author: László Németh Date: Tue Jan 7 10:11:53 2014 +0100 librelogo: fix messagebox (API changes) Change-Id: I7fe8c26b7ca93319658c14abd1142f1623141ce8 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index e2fb718..7b5930b 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -275,9 +275,9 @@ def MessageBox(parent, message, title, msgtype = "messbox", buttons = __OK__): d.WindowAttributes = buttons tk = parent.getToolkit() msgbox = tk.createWindow(d) -msgbox.setMessageText(message) +msgbox.MessageText = message if title: -msgbox.setCaptionText(title) +msgbox.CaptionText = title return msgbox.execute() def Random(r): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit efae2d68dd1b94e28349c0ce26018d8f8689d5a5 Author: László Németh Date: Tue Jan 7 10:11:53 2014 +0100 librelogo: fix messagebox (API changes) Change-Id: I7fe8c26b7ca93319658c14abd1142f1623141ce8 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index e2fb718..7b5930b 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -275,9 +275,9 @@ def MessageBox(parent, message, title, msgtype = "messbox", buttons = __OK__): d.WindowAttributes = buttons tk = parent.getToolkit() msgbox = tk.createWindow(d) -msgbox.setMessageText(message) +msgbox.MessageText = message if title: -msgbox.setCaptionText(title) +msgbox.CaptionText = title return msgbox.execute() def Random(r): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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|REOPENED|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 'libreoffice-4-2' - oox/source sd/qa
oox/source/drawingml/customshapeproperties.cxx |6 ++ sd/qa/unit/data/xml/n762695_0.xml |2 +- sd/qa/unit/data/xml/n762695_1.xml |4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit bec40dcd4f36bf774f6bc2d805a646ba2232175c Author: Muthu Subramanian Date: Fri Dec 27 19:59:22 2013 +0530 fdo#72998: Custom shapes have improper size. Change-Id: I4f8b7f80f89ad713e274acf6fc93bb415e660baf diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 48ace8b..247e8cf 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -213,7 +213,13 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi aPropertyMap[ PROP_Type ] <<= OUString( "ooxml-non-primitive" ); aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); +// Note 1: If Equations are defined - they are processed using internal div by 360 coordinates +// while if they are not, standard ooxml coordinates are used. +// This size specifically affects scaling. +// Note 2: Width and Height are set to 0 to force scaling to 1. awt::Rectangle aViewBox( 0, 0, aSize.Width, aSize.Height ); +if( maGuideList.size() ) +aViewBox = awt::Rectangle( 0, 0, 0, 0 ); aPropertyMap[ PROP_ViewBox ] <<= aViewBox; Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentValues( maAdjustmentGuideList.size() ); diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml index 5f3080f..d55c979 100644 --- a/sd/qa/unit/data/xml/n762695_0.xml +++ b/sd/qa/unit/data/xml/n762695_0.xml @@ -83,7 +83,7 @@ - + diff --git a/sd/qa/unit/data/xml/n762695_1.xml b/sd/qa/unit/data/xml/n762695_1.xml index d746783..fb24ba08 100644 --- a/sd/qa/unit/data/xml/n762695_1.xml +++ b/sd/qa/unit/data/xml/n762695_1.xml @@ -83,7 +83,7 @@ - + @@ -170,7 +170,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/vbahelper/vbahelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e1b14fa6557f0ded8b5149e28e00861b296dcb34
Author: Tor Lillqvist
Date: Tue Jan 7 10:11:02 2014 +0200
Fix syntax error
Change-Id: I3967658c001479d0adc7a0f60dea97d1c0c64eb2
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index 6b184a6..a3bcc51 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -607,7 +607,7 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike )
case '[':
case '?':
case '*':
-sResult.append(('\\');
+sResult.append('\\');
sResult.append(*start);
break;
case ']':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/misc/urihelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 66e173eb4456639ecd2e75fbb23a557a5b7c5932
Author: Noel Grandin
Date: Tue Jan 7 10:04:50 2014 +0200
Fix typo in my commit
Fix typo in my commit 82625bb98e256b83351328d3bf2a14e3dd244eef
"remove unnecessary sal_Unicode casts in OUStringBuffer::append calls"
Change-Id: I593c6a8ce5be3d4e2783acd3800626d7eb9a0480
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index c20d476..402e90b 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -243,7 +243,7 @@ OUString normalize(
buf.append(ref->getPathSegment(j));
}
if (ref->hasQuery()) {
-buf.append'?');
+buf.append('?');
buf.append(ref->getQuery());
}
if (ref->hasFragment()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
