[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/swuiccoll.cxx | 34 +-
sw/source/uibase/inc/swuiccoll.hxx | 12 ++--
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit b13dea51e44ce7bdd1a2c3f4ca9f33e9cf6ca302
Author: Miklos Vajna
Date: Wed May 20 08:53:43 2015 +0200
sw: prefix members of SwCondCollPage
Change-Id: I8e290ab6264dff4d361e1dc0eee6b69a14512d03
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 6989e6e..4b8f894 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -39,7 +39,7 @@
#include "swuiccoll.hxx"
-const sal_uInt16 SwCondCollPage::aPageRg[] = {
+const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
FN_COND_COLL, FN_COND_COLL,
0
};
@@ -54,11 +54,11 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const
SfxItemSet &rSet)
: SfxTabPage(pParent, "ConditionPage",
"modules/swriter/ui/conditionpage.ui", &rSet)
,
-rSh(::GetActiveView()->GetWrtShell()),
-pCmds( SwCondCollItem::GetCmds() ),
-pFmt(0),
+m_rSh(::GetActiveView()->GetWrtShell()),
+m_pCmds( SwCondCollItem::GetCmds() ),
+m_pFmt(0),
-bNewTemplate(false)
+m_bNewTemplate(false)
{
get(m_pConditionCB, "condstyle");
get(m_pContextFT, "contextft");
@@ -174,21 +174,21 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
void SwCondCollPage::Reset(const SfxItemSet *)
{
-if(bNewTemplate)
+if(m_bNewTemplate)
m_pConditionCB->Enable();
-if(RES_CONDTXTFMTCOLL == pFmt->Which())
+if(RES_CONDTXTFMTCOLL == m_pFmt->Which())
m_pConditionCB->Check();
OnOffHdl(m_pConditionCB);
m_pTbLinks->Clear();
-SfxStyleSheetBasePool* pPool =
rSh.GetView().GetDocShell()->GetStyleSheetPool();
+SfxStyleSheetBasePool* pPool =
m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL);
m_pStyleLB->Clear();
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
{
-if(!pFmt || pBase->GetName() != pFmt->GetName())
+if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next();
}
@@ -199,9 +199,9 @@ void SwCondCollPage::Reset(const SfxItemSet *)
OUString aEntry( m_aStrArr[n] + "\t" );
const SwCollCondition* pCond = 0;
-if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() &&
-0 != ( pCond = static_cast(pFmt)->
-HasCondition( SwCollCondition( 0, pCmds[n].nCnd, pCmds[n].nSubCond
) ) )
+if( m_pFmt && RES_CONDTXTFMTCOLL == m_pFmt->Which() &&
+0 != ( pCond = static_cast(m_pFmt)->
+HasCondition( SwCollCondition( 0, m_pCmds[n].nCnd,
m_pCmds[n].nSubCond ) ) )
&& pCond->GetTxtFmtColl() )
{
aEntry += pCond->GetTxtFmtColl()->GetName();
@@ -265,13 +265,13 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
m_pStyleLB->Clear();
const sal_Int32 nSelPos = pBox->GetSelectEntryPos();
const sal_uInt16 nSearchFlags =
*static_cast(m_pFilterLB->GetEntryData(nSelPos));
-SfxStyleSheetBasePool* pPool =
rSh.GetView().GetDocShell()->GetStyleSheetPool();
+SfxStyleSheetBasePool* pPool =
m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags);
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
{
-if(!pFmt || pBase->GetName() != pFmt->GetName())
+if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next();
}
@@ -295,10 +295,10 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
return 0;
}
-void SwCondCollPage::SetCollection(SwFmt* pNewFormat, bool bNew)
+void SwCondCollPage::SetCollection(SwFmt* pFormat, bool bNew)
{
-pFmt = pNewFormat;
-bNewTemplate = bNew;
+m_pFmt = pFormat;
+m_bNewTemplate = bNew;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuiccoll.hxx
b/sw/source/uibase/inc/swuiccoll.hxx
index a66a468..fadb565 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -41,11 +41,11 @@ class SwCondCollPage : public SfxTabPage
std::vector m_aStrArr;
-SwWrtShell &rSh;
-const CommandStruct*pCmds;
-SwFmt* pFmt;
+SwWrtShell &m_rSh;
+const CommandStruct*m_pCmds;
+SwFmt* m_pFmt;
-boolbNewTemplate;
+boolm_bNewTemplate;
virtual ~SwCondCollPage();
virtual void dispose() SAL_OVERRIDE;
@@ -59,13 +59,13 @@ class SwCondCollPage : public SfxTabPage
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
-static const s
RE: problem with interpreting OpenFormula format in ODF1.2
Hi Andras, Regina, > I think we have already resolved it as OFFICE-3879 for ODF1.2 Errata 01 > and ODF 1.3. > > It can be a copy&paste error. I filed a bug: > > https://issues.oasis-open.org/browse/OFFICE-3885 > > We'll discuss this on the next OASIS ODF TC meeting (1st of June), > > unless until then someone proves that the current text is correct. Thanks for your help! I can now confidently continue my code changes :) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source svl/source svtools/source
sfx2/source/appl/appmain.cxx |1 - sfx2/source/appl/module.cxx|1 - sfx2/source/appl/workwin.cxx |1 - sfx2/source/control/dispatch.cxx |1 - sfx2/source/toolbox/imgmgr.cxx |1 - sfx2/source/view/viewfrm.cxx |2 -- svl/source/items/itempool.cxx |1 - svl/source/items/poolio.cxx|1 - svl/source/misc/documentlockfile.cxx |2 -- svl/source/misc/ownlist.cxx|1 - svl/source/misc/sharecontrolfile.cxx |2 -- svtools/source/config/test/test.cxx|1 - svtools/source/contnr/treelist.cxx |2 -- svtools/source/control/ctrlbox.cxx | 12 ++-- svtools/source/control/fmtfield.cxx|1 - svtools/source/dialogs/addresstemplate.cxx |1 - svtools/source/svhtml/htmlsupp.cxx |1 - svtools/source/svhtml/parhtml.cxx |1 - svtools/source/svrtf/parrtf.cxx|1 - svtools/source/svrtf/svparser.cxx |1 - 20 files changed, 2 insertions(+), 33 deletions(-) New commits: commit b255304be9f60f56ad93794d68a1447ed0d9d077 Author: Julien Nabet Date: Tue May 19 22:45:30 2015 +0200 Remove include stdio (part4) Change-Id: Ic17885b22167eedd0e56b3e5027c09a1c3aac1d8 Reviewed-on: https://gerrit.libreoffice.org/15819 Tested-by: Jenkins Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index c8f8da8..e2dab38 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index d822e00..c87e271 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index d6ec61c..bcb 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index eea0d8d..5e6f9bc 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index c184219..7bdda11 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -18,7 +18,6 @@ */ -#include #include #include diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index bc40e9d..fc8dbae 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -19,8 +19,6 @@ #include -#include - #include #include #include diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 62c4aaf..8f4a860 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index f460725..6b0fee8 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index db7b769..ba55fcb 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -18,8 +18,6 @@ */ -#include - #include #include #include diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 16d63a5..d2b87c9 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index b866e84..009ecea 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -18,8 +18,6 @@ */ -#include - #include #include #include diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index 4296569..78d7064 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -46,7 +46,6 @@ #include #include #include -#include using namespace ::osl ; using namespace ::comphelper; diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 03b9152..f1283f2 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -22,8 +22,6 @@ #include #include -#include
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/unitconverter.hxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit bcdd3a403ca1d0ac05dd2382cf7e8fdfd3281322 Author: Markus Mohrhard Date: Wed May 20 04:06:46 2015 +0200 forgot to include that part Change-Id: I8d905ca573e1ff15c4bf6049ce8884b223ff146c diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 6cb49b2..47db0e8 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -89,11 +89,12 @@ public: /** Returns an error string from the passed BIFF error code. */ OUStringcalcErrorString( sal_uInt8 nErrorCode ) const; +/** Returns the conversion coefficient for the passed unit. */ +double getCoefficient( Unit eUnit ) const; + private: /** Adds an error code to the internal maps. */ voidaddErrorCode( sal_uInt8 nErrorCode, const OUString& rErrorCode ); -/** Returns the conversion coefficient for the passed unit. */ -double getCoefficient( Unit eUnit ) const; private: typedef ::std::vector< double > DoubleVector; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_filters-test.cxx |2 ++
sc/source/filter/oox/worksheethelper.cxx | 23 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 16726a1b37df8bdcae02b3c7699df814977222bd
Author: Markus Mohrhard
Date: Wed May 20 03:59:49 2015 +0200
better algorithm for OOXML column width import, tdf#91267
This patch contains a magic factor of 1.047 that is necessary as the set
value and retrieved value are not the same. When we ahve too much time
(propably never) we should explore why the value that we set for the
column width is not equal to the one that we see on the screen.
Change-Id: I317127ea5b8af2d5e8386758e66907a44fe58579
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index aaa45a9..3dfbf8a 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
namespace oox {
namespace xls {
@@ -1166,11 +1167,31 @@ void WorksheetGlobals::convertColumns()
convertOutlines( aColLevels, nMaxCol + 1, 0, false, false );
}
+namespace {
+
+sal_Int32 getColumnWidth(UnitConverter& rConverter, double nWidth)
+{
+double nCoeff = rConverter.getCoefficient(UNIT_DIGIT);
+VirtualDevice aDev;
+
+long nPixel = aDev.LogicToPixel(Point(nCoeff, 0),
MapMode(MAP_100TH_MM)).getX();
+
+
+// the 1.047 has been experimentally chosen based on measurements witha
screen ruler
+// TODO: fix the display of cells so that it no longer requires this hack
+// algorithm from OOXML spec part1: 18.3.1.13
+sal_Int32 nColWidthPixel= std::floor(((256*nWidth +
std::floor(128.0/nPixel))/256.0)*nPixel) * 1.047;
+
+return aDev.PixelToLogic(Point(nColWidthPixel, 0),
MapMode(MAP_100TH_MM)).getX();
+}
+
+}
+
void WorksheetGlobals::convertColumns( OutlineLevelVec& orColLevels,
const ValueRange& rColRange, const ColumnModel& rModel )
{
// column width: convert 'number of characters' to column width in 1/100 mm
-sal_Int32 nWidth = getUnitConverter().scaleToMm100( rModel.mfWidth,
UNIT_DIGIT );
+sal_Int32 nWidth = getColumnWidth(getUnitConverter(), rModel.mfWidth);
// macro sheets have double width
if( meSheetType == SHEETTYPE_MACROSHEET )
nWidth *= 2;
commit 1d2d037b4defa775b164880b56732af2a837f254
Author: Markus Mohrhard
Date: Tue May 19 05:49:28 2015 +0200
add missing DoClose at end of test
Change-Id: Ia06522ba4d3e6b4495e17d260d0bc3618b1a7cf2
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index c0b12d3..a110cb56 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3046,6 +3046,8 @@ void ScFiltersTest::testEditEngStrikeThroughXLSX()
}
}
}
+
+xDocSh->DoClose();
}
void ScFiltersTest::testRefStringXLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/uiconfig
writerperfect/uiconfig/ui/wpftencodingdialog.ui | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit 90e2dabb8d0bb5382234be776c2ad0e2d5d9e224 Author: Adolfo Jayme Barrientos Date: Tue May 19 20:01:52 2015 -0500 wpftencodingdialog.ui: Fix spacing, add mnemonic widget and accelerator Change-Id: I2dd735d3e9248b31f1c6992c3479bd070eda3a40 diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui b/writerperfect/uiconfig/ui/wpftencodingdialog.ui index 8c47bf8..40d2652 100644 --- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui +++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui @@ -4,6 +4,8 @@ False +6 +False True -1 dialog @@ -11,7 +13,7 @@ False vertical -2 +6 False @@ -57,10 +59,10 @@ True False -Character set: - - - +start +_Character set: +True +comboboxtext False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype bin/lo-commit-stat external/nss i18npool/qa sot/source starmath/source svl/qa sw/qa
bin/get-bugzilla-attachments-by-mimetype |2 -
bin/lo-commit-stat |2 -
external/nss/README |2 -
i18npool/qa/cppunit/test_breakiterator.cxx | 34 +--
i18npool/qa/cppunit/test_characterclassification.cxx |2 -
sot/source/sdstor/stgole.cxx |2 -
starmath/source/parse.cxx|6 +--
svl/qa/unit/svl.cxx |2 -
sw/qa/core/uwriter.cxx |2 -
sw/qa/extras/ww8import/ww8import.cxx |2 -
10 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit d02c15979b90fe356ee814acd77c4f21edeb2b0f
Author: Adolfo Jayme Barrientos
Date: Tue May 19 19:48:11 2015 -0500
Update Apache Bugzillaâs URL
Change-Id: I6ef4ae530b7fb4e615100803ae6e3972d9b4545f
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 53108e2..8b0b4c5 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -328,7 +328,7 @@ rss_bugzillas = {
# NOTE: I am leaving it in the list, commented out, just so someone
# does not add it back immediately .-)
# 'novell': 'https://bugzilla.novell.com/buglist.cgi',
-'ooo': 'https://issues.apache.org/ooo/buglist.cgi',
+'ooo': 'https://bz.apache.org/ooo/buglist.cgi',
'tdf': 'http://bugs.documentfoundation.org/buglist.cgi',
}
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index a372eea..5a68820 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -20,7 +20,7 @@ my %bugzillas = (
fdo => "https://bugs.libreoffice.org/show_bug.cgi?id=";,
bnc => "https://bugzilla.novell.com/show_bug.cgi?id=";,
rhbz => "https://bugzilla.redhat.com/show_bug.cgi?id=";,
-i=> "https://issues.apache.org/ooo/show_bug.cgi?id=";,
+i=> "https://bz.apache.org/ooo/show_bug.cgi?id=";,
fate => "https://features.opensuse.org/";,
);
diff --git a/external/nss/README b/external/nss/README
index 89498a7..0c5adf8 100644
--- a/external/nss/README
+++ b/external/nss/README
@@ -74,7 +74,7 @@ tools if they use system libraries which are linked with the
system
sqlite. Therefore we deliver it into lib/sqlite on unix systems.
See also issue:
-[https://issues.apache.org/ooo/show_bug.cgi?id=106132]
+[https://bz.apache.org/ooo/show_bug.cgi?id=106132]
== system NSS on Linux ==
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index bd5ef43..be4dd6d 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -113,7 +113,7 @@ void TestBreakIterator::testLineBreaking()
}
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=17155
+//See https://bz.apache.org/ooo/show_bug.cgi?id=17155
{
OUString aTest("foo /bar/baz");
@@ -128,7 +128,7 @@ void TestBreakIterator::testLineBreaking()
}
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=19716
+//See https://bz.apache.org/ooo/show_bug.cgi?id=19716
{
OUString aTest("aaa]aaa");
@@ -153,7 +153,7 @@ void TestBreakIterator::testWordBoundaries()
i18n::Boundary aBounds;
-//See https://issues.apache.org/ooo/show_bug.cgi?id=11993
+//See https://bz.apache.org/ooo/show_bug.cgi?id=11993
{
OUString aTest("abcd ef ghi??? KLM");
@@ -184,7 +184,7 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(aBounds.startPos == 16 && aBounds.endPos == 19);
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=21907
+//See https://bz.apache.org/ooo/show_bug.cgi?id=21907
{
OUString aTest("b a?");
@@ -201,7 +201,7 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES));
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=14904
+//See https://bz.apache.org/ooo/show_bug.cgi?id=14904
{
const sal_Unicode TEST[] =
{
@@ -303,7 +303,7 @@ void TestBreakIterator::testWordBoundaries()
}
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=13494
+//See https://bz.apache.org/ooo/show_bug.cgi?id=13494
{
const OUString aBase("xxAAxxBBxxCCxx");
const sal_Unicode aTests[] =
@@ -383,7 +383,7 @@ void TestBreakIterator::testWordBoundaries()
}
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=13451
+//See https://bz.apache.org/ooo/show_bug.cgi?id=13451
{
aLocale.Language = "ca";
aLocale.Country = "ES";
@@ -404,7 +404,7 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i == SAL_N_ELEMENTS(aExpected));
}
-//See https://issues.apache.org/ooo/show_bug.cgi?id=85411
+//Se
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/res/helpimg/note.png|binary icon-themes/tango/res/helpimg/tip.png |binary icon-themes/tango/res/helpimg/warning.png |binary 3 files changed New commits: commit 2a886adb500fe481e1ea61573551b19e99c55b8b Author: Adolfo Jayme Barrientos Date: Tue May 19 19:26:56 2015 -0500 tdf#90830 Add Tango help icons Change-Id: I9f213cc2d356da40f92ca96bf0ac584c3c5a89dc diff --git a/icon-themes/tango/res/helpimg/note.png b/icon-themes/tango/res/helpimg/note.png new file mode 100644 index 000..681c2a3 Binary files /dev/null and b/icon-themes/tango/res/helpimg/note.png differ diff --git a/icon-themes/tango/res/helpimg/tip.png b/icon-themes/tango/res/helpimg/tip.png new file mode 100755 index 000..0652148 Binary files /dev/null and b/icon-themes/tango/res/helpimg/tip.png differ diff --git a/icon-themes/tango/res/helpimg/warning.png b/icon-themes/tango/res/helpimg/warning.png new file mode 100755 index 000..a36f684 Binary files /dev/null and b/icon-themes/tango/res/helpimg/warning.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/ExternalProject_libetonyek.mk |1 + external/libetonyek/UnpackedTarball_libetonyek.mk |1 + external/libetonyek/win_build.patch.1 | 13 + 3 files changed, 15 insertions(+) New commits: commit 97b643ac862d0d6d0a305a7fd82fd20dfb3dbf72 Author: Michael Stahl Date: Wed May 20 00:52:44 2015 +0200 libetonyek: fix windows build Putting source files into sub-directories is not really supported by autotools apparently. Change-Id: I6f0ff7e0ee0c2c4b59fb670a3cbaa9723b655d1f diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 3de8605..4fd48b1 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-werror \ --disable-weffc \ --without-tools \ + $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 01f35c3..4706d02 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/assert.patch \ external/libetonyek/0001-missing-include.patch.1 \ + external/libetonyek/win_build.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/win_build.patch.1 b/external/libetonyek/win_build.patch.1 new file mode 100644 index 000..261167b --- /dev/null +++ b/external/libetonyek/win_build.patch.1 @@ -0,0 +1,13 @@ +Fix the windows build - fix libtool + +--- libetonyek/ltmain.sh.orig 2015-05-20 00:47:55.37880 +0200 libetonyek/ltmain.sh 2015-05-20 00:47:33.64800 +0200 +@@ -3722,6 +3722,8 @@ + sleep 2 + done + fi ++# Cygwin ar.exe does not create directories for the objects! ++mkdir -p $f_ex_an_ar_dir/contexts + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4085dbf35c95cd030bc4b74c7235e90d7c2bff4 Author: Christian Lohmaier Date: Tue May 19 22:09:03 2015 +0200 Updated core Project: translations f7efc4ecf69cba536cd0391d4673e31226b1fe86 update translations for 5.0.0 beta1 and force-fix errors using pocheck Change-Id: I295e6d2e6b47a06165cdf8900e2775b7157af809 diff --git a/translations b/translations index 625f07e..f7efc4e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 625f07e0dc9a40453c54c4dc8ebfbc6062f54f86 +Subproject commit f7efc4ecf69cba536cd0391d4673e31226b1fe86 ___ 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/sidebar/tools/Popup.cxx | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 3430d2c2b2c4e24b2757015addada9256e399012
Author: Philippe Jung
Date: Tue May 19 18:32:21 2015 +0200
tdf#91382 UI: Crash after visiting Sidebar Properties Page
When a popup is displayed, no cleaning / disposing is performed.
Change-Id: Ibae0f977360f8862f2d7ff4c753356975dec3771
Reviewed-on: https://gerrit.libreoffice.org/15817
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 193bf85..71911a5 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -42,8 +42,8 @@ Popup::Popup (
Popup::~Popup()
{
-mxControl.reset();
-mxContainer.reset();
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
}
void Popup::Show (ToolBox& rToolBox)
@@ -103,12 +103,16 @@ void Popup::ProvideContainerAndControl()
void Popup::CreateContainerAndControl()
{
-mxContainer.reset(VclPtr::Create(mpParent));
+// Clean previous components, if any
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
+
+mxContainer.set(VclPtr::Create(mpParent));
mxContainer->SetAccessibleName(msAccessibleName);
mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler));
mxContainer->SetBorderStyle(mxContainer->GetBorderStyle() |
WindowBorderStyle::MENU);
-mxControl.reset(maControlCreator(mxContainer.get()));
+mxControl.set(maControlCreator(mxContainer.get()));
}
IMPL_LINK_NOARG(Popup, PopupModeEndHandler)
@@ -117,8 +121,8 @@ IMPL_LINK_NOARG(Popup, PopupModeEndHandler)
maPopupModeEndCallback();
// Popup control is no longer needed and can be destroyed.
-mxControl.reset();
-mxContainer.reset();
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/inc basic/source
basic/inc/pch/precompiled_sb.hxx |2 -
basic/source/runtime/methods.cxx | 46 +--
2 files changed, 40 insertions(+), 8 deletions(-)
New commits:
commit 564fc483931c0aa2872a33023473c7ac36bfedf1
Author: Michael Stahl
Date: Tue May 19 21:48:55 2015 +0200
tdf#90110: basic: fix Randomize statement
- time() is used to seed the RNG but since it only has second resolution,
the same values will be generated if it's called multiple times like
in the bug report
- BASIC using the global rng would be fine except that BASIC Randomize
takes an optional parameter to set the seed, which should continue
to be supported, but should not affect the RNG state for non-BASIC
users of comphelper::random
(regression from df466d79cb126667cc9d5c108367bfa4f5ce76c8,
but the old implementation was even more delightfully absurd,
where Randomize was essentially srand((sal_uInt16)rand()) ...)
Change-Id: I0f30e509de08f933c02ac77c5d932b20e79586c5
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index 8ed406d..d797b0b 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -46,6 +45,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 377b66c..a2bb346 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -47,7 +47,6 @@
#include "errobject.hxx"
#include
-#include
#include
#include
@@ -61,6 +60,8 @@
#include
#include
+#include
+
using namespace comphelper;
using namespace osl;
using namespace com::sun::star;
@@ -3518,6 +3519,38 @@ RTLFUNC(Format)
}
}
+namespace {
+
+// note: BASIC does not use comphelper::random, because
+// Randomize(int) must be supported and should not affect non-BASIC random use
+struct RandomNumberGenerator
+{
+std::mt19937 global_rng;
+
+RandomNumberGenerator()
+{
+try
+{
+std::random_device rd;
+// initialises the state of the global random number generator
+// should only be called once.
+// (note, a few std::variate_generator<> (like normal) have their
+// own state which would need a reset as well to guarantee
identical
+// sequence of numbers, e.g. via myrand.distribution().reset())
+global_rng.seed(rd() ^ time(nullptr));
+}
+catch (std::runtime_error& e)
+{
+SAL_WARN("basic", "Using std::random_device failed: " << e.what());
+global_rng.seed(time(nullptr));
+}
+}
+};
+
+class theRandomNumberGenerator : public rtl::Static {};
+
+}
+
RTLFUNC(Randomize)
{
(void)pBasic;
@@ -3531,12 +3564,9 @@ RTLFUNC(Randomize)
if( rPar.Count() == 2 )
{
nSeed = (int)rPar.Get(1)->GetInteger();
+theRandomNumberGenerator::get().global_rng.seed(nSeed);
}
-else
-{
-nSeed = (int)time(NULL);
-}
-comphelper::rng::reseed(nSeed);
+// without parameter, no need to do anything - RNG is seeded at first use
}
RTLFUNC(Rnd)
@@ -3550,7 +3580,9 @@ RTLFUNC(Rnd)
}
else
{
-rPar.Get(0)->PutDouble(comphelper::rng::uniform_real_distribution());
+std::uniform_real_distribution dist(0.0, 1.0);
+double const tmp(dist(theRandomNumberGenerator::get().global_rng));
+rPar.Get(0)->PutDouble(tmp);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optcolor.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit e1b1f9537a299e5cdb4bd824513b41ee903b4bda
Author: Michael Meeks
Date: Tue May 19 21:12:14 2015 +0100
tdf#91185 - appearance settings lifecycle fix.
Change-Id: I4efe8e68419a3d878acf3c4eb741239794b26d85
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 5b1c429..fd4bcab 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -199,6 +199,7 @@ private:
Chapter(FixedText *pText, bool bShow);
Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString&
sDisplayName);
~Chapter();
+void dispose() { m_pText.disposeAndClear(); }
public:
void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); }
void Show(const Wallpaper& rBackWall);
@@ -231,7 +232,12 @@ private:
public:
bool Is (CheckBox* pBox) const { return m_pText == pBox; }
bool Is (ColorListBox* pBox) const { return m_pColorList == pBox; }
-
+void dispose()
+{
+m_pText.disposeAndClear();
+m_pColorList.disposeAndClear();
+m_pPreview.disposeAndClear();
+}
private:
bool m_bOwnsWidgets;
// checkbox (CheckBox) or simple text (FixedText)
@@ -510,10 +516,14 @@
ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
void ColorConfigWindow_Impl::dispose()
{
-disposeBuilder();
m_pGrid.clear();
m_pVScroll.clear();
m_pHeaderHB.clear();
+for (auto i = vChapters.begin(); i != vChapters.end(); ++i)
+(*i)->dispose();
+for (auto i = vEntries.begin(); i != vEntries.end(); ++i)
+(*i)->dispose();
+disposeBuilder();
VclContainer::dispose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source solenv/gbuild
sc/source/ui/inc/tphfedit.hxx |2 +-
sc/source/ui/pagedlg/scuitphfedit.cxx |2 +-
sc/source/ui/pagedlg/tphfedit.cxx |2 +-
solenv/gbuild/README |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c922776fdde4801af51ea3840c62f2fa3b8bc552
Author: Julien Nabet
Date: Tue May 19 21:58:46 2015 +0200
Typo
Change-Id: Ifaf9320a4f616d25609254d92d9b0e224c2ec591
diff --git a/solenv/gbuild/README b/solenv/gbuild/README
index e3cc0d6..fe123e2 100644
--- a/solenv/gbuild/README
+++ b/solenv/gbuild/README
@@ -11,7 +11,7 @@ for an archived overview of the new build system.
See
./solenv/doc/gbuild
-for a commented class/API heirachy of gbuild written in C++ syntax. It was not
+for a commented class/API hierarchy of gbuild written in C++ syntax. It was not
intended for any use beyond to generate nicelooking docs with the doxygen
doxygen documentation generator from it. It likely is quite outdated these
days.
commit 2dd61975f16c42df4babe59d8f22c652a9d6a7e5
Author: Julien Nabet
Date: Tue May 19 21:57:28 2015 +0200
Typo: SetCharAttriutes->SetCharAttributes
Change-Id: I889f67f1bc097b171ba416cd07d1a54a0cbc542d
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 19cc96c..f222c63 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -62,7 +62,7 @@ public:
using Control::SetText;
voidSetText( const EditTextObject& rTextObject );
EditTextObject* CreateTextObject();
-voidSetCharAttriutes();
+voidSetCharAttributes();
voidInsertField( const SvxFieldItem& rFld );
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx
b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 6de4ed6..59b24a0 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -803,7 +803,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, PushButton*, pBtn )
if ( pBtn == m_pBtnText )
{
-pActiveEdWnd->SetCharAttriutes();
+pActiveEdWnd->SetCharAttributes();
}
else
{
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx
b/sc/source/ui/pagedlg/tphfedit.cxx
index cb6d90b..dd8cb95 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -185,7 +185,7 @@ void ScEditWindow::InsertField( const SvxFieldItem& rFld )
pEdView->InsertField( rFld );
}
-void ScEditWindow::SetCharAttriutes()
+void ScEditWindow::SetCharAttributes()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/combobox.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ebb9a26c26d78c9d1605264503b1d3f276b8729
Author: Caolán McNamara
Date: Tue May 19 20:38:59 2015 +0100
VclPtr: crash on exit if cursor is in fontsize widget in sidebar
Change-Id: I533abbe271beddbb6b60a7703fcf3d53fb5caeb7
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 688fff6..787d3b2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -807,7 +807,7 @@ void ComboBox::Modify()
void ComboBox::ImplUpdateFloatSelection()
{
-if (!mpImplLB)
+if (!mpImplLB || !mpSubEdit)
return;
// move text in the ListBox into the visible region
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b3dpolygontools.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 15a7ae3e8008ef7dbafdcb4b7604cac1fe1f9061
Author: Zsolt Bölöny
Date: Mon May 18 23:50:47 2015 +0200
That was totally pointless
Change-Id: I6046461b2e26a8506249c4a2fdd783bbd2ec223f
Reviewed-on: https://gerrit.libreoffice.org/15810
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx
b/basegfx/source/polygon/b3dpolygontools.cxx
index 1ca3820..10e3581 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -642,8 +642,6 @@ namespace basegfx
if(areParallel(aEdgeVector, aTestVector))
{
-const double fZero(0.0);
-const double fOne(1.0);
double fParamTestOnCurr(0.0);
if(aEdgeVector.getX() > aEdgeVector.getY())
@@ -673,7 +671,7 @@ namespace basegfx
}
}
-if(fTools::more(fParamTestOnCurr, fZero) &&
fTools::less(fParamTestOnCurr, fOne))
+if(fTools::more(fParamTestOnCurr, 0.0) &&
fTools::less(fParamTestOnCurr, 1.0))
{
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/0001-missing-include.patch.1 | 25 ++ external/libetonyek/ExternalProject_libetonyek.mk |2 - external/libetonyek/UnpackedTarball_libetonyek.mk |1 3 files changed, 27 insertions(+), 1 deletion(-) New commits: commit eb5850d63acfd3077a4c5c62d45dff48bc6a6137 Author: David Tardon Date: Tue May 19 18:46:34 2015 +0200 hopefully better fix for windows Change-Id: I196853f0efbaab48e5e09b2728df0a8e5152dc9e diff --git a/external/libetonyek/0001-missing-include.patch.1 b/external/libetonyek/0001-missing-include.patch.1 new file mode 100644 index 000..f3e4e24 --- /dev/null +++ b/external/libetonyek/0001-missing-include.patch.1 @@ -0,0 +1,25 @@ +From 3663b7b44646e1ed1218598aeb0bdf7326934029 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 19 May 2015 18:44:53 +0200 +Subject: [PATCH] missing include + +Change-Id: Ie7a733b49a5b9a056671f4274b5194c3891569ae +--- + src/lib/IWORKText.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp +index 3413ef3..c37b1bc 100644 +--- a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp +@@ -11,6 +11,7 @@ + + #include + #include ++#include + + #include + #include +-- +2.4.0 + diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index a83c654..3de8605 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-weffc \ --without-tools \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - BOOST_CFLAGS="-DBOOST_DETAIL_NO_CONTAINER_FWD $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 4853907..01f35c3 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/assert.patch \ + external/libetonyek/0001-missing-include.patch.1 \ )) # 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: external/libetonyek
external/libetonyek/ExternalProject_libetonyek.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d17b7e3a91fee6211b884e2e991a654c56fe8b4 Author: David Tardon Date: Tue May 19 18:23:52 2015 +0200 blind fix for windows Change-Id: Ia042bbb7845a6de4769949230e3f1bc90099c9aa diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 3de8605..a83c654 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-weffc \ --without-tools \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + BOOST_CFLAGS="-DBOOST_DETAIL_NO_CONTAINER_FWD $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ ___ 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/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 28 ++
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 93571a90b3c2e61f3c6ab9c4c42a8ce4f7fd87b2
Author: Caolán McNamara
Date: Tue May 19 16:53:32 2015 +0100
gtk3: checkmarks slightly clipped on left side
Change-Id: If10822b64e0a9a28c45fd8a1c0e9e44bdbfb054b
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6d9e39d..2a414dd 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -787,13 +787,14 @@ void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext
*context,
const Rectangle& rControlRectangle,
ControlType nType)
{
-gint x, y, indicator_size;
+gint indicator_size;
gtk_style_context_get_style(mpCheckButtonStyle,
"indicator-size", &indicator_size,
-NULL );
+NULL);
+
+gint x = (rControlRectangle.GetWidth() - indicator_size) / 2;
+gint y = (rControlRectangle.GetHeight() - indicator_size) / 2;
-x = (rControlRectangle.GetWidth() - indicator_size) / 2;
-y = (rControlRectangle.GetHeight() - indicator_size) / 2;
if (nType == CTRL_CHECKBOX)
gtk_render_check(context, cr, x, y, indicator_size, indicator_size);
else if (nType == CTRL_RADIOBUTTON)
@@ -1222,16 +1223,27 @@ bool GtkSalGraphics::getNativeControlRegion(
ControlType nType, ControlPart nPar
if(((nType == CTRL_CHECKBOX) || (nType == CTRL_RADIOBUTTON)) &&
nPart == PART_ENTIRE_CONTROL)
{
+rNativeBoundingRegion = rControlRegion;
+
gtk_style_context_get_style( mpCheckButtonStyle,
"indicator-size", &indicator_size,
"indicator-spacing", &indicator_spacing,
(char *)NULL );
-gint size = indicator_size + indicator_spacing*2;
+GtkBorder border;
+gtk_style_context_get_border(mpCheckButtonStyle,
GTK_STATE_FLAG_NORMAL, &border);
+
+GtkBorder padding;
+gtk_style_context_get_padding(mpCheckButtonStyle,
GTK_STATE_FLAG_NORMAL, &padding);
-point = MAX(0, rControlRegion.GetHeight() - size);
-aEditRect = Rectangle( Point( 0, point / 2),
- Size( size, size ) );
+
+indicator_size += 2*indicator_spacing + border.left + padding.left +
border.right + padding.right;
+Rectangle aIndicatorRect( Point( 0,
+
(rControlRegion.GetHeight()-indicator_size)/2),
+ Size( indicator_size, indicator_size ) );
+rNativeContentRegion = aIndicatorRect;
+
+return true;
}
else if( nType == CTRL_MENU_POPUP)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin4.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 2d1abfff0156c17cdaabf27c01e92b5e3f0bbbf4 Author: Laurent Godard Date: Tue May 19 14:36:44 2015 +0200 draw Note mark before text for correct ZOrder tdf#89182 the cell content is now drawn over the cell note rectangle Change-Id: Idce05497b7a9f67e5e315f5bc2f9c59e53898131 Reviewed-on: https://gerrit.libreoffice.org/15802 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index a3e5170..c175d02 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -741,6 +741,11 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.DrawShadow(); aOutputData.DrawFrame(); + +// Show Note Mark +if ( rOpts.GetOption( VOPT_NOTES ) ) +aOutputData.DrawNoteMarks(); + if ( !bLogicText ) aOutputData.DrawStrings(false); // in pixel MapMode @@ -757,11 +762,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI DrawButtons(nX1, nX2, rTableInfo, pContentDev); // Pixel -// Notiz-Anzeiger - -if ( rOpts.GetOption( VOPT_NOTES ) ) -aOutputData.DrawNoteMarks(); - aOutputData.DrawClipMarks(); // Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst ___ 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/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 697d49cbb43c7d12bb88ba4f67dafe069cb1c5bd Author: Michael Meeks Date: Tue May 19 16:54:47 2015 +0100 use CHECKED alias for GTK_STATE_FLAG_CHECKED instead. Change-Id: I42a1b3d133b32ff29eb02fbc262e6ec0aa941b9c diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 1d82490..6d9e39d 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1001,7 +1001,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co context = mpTreeHeaderButtonStyle; ButtonValue aButtonValue = rValue.getTristateVal(); if (aButtonValue == BUTTONVALUE_ON) -flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_CHECKED); +flags = (GtkStateFlags) (flags | CHECKED); renderType = RENDER_EXPANDER; styleClass = GTK_STYLE_CLASS_EXPANDER; break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/UnpackedTarball_libetonyek.mk |6 ++ external/libetonyek/assert.patch | 20 2 files changed, 26 insertions(+) New commits: commit 7a7f73cebcd84a03a5db85d3b423b65c897651f4 Author: David Tardon Date: Tue May 19 17:47:52 2015 +0200 restore windows build fix Change-Id: I1269be7ab26a4f7ba30a70eb8aef3023384a7de2 diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 52e6a95..4853907 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/assert.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch new file mode 100644 index 000..fe5e282 --- /dev/null +++ b/external/libetonyek/assert.patch @@ -0,0 +1,20 @@ +--- src/lib/EtonyekDocument.cpp src/lib/EtonyekDocument.cpp +@@ -7,6 +7,8 @@ + + #include + ++#include ++ + #include + #include + #include +@@ -179,7 +181,7 @@ + info.input->seek(0, RVNG_SEEK_SET); + } + +- assert(!isGzipped); ++ assert(bool(!isGzipped)); + + return probeXMLImpl(info.input, probe, type, info); + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source
sw/inc/IDocumentDrawModelAccess.hxx |5 ++
sw/source/core/crsr/findtxt.cxx | 26 --
sw/source/core/doc/DocumentDrawModelManager.cxx | 59
sw/source/core/inc/DocumentDrawModelManager.hxx |2
sw/source/uibase/inc/view.hxx |2
sw/source/uibase/uiview/viewdraw.cxx|7 ++
6 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit bdc1824ea7acfa2fe9d71cdbe57882acce155577
Author: Miklos Vajna
Date: Tue May 19 17:20:10 2015 +0200
SwPaM::Find: search in shapes anchored to the range
Change-Id: I028f95029deaebddcacf2730d429ad53abbc79fa
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 200d02b..ba7dcbd 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -244,7 +245,8 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
{
if( pNode->IsTxtNode() )
{
-sal_Int32 nTxtLen = pNode->GetTxtNode()->GetTxt().getLength();
+SwTxtNode& rTxtNode = *pNode->GetTxtNode();
+sal_Int32 nTxtLen = rTxtNode.GetTxt().getLength();
sal_Int32 nEnd;
if( rNdIdx == pPam->GetMark()->nNode )
nEnd = pPam->GetMark()->nContent.GetIndex();
@@ -256,7 +258,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
// if there are SwPostItFields inside our current node text, we
// split the text into separate pieces and search for text inside
// the pieces as well as inside the fields
-const SwpHints *pHts = pNode->GetTxtNode()->GetpSwpHints();
+const SwpHints *pHts = rTxtNode.GetpSwpHints();
// count PostItFields by looping over all fields
sal_Int32 aNumberPostits = 0;
@@ -295,14 +297,15 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
SwViewShell *const pWrtShell = (pDocShell) ?
pDocShell->GetEditShell() : 0;
SwPostItMgr *const pPostItMgr = (pWrtShell) ?
pWrtShell->GetPostItMgr() : 0;
+SvxSearchItem aSearchItem(SID_SEARCH_ITEM);
+aSearchItem.SetSearchOptions(rSearchOpt);
+aSearchItem.SetBackward(!bSrchForward);
+
// If there is an active text edit, then search there.
if (SdrView* pSdrView = pWrtShell->GetDrawView())
{
if (pSdrView->GetTextEditObject())
{
-SvxSearchItem aSearchItem(SID_SEARCH_ITEM);
-aSearchItem.SetSearchOptions(rSearchOpt);
-aSearchItem.SetBackward(!bSrchForward);
sal_uInt16 nResult =
pSdrView->GetTextEditOutlinerView()->StartSearchAndReplace(aSearchItem);
if (!nResult)
{
@@ -318,6 +321,19 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
}
}
+// If there are any shapes anchored to this node, search there.
+SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
+aPaM.GetPoint()->nNode = rTxtNode;
+
aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTxtNode(),
nStart);
+aPaM.SetMark();
+aPaM.GetMark()->nNode = rTxtNode.GetIndex() + 1;
+
aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTxtNode(),
0);
+if (pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM,
aSearchItem))
+{
+bFound = true;
+break;
+}
+
sal_Int32 aStart = 0;
// do we need to finish a note?
if (pPostItMgr && pPostItMgr->HasActiveSidebarWin())
commit b97fb340b23e1b6a48c5c95c8d42e9f10ece1748
Author: Miklos Vajna
Date: Tue May 19 17:19:14 2015 +0200
Add sw::DocumentDrawModelManager::Search()
Change-Id: Idcbbb9e049f0fbc5d6503b86fd506df9fb2ad3c5
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx
b/sw/inc/IDocumentDrawModelAccess.hxx
index 7cf0b86..a8b5ba2 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -23,7 +23,9 @@
#include
class SwDrawModel;
+class SwPaM;
class SdrPageView;
+class SvxSearchItem;
class IDocumentDrawModelAccess
{
@@ -89,6 +91,9 @@ public:
*/
virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID&
_nVisibleLayerId ) = 0;
+/// Searches text in shapes anchored inside rPaM.
+virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) =
0;
+
protected:
virtual ~IDocumentDrawModelAccess() {};
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx
b/sw/source/core/doc/DocumentDrawModelManage
Re: removing invalid attribute based on c1e1ef80e
On 07.04.2015 00:46, Markus Mohrhard wrote: > Hey, > > so going through the calc list of invalid documents I found that you > documented in c1e1ef80e that we should remove the invalid attribute in a > few years and make the exported files valid through that. > > I suppose that 3.5 years count as a enough time and we can safely remove > that attribute now. guess it's long enough as far as LO is concerned; the old versions that can't read the correct attribute are probably not used any more. unfortunately there are a lot of AOO users out there too who can't read the correct attribute as the bug was never fixed there, but i guess we can't make everybody happy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/libetonyek RepositoryExternal.mk
RepositoryExternal.mk |2 +-
config_host.mk.in |1 +
configure.ac |2 ++
external/libetonyek/ExternalProject_libetonyek.mk |1 -
4 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1349491d48a2f8a130f1b8b840383d31e7927252
Author: David Tardon
Date: Tue May 19 16:59:26 2015 +0200
move setting of GLM_CFLAGS to configure
Change-Id: Ic9f6165626a8ffc303260c0439010fe7e2ce634b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e44b08a..a114e13 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -157,7 +157,7 @@ else
define gb_LinkTarget__use_glm_headers
$(call gb_LinkTarget_use_unpacked,$(1),glm)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,glm) \
+ $(GLM_CFLAGS) \
$$(INCLUDE) \
)
diff --git a/config_host.mk.in b/config_host.mk.in
index 27422d3..ffb2deb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -207,6 +207,7 @@ export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GLEW_CFLAGS=$(gb_SPACE)@GLEW_CFLAGS@
export GLEW_LIBS=$(gb_SPACE)@GLEW_LIBS@
+export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 738d195..e016794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8633,7 +8633,9 @@ else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE GLM"
SYSTEM_GLM=
+GLM_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/glm"
fi
+AC_SUBST([GLM_CFLAGS])
AC_SUBST([SYSTEM_GLM])
dnl ===
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk
b/external/libetonyek/ExternalProject_libetonyek.mk
index 31ec898..3de8605 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -39,7 +39,6 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
BOOST_CFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
- $(call gb_Helper_optional,GLM,GLM_CFLAGS="-I$(call
gb_UnpackedTarball_get_dir,glm)") \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bitmap.cxx | 59 ++-
1 file changed, 53 insertions(+), 6 deletions(-)
New commits:
commit 0da6ba6d3ccf736ba10bb98ca9b955736a83c5a4
Author: Caolán McNamara
Date: Tue May 19 15:58:09 2015 +0100
Resolves: tdf#91392 orig map for orig code paths, and new map for new path
otherwise with SAL_DISABLE_NATIVE_ALPHA=1/SAL_USE_VCLPLUGIN=gtk3 the 8 bit
page icons in the status bar lose their bottom rows
Change-Id: Id9d9ba1a6fb74784a0a4c29bf3d13ebf8476c376
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 71e6afc..b94b8f1 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -680,7 +680,7 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap&
rBmp, const AlphaMask& r
namespace
{
-struct ScaleContext
+struct LinearScaleContext
{
boost::scoped_array mpMapX;
boost::scoped_array mpMapY;
@@ -688,7 +688,7 @@ struct ScaleContext
boost::scoped_array mpMapXOffset;
boost::scoped_array mpMapYOffset;
-ScaleContext(Rectangle& aDstRect, Rectangle& aBitmapRect,
+LinearScaleContext(Rectangle& aDstRect, Rectangle& aBitmapRect,
Size& aOutSize, long nOffX, long nOffY)
: mpMapX(new long[aDstRect.GetWidth()])
@@ -852,6 +852,52 @@ public:
}
};
+struct TradScaleContext
+{
+boost::scoped_array mpMapX;
+boost::scoped_array mpMapY;
+
+TradScaleContext(Rectangle& aDstRect, Rectangle& aBitmapRect,
+ Size& aOutSize, long nOffX, long nOffY)
+
+: mpMapX(new long[aDstRect.GetWidth()])
+, mpMapY(new long[aDstRect.GetHeight()])
+{
+const long nSrcWidth = aBitmapRect.GetWidth();
+const long nSrcHeight = aBitmapRect.GetHeight();
+
+const bool bHMirr = aOutSize.Width() < 0;
+const bool bVMirr = aOutSize.Height() < 0;
+
+generateSimpleMap(
+nSrcWidth, aDstRect.GetWidth(), aBitmapRect.Left(),
+aOutSize.Width(), nOffX, bHMirr, mpMapX.get());
+
+generateSimpleMap(
+nSrcHeight, aDstRect.GetHeight(), aBitmapRect.Top(),
+aOutSize.Height(), nOffY, bVMirr, mpMapY.get());
+}
+
+private:
+
+static void generateSimpleMap(long nSrcDimension, long nDstDimension, long
nDstLocation,
+ long nOutDimention, long nOffset, bool
bMirror, long* pMap)
+{
+long nMirrorOffset = 0;
+
+if (bMirror)
+nMirrorOffset = (nDstLocation << 1) + nSrcDimension - 1L;
+
+for (long i = 0L; i < nDstDimension; ++i, ++nOffset)
+{
+pMap[i] = nDstLocation + nOffset * nSrcDimension / nOutDimention;
+if (bMirror)
+pMap[i] = nMirrorOffset - pMap[i];
+}
+}
+};
+
+
} // end anonymous namespace
void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const Bitmap& rBitmap, const
AlphaMask& rAlpha, Rectangle aDstRect, Rectangle aBmpRect, Size& aOutSize,
Point& aOutPoint)
@@ -896,7 +942,7 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const
Bitmap& rBitmap, const Al
const long nOffY = aDstRect.Top() - aOutPoint.Y();
-ScaleContext aContext(aDstRect, aBmpRect, aOutSize, nOffX, nOffY);
+TradScaleContext aTradContext(aDstRect, aBmpRect, aOutSize, nOffX, nOffY);
Bitmap::ScopedReadAccess pBitmapReadAccess(const_cast(rBitmap));
AlphaMask::ScopedReadAccess
pAlphaReadAccess(const_cast(rAlpha));
@@ -917,11 +963,12 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const
Bitmap& rBitmap, const Al
aDstRect,
nOffY, nDstHeight,
nOffX, nDstWidth,
-aContext.mpMapX.get(), aContext.mpMapY.get() );
+aTradContext.mpMapX.get(),
aTradContext.mpMapY.get() );
}
else
{
-if( aContext.blendBitmap( Bitmap::ScopedWriteAccess(aBmp).get(),
pBitmapReadAccess.get(), pAlphaReadAccess.get(),
+LinearScaleContext aLinearContext(aDstRect, aBmpRect, aOutSize,
nOffX, nOffY);
+if (aLinearContext.blendBitmap(
Bitmap::ScopedWriteAccess(aBmp).get(), pBitmapReadAccess.get(),
pAlphaReadAccess.get(),
nDstWidth, nDstHeight))
{
aNewBitmap = aBmp;
@@ -934,7 +981,7 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const
Bitmap& rBitmap, const Al
nOffX, nDstWidth,
aBmpRect, aOutSize,
bHMirr, bVMirr,
-aContext.mpMapX.get(), aContext.mpMapY.get() );
+aTradContext.mpMapX.get(),
aTradContext.mpMapY.get() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/ExternalProject_libetonyek.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4f0ee1e0514c29a11eb74fd8fa29f594032d1660 Author: David Tardon Date: Tue May 19 16:56:07 2015 +0200 quick & dirty fix for build with bundled glm Change-Id: I4140f24f4b96c930c3f651cf592966534ef7 diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 3de8605..31ec898 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ + $(call gb_Helper_optional,GLM,GLM_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,glm)") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) ___ 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.documentfoundation.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 80849, which changed state. Bug 80849 Summary: FILESAVE: Insert Image as Link broken (PNG) https://bugs.documentfoundation.org/show_bug.cgi?id=80849 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: embeddedobj/source sw/source
embeddedobj/source/commonembedding/embedobj.cxx |1 -
sw/source/core/ole/ndole.cxx|6 ++
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit b717bda1f6484905aebc571c4538165a1fbfd2bb
Author: Mike Kaganski
Date: Mon May 18 00:03:41 2015 +1000
tdf#67421: Prevent unloading objects due to cache full
When an object is added to OLE objects cache, when cache is full,
old objects are tried to be unloaded. This triggers notifications
that cause all loaded objects to become active, and to be added to
cache (moved to front).
As the new object already was added to front of the cache, later
activity pushes it to back, until it is the last object in cache.
The cache in this process is overfilled, so each next refresh tries
to unload current last OLE object. So, in the end, this effectively
unloads all cached OLE objects.
This patch prevents this by first unloading last object, and then
adding new object to front of cache.
Also, removed needless creation of reference (makes at least 200
function calls for no reason).
Change-Id: Ia903f4df101971df1b0b0148320fc8e45ac1e79c
Reviewed-on: https://gerrit.libreoffice.org/15772
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx
b/embeddedobj/source/commonembedding/embedobj.cxx
index 9e24276..4be6cc9 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -421,7 +421,6 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32
nNewState )
uno::Exception,
uno::RuntimeException, std::exception )
{
-uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(
this ), uno::UNO_QUERY);
{
::osl::ResettableMutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 649d0b7..d69ddd9 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -972,18 +972,16 @@ void SwOLELRUCache::InsertObj( SwOLEObj& rObj )
}
if (it == m_OleObjects.end())
{
-m_OleObjects.push_front( pObj );
-
// try to remove objects if necessary
-// (of course not the freshly inserted one at nPos=0)
sal_Int32 nCount = m_OleObjects.size();
sal_Int32 nPos = nCount-1;
-while (nPos && nCount > m_nLRU_InitSize)
+while (nPos >= 0 && nCount >= m_nLRU_InitSize)
{
pObj = m_OleObjects[ nPos-- ];
if ( pObj->UnloadObject() )
nCount--;
}
+m_OleObjects.push_front(&rObj);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/toolbox.hxx|4 +-
vcl/source/window/toolbox.cxx | 70 +++--
vcl/source/window/toolbox2.cxx |4 +-
3 files changed, 38 insertions(+), 40 deletions(-)
New commits:
commit 9c9db85643866ea57757a532d232e05a88de5fb8
Author: Jan Holesovsky
Date: Tue May 19 16:35:45 2015 +0200
rendercontext toolbar: Invalidate instead of direct paint.
Change-Id: Ib4c11d3f1ec793e66cd47c1f7bb4f7d06820d58f
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 98e73e0..ac313dc 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -197,9 +197,9 @@ private:
public:
using Window::ImplInit;
private:
-SAL_DLLPRIVATE void InvalidateItem(sal_uInt16 nPosition, sal_uInt16
nHighlight = 0, bool bPaint = false, bool bLayout = false);
+SAL_DLLPRIVATE void InvalidateItem(sal_uInt16 nPosition);
SAL_DLLPRIVATE void InvalidateSpin(bool bUpperIn, bool bLowerIn);
-SAL_DLLPRIVATE void InvalidateMenuButton(bool bHighlight);
+SAL_DLLPRIVATE void InvalidateMenuButton();
SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits
nStyle );
using DockingWindow::ImplInitSettings;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ca362fd..e1a25f4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1347,7 +1347,6 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel
)
void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
-
// initialize variables
ImplGetWindowImpl()->mbToolBox = true;
mpData= new ImplToolBoxPrivateData;
@@ -3342,7 +3341,7 @@ void ToolBox::ImplFloatControl( bool bStart,
FloatingWindow* pFloatWindow )
mpFloatWin = pFloatWindow;
// redraw item, to trigger drawing of a special border
-InvalidateItem(mnCurPos, 1);
+InvalidateItem(mnCurPos);
mbDrag = false;
EndTracking();
@@ -3357,7 +3356,7 @@ void ToolBox::ImplFloatControl( bool bStart,
FloatingWindow* pFloatWindow )
bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard;
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
-InvalidateItem(mnCurPos, bWasKeyboardActivate ? 2 : 0);
+InvalidateItem(mnCurPos);
Deactivate();
if( !bWasKeyboardActivate )
@@ -3420,7 +3419,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent&
rMEvt, bool bRepeat )
{
if ( !mnCurItemId )
{
-InvalidateItem(mnCurPos, 1);
+InvalidateItem(mnCurPos);
mnCurItemId = pItem->mnId;
Highlight();
}
@@ -3549,17 +3548,12 @@ bool ToolBox::ImplHandleMouseButtonUp( const
MouseEvent& rMEvt, bool bCancel )
// Items not destroyed, in Select handler
if ( mnCurItemId )
{
-sal_uInt16 nHighlight;
-if ( (mnCurItemId == mnHighItemId) && (mnOutStyle &
TOOLBOX_STYLE_FLAT) )
-nHighlight = 2;
-else
-nHighlight = 0;
// Get current pos for the case that items are
inserted/removed
// in the toolBox
mnCurPos = GetItemPos( mnCurItemId );
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
{
-InvalidateItem(mnCurPos, nHighlight);
+InvalidateItem(mnCurPos);
Flush();
}
}
@@ -3655,7 +3649,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
{
mnCurItemId = mnHighItemId = it->mnId;
-InvalidateItem(mnCurPos, 2); // always use shadow effect (2)
+InvalidateItem(mnCurPos);
}
else
mnCurItemId = mnHighItemId = 0;
@@ -3750,10 +3744,10 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
if ( mpData->mbMenubuttonSelected )
{
// remove highlight from menubutton
-InvalidateMenuButton(false);
+InvalidateMenuButton();
}
mnHighItemId = it->mnId;
-InvalidateItem(nTempPos, 2);
+InvalidateItem(nTempPos);
ImplShowFocus();
CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT
);
}
@@ -3773,7 +3767,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
if ( !bMenuButtonHit && mpData->mbMenubuttonSelected )
{
// remove hi
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 80849, which changed state. Bug 80849 Summary: FILESAVE: Insert Image as Link broken (PNG) https://bugs.documentfoundation.org/show_bug.cgi?id=80849 What|Removed |Added Status|RESOLVED|REOPENED 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: external/libetonyek
external/libetonyek/ExternalProject_libetonyek.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bbefb58c13f470cdf4e5d0d7d81c7ce95536a6a0 Author: David Tardon Date: Tue May 19 16:13:30 2015 +0200 fix external project name Change-Id: I8c2277384537b78255bb2115126d5b2f2812f7df diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index bbc4c02..3de8605 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libetonyek,\ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ boost_headers \ - glm \ + glm_headers \ libxml2 \ revenge \ zlib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek writerperfect/Library_wpftimpress.mk
external/libetonyek/ExternalProject_libetonyek.mk |1 + writerperfect/Library_wpftimpress.mk |1 - 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit b46e0d5dcef20118028a0b4bbd3afb75492d9ec0 Author: David Tardon Date: Tue May 19 16:07:12 2015 +0200 glm is only needed for libetonyek build Change-Id: I398ae27e49ca684b7d1b8d328be90bffee825797 diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index f5ea457..bbc4c02 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libetonyek,\ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ boost_headers \ + glm \ libxml2 \ revenge \ zlib \ diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index d256c3d..3d35aa7 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\ $(eval $(call gb_Library_use_externals,wpftimpress,\ boost_headers \ etonyek \ - glm \ mwaw \ odfgen \ revenge \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - download.lst external/libetonyek external/libwps writerperfect/Library_wpftimpress.mk
download.lst |8 +--- external/libetonyek/UnpackedTarball_libetonyek.mk |6 -- external/libetonyek/assert.patch | 20 external/libwps/ExternalPackage_libwps.mk |2 +- writerperfect/Library_wpftimpress.mk |1 + 5 files changed, 7 insertions(+), 30 deletions(-) New commits: commit 3828a18f5f4134daea616121b6df5f06b463e3bb Author: David Tardon Date: Tue May 19 15:56:04 2015 +0200 upload libetonyek 0.1.2 Change-Id: I7b8382b5ca74f5a1d9535ef0715629f2537d9f7e diff --git a/download.lst b/download.lst index 2e917f5..86ce10c 100644 --- a/download.lst +++ b/download.lst @@ -34,8 +34,9 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a -export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2 +export ETONYEK_MD5SUM := 1704a75df7621d8073b921f8b6506951 +export ETONYEK_VERSION_MICRO := 2 +export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 448e41e..52e6a95 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) - -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ -external/libetonyek/assert.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch deleted file mode 100644 index 39d68db..000 --- a/external/libetonyek/assert.patch +++ /dev/null @@ -1,20 +0,0 @@ src/lib/EtonyekDocument.cpp -+++ src/lib/EtonyekDocument.cpp -@@ -7,6 +7,8 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include -+ - #include - #include - #include -@@ -179,7 +181,7 @@ - info.input->seek(0, RVNG_SEEK_SET); - } - -- assert(!isGzipped); -+ assert(bool(!isGzipped)); - - return probeXMLImpl(info.input, probe, type, info); - } diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 3d35aa7..d256c3d 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\ $(eval $(call gb_Library_use_externals,wpftimpress,\ boost_headers \ etonyek \ + glm \ mwaw \ odfgen \ revenge \ commit ac210e9d544df8509e4f53036754d1046c08883d Author: David Tardon Date: Tue May 19 15:41:58 2015 +0200 avoid the need to touch the Package makefile on updates Change-Id: I4c9d3e8cf9e5635c848c165d4eda44ad3798ae38 diff --git a/download.lst b/download.lst index 7ea4862..2e917f5 100644 --- a/download.lst +++ b/download.lst @@ -146,7 +146,8 @@ export WPD_TARBALL := libwpd-0.10.0.tar.bz2 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a export WPG_TARBALL := libwpg-0.3.0.tar.bz2 export WPS_MD5SUM := e9162d2566421d9d71b3ad2377a68fd5 -export WPS_TARBALL := libwps-0.4.0.tar.bz2 +export WPS_VERSION_MICRO := 0 +export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40 export ZLIB_TARBALL := zlib-1.2.8.tar.gz diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk index f37dc31..034900c 100644 --- a/external/libwps/ExternalPackage_libwps.mk +++ b/external/libwps/ExternalPackage_libwps.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4 else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.0)) +$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.$(WPS_VERSION_MICRO))) endif # 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: include/vcl vcl/source
include/vcl/window.hxx | 12 ++
vcl/source/window/paint.cxx | 179 +++-
2 files changed, 107 insertions(+), 84 deletions(-)
New commits:
commit 5094075fb1544ad29c2505f86862774c32500545
Author: Jan Holesovsky
Date: Tue May 19 15:54:34 2015 +0200
rendercontext: Double-buffer an entire hierarchy.
This finally allows real double-buffering. Also with the per-widget
setting,
no need to be experimental any more.
Change-Id: I405b3b2ce084cb8176b761e7113d3c3c87a6febf
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index c86ecb8..d975ff8 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -609,7 +609,17 @@ private:
SAL_DLLPRIVATE void ImplCalcOverlapRegion( const
Rectangle& rSourceRect, vcl::Region& rRegion,
bool bChildren,
bool bParent, bool bSiblings );
-SAL_DLLPRIVATE void ImplCallPaint( const vcl::Region*
pRegion, sal_uInt16 nPaintFlags );
+/** Invoke the actual painting.
+
+This function is kind of recursive - it may be called from the
+PaintHelper destructor; and on the other hand it creates PaintHelper
+that (when destructed) calls other ImplCallPaint()'s.
+
+@param rBuffer VirtualDevice for double-buffering. It is only passed
+here, the actual handling happens in the PaintHelper.
+*/
+SAL_DLLPRIVATE void ImplCallPaint(const
VclPtr& rBuffer, const vcl::Region* pRegion, sal_uInt16
nPaintFlags);
+
SAL_DLLPRIVATE void ImplCallOverlapPaint();
SAL_DLLPRIVATE void ImplPostPaint();
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 4f7f9dd..374e5de 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -25,7 +25,6 @@
#include
#include
-#include
#include
#include
@@ -44,15 +43,17 @@ class PaintHelper
{
private:
VclPtr m_pWindow;
+VclPtr m_pBuffer; ///< Buffer for the double-buffering
vcl::Region* m_pChildRegion;
Rectangle m_aSelectionRect;
Rectangle m_aPaintRect;
vcl::Region m_aPaintRegion;
sal_uInt16 m_nPaintFlags;
-bool m_bPop;
-bool m_bRestoreCursor;
+bool m_bPop : 1;
+bool m_bRestoreCursor : 1;
+bool m_bCreatedBuffer : 1; ///< This PaintHelper created the buffer for
the double-buffering, and should dispose it when being destructed (if it is
still alive by then).
public:
-PaintHelper(vcl::Window* pWindow, sal_uInt16 nPaintFlags);
+PaintHelper(vcl::Window* pWindow, const VclPtr& rBuffer,
sal_uInt16 nPaintFlags);
void SetPop()
{
m_bPop = true;
@@ -82,16 +83,75 @@ public:
return m_aPaintRegion;
}
void DoPaint(const vcl::Region* pRegion);
+
+/// Create m_pBuffer, and set it up to have the same settings as m_pWindow.
+void SetupBuffer();
+
+/// Paint the content of the buffer to the current m_pWindow.
+void PaintBuffer();
+
~PaintHelper();
};
-PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags)
+PaintHelper::PaintHelper(vcl::Window *pWindow, const VclPtr&
rBuffer, sal_uInt16 nPaintFlags)
: m_pWindow(pWindow)
+, m_pBuffer(rBuffer)
, m_pChildRegion(NULL)
, m_nPaintFlags(nPaintFlags)
, m_bPop(false)
, m_bRestoreCursor(false)
+, m_bCreatedBuffer(false)
+{
+}
+
+void PaintHelper::SetupBuffer()
+{
+assert(!m_pBuffer);
+
+m_pBuffer = VclPtrInstance();
+m_bCreatedBuffer = true;
+
+// transfer various settings
+// FIXME: this must disappear as we move to RenderContext only,
+// the painting must become state-less, so that no actual
+// vcl::Window setting affects this
+if (m_pWindow->IsBackground())
+m_pBuffer->SetBackground(m_pWindow->GetBackground());
+else
+SAL_WARN("vcl.doublebuffering", "the root of the double-buffering
hierarchy should not have a transparent background");
+
+m_pBuffer->SetClipRegion(m_pWindow->GetClipRegion());
+m_pBuffer->SetFillColor(m_pWindow->GetFillColor());
+m_pBuffer->SetFont(m_pWindow->GetFont());
+m_pBuffer->SetLineColor(m_pWindow->GetLineColor());
+m_pBuffer->SetMapMode(m_pWindow->GetMapMode());
+m_pBuffer->SetRefPoint(m_pWindow->GetRefPoint());
+m_pBuffer->SetSettings(m_pWindow->GetSettings());
+m_pBuffer->SetTextColor(m_pWindow->GetTextColor());
+m_pBuffer->SetTextLineColor(m_pWindow->GetTextLineColor());
+m_pBuffer->SetOverlineColor(m_pWindow->GetOverlineColor());
+m_pBuffer->SetTextFillColor(m_pWindow->GetTextFillColor());
+m_pBuffer->SetTextAlign(m_pWindow->GetTextAlign());
+m_pBuffer->SetRasterOp(m_pWindow->GetRasterOp());
+m_pBuffer->SetRefPoint(m_pWindow->GetRefPoint());
+m_pBuffer->SetLayoutMode(m_pWindow->GetLayoutMode());
+m_pBuffer->SetDigitLanguage(m_pWindow->GetDigitLanguage());
+
+// update t
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2438 ++-- 1 file changed, 1268 insertions(+), 1170 deletions(-) New commits: commit 94a76b9fa7f7dcf698da2cc27255e1dd461aa53a Author: Christian Lohmaier Date: Tue May 19 15:54:15 2015 +0200 update credits Change-Id: I9c6a3a2a06bb398a8477e1d95f3975eb21ba1e55 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c89e96a..ac38257 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.2.2$Linux_X86_64 LibreOffice_project/c4c7d32d0d49397cad38d62472b0bc8acff48dd62012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 660 + 2880 501 - 23629 - 15215 + 21525 + 27942 true true view2 - 3676 - 3471 + 3709 + 3475 501 - 660 - 24128 - 15873 + 2880 + 22024 + 30820 0 0 false @@ -36,6 +36,7 @@ false false false + true false false false @@ -82,7 +83,7 @@ false 0 - 2684130 + 2733121 false true @@ -131,8 +132,8 @@ - - + + @@ -163,7 +164,7 @@ - + @@ -201,7 +202,7 @@ - + @@ -210,14 +211,14 @@ - + - + @@ -301,55 +302,58 @@ - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + @@ -358,19 +362,19 @@ - + - + - + - + - + @@ -379,23 +383,26 @@ - + - + - + - + - + + + + @@ -717,8 +724,7 @@ - - + @@ -1002,7 +1008,7 @@ Credits -1055 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-04-28 21:51:10. +1056 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-19 14:32:04. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1029,18 +1035,18 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 17009Joined: 200
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/help.cxx | 21 -
1 file changed, 21 deletions(-)
New commits:
commit ed88d1b4a23b9f97d09c15017f19a991eb3e707a
Author: Tomaž Vajngerl
Date: Tue May 19 22:27:42 2015 +0900
remove setup of painting for help windows (done in ApplySettings)
Change-Id: Idc243ec7083602c639ce5769b8e18a3bac2f773f
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 6bdb60e..cc346f4 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -250,27 +250,6 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent,
const OUString& rText, sal
// EnableAlwaysOnTop();
EnableSaveBackground();
-// FIXME RenderContext
-const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-SetPointFont(*this, rStyleSettings.GetHelpFont());
-SetTextColor(rStyleSettings.GetHelpTextColor());
-SetTextAlign(ALIGN_TOP);
-if (IsNativeControlSupported(CTRL_TOOLTIP, PART_ENTIRE_CONTROL))
-{
-EnableChildTransparentMode(true);
-SetParentClipMode(PARENTCLIPMODE_NOCLIP);
-SetPaintTransparent(true);
-SetBackground();
-}
-else
-SetBackground(Wallpaper(rStyleSettings.GetHelpColor()));
-
-if( rStyleSettings.GetHelpColor().IsDark() )
-SetLineColor( COL_WHITE );
-else
-SetLineColor( COL_BLACK );
-SetFillColor();
-
if( mnStyle & QuickHelpFlags::BiDiRtl )
{
ComplexTextLayoutMode nLayoutMode = GetLayoutMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/harfbuzz
external/harfbuzz/UnpackedTarball_harfbuzz.mk |4 +++
external/harfbuzz/ubsan.patch | 32 ++
2 files changed, 36 insertions(+)
New commits:
commit fd2c99e473fabf811a909be9b11b7dbe19f2814e
Author: Stephan Bergmann
Date: Tue May 19 15:27:51 2015 +0200
external/harfbuzz: work around -fsanitize=function
Change-Id: I8e107c155a99fd68b0aa054435bc85246444b3c6
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 5450a81..9a5560f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -13,6 +13,10 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfb
$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
+$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+external/harfbuzz/ubsan.patch \
+))
+
ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/harfbuzz-rtti.patch \
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
new file mode 100644
index 000..1375c9d
--- /dev/null
+++ b/external/harfbuzz/ubsan.patch
@@ -0,0 +1,32 @@
+--- src/hb-ot-map-private.hh
src/hb-ot-map-private.hh
+@@ -52,8 +52,11 @@
+ unsigned int needs_fallback : 1;
+ unsigned int auto_zwj : 1;
+
+-static int cmp (const feature_map_t *a, const feature_map_t *b)
+-{ return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; }
++static int cmp (void const * a_, void const * b_) {
++ feature_map_t const * a = static_cast(a_);
++ feature_map_t const * b = static_cast(b_);
++ return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0;
++}
+ };
+
+ struct lookup_map_t {
+--- src/hb-ot-tag.cc
src/hb-ot-tag.cc
+@@ -778,9 +778,11 @@
+ };
+
+ static int
+-lang_compare_first_component (const char *a,
+-const char *b)
++lang_compare_first_component (void const * a_,
++void const * b_)
+ {
++ char const * a = static_cast(a_);
++ char const * b = static_cast(b_);
+ unsigned int da, db;
+ const char *p;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: problem with interpreting OpenFormula format in ODF1.2
On Tue, May 19, 2015 at 2:55 PM, Regina Henschel wrote: > Hi Andras, > > I think we have already resolved it as OFFICE-3879 for ODF1.2 Errata 01 and > ODF 1.3. > Hi Regina, You are right. Unfortunately it is not yet in the current 1.3 draft. Thanks! Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75745] Custom Colors Should Appear at Front of List
https://bugs.documentfoundation.org/show_bug.cgi?id=75745 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #3 from Björn Michaelsen --- add dev-list to cc for some EasyHacks ... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 87743] Pack LibreOffice for PlayOnLinux for QA
https://bugs.documentfoundation.org/show_bug.cgi?id=87743 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #6 from Björn Michaelsen --- add dev-list to cc for some EasyHacks ... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 76002] Sidebar: Can't enter page margins directly
https://bugs.documentfoundation.org/show_bug.cgi?id=76002 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #7 from Björn Michaelsen --- add dev-list to cc for some EasyHacks ... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 89290] HTML export: replace tabulator characters with double spaces or ellipses (three dot leader) in Table of Contents
https://bugs.documentfoundation.org/show_bug.cgi?id=89290 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen --- add dev-list to cc for some EasyHacks ... -- 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: problem with interpreting OpenFormula format in ODF1.2
Hi Andras, I think we have already resolved it as OFFICE-3879 for ODF1.2 Errata 01 and ODF 1.3. Kind regards Regina Andras Timar schrieb: Hi, On Tue, May 19, 2015 at 1:24 PM, Winfried Donkers wrote: Hi, I'm currently working on the various FLOOR functions (all Calc and Excel variations) and I struggle with this phrase in http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018610_715980110 : "If mode is given and not equal to zero, the absolute value of N is rounded __away from zero__ to a multiple of the absolute value of significance and then the sign applied ." That sounds to me as CEILING behaviour, not FLOOR. Is my interpretation wrong, is there an error in the standard? What should the behaviour be to have FLOOR comply with ODFF1.2? It can be a copy&paste error. I filed a bug: https://issues.oasis-open.org/browse/OFFICE-3885 We'll discuss this on the next OASIS ODF TC meeting (1st of June), unless until then someone proves that the current text is correct. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 91387] create doxygen docs for the LibreOffice build system from inline comments
https://bugs.documentfoundation.org/show_bug.cgi?id=91387 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org -- 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: vcl/source
vcl/source/window/decoview.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ab216f7039d473a4e7b6c08d868d4dc376161539
Author: Thorsten Behrens
Date: Tue May 19 14:32:04 2015 +0200
Accomodate gcc 4.2's inabilities to cope with complex templates.
Change-Id: I0a35849a02e3f185783c261a369052594583b082
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index baba1e4..e560ccf 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -653,9 +653,12 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle&
rRect,
if( nStyle != DrawFrameStyle::NWF &&
pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
{
-ImplControlValue aControlValue( static_cast(nStyle) |
static_cast(nFlags) |
-
static_cast(pWin->GetType()==WINDOW_BORDERWINDOW ?
-
DrawFrameFlags::BorderWindowBorder : DrawFrameFlags::NONE) );
+long nControlFlags = static_cast(nStyle);
+nControlFlags |= static_cast(nFlags);
+nControlFlags |=
static_cast(pWin->GetType()==WINDOW_BORDERWINDOW ?
+ DrawFrameFlags::BorderWindowBorder
: DrawFrameFlags::NONE);
+ImplControlValue aControlValue( nControlFlags );
+
Rectangle aBound, aContent;
Rectangle aNatRgn( rRect );
if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild solenv/README
solenv/README| 37 ++--- solenv/gbuild/README |7 ++- 2 files changed, 24 insertions(+), 20 deletions(-) New commits: commit 9fe32d106e1fd23f281e1e70c48f9a45e86547ff Author: Bjoern Michaelsen Date: Tue May 19 14:08:48 2015 +0200 update solenv READNE - gbuild is not "shiny new" anymore -- its the default - hint at solenv/doc/gbuild Change-Id: I20be4f10c68a935bd4ec99c4a95714ab08f80ca0 diff --git a/solenv/README b/solenv/README index e3508c7..68e58e8 100644 --- a/solenv/README +++ b/solenv/README @@ -4,32 +4,31 @@ This module contains many tools and makefile configuration pieces, critical for building LibreOffice: bin/ - contains lots of tools used during the build: +contains lots of tools used during the build: - concat-deps* - these aggregate, and remove duplicates from module - dependencies, to accelerate build times. +concat-deps* +these aggregate, and remove duplicates from module +dependencies, to accelerate build times. - make_installer.pl - this script executes the compiled instructions from - the scp2/ module to create an installer, and/or to - do a local install for the smoketest. +make_installer.pl +this script executes the compiled instructions from +the scp2/ module to create an installer, and/or to +do a local install for the smoketest. gbuild/ - the (shiny new) gnumake build makefile fragments we are - migrating the codebase to use. - See gbuild/README for more info. +implementation of the LibreOffice build system +See gbuild/README for more info. gdb/ - lots of nice python helpers to make debugging -much- easier - that (eg.) print UCS2 strings as UTF-8 on the console to - help with debugging. +lots of nice python helpers to make debugging -much- easier +that (eg.) print UCS2 strings as UTF-8 on the console to +help with debugging. inc/ - old / increasingly obsolete dmake setup and includes, we are - trying to entirely rid ourselves of this +old / increasingly obsolete dmake setup and includes, we are +trying to entirely rid ourselves of this src/ - useful standard / re-usable component map files for components - which shouldn't export anything more than a few registration - symbols. +useful standard / re-usable component map files for components +which shouldn't export anything more than a few registration +symbols. diff --git a/solenv/gbuild/README b/solenv/gbuild/README index fdcb926..e3cc0d6 100644 --- a/solenv/gbuild/README +++ b/solenv/gbuild/README @@ -9,4 +9,9 @@ See https://web.archive.org/web/20130911015536/http://wiki.openoffice.org/wiki/Build_Environment_Effort/Module_Migration for an archived overview of the new build system. - +See + ./solenv/doc/gbuild +for a commented class/API heirachy of gbuild written in C++ syntax. It was not +intended for any use beyond to generate nicelooking docs with the doxygen +doxygen documentation generator from it. It likely is quite outdated these +days. ___ 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/crsr/findtxt.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 995ecbdc903223aca7c4198c6acecbba0500a955
Author: Miklos Vajna
Date: Tue May 19 13:01:04 2015 +0200
SwPaM::Find: when no more result in the shape, unmark it
So that when the next result is found in the normal Writer text, only
that will be selected. Having both shape selection + Writer text
selection is confusing.
Change-Id: I52d399e7224b472f76d39d93ffc394c2e3107a86
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index dd1edd2..200d02b 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -305,8 +305,11 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
aSearchItem.SetBackward(!bSrchForward);
sal_uInt16 nResult =
pSdrView->GetTextEditOutlinerView()->StartSearchAndReplace(aSearchItem);
if (!nResult)
+{
// If not found, end the text edit.
pSdrView->SdrEndTextEdit();
+pSdrView->UnmarkAll();
+}
else
{
bFound = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
sw/qa/extras/htmlexport/data/tdf90905.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx|9 +
sw/source/filter/html/wrthtml.cxx |8 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 7ce44f5f8e786a1bfd56aad8e30ef52702115ba2
Author: Vasily Melenchuk
Date: Mon May 4 17:24:09 2015 +0300
tdf#90905 fix for url encoding in internal urls
Do not try to use INetURLObject class for encoding of internal document
links.
External URLs are encoded as before.
Change-Id: I90621819ed21c3f793171ac4ab3fc7d49ac69f56
Reviewed-on: https://gerrit.libreoffice.org/15625
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit d82c035953347a19bbbc5eda61e1c9389bf3b73b)
Signed-off-by: Michael Stahl
diff --git a/sw/qa/extras/htmlexport/data/tdf90905.odt
b/sw/qa/extras/htmlexport/data/tdf90905.odt
new file mode 100644
index 000..cab8a04
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/tdf90905.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 47cffc7..54f7bf1 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -243,6 +243,15 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding,
"tdf76291.odt")
assertXPath(pDoc, "/html/body/p/a[2]", "href",
"http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12";);
}
+DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, "tdf90905.odt")
+{
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+// Internal url should be valid
+assertXPath(pDoc, "/html/body/p/a", "href", "#0.0.1.Text|outline");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 26b8ab6..5de95b2 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1198,8 +1198,12 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const
OUString& rURL)
}
}
}
-INetURLObject aURL( sURL );
-return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(),
aURL.GetMainURL( INetURLObject::NO_DECODE ) );
+else
+{
+INetURLObject aURL(sURL);
+sURL = aURL.GetMainURL(INetURLObject::NO_DECODE);
+}
+return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), sURL );
}
void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/htmlexport/data/tdf90905.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx|9 +
sw/source/filter/html/wrthtml.cxx |8 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit d82c035953347a19bbbc5eda61e1c9389bf3b73b
Author: Vasily Melenchuk
Date: Mon May 4 17:24:09 2015 +0300
tdf#90905 fix for url encoding in internal urls
Do not try to use INetURLObject class for encoding of internal document
links.
External URLs are encoded as before.
Change-Id: I90621819ed21c3f793171ac4ab3fc7d49ac69f56
Reviewed-on: https://gerrit.libreoffice.org/15625
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/htmlexport/data/tdf90905.odt
b/sw/qa/extras/htmlexport/data/tdf90905.odt
new file mode 100644
index 000..cab8a04
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/tdf90905.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 30e9263..77db88b 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -244,6 +244,15 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding,
"tdf76291.odt")
assertXPath(pDoc, "/html/body/p/a", "href",
"http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12";);
}
+DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, "tdf90905.odt")
+{
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+// Internal url should be valid
+assertXPath(pDoc, "/html/body/p/a", "href", "#0.0.1.Text|outline");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 548d1c9..6cc813d 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1198,8 +1198,12 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const
OUString& rURL)
}
}
}
-INetURLObject aURL( sURL );
-return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(),
aURL.GetMainURL( INetURLObject::NO_DECODE ) );
+else
+{
+INetURLObject aURL(sURL);
+sURL = aURL.GetMainURL(INetURLObject::NO_DECODE);
+}
+return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), sURL );
}
void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source svtools/uiconfig sw/source
include/svtools/restartdialog.hxx|5 ++-
svtools/source/dialogs/restartdialog.cxx |3 ++
svtools/uiconfig/ui/restartdialog.ui | 15 ++
sw/source/uibase/app/apphdl.cxx | 45 ++-
4 files changed, 66 insertions(+), 2 deletions(-)
New commits:
commit 76c61ced4eaa5f69b948dca7537028eaa88225b3
Author: Bjoern Michaelsen
Date: Tue May 19 13:58:13 2015 +0200
check for and handle missing base in mail merge (related: fdo#33266)
Change-Id: I3e362a873c28026cbecf005c07def1295aa920e0
diff --git a/include/svtools/restartdialog.hxx
b/include/svtools/restartdialog.hxx
index 48aa5b2..bede9ed 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -29,9 +29,12 @@ enum RestartReason {
RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
// For the modified default print job format to take effect,
// %PRODUCTNAME must be restarted.
-RESTART_REASON_BIBLIOGRAPHY_INSTALL
+RESTART_REASON_BIBLIOGRAPHY_INSTALL,
// "For the bibliography to work properly,
// %PRODUCTNAME must be restarted."
+RESTART_REASON_MAILMERGE_INSTALL
+// "For the mail merge to work properly,
+// %PRODUCTNAME must be restarted."
};
// Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx
b/svtools/source/dialogs/restartdialog.cxx
index 1e99d16..7bef797 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -40,6 +40,9 @@ public:
case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
get(reason_, "reason_bibliography_install");
break;
+case svtools::RESTART_REASON_MAILMERGE_INSTALL:
+get(reason_, "reason_mailmerge_install");
+break;
default:
assert(false); // this cannot happen
}
diff --git a/svtools/uiconfig/ui/restartdialog.ui
b/svtools/uiconfig/ui/restartdialog.ui
index 0782ff4..78e4d7d 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -106,6 +106,21 @@
+
+False
+True
+0
+For the mail merge
to work properly, %PRODUCTNAME must be restarted.
+True
+50
+
+
+False
+True
+2
+
+
+
True
False
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 8b7..9b32ae7 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -21,17 +21,19 @@
#include
+#include
#include
#include
#include
#include
-#include
#include
#include
#include
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -92,7 +94,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
@@ -115,6 +119,24 @@ using namespace ::com::sun::star;
#include
+namespace
+{
+static bool lcl_hasAllComponentsAvailable()
+{
+try
+{
+return
css::sdb::TextConnectionSettings::create(comphelper::getProcessComponentContext()).is();
+}
+catch (css::uno::Exception & e)
+{
+SAL_INFO(
+"sw.core",
+"assuming Base to be missing; caught " << e.Message);
+return false;
+}
+}
+}
+
SFX_IMPL_INTERFACE(SwModule, SfxModule)
void SwModule::InitInterface_Impl()
@@ -278,6 +300,27 @@ SwMailMergeWizardExecutor::~SwMailMergeWizardExecutor()
void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet *
pArgs )
{
+if(!lcl_hasAllComponentsAvailable())
+{
+try
+{
+using namespace org::freedesktop::PackageKit;
+using namespace svtools;
+css::uno::Reference< XSyncDbusSessionHelper >
xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
+const css::uno::Sequence< OUString > vPackages{ "libreoffice-base"
};
+OUString sInteraction;
+xSyncDbusSessionHelper->InstallPackageNames(0, vPackages,
sInteraction);
+SolarMutexGuard aGuard;
+executeRestartDialog(comphelper::getProcessComponentContext(),
NULL, RESTART_REASON_MAILMERGE_INSTALL);
+}
+catch (const css::uno::Exception & e)
+{
+SAL_INFO(
+"sw.core",
+"trying to install LibreOffice Base, caught " << e.Message);
+}
+return;
+}
if ( m_pView )
{
OSL_FAIL("SwMailMergeWizardExecutor::ExecuteMailMergeWizard: Already
executing the wizard!" );
___
Libreoffice-commits mai
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/README |4 1 file changed, 4 insertions(+) New commits: commit 4ab498fd50d94f2d84b5794f0a75d621a701e622 Author: Noel Grandin Date: Tue May 19 13:28:41 2015 +0200 add link Change-Id: I75ffd1e1f877e0d23fdd21370a795fa11bf83f9f diff --git a/solenv/gbuild/README b/solenv/gbuild/README index 0441a83..fdcb926 100644 --- a/solenv/gbuild/README +++ b/solenv/gbuild/README @@ -2,6 +2,10 @@ GBuild is a set of makefile macros built on top of gmake that attempts to simplify LibreOffice development. See + https://wiki.documentfoundation.org/Development/Build_System/ +for online build-system documentation. + +See https://web.archive.org/web/20130911015536/http://wiki.openoffice.org/wiki/Build_Environment_Effort/Module_Migration for an archived overview of the new build system. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide .gitignore
.gitignore| 18 --
bin/gbuild-to-ide | 97 +-
2 files changed, 60 insertions(+), 55 deletions(-)
New commits:
commit 80bbca88d374486dde9d20e19e26a5036e94d3b2
Author: Yurii Kolesnykov
Date: Sun May 10 12:56:58 2015 +0300
An attempt to fix xcode-ide-integration
Added more Xcode specific files to .gitignore.
Made some properties common in gbuil-to-ide to avoid code duplication/bugs.
Xcode projects are broken for now.
Change-Id: I9530435ffe54158ae68ddae0581ac68f968af235
Reviewed-on: https://gerrit.libreoffice.org/15694
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/.gitignore b/.gitignore
index c7891bf..30279a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,10 +97,22 @@ __pycache__
.DS_Store
# Xcode specific
-build
-project.xcworkspace
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
xcuserdata
-*.xuserstate
+*.xcuserstate
+*.xccheckout
+*.moved-aside
+DerivedData
+*.xcodeproj
+*.xcworkspace
# MSVS specific
*/Debug
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 76f0414..0ec56d1 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -103,7 +103,7 @@ class GbuildParser:
def __init__(self):
(self.makecmd, self.srcdir, self.builddir, self.instdir, self.libs,
- self.exes, self.libnames, self.exenames) = ('', '', '', '', [], [],
{}, {})
+ self.exes, self.libnames, self.exenames, self.target_by_path,
self.target_by_location) = ('', '', '', '', [], [], {}, {}, {}, {})
def __mapping_to_dict(self, mapping):
mapping_dict = {}
@@ -215,6 +215,21 @@ class GbuildParser:
self.exenames =
self.__mapping_to_dict(exenamesmatch.group(1))
continue
state = GbuildParserState()
+
+for target in set(self.libs) | set(self.exes):
+if target.location not in self.target_by_location:
+self.target_by_location[target.location] = set()
+self.target_by_location[target.location] |= set([target])
+for cxx in target.cxxobjects:
+path = '/'.join(cxx.split('/')[:-1])
+if path not in self.target_by_path:
+self.target_by_path[path] = set()
+self.target_by_path[path] |= set([target])
+for path in self.target_by_path:
+if len(self.target_by_path[path]) > 1:
+print('fdo#70422: multiple target use dir %s: %s' % (
+path, ', '.join([target.short_name() for target in
self.target_by_path[path]])))
+
return self
@@ -462,40 +477,26 @@ VersionControl=kdevgit
def write_includepaths(self, path):
includedirfile = open(os.path.join(path, '.kdev_include_paths'), 'w')
include = set()
-for target in self.target_by_path[path]:
+for target in self.gbuildparser.target_by_path[path]:
include |= set(target.include)
includedirfile.write('\n'.join(include))
includedirfile.close()
def __init__(self, gbuildparser, ide):
IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
-self.target_by_location = {}
-self.target_by_path = {}
-for target in set(self.gbuildparser.libs) |
set(self.gbuildparser.exes):
-if target.location not in self.target_by_location:
-self.target_by_location[target.location] = set()
-self.target_by_location[target.location] |= set([target])
-for cxx in target.cxxobjects:
-path = '/'.join(cxx.split('/')[:-1])
-if path not in self.target_by_path:
-self.target_by_path[path] = set()
-self.target_by_path[path] |= set([target])
-for path in self.target_by_path:
-if len(self.target_by_path[path]) > 1:
-print('fdo#70422: multiple target use dir %s: %s' % (
-path, ', '.join([target.short_name() for target in
self.target_by_path[path]])))
+
def emit(self):
-for path in self.target_by_path:
+for path in self.gbuildparser.target_by_path:
self.write_includepaths(path)
-for location in self.target_by_location:
+for location in self.gbuildparser.target_by_location:
for f in os.listdir(location):
if f.endswith('.kdev4'):
try:
os.remove(os.path.join(location, f))
except OSError:
shutil.rmtree(os.path.join(location, f))
-for location in self.target_by_location:
+for location in self.gbuildparser.target_by_location:
modulename = os.path.split(location)[1]
self.write_modulestub(location, modulename)
self.write_modulebeef(locat
Re: problem with interpreting OpenFormula format in ODF1.2
Hi, On Tue, May 19, 2015 at 1:24 PM, Winfried Donkers wrote: > Hi, > > > > I'm currently working on the various FLOOR functions (all Calc and Excel > variations) and I struggle with this phrase in > http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018610_715980110 > : > > > > "If mode is given and not equal to zero, the absolute value of N is rounded > __away from zero__ to a multiple of the absolute value of significance and > then the sign applied ." > > > > That sounds to me as CEILING behaviour, not FLOOR. > > > > Is my interpretation wrong, is there an error in the standard? > > What should the behaviour be to have FLOOR comply with ODFF1.2? > It can be a copy&paste error. I filed a bug: https://issues.oasis-open.org/browse/OFFICE-3885 We'll discuss this on the next OASIS ODF TC meeting (1st of June), unless until then someone proves that the current text is correct. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf91261.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 19 +++
writerfilter/source/dmapper/DomainMapper.cxx | 21 -
writerfilter/source/dmapper/PropertyIds.cxx |2 ++
writerfilter/source/dmapper/PropertyIds.hxx |2 ++
writerfilter/source/dmapper/PropertyMap.cxx |5 +
writerfilter/source/dmapper/PropertyMap.hxx |2 ++
7 files changed, 46 insertions(+), 5 deletions(-)
New commits:
commit b7c8c337d4ffad55fe111c9634c4c04afce78bad
Author: Mark Hung
Date: Thu May 14 23:02:21 2015 +0800
tdf#91261: DOCX import: snapGrid property of paragraphs are ignored
Fix the situation for OOXML import filter:
a) While handling DocGrid type, SnapToChars was treated as
None. Now it is implemented as described in the article:
http://linpeifeng.blogspot.tw/2007/02/text-grid-enhancement.html
Both LinesAndChars and SnapToChars will be translated to
Writer grid type "lines and characters", and set SnapToGrid
property to false or true accordingly.
b) All the imported paragraphs snap to grid because SnapToGrid was
appended to grabbag, now it allows SnapToGrid property in
paragraph and paragraph styles to be imported properly.
Change-Id: I446b4c64c0ed86960896bcd61a1006c9173a757a
Reviewed-on: https://gerrit.libreoffice.org/15732
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/tdf91261.docx
b/sw/qa/extras/ooxmlexport/data/tdf91261.docx
new file mode 100644
index 000..6edb8b8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf91261.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 948d3fb..ba7715b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -676,6 +676,25 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89791, "tdf89791.docx")
}
}
+DECLARE_OOXMLEXPORT_TEST(testTdf91261, "tdf91261.docx")
+{
+bool snapToGrid = true;
+uno::Reference< text::XTextRange > xPara = getParagraph( 2 );
+uno::Reference< beans::XPropertySet > properties( xPara, uno::UNO_QUERY);
+properties->getPropertyValue("SnapToGrid") >>= snapToGrid ;
+CPPUNIT_ASSERT_EQUAL(false, snapToGrid);
+
+uno::Reference< beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+sal_Int16 nGridMode;
+xStyle->getPropertyValue("GridMode") >>= nGridMode;
+CPPUNIT_ASSERT_EQUAL( sal_Int16(2), nGridMode);
+
+bool bGridSnapToChars;
+xStyle->getPropertyValue("GridSnapToChars") >>= bGridSnapToChars;
+CPPUNIT_ASSERT_EQUAL(true, bGridSnapToChars);
+
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index abe1069..5542cca 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -934,14 +934,18 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
switch( nIntValue )
{
case NS_ooxml::LN_Value_doc_ST_DocGrid_default:
-case NS_ooxml::LN_Value_doc_ST_DocGrid_snapToChars:
-pSectionContext->SetGridType( 0 );
+pSectionContext->SetGridType(text::TextGridMode::NONE);
break;
case NS_ooxml::LN_Value_doc_ST_DocGrid_lines:
-pSectionContext->SetGridType( 1 );
+
pSectionContext->SetGridType(text::TextGridMode::LINES);
break;
case NS_ooxml::LN_Value_doc_ST_DocGrid_linesAndChars:
-pSectionContext->SetGridType( 2 );
+
pSectionContext->SetGridType(text::TextGridMode::LINES_AND_CHARS);
+pSectionContext->SetGridSnapToChars( false );
+break;
+case NS_ooxml::LN_Value_doc_ST_DocGrid_snapToChars:
+
pSectionContext->SetGridType(text::TextGridMode::LINES_AND_CHARS);
+pSectionContext->SetGridSnapToChars( true );
break;
default :
OSL_FAIL("unknown SwTextGrid value");
@@ -2005,7 +2009,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
break;
case NS_ooxml::LN_CT_PPrBase_snapToGrid:
-m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "snapToGrid",
OUString::number(nIntValue));
+if (!IsStyleSheetImport()||!m_pImpl->isInteropGrabBagEnabled())
+{
+rContext->Insert( PROP_SNAP_TO_GRID,
uno::makeAny(bool(nIntValue)));
+}
+else
+{
+m_pImpl->appendGrabBag(m_pImpl->m_aI
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 16 commits - config_host/config_poppler.h.in configure.ac Makefile.in Repository.mk scp2/Module_scp2.mk scp2/source sd/CppunitTest_sd
Makefile.in |4
Repository.mk |6
config_host/config_poppler.h.in | 12
configure.ac | 12
scp2/Module_scp2.mk |4
scp2/source/ooo/common_brand.scp |8
scp2/source/ooo/file_ooo.scp |4
sd/CppunitTest_sd_import_tests.mk |2
sd/qa/unit/import-tests.cxx | 10
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |8
solenv/bin/macosx-codesign-app-bundle |2
sysui/desktop/macosx/Info.plist.in| 1473 +++---
ure/Package_install.mk|2
vcl/Module_vcl.mk | 12
14 files changed, 1007 insertions(+), 552 deletions(-)
New commits:
commit 64b8ffdc6b92c9efeebe335d4054ae28cbd43f0c
Author: Andras Timar
Date: Sun May 17 17:50:33 2015 +0200
codesign --force
Change-Id: I4128e4eb127098eafa96e82cc3e698a75079b53b
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 04d52aa..23fe2be 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -58,7 +58,7 @@ done
find "$APP_BUNDLE/Contents/MacOS" -type f |
while read file; do
id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
+codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
done
# Sign included bundles. First .app ones (i.e. the Python.app inside
commit ab4c2403129c2b832769ff00e36f332c6357f33f
Author: Andras Timar
Date: Sun May 17 16:26:15 2015 +0200
use Info.plist from cp-4.3
Change-Id: I61d8d9fca19fe6e02b2d7f9129b1a15dbd9758c5
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 6f6f711..c6bb7d9 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -21,7 +21,7 @@
CFBundleDevelopmentRegion
English
-
+
UTExportedTypeDeclarations
@@ -48,6 +48,8 @@
application/vnd.stardivision.writer
+ UTTypeIconFile
+ text.icns
UTTypeIdentifier
@@ -70,28 +72,8 @@
application/vnd.oasis.opendocument.text
-
-
- UTTypeIdentifier
- vnd.oasis.opendocument.text-flat-xml
- UTTypeDescription
- OpenDocument Text (Flat XML)
- UTTypeConformsTo
-
- public.data
- public.content
-
- UTTypeTagSpecification
-
- public.filename-extension
-
- fodt
-
- public.mime-type
-
-
application/vnd.oasis.opendocument.text-flat-xml
-
-
+ UTTypeIconFile
+ oasis-text.icns
@@ -118,6 +100,8 @@
application/vnd.stardivision.calc
+ UTTypeIconFile
+ spreadsheet.icns
UTTypeIdentifier
@@ -140,28 +124,8 @@
application/vnd.oasis.opendocument.spreadsheet
-
-
- UTTypeIdentifier
-
vnd.oasis.opendocument.spreadsheet-flat-xml
- UTTypeDescription
- OpenDocument Spreadsheet (Flat XML)
- UTTypeConformsTo
-
- public.data
- public.content
-
- UTTypeTagSpecification
-
- public.filename-extension
-
- fods
-
problem with interpreting OpenFormula format in ODF1.2
Hi, I'm currently working on the various FLOOR functions (all Calc and Excel variations) and I struggle with this phrase in http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018610_715980110 : "If mode is given and not equal to zero, the absolute value of N is rounded __away from zero__ to a multiple of the absolute value of significance and then the sign applied ." That sounds to me as CEILING behaviour, not FLOOR. Is my interpretation wrong, is there an error in the standard? What should the behaviour be to have FLOOR comply with ODFF1.2? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild solenv/README
solenv/README|1 + solenv/gbuild/README |8 2 files changed, 9 insertions(+) New commits: commit 3128dbdebef081cc865a6239543c5a8ab705fdcc Author: Noel Grandin Date: Tue May 19 13:17:45 2015 +0200 very very basic README for gbuild Change-Id: I5272fe6e6007d4a21a2484b8f5bfe42f5b6ab853 diff --git a/solenv/README b/solenv/README index fd0c593..e3508c7 100644 --- a/solenv/README +++ b/solenv/README @@ -18,6 +18,7 @@ bin/ gbuild/ the (shiny new) gnumake build makefile fragments we are migrating the codebase to use. + See gbuild/README for more info. gdb/ lots of nice python helpers to make debugging -much- easier diff --git a/solenv/gbuild/README b/solenv/gbuild/README new file mode 100644 index 000..0441a83 --- /dev/null +++ b/solenv/gbuild/README @@ -0,0 +1,8 @@ + +GBuild is a set of makefile macros built on top of gmake that attempts to simplify LibreOffice development. + +See + https://web.archive.org/web/20130911015536/http://wiki.openoffice.org/wiki/Build_Environment_Effort/Module_Migration +for an archived overview of the new build system. + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 14 commits - configure.ac jurt/com lo.xcent.in Makefile.in postprocess/Rdb_services.mk registry/Module_registry.mk Repository.mk sysu
Makefile.in | 44 +++-
Repository.mk |6 +-
configure.ac| 24 ++
jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 10
lo.xcent.in |9
postprocess/Rdb_services.mk | 12 +++--
registry/Module_registry.mk |6 +-
sysui/desktop/macosx/Info.plist.in |2
8 files changed, 93 insertions(+), 20 deletions(-)
New commits:
commit f07e87a000aff3639ea1aa3bcbd2555f365f52c5
Author: Stephan Bergmann
Date: Mon Mar 16 14:24:45 2015 +0100
Exclude Python components if --disable-python
Change-Id: I05c1e9d7b270bcafa7fbfe526c8b12733d8ed708
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index affb629..9b398cf 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,16 +168,18 @@ $(eval $(call gb_Rdb_add_components,services,\
scripting/source/basprov/basprov \
scripting/source/dlgprov/dlgprov \
scripting/source/protocolhandler/protocolhandler \
- scripting/source/pyprov/mailmerge \
- wizards/com/sun/star/wizards/fax/fax \
- wizards/com/sun/star/wizards/letter/letter \
- wizards/com/sun/star/wizards/agenda/agenda \
- wizards/com/sun/star/wizards/web/web \
scripting/source/stringresource/stringresource \
scripting/source/vbaevents/vbaevents \
scripting/util/scriptframe \
sw/util/vbaswobj \
vbahelper/util/msforms \
+ $(ifneq ($(DISABLE_PYTHON),TRUE) \
+ scripting/source/pyprov/mailmerge \
+ wizards/com/sun/star/wizards/agenda/agenda \
+ wizards/com/sun/star/wizards/fax/fax \
+ wizards/com/sun/star/wizards/letter/letter \
+ wizards/com/sun/star/wizards/web/web \
+ ) \
) \
$(if $(ENABLE_CAIRO_CANVAS), \
canvas/source/cairo/cairocanvas \
commit 093ab33a858e5da4d508bcb33bacf2ce31a47eb3
Author: Andras Timar
Date: Mon May 11 22:26:29 2015 +0200
create empty .lproj directories for languages supported by OS X
The previous solution had problems. InfoPlist.strings were empty,
because localization has not been working since the CFBundleTypeIconFile
entries were removed from Info.plist. Icon file basename was the key
in documents.ulf. So we packages 0 bytes long files. The second problem
was that we used LibreOffice language codes, and OS X language codes are
different in some cases. This caused problems such as French strings on
English UI (e.g. Open/Save dialogs), because the system did not
recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Conflicts:
Makefile.in
diff --git a/Makefile.in b/Makefile.in
index d5c008c..cf61549 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,14 +297,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj
directories.
- set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
- bn=`basename $$F .zip`; \
- lang=$${bn#InfoPlist_}; \
+#
+# Create Resources/*.lproj directories for languages supported by OS X
+ set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl
no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
lproj=$(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
mkdir $$lproj; \
- (cd $$lproj; unzip $$F); \
done
+#
# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
#
commit 68c4ab7facd3cf8d406f7b3e3e94a4427d02e8f6
Author: Tor Lillqvist
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index 1585d0b..d5c008c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -328,6 +328,7 @@ endif
mac-app-store-package: test-install
ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' '
'-').pkg
els
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php |1 +
1 file changed, 1 insertion(+)
New commits:
commit 455eb648dd7e28ba4e430332e0ef375a818b34e2
Author: Christian Lohmaier
Date: Tue May 19 12:49:32 2015 +0200
fix syntax error
diff --git a/check.php b/check.php
index 20467b2..062f5e5 100644
--- a/check.php
+++ b/check.php
@@ -458,6 +458,7 @@ function print_update_xml($buildid, $os, $arch, $lang,
$pkgfmt) {
error('No 32bit update available - for OS X 10.8
or later, please install 64bit version of LibreOffice.');
}
}
+ }
break;
case 'Windows':
$target_type = 'win-x86';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdmod2.cxx |6 +-
sd/source/ui/app/strings.src |9 +++--
sd/source/ui/inc/strings.hrc |3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 737863ce3466391733c3f66766ab764d2fbda4ab
Author: Katarina Behrens
Date: Tue May 19 12:38:59 2015 +0200
Related tdf#88056: Use different placeholders for Impress and Draw
Change-Id: Ib087baada3660bf0d31e1295cbac322dada53d2d
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 5025cab..a817f5e 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -269,7 +269,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
aRepresentation = pPage->GetName();
}
else
-aRepresentation =
SdResId(STR_FIELD_PLACEHOLDER_PAGETITLE).toString();
+{
+aRepresentation = ( ( pDoc->GetDocumentType() ==
DOCUMENT_TYPE_IMPRESS )
+?
SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
+:
SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
+}
pInfo->SetRepresentation( aRepresentation );
}
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 2f31991..ed790cf 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1076,9 +1076,14 @@ String STR_FIELD_PLACEHOLDER_COUNT
Text [ en-US ] = "" ;
};
-String STR_FIELD_PLACEHOLDER_PAGETITLE
+String STR_FIELD_PLACEHOLDER_SLIDENAME
{
-Text [ en-US ] = "" ;
+Text [ en-US ] = "" ;
+};
+
+String STR_FIELD_PLACEHOLDER_PAGENAME
+{
+Text [ en-US ] = "" ;
};
String STR_PLACEHOLDER_DESCRIPTION_NOTES
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index f713b83..a5da566 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -372,7 +372,8 @@
#define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696)
#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697)
-#define STR_FIELD_PLACEHOLDER_PAGETITLE (RID_APP_START+698)
+#define STR_FIELD_PLACEHOLDER_SLIDENAME (RID_APP_START+698)
+#define STR_FIELD_PLACEHOLDER_PAGENAME (RID_APP_START+699)
#define STR_LEFT_PANE_DRAW_TITLE(RID_APP_START+700)
#define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 11 commits - basic/source filter/source icon-themes/galaxy sd/source sfx2/source sw/qa sw/source
basic/source/classes/sb.cxx| 19 +++- dev/null |binary filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |4 icon-themes/galaxy/res/helpimg/rechenlt.png|binary sd/source/ui/app/sdxfer.cxx| 18 +++- sfx2/source/sidebar/SidebarController.cxx | 90 - sw/qa/extras/odfimport/odfimport.cxx |2 sw/source/core/doc/docbm.cxx |2 sw/source/core/layout/flowfrm.cxx |9 +- sw/source/core/unocore/unoframe.cxx|7 + sw/source/core/unocore/unotext.cxx | 19 ++-- sw/source/filter/ww8/docxattributeoutput.cxx |2 12 files changed, 99 insertions(+), 73 deletions(-) New commits: commit 8ebb31f73a68a388a2c37d810db92c6fce35b0b2 Author: Andras Timar Date: Mon May 18 18:59:30 2015 +0200 tdf#80075 correct Writer formula bar screenshot (There is no localizable content in new screenshot.) Conflicts: icon-themes/galaxy/res/helpimg/tr/rechenlt.png Change-Id: I140d6996c747d2ca8938d2072711041896044b18 Reviewed-on: https://gerrit.libreoffice.org/15791 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/galaxy/res/helpimg/bg/rechenlt.png b/icon-themes/galaxy/res/helpimg/bg/rechenlt.png deleted file mode 100644 index 0147e33..000 Binary files a/icon-themes/galaxy/res/helpimg/bg/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/cs/rechenlt.png b/icon-themes/galaxy/res/helpimg/cs/rechenlt.png deleted file mode 100644 index fc0b645..000 Binary files a/icon-themes/galaxy/res/helpimg/cs/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/da/rechenlt.png b/icon-themes/galaxy/res/helpimg/da/rechenlt.png deleted file mode 100644 index b79771d..000 Binary files a/icon-themes/galaxy/res/helpimg/da/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/de/rechenlt.png b/icon-themes/galaxy/res/helpimg/de/rechenlt.png deleted file mode 100644 index d7340bf..000 Binary files a/icon-themes/galaxy/res/helpimg/de/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/es/rechenlt.png b/icon-themes/galaxy/res/helpimg/es/rechenlt.png deleted file mode 100644 index b5ce022..000 Binary files a/icon-themes/galaxy/res/helpimg/es/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/et/rechenlt.png b/icon-themes/galaxy/res/helpimg/et/rechenlt.png deleted file mode 100644 index fc0b645..000 Binary files a/icon-themes/galaxy/res/helpimg/et/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/fr/rechenlt.png b/icon-themes/galaxy/res/helpimg/fr/rechenlt.png deleted file mode 100644 index 099ce6a..000 Binary files a/icon-themes/galaxy/res/helpimg/fr/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/hu/rechenlt.png b/icon-themes/galaxy/res/helpimg/hu/rechenlt.png deleted file mode 100644 index 23b3645..000 Binary files a/icon-themes/galaxy/res/helpimg/hu/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/it/rechenlt.png b/icon-themes/galaxy/res/helpimg/it/rechenlt.png deleted file mode 100644 index 1c64d49..000 Binary files a/icon-themes/galaxy/res/helpimg/it/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/ja/rechenlt.png b/icon-themes/galaxy/res/helpimg/ja/rechenlt.png deleted file mode 100644 index 02aab56..000 Binary files a/icon-themes/galaxy/res/helpimg/ja/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/km/rechenlt.png b/icon-themes/galaxy/res/helpimg/km/rechenlt.png deleted file mode 100644 index 6083a52..000 Binary files a/icon-themes/galaxy/res/helpimg/km/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/ko/rechenlt.png b/icon-themes/galaxy/res/helpimg/ko/rechenlt.png deleted file mode 100644 index 101d650..000 Binary files a/icon-themes/galaxy/res/helpimg/ko/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/pl/rechenlt.png b/icon-themes/galaxy/res/helpimg/pl/rechenlt.png deleted file mode 100644 index 45df963..000 Binary files a/icon-themes/galaxy/res/helpimg/pl/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/pt-BR/rechenlt.png b/icon-themes/galaxy/res/helpimg/pt-BR/rechenlt.png deleted file mode 100644 index 890d8d8..000 Binary files a/icon-themes/galaxy/res/helpimg/pt-BR/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/helpimg/pt/rechenlt.png b/icon-themes/galaxy/res/helpimg/pt/rechenlt.png deleted file mode 100644 index 890d8d8..000 Binary files a/icon-themes/galaxy/res/helpimg/pt/rechenlt.png and /dev/null differ diff --git a/icon-themes/galaxy/res/hel
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 339cfd98124cd3f6db697d5ec57fa687c7d99db6
Author: Miklos Vajna
Date: Tue May 19 12:21:07 2015 +0200
vcl: handle NULL pCursor in Edit::ImplShowCursor()
I saw this happening on Writer shutdown.
Change-Id: Ib357d070f53ce0728a5b89f895b87fc42628834c
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9449e49..f69b268 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1197,9 +1197,12 @@ void Edit::ImplShowCursor( bool bOnlyIfVisible )
const long nTextHeight = GetTextHeight();
const long nCursorPosY = ImplGetTextYPosition();
-pCursor->SetPos( Point( nCursorPosX, nCursorPosY ) );
-pCursor->SetSize( Size( nCursorWidth, nTextHeight ) );
-pCursor->Show();
+if (pCursor)
+{
+pCursor->SetPos( Point( nCursorPosX, nCursorPosY ) );
+pCursor->SetSize( Size( nCursorWidth, nTextHeight ) );
+pCursor->Show();
+}
}
void Edit::ImplAlign()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/vclwidgets.cxx | 108 +++
1 file changed, 108 insertions(+)
New commits:
commit 245142cef18d4670a52094165fb4e4aedbb75496
Author: Noel Grandin
Date: Mon May 18 10:08:00 2015 +0200
vclwidget plugin: check for memcpy of VclPtr
Change-Id: I873d3efbb7b78d0efe5d586b378d024ee22ac77e
diff --git a/compilerplugins/clang/vclwidgets.cxx
b/compilerplugins/clang/vclwidgets.cxx
index 22d722c..fd79241 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -44,8 +44,11 @@ public:
bool VisitCXXDeleteExpr(const CXXDeleteExpr *);
+bool VisitCallExpr(const CallExpr *);
+bool VisitDeclRefExpr(const DeclRefExpr* pDeclRefExpr);
private:
bool isDisposeCallingSuperclassDispose(const CXXMethodDecl* pMethodDecl);
+bool mbCheckingMemcpy = false;
};
static bool startsWith(const std::string& s, const char* other)
@@ -472,6 +475,111 @@ bool VCLWidgets::isDisposeCallingSuperclassDispose(const
CXXMethodDecl* pMethodD
return true;
}
+bool containsVclPtr(const Type* pType0);
+
+bool containsVclPtr(const QualType& qType) {
+auto t = qType->getAs();
+if (t != nullptr) {
+auto d = dyn_cast(t->getDecl());
+if (d != nullptr) {
+std::string name(d->getQualifiedNameAsString());
+if (name == "ScopedVclPtr" || name == "ScopedVclPtrInstance"
+|| name == "VclPtr" || name == "VclPtrInstance")
+{
+return true;
+}
+}
+}
+return containsVclPtr(qType.getTypePtr());
+}
+
+bool containsVclPtr(const Type* pType0) {
+if (!pType0)
+return false;
+const Type* pType = pType0->getUnqualifiedDesugaredType();
+if (!pType)
+return false;
+if (pType->isPointerType()) {
+return false;
+} else if (pType->isArrayType()) {
+const ArrayType* pArrayType = dyn_cast(pType);
+QualType elementType = pArrayType->getElementType();
+return containsVclPtr(elementType);
+} else {
+const CXXRecordDecl* pRecordDecl = pType->getAsCXXRecordDecl();
+if (pRecordDecl)
+{
+std::string name(pRecordDecl->getQualifiedNameAsString());
+if (name == "ScopedVclPtr" || name == "ScopedVclPtrInstance"
+|| name == "VclPtr" || name == "VclPtrInstance")
+{
+return true;
+}
+for(auto fieldDecl = pRecordDecl->field_begin();
+fieldDecl != pRecordDecl->field_end(); ++fieldDecl)
+{
+const RecordType *pFieldRecordType =
fieldDecl->getType()->getAs();
+if (pFieldRecordType && containsVclPtr(pFieldRecordType)) {
+return true;
+}
+}
+for(auto baseSpecifier = pRecordDecl->bases_begin();
+baseSpecifier != pRecordDecl->bases_end(); ++baseSpecifier)
+{
+const RecordType *pFieldRecordType =
baseSpecifier->getType()->getAs();
+if (pFieldRecordType && containsVclPtr(pFieldRecordType)) {
+return true;
+}
+}
+}
+}
+return false;
+}
+
+bool VCLWidgets::VisitCallExpr(const CallExpr* pCallExpr)
+{
+if (ignoreLocation(pCallExpr)) {
+return true;
+}
+FunctionDecl const * fdecl = pCallExpr->getDirectCallee();
+if (fdecl == nullptr) {
+return true;
+}
+std::string qname { fdecl->getQualifiedNameAsString() };
+if (qname.find("memcpy") == std::string::npos
+ && qname.find("bcopy") == std::string::npos
+ && qname.find("memmove") == std::string::npos
+ && qname.find("rtl_copy") == std::string::npos) {
+return true;
+}
+mbCheckingMemcpy = true;
+Stmt * pStmt = const_cast(static_cast(pCallExpr->getArg(0)));
+TraverseStmt(pStmt);
+mbCheckingMemcpy = false;
+return true;
+}
+
+bool VCLWidgets::VisitDeclRefExpr(const DeclRefExpr* pDeclRefExpr)
+{
+if (!mbCheckingMemcpy) {
+return true;
+}
+if (ignoreLocation(pDeclRefExpr)) {
+return true;
+}
+QualType pType = pDeclRefExpr->getDecl()->getType();
+if (pType->isPointerType()) {
+pType = pType->getPointeeType();
+}
+if (!containsVclPtr(pType)) {
+return true;
+}
+report(
+DiagnosticsEngine::Warning,
+"Calling memcpy on a type which contains a VclPtr",
+pDeclRefExpr->getExprLoc());
+return true;
+}
loplugin::Plugin::Registration< VCLWidgets > X("vclwidgets");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'distro/collabora/lov-4.4'
New branch 'distro/collabora/lov-4.4' available with the following commits: commit a154d52364a9cccdd30cff340275eb38b58b07ca Author: Andras Timar Date: Sun May 17 17:50:33 2015 +0200 codesign --force Change-Id: I4128e4eb127098eafa96e82cc3e698a75079b53b commit 69026b340b5f17a7700046219f5b4c28087cdd83 Author: Andras Timar Date: Sun May 17 16:26:15 2015 +0200 use Info.plist from cp-4.3 Change-Id: I61d8d9fca19fe6e02b2d7f9129b1a15dbd9758c5 commit 0e00c08031d1c6e2b5eb002e9efdddcf89bcb46d Author: Andras Timar Date: Sun May 17 16:19:34 2015 +0200 remove unoinfo from App Store package Change-Id: I12f07c688966d610191a801c7838052d57f197c4 commit 210efcea13a3f7c91eabd8ddc1b73230ece9ca9a Author: Andras Timar Date: Sun May 17 14:32:02 2015 +0200 Don't package ui-previewer in App Store case Change-Id: I122c65d7f6dec7588ea2624e291e9dfe04dff22c commit fa54c12fd63ba90ffea193eb63364df041a7d228 Author: Andras Timar Date: Sun May 17 11:43:08 2015 +0200 remove unopkg script from MacOSX folder of sandboxed app Change-Id: Ib59953225480e6923e418b966cce289f07f863b5 commit 1fecaf9041c2721c03fe6bf5849d5147fe0abd20 Author: Andras Timar Date: Sun May 17 11:39:44 2015 +0200 Don't put symlink to MacOS folder of sandboxed app Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a commit 458a78e0a1aa630f5102582fbead166d47ef6544 Author: Andras Timar Date: Sun May 17 11:07:14 2015 +0200 Don't package unoinfo in case of Mac OS X like app structure Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948 commit 5450adcab4751e1bd0e56b9bf129596e9e7d9d70 Author: Andras Timar Date: Sun May 17 10:59:11 2015 +0200 Don't package gengal script in App Store case Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c commit 66ad93e6a0b06441e09749d3a35cc457d9e3080f Author: Andras Timar Date: Sun May 17 10:56:20 2015 +0200 Don't build ui-previewer in the App Store case Change-Id: I1b095586b66fbbe582b0e7266609895bb288c6fb commit 201e8d9dc5a00f660321f77bea2a3f882a46ccf2 Author: Andras Timar Date: Sun May 17 10:50:40 2015 +0200 scp2: fix --disable-python Change-Id: I621ef88aefa91fb8f970a9ccb7d974019841cdc7 commit 388061224cbb8a19160d0a1ed9c6c9d9876b8251 Author: Tor Lillqvist Date: Tue Apr 28 22:51:10 2015 +0300 Fix --disable-pdfimport build Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I932f584ef3c054abe738d59e9957c3a40be1d2c9 commit 64339ef8b96d7ac64f86123fc87cfdd6b71b165f Author: Tomáš Chvátal Date: Thu Apr 16 10:13:06 2015 +0200 Make cpp/poppler-version.h header optional Older popler (SLE11) does not have this header yet. With the code simply if the header not found define version to oldest possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c Reviewed-on: https://gerrit.libreoffice.org/15339 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara commit 568791565a933fedfd81cdcb682a1d6e1fcb8ed4 Author: Tor Lillqvist Date: Tue Apr 28 19:13:08 2015 +0300 Check ENABLE_PDFIMPORT (cherry picked from commit baee89d5a068fe950e78e9ec13937f237c5a2c9e) Conflicts: sd/CppunitTest_sd_import_tests.mk Change-Id: I1c0e7e5ecfcd62315e367d537cd3e0466b66e48f commit 136215ab53a7926a5e08f8f43d0c34dfce194f6b Author: Tor Lillqvist Date: Sat Sep 20 01:12:17 2014 +0300 This test was the wrong way surely? Change-Id: I3470fbd2992cd96a772452d75fb2f0320bb529bf commit 4fdd40bca56cfca083315d0213bcee2e6fea57e1 Author: Andras Timar Date: Fri May 15 17:05:17 2015 +0200 shell script in Contents/MacOS is not accepted commit f1e63c1dfd38987e7ed5a1b1b5cf1e6eab636206 Author: Andras Timar Date: Thu May 14 00:01:17 2015 +0200 do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICE (cherry picked from commit cb5a0b03bef4eb8ab0d8689ec73ed83bb73ef5c0) Conflicts: scp2/source/ooo/common_brand.scp Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca Conflicts: scp2/source/ooo/common_brand.scp commit c88bfcebbe7b8f1b231313b02eb6694a7b891589 Author: Andras Timar Date: Fri May 15 16:59:20 2015 +0200 OS X codesign commit 2b8d99acb71067a11593cfa0df88dc41aff51afb Author: Stephan Bergmann Date: Mon Mar 16 14:24:45 2015 +0100 Exclude Python components if --disable-python Change-Id: I05c1e9d7b270bcafa7fbfe526c8b12733d8ed708 commit a397026d958da4548295ce1e4589e57f6903f10c Author: Andras Timar Date: Mon May 11 22:26:29 2015 +0200 create empty .lproj directories for languages supported by OS X The previous solution had problems. InfoPlist.strings were empty, because localization has not been working since the CFBundleTypeIconFile entries were removed from Info.plist.
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 87a235ab55f2afbda7bcb2a508dd99b0de2a
Author: Caolán McNamara
Date: Tue May 19 10:59:28 2015 +0100
downgrade remaining nwf spew to info
Change-Id: I9b6a86ecf12c274d027a0484dd4c12c424e2761f
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 3f42fed..1d82490 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1863,8 +1863,7 @@ bool GtkSalGraphics::IsNativeControlSupported(
ControlType nType, ControlPart nP
break;
}
-printf( "Unhandled is native supported for Type: %d, Part %d\n",
-(int)nType, (int)nPart );
+SAL_INFO("vcl.gtk", "Unhandled is native supported for Type:" << nType <<
", Part" << nPart);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/LibreOfficeKit libreofficekit/source sw/source tools/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |7 ++-
libreofficekit/source/gtk/lokdocview.cxx |4
sw/source/uibase/uiview/viewsrch.cxx | 15 +++
tools/source/generic/fract.cxx |6 ++
4 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 158614a2abc35d122e467d2006830f2c5375aa84
Author: Mihai Varga
Date: Tue May 19 10:55:18 2015 +0300
LOKit callback for search not found
Needed for signaling the user when no match was found for
the searched input
Change-Id: I171ee956d94d6fd83036ae34102c2f1bdd5661de
Reviewed-on: https://gerrit.libreoffice.org/15798
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index aaf99be..ffa2f64 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -138,7 +138,12 @@ typedef enum
*
* Not necessarily ever emitted.
*/
-LOK_CALLBACK_STATUS_INDICATOR_FINISH
+LOK_CALLBACK_STATUS_INDICATOR_FINISH,
+
+/**
+ * No match was found for the search input
+ */
+LOK_CALLBACK_SEARCH_NOT_FOUND
}
LibreOfficeKitCallbackType;
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f7f040a..47b57a6 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -914,6 +914,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
return "LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE";
case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
+case LOK_CALLBACK_SEARCH_NOT_FOUND:
+return "LOK_CALLBACK_SEARCH_NOT_FOUND";
}
return 0;
}
@@ -1006,6 +1008,8 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData*
pCallback)
commandChanged(pCallback->m_aPayload);
}
break;
+case LOK_CALLBACK_SEARCH_NOT_FOUND:
+break;
default:
g_assert(false);
break;
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index e1deaba..a7c7c88 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
@@ -213,7 +214,11 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
{
#if HAVE_FEATURE_DESKTOP
if( !bApi )
+{
+
m_pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+
m_pSrchItem->GetSearchString().toUtf8().getStr());
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+}
#endif
m_bFound = false;
}
@@ -335,7 +340,11 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
{
#if HAVE_FEATURE_DESKTOP
if( !bApi )
+{
+
m_pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+
m_pSrchItem->GetSearchString().toUtf8().getStr());
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+}
#endif
m_bFound = false;
return;
@@ -511,6 +520,8 @@ bool SwView::SearchAndWrap(bool bApi)
if( !bApi )
{
#if HAVE_FEATURE_DESKTOP
+m_pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+m_pSrchItem->GetSearchString().toUtf8().getStr());
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
#endif
}
@@ -551,7 +562,11 @@ bool SwView::SearchAndWrap(bool bApi)
SvxSearchDialogWrapper::SetSearchLabel(SL_Start);
}
else if(!bApi)
+{
+m_pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+m_pSrchItem->GetSearchString().toUtf8().getStr());
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+}
#endif
return m_bFound;
}
commit d6c80f239ee7487e38ce17afdb02c160fca7d313
Author: Michael Stahl
Date: Tue May 19 11:42:04 2015 +0200
tools: check for data loss in WriteFraction
Currently it's only used in VCL's MapMode.
Change-Id: Ib8ce09fadc704bc4d592d333d4cf3bddc9185036
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index b5db1e0..72ce43d 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -384,6 +384,12 @@ SvStream& WriteFraction( SvStream& rOStream, const
Fraction& rFract )
rOStream.WriteInt32( 0 );
rOStream.WriteInt32( -1 );
} else {
+#if OSL_DEBUG_LEVEL > 0
+// can only write 32 bits - check that no data is lost!
+b
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/menubarwindow.cxx |4 --
vcl/source/window/menufloatingwindow.cxx | 10 +-
vcl/source/window/menuwindow.cxx | 51 ---
vcl/source/window/menuwindow.hxx |3 -
4 files changed, 3 insertions(+), 65 deletions(-)
New commits:
commit 7cc23494dbadcd1ae0b94f6163ffe293857eb266
Author: Tomaž Vajngerl
Date: Tue May 19 17:45:02 2015 +0900
remove ImplInitMenuWindow as ApplySettings set it up instead
Change-Id: I9086d36e254d3705bfc60ad9f01c09943f915c09
diff --git a/vcl/source/window/menubarwindow.cxx
b/vcl/source/window/menubarwindow.cxx
index faab3d9..dd2e9c6 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -187,7 +187,6 @@ void MenuBarWindow::SetMenu( MenuBar* pMen )
pMenu = pMen;
KillActivePopup();
nHighlightedItem = ITEMPOS_INVALID;
-ImplInitMenuWindow(this, true, true);
if (pMen)
{
aCloseBtn->ShowItem(IID_DOCUMENTCLOSE, pMen->HasCloseButton());
@@ -991,7 +990,6 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
if (nType == StateChangedType::ControlForeground ||
nType == StateChangedType::ControlBackground)
{
-ImplInitMenuWindow(this, false, true);
Invalidate();
}
else if(pMenu)
@@ -1005,8 +1003,6 @@ void MenuBarWindow::LayoutChanged()
if (!pMenu)
return;
-ImplInitMenuWindow(this, true, true);
-
// if the font was changed.
long nHeight = pMenu->ImplCalcSize(this).Height();
diff --git a/vcl/source/window/menufloatingwindow.cxx
b/vcl/source/window/menufloatingwindow.cxx
index dea3016..46a997a 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -46,7 +46,6 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen,
vcl::Window* pParent, WinBit
bKeyInput = false;
EnableSaveBackground();
-ImplInitMenuWindow( this, true, false );
SetPopupModeEndHdl( LINK( this, MenuFloatingWindow, PopupEnd ) );
@@ -1176,7 +1175,6 @@ void MenuFloatingWindow::StateChanged( StateChangedType
nType )
if ( ( nType == StateChangedType::ControlForeground ) || ( nType ==
StateChangedType::ControlBackground ) )
{
-ImplInitMenuWindow( this, false, false );
Invalidate();
}
}
@@ -1190,7 +1188,6 @@ void MenuFloatingWindow::DataChanged( const
DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
-ImplInitMenuWindow( this, false, false );
Invalidate();
}
}
@@ -1202,18 +1199,17 @@ void MenuFloatingWindow::Command( const CommandEvent&
rCEvt )
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() ==
CommandWheelMode::SCROLL ) )
{
-// ImplCursorUpDown( pData->GetDelta() > 0L );
ImplScroll( pData->GetDelta() > 0L );
MouseMove( MouseEvent( GetPointerPosPixel(), 0 ) );
}
}
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible
> MenuFloatingWindow::CreateAccessible()
+css::uno::Reference
MenuFloatingWindow::CreateAccessible()
{
-::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > xAcc;
+css::uno::Reference xAcc;
-if ( pMenu && !pMenu->pStartedFrom )
+if (pMenu && !pMenu->pStartedFrom)
xAcc = pMenu->GetAccessible();
return xAcc;
diff --git a/vcl/source/window/menuwindow.cxx b/vcl/source/window/menuwindow.cxx
index 2e8df7a..e915c33 100644
--- a/vcl/source/window/menuwindow.cxx
+++ b/vcl/source/window/menuwindow.cxx
@@ -26,57 +26,6 @@
#include
#include
-void MenuWindow::ImplInitMenuWindow(vcl::Window* pWin, bool bFont, bool
bMenuBar)
-{
-const StyleSettings& rStyleSettings =
pWin->GetSettings().GetStyleSettings();
-
-// FIXME RenderContext
-if (bFont)
-pWin->SetPointFont(*pWin, rStyleSettings.GetMenuFont());
-if( bMenuBar )
-{
-const BitmapEx& rPersonaBitmap =
Application::GetSettings().GetStyleSettings().GetPersonaHeader();
-if ( !rPersonaBitmap.IsEmpty() )
-{
-Wallpaper aWallpaper( rPersonaBitmap );
-aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
-aWallpaper.SetColor(
Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
-
-pWin->SetBackground( aWallpaper );
-pWin->SetPaintTransparent( false );
-pWin->SetParentClipMode( 0 );
-}
-else if ( pWin->IsNativeControlSupported( CTRL_MENUBAR,
PART_ENTIRE_CONTROL ) )
-{
-pWin->SetBackground(); // background will be drawn by NWF
-}
-else
-{
-Wallpaper aWallpaper;
-aWallpaper.SetStyle( WALLPAPER_APPLICATIONGRADIENT );
-pWin->SetBackground( aWallpap
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 24945eaa513856b93296f20593e0eba30ac87b0d
Author: Caolán McNamara
Date: Tue May 19 10:41:56 2015 +0100
gtk3: nwf for list node expanders
Change-Id: I710e4feca188836f6572e55132fd6c5941ad06e6
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index be39e6f..3f42fed 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -996,6 +996,16 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType,
ControlPart nPart, co
context = nPart == PART_SEPARATOR_HORZ ? mpFixedHoriLineStyle :
mpFixedVertLineStyle;
renderType = RENDER_SEPERATOR;
break;
+case CTRL_LISTNODE:
+{
+context = mpTreeHeaderButtonStyle;
+ButtonValue aButtonValue = rValue.getTristateVal();
+if (aButtonValue == BUTTONVALUE_ON)
+flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_CHECKED);
+renderType = RENDER_EXPANDER;
+styleClass = GTK_STYLE_CLASS_EXPANDER;
+break;
+}
case CTRL_LISTHEADER:
context = mpTreeHeaderButtonStyle;
if (nPart == PART_ARROW)
@@ -1102,7 +1112,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
MIN(rControlRegion.GetWidth(), 1 +
rControlRegion.GetHeight()));
break;
case RENDER_EXPANDER:
-gtk_render_expander(context, cr, 0, 0, nWidth, nHeight);
+gtk_render_expander(context, cr, -2, -2, nWidth+4, nHeight+4);
break;
case RENDER_SCROLLBAR:
PaintScrollbar(context, cr, rControlRegion, nType, nPart, rValue);
@@ -1758,7 +1768,7 @@ bool GtkSalGraphics::IsNativeControlSupported(
ControlType nType, ControlPart nP
case CTRL_RADIOBUTTON:
case CTRL_CHECKBOX:
case CTRL_PROGRESS:
-//case CTRL_LISTNODE:
+case CTRL_LISTNODE:
case CTRL_LISTNET:
if (nPart==PART_ENTIRE_CONTROL || nPart == PART_FOCUS)
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |3 ++-
sc/source/ui/view/gridwin2.cxx |1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 88528b88bfa41d7c13c619ed0e17215924c589a9
Author: Michael Meeks
Date: Tue May 19 10:30:31 2015 +0100
tdf#91364 - fix data-pilot and auto-filter popup lifecycle.
Change-Id: I6bc94025da3d6536b38cb43eef262d1d5f4c4c4c
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9c2eaa4..5f2a06a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -575,7 +575,7 @@ void ScGridWindow::ClickExtern()
if (mpDPFieldPopup)
{
mpDPFieldPopup->close(false);
-mpDPFieldPopup.reset();
+mpDPFieldPopup.disposeAndClear();
}
}
@@ -705,6 +705,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
SCTAB nTab = pViewData->GetTabNo();
ScDocument* pDoc = pViewData->GetDocument();
+mpAutoFilterPopup.disposeAndClear();
mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
mpAutoFilterPopup->setPopupEndAction(
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 0419490..03e2150 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -455,6 +455,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
const ScDPLabelData& rLabelData = pDPData->maLabels;
+mpDPFieldPopup.disposeAndClear();
mpDPFieldPopup.reset(VclPtr::Create(this,
pViewData->GetDocument()));
mpDPFieldPopup->setName("DataPilot field member popup");
mpDPFieldPopup->setExtendedData(pDPData.release());
___
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/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 2e3f48746ea887c5503a87830b7d68b9eca2f3cc Author: Caolán McNamara Date: Tue May 19 10:21:28 2015 +0100 gtk3: presume we want the same no-op for LISTNET as gtk2 Change-Id: Ic05f49d4e7d379c1d66c911e1d63f13680d2e293 diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index fbcf294..be39e6f 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -947,6 +947,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co break; } break; +case CTRL_LISTNET: case CTRL_TAB_BODY: return true; break; @@ -1758,7 +1759,7 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP case CTRL_CHECKBOX: case CTRL_PROGRESS: //case CTRL_LISTNODE: -//case CTRL_LISTNET: +case CTRL_LISTNET: if (nPart==PART_ENTIRE_CONTROL || nPart == PART_FOCUS) return true; break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|1
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 37 --
2 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 9bc6cb2b405c879d6fc6d208f8deab0b295aed18
Author: Caolán McNamara
Date: Tue May 19 10:15:58 2015 +0100
gtk3: nwf for progress bars
Change-Id: If45020ba9916f9df9b602f57c443f828c8d1de1a
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 087ad54..af86e7f 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -89,6 +89,7 @@ private:
static GtkStyleContext *mpFixedHoriLineStyle;
static GtkStyleContext *mpFixedVertLineStyle;
static GtkStyleContext *mpTreeHeaderButtonStyle;
+static GtkStyleContext *mpProgressBarStyle;
static Rectangle NWGetScrollButtonRect( ControlPart nPart, Rectangle
aAreaRect );
static Rectangle NWGetSpinButtonRect( ControlPart nPart, Rectangle
aAreaRect);
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index b78de56..fbcf294 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -45,6 +45,7 @@ GtkStyleContext* GtkSalGraphics::mpFrameOutStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpFixedHoriLineStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpFixedVertLineStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpTreeHeaderButtonStyle = NULL;
+GtkStyleContext* GtkSalGraphics::mpProgressBarStyle = NULL;
bool GtkSalGraphics::style_loaded = false;
/
@@ -90,7 +91,8 @@ enum {
RENDER_EXTENSION = 12,
RENDER_EXPANDER = 13,
RENDER_ICON = 14,
-RENDER_FOCUS = 15,
+RENDER_PROGRESS = 15,
+RENDER_FOCUS = 16,
};
static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
@@ -1007,6 +1009,11 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
styleClass = GTK_STYLE_CLASS_ARROW;
}
break;
+case CTRL_PROGRESS:
+context = mpProgressBarStyle;
+renderType = RENDER_PROGRESS;
+styleClass = GTK_STYLE_CLASS_TROUGH;
+break;
default:
return false;
}
@@ -1127,6 +1134,29 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
break;
}
+case RENDER_PROGRESS:
+{
+gtk_render_background(context, cr, nX, nY, nWidth, nHeight);
+gtk_render_frame(context, cr, nX, nY, nWidth, nHeight);
+long nProgressWidth = rValue.getNumericVal();
+if (nProgressWidth)
+{
+GtkBorder padding;
+gtk_style_context_get_padding(context, GTK_STATE_FLAG_NORMAL,
&padding);
+
+gtk_style_context_remove_class(context, GTK_STYLE_CLASS_TROUGH);
+gtk_style_context_add_class(context, GTK_STYLE_CLASS_PROGRESSBAR);
+gtk_style_context_add_class(context, GTK_STYLE_CLASS_PULSE);
+nX += padding.left;
+nY += padding.top;
+nHeight -= (padding.top + padding.bottom);
+nProgressWidth -= (padding.left + padding.right);
+gtk_render_background(context, cr, nX, nY, nProgressWidth,
nHeight);
+gtk_render_frame(context, cr, nX, nY, nProgressWidth, nHeight);
+}
+
+break;
+}
default:
break;
}
@@ -1726,7 +1756,7 @@ bool GtkSalGraphics::IsNativeControlSupported(
ControlType nType, ControlPart nP
case CTRL_PUSHBUTTON:
case CTRL_RADIOBUTTON:
case CTRL_CHECKBOX:
-//case CTRL_PROGRESS:
+case CTRL_PROGRESS:
//case CTRL_LISTNODE:
//case CTRL_LISTNET:
if (nPart==PART_ENTIRE_CONTROL || nPart == PART_FOCUS)
@@ -2033,6 +2063,9 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame,
GtkWidget *pWindow )
GtkWidget* pTreeHeaderCellWidget =
gtk_tree_view_column_get_button(middleTreeViewColumn);
mpTreeHeaderButtonStyle =
gtk_widget_get_style_context(pTreeHeaderCellWidget);
+/* Progress Bar */
+getStyleContext(&mpProgressBarStyle, gtk_progress_bar_new());
+
gtk_widget_show_all(gDumbContainer);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source basic/qa basic/source include/basic include/sfx2 sd/source sfx2/source
basctl/source/basicide/iderdll.cxx |4 ++--
basctl/source/basicide/iderdll2.hxx |2 +-
basic/qa/cppunit/basictest.hxx |8
basic/source/classes/sb.cxx | 16
basic/source/classes/sbxmod.cxx |8
basic/source/inc/sbintern.hxx|4 ++--
include/basic/sbstar.hxx | 18 +-
include/sfx2/app.hxx |2 +-
sd/source/ui/slideshow/slideshowimpl.cxx |4 ++--
sd/source/ui/slideshow/slideshowimpl.hxx |2 +-
sfx2/source/appl/app.cxx |8
11 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit ae451af87d01de3806abf1db474017d002092e4c
Author: Noel Grandin
Date: Thu May 14 09:20:01 2015 +0200
basic: used typed LINKs
Change-Id: I8770a782e7ff5529e30aee13558711bdd8a4070d
diff --git a/basctl/source/basicide/iderdll.cxx
b/basctl/source/basicide/iderdll.cxx
index 24a2bf4..535397b 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -174,9 +174,9 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem)
pSearchItem.reset(static_cast(rItem.Clone()));
}
-IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic)
+IMPL_STATIC_LINK_TYPED(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic,
sal_uInt16)
{
-long nRet = 0;
+sal_uInt16 nRet = 0;
if (Shell* pShell = GetShell())
{
if (BasicManager* pBasMgr = FindBasicManager(pBasic))
diff --git a/basctl/source/basicide/iderdll2.hxx
b/basctl/source/basicide/iderdll2.hxx
index 6359d17..e64b6a0 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -50,7 +50,7 @@ private:
boolbShellInCriticalSection;
protected:
-DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC * );
+DECL_STATIC_LINK_TYPED( ExtraData, GlobalBasicBreakHdl, StarBASIC *,
sal_uInt16 );
public:
ExtraData();
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 1638e05..f8ac9f8 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -125,7 +125,7 @@ class MacroSnippet
return !mbError;
}
-DECL_LINK( BasicErrorHdl, StarBASIC * );
+DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
static ErrorDetail GetError()
{
@@ -140,18 +140,18 @@ class MacroSnippet
void ResetError()
{
-StarBASIC::SetGlobalErrorHdl( Link<>() );
+StarBASIC::SetGlobalErrorHdl( Link() );
mbError = false;
}
};
-IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/)
+IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
{
fprintf(stderr,"(%d:%d)\n",
StarBASIC::GetLine(), StarBASIC::GetCol1());
fprintf(stderr,"Basic error: %s\n", OUStringToOString(
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
mbError = true;
-return 0;
+return false;
}
#endif
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3365053..01e6d94 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1486,7 +1486,7 @@ sal_uInt16 StarBASIC::BreakPoint( sal_Int32 l, sal_Int32
c1, sal_Int32 c2 )
bBreak = true;
if( GetSbData()->aBreakHdl.IsSet() )
{
-return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
+return GetSbData()->aBreakHdl.Call( this );
}
else
{
@@ -1500,7 +1500,7 @@ sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32
c1, sal_Int32 c2 )
bBreak = false;
if( GetSbData()->aBreakHdl.IsSet() )
{
-return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
+return GetSbData()->aBreakHdl.Call( this );
}
else
{
@@ -1510,7 +1510,7 @@ sal_uInt16 StarBASIC::StepPoint( sal_Int32 l, sal_Int32
c1, sal_Int32 c2 )
sal_uInt16 StarBASIC::BreakHdl()
{
-return (sal_uInt16) ( aBreakHdl.IsSet() ? aBreakHdl.Call( this ) :
SbDEBUG_CONTINUE );
+return aBreakHdl.IsSet() ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE;
}
// Calls for error handler and break handler
@@ -1721,7 +1721,7 @@ bool StarBASIC::CError( SbError code, const OUString&
rMsg,
bool bRet;
if( GetSbData()->aErrHdl.IsSet() )
{
-bRet = (bool) GetSbData()->aErrHdl.Call( this );
+bRet = GetSbData()->aErrHdl.Call( this );
}
else
{
@@ -1769,7 +1769,7 @@ bool StarBASIC::RTError( SbError code, const OUString&
rMsg, sal_Int32 l, sal_In
SetErrorData( code, l, c1, c2 );
if( GetSbData()->aErrHdl.IsSet() )
{
-return (bool) GetSbData()->aErrHdl.Call( this );
+return GetSbData()->aErrHdl.Call( this );
}
else
{
@@ -1848,17 +1848,17 @@ bool StarBASIC::ErrorHdl()
return aErrorHdl.IsSet() && aErrorHdl.Call( this );
}
-Link<> StarBASIC::GetGlobalErrorHdl()
+Link StarBASIC::GetGlobalErrorH
[Libreoffice-commits] core.git: writerperfect/inc writerperfect/source
writerperfect/inc/DirectoryStream.hxx | 16 +--
writerperfect/inc/DocumentHandler.hxx | 19 +++--
writerperfect/inc/WPFTEncodingDialog.hxx | 14 +
writerperfect/inc/WPXSvInputStream.hxx| 26 --
writerperfect/source/calc/MSWorksCalcImportFilter.cxx |2 -
writerperfect/source/writer/MSWorksImportFilter.cxx |2 -
6 files changed, 57 insertions(+), 22 deletions(-)
New commits:
commit acc4c466c35e8ca9ca7ce8bd7b90c505061a0fb3
Author: David Tardon
Date: Tue May 19 11:08:42 2015 +0200
astyle
Change-Id: I4e7bf54959b8a9ce6c453cedfd3525aeff5c8e3a
diff --git a/writerperfect/inc/DirectoryStream.hxx
b/writerperfect/inc/DirectoryStream.hxx
index bfa7d57..1107a1d 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -16,9 +16,19 @@
#include
-namespace com { namespace sun { namespace star { namespace ucb {
-class XContent;
-} } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace ucb
+{
+class XContent;
+}
+}
+}
+}
namespace writerperfect
{
diff --git a/writerperfect/inc/DocumentHandler.hxx
b/writerperfect/inc/DocumentHandler.hxx
index 608974b..15cd4a8 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -26,9 +26,22 @@
#include
-namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
-class XDocumentHandler;
-} } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace xml
+{
+namespace sax
+{
+class XDocumentHandler;
+}
+}
+}
+}
+}
namespace writerperfect
{
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx
b/writerperfect/inc/WPFTEncodingDialog.hxx
index e76fb88..2d3a63a 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -20,17 +20,19 @@
#include
-namespace writerperfect {
+namespace writerperfect
+{
class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
{
public:
-WPFTEncodingDialog( const OUString& title, const OUString& defEncoding);
+WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);
virtual ~WPFTEncodingDialog();
-OUString GetEncoding( ) const;
-bool hasUserCalledCancel() const {
+OUString GetEncoding() const;
+bool hasUserCalledCancel() const
+{
return m_userHasCancelled;
}
private:
@@ -40,8 +42,8 @@ private:
bool m_userHasCancelled;
private:
-DECL_LINK( DoubleClickHdl, ListBox* );
-DECL_LINK(CancelHdl, void*);
+DECL_LINK(DoubleClickHdl, ListBox *);
+DECL_LINK(CancelHdl, void *);
void dispose() SAL_OVERRIDE;
diff --git a/writerperfect/inc/WPXSvInputStream.hxx
b/writerperfect/inc/WPXSvInputStream.hxx
index cd87f1b..7382607 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -16,10 +16,20 @@
#include
-namespace com { namespace sun { namespace star { namespace io {
-class XInputStream;
-class XSeekable;
-} } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace io
+{
+class XInputStream;
+class XSeekable;
+}
+}
+}
+}
namespace writerperfect
{
@@ -29,15 +39,15 @@ class WPXSvInputStreamImpl;
class WRITERPERFECT_DLLPUBLIC WPXSvInputStream : public
librevenge::RVNGInputStream
{
public:
-WPXSvInputStream( ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream );
+WPXSvInputStream(::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream);
virtual ~WPXSvInputStream();
virtual bool isStructured() SAL_OVERRIDE;
virtual unsigned subStreamCount() SAL_OVERRIDE;
-virtual const char * subStreamName(unsigned id) SAL_OVERRIDE;
+virtual const char *subStreamName(unsigned id) SAL_OVERRIDE;
virtual bool existsSubStream(const char *name) SAL_OVERRIDE;
-virtual librevenge::RVNGInputStream * getSubStreamByName(const char *name)
SAL_OVERRIDE;
-virtual librevenge::RVNGInputStream * getSubStreamById(unsigned id)
SAL_OVERRIDE;
+virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name)
SAL_OVERRIDE;
+virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id)
SAL_OVERRIDE;
virtual const unsigned char *read(unsigned long numBytes, unsigned long
&numBytesRead) SAL_OVERRIDE;
virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
SAL_OVERRIDE;
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 2431e79..3ccf2db 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -68,7 +68,7 @@ bool
MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp
else if (pDlg->hasUserCalledCancel())
return false;
}
-catc
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/LoggedResources.cxx | 66
writerfilter/source/dmapper/LoggedResources.hxx | 10 +--
2 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 8af58f60af85c4a87f77053c1b1a322f391e14b7
Author: Stephan Bergmann
Date: Tue May 19 11:07:33 2015 +0200
loplugin:staticmethods
Change-Id: I6dbc972c1d6e05667ac5f354703a77db4266aea0
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx
b/writerfilter/source/dmapper/LoggedResources.cxx
index a4e495e..55ade5a 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -101,7 +101,7 @@ void LoggedStream::endSectionGroup()
lcl_endSectionGroup();
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("section");
+LoggedResourcesHelper::endElement("section");
#endif
}
@@ -119,7 +119,7 @@ void LoggedStream::endParagraphGroup()
lcl_endParagraphGroup();
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("paragraph");
+LoggedResourcesHelper::endElement("paragraph");
#endif
}
@@ -138,7 +138,7 @@ void LoggedStream::endCharacterGroup()
lcl_endCharacterGroup();
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("charactergroup");
+LoggedResourcesHelper::endElement("charactergroup");
#endif
}
@@ -156,7 +156,7 @@ void LoggedStream::endShape()
lcl_endShape();
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("shape");
+LoggedResourcesHelper::endElement("shape");
#endif
}
@@ -168,14 +168,14 @@ void LoggedStream::text(const sal_uInt8 * data, size_t
len)
OUString sText( reinterpret_cast(data), len,
RTL_TEXTENCODING_MS_1252 );
mHelper.startElement("data");
-mHelper.chars(sText);
-mHelper.endElement("data");
+LoggedResourcesHelper::chars(sText);
+LoggedResourcesHelper::endElement("data");
#endif
lcl_text(data, len);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("text");
+LoggedResourcesHelper::endElement("text");
#endif
}
@@ -190,15 +190,15 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t
len)
aBuffer.append( reinterpret_cast(data), len);
sText = aBuffer.makeStringAndClear();
-mHelper.chars(sText);
+LoggedResourcesHelper::chars(sText);
-mHelper.endElement("data");
+LoggedResourcesHelper::endElement("data");
#endif
lcl_utext(data, len);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("utext");
+LoggedResourcesHelper::endElement("utext");
#endif
}
@@ -206,14 +206,14 @@ void LoggedStream::positionOffset(const OUString& rText,
bool bVertical)
{
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("positionOffset");
-mHelper.attribute("vertical", static_cast(bVertical));
-mHelper.chars(rText);
+LoggedResourcesHelper::attribute("vertical", static_cast(bVertical));
+LoggedResourcesHelper::chars(rText);
#endif
lcl_positionOffset(rText, bVertical);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("positionOffset");
+LoggedResourcesHelper::endElement("positionOffset");
#endif
}
@@ -221,14 +221,14 @@ void LoggedStream::align(const OUString& rText, bool
bVertical)
{
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("align");
-mHelper.attribute("vertical", static_cast(bVertical));
-mHelper.chars(rText);
+LoggedResourcesHelper::attribute("vertical", static_cast(bVertical));
+LoggedResourcesHelper::chars(rText);
#endif
lcl_align(rText, bVertical);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("align");
+LoggedResourcesHelper::endElement("align");
#endif
}
@@ -236,13 +236,13 @@ void LoggedStream::positivePercentage(const OUString&
rText)
{
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("positivePercentage");
-mHelper.chars(rText);
+LoggedResourcesHelper::chars(rText);
#endif
lcl_positivePercentage(rText);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("positivePercentage");
+LoggedResourcesHelper::endElement("positivePercentage");
#endif
}
@@ -255,7 +255,7 @@ void
LoggedStream::props(writerfilter::Reference::Pointer_t ref)
lcl_props(ref);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("props");
+LoggedResourcesHelper::endElement("props");
#endif
}
@@ -263,13 +263,13 @@ void LoggedStream::table(Id name,
writerfilter::Reference::Pointer_t ref)
{
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("table");
-mHelper.attribute("name", (*QNameToString::Instance())(name));
+LoggedResourcesHelper::attribute("name",
(*QNameToString::Instance())(name));
#endif
lcl_table(name, ref);
#ifdef DEBUG_WRITERFILTER
-mHelper.endElement("table");
+LoggedResourcesHelper::endElement("table");
#endif
}
@@ -277,13 +277,13 @@ void LoggedStream::substream(Id name,
writerfilter::Reference::Pointer_t
{
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("substream");
-mHelper.attribute("name", (*QNameToString::Instance())(name));
+
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f066fd04ab6d8f672c8de33ad1c83adbad5f05a6 Author: David Tardon Date: Tue May 19 11:02:09 2015 +0200 require libwps 0.4 Change-Id: I4ffbd3ae7d59a0cd17302f0380dc225f7f7f2905 diff --git a/configure.ac b/configure.ac index 6cb02e6..738d195 100644 --- a/configure.ac +++ b/configure.ac @@ -7701,7 +7701,7 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) dnl === dnl Check for system libwps dnl === -libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.3]) +libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4]) dnl === dnl Check for system libwpg ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/writerperfect writerperfect/CppunitTest_writerperfect_stream.mk writerperfect/inc writerperfect/Library_writerperfect.mk writerperfect/qa writerperf
include/writerperfect/DirectoryStream.hxx | 57 -- include/writerperfect/DocumentHandler.hxx | 54 -- include/writerperfect/WPFTEncodingDialog.hxx | 56 -- include/writerperfect/WPXSvInputStream.hxx| 55 -- include/writerperfect/writerperfectdllapi.h | 23 - writerperfect/CppunitTest_writerperfect_stream.mk |1 writerperfect/Library_writerperfect.mk|5 writerperfect/inc/DirectoryStream.hxx | 57 ++ writerperfect/inc/DocumentHandler.hxx | 54 ++ writerperfect/inc/DocumentHandlerFor.hxx | 28 + writerperfect/inc/ImportFilter.hxx| 207 ++ writerperfect/inc/WPFTEncodingDialog.hxx | 56 ++ writerperfect/inc/WPXSvInputStream.hxx| 55 ++ writerperfect/inc/writerperfect/DocumentHandlerFor.hxx| 28 - writerperfect/inc/writerperfect/ImportFilter.hxx | 207 -- writerperfect/inc/writerperfectdllapi.h | 23 + writerperfect/qa/unit/DirectoryStreamTest.cxx |2 writerperfect/qa/unit/WPXSvStreamTest.cxx |2 writerperfect/source/calc/DocumentHandlerForOds.hxx |2 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |2 writerperfect/source/calc/MSWorksCalcImportFilter.hxx |2 writerperfect/source/calc/MWAWCalcImportFilter.hxx|2 writerperfect/source/common/DirectoryStream.cxx |4 writerperfect/source/common/DocumentHandler.cxx |2 writerperfect/source/common/WPFTEncodingDialog.cxx|2 writerperfect/source/common/WPXSvInputStream.cxx |2 writerperfect/source/draw/CDRImportFilter.hxx |2 writerperfect/source/draw/CMXImportFilter.hxx |2 writerperfect/source/draw/DocumentHandlerForOdg.hxx |2 writerperfect/source/draw/FreehandImportFilter.hxx|2 writerperfect/source/draw/MSPUBImportFilter.hxx |2 writerperfect/source/draw/MWAWDrawImportFilter.hxx|2 writerperfect/source/draw/PageMakerImportFilter.hxx |2 writerperfect/source/draw/VisioImportFilter.hxx |2 writerperfect/source/draw/WPGImportFilter.hxx |2 writerperfect/source/impress/DocumentHandlerForOdp.hxx|4 writerperfect/source/impress/KeynoteImportFilter.cxx |6 writerperfect/source/impress/KeynoteImportFilter.hxx |2 writerperfect/source/impress/MWAWPresentationImportFilter.hxx |2 writerperfect/source/writer/AbiWordImportFilter.hxx |2 writerperfect/source/writer/DocumentHandlerForOdt.hxx |2 writerperfect/source/writer/EBookImportFilter.hxx |2 writerperfect/source/writer/MSWorksImportFilter.cxx |2 writerperfect/source/writer/MSWorksImportFilter.hxx |2 writerperfect/source/writer/MWAWImportFilter.hxx |2 writerperfect/source/writer/WordPerfectImportFilter.cxx |4 46 files changed, 521 insertions(+), 515 deletions(-) New commits: commit fc5dfa8fd34f93a74f590167cb755ef7831bc0d8 Author: Stephan Bergmann Date: Tue May 19 10:55:43 2015 +0200 Move module-local includes to writerperfect/inc Change-Id: I8e90a95d6ab8d8a696d4666e2ab4ddd9584b60f0 diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk index 2d32844..5bb0c4b 100644 --- a/writerperfect/CppunitTest_writerperfect_stream.mk +++ b/writerperfect/CppunitTest_writerperfect_stream.mk @@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerperfect_stream)) $(eval $(call gb_CppunitTest_set_include,writerperfect_stream,\ -I$(SRCDIR)/writerperfect/source/common \ + -I$(SRCDIR)/writerperfect/inc \ $$(INCLUDE) \ )) diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk index 1343be6..165a7a0 100644 --- a/writerperfect/Library_writerperfect.mk +++ b/writerperfect/Library_writerperfect.mk @@ -23,6 +23,11 @@ $(eval $(call gb_Library_add_defs,writerperfect,\ -DWRITERPERFECT_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_set_include,writerperfect, \ +-I$(SRCDIR)/writerperfect/inc \ +$$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_externals,writerperfect,\ boost_headers \ odfgen \ diff --git a/include/writerperfect/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx similarity index 97% rename from include/writerperfect/DirectoryStream.hxx rename to writerperfect/inc/DirectoryStream.hxx index 2a7bffd..bfa7d57 100644 --- a/include/writerperfect/DirectoryStream.hxx +++ b/writerperfect/inc/D
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 Cor Nouws changed: What|Removed |Added Depends on||86675 --- Comment #66 from Cor Nouws --- adding Bug 86675 - Bad-quality antialiasing for PNG images, looks terribly ugly .. -- 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: include/vcl vcl/source
include/vcl/splitwin.hxx | 12
vcl/source/window/splitwin.cxx | 795 -
2 files changed, 409 insertions(+), 398 deletions(-)
New commits:
commit 9451097a9d20f8a522d587271d57efee1fc5566d
Author: Philippe Jung
Date: Mon May 18 16:58:39 2015 +0200
tdf#91259 Crash when closing Help
Rewrite of splitwin.
The previous implementation used struct and memset/memcpy/memmove.
Struct have been replaced by classes with destructors. Array of pointers
are handled in vectors.
This enables clean call to clear of VclPtr.
Change-Id: Iab77303fb1d802f208dfdf476140557e42af949a
Reviewed-on: https://gerrit.libreoffice.org/15788
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index ea38e5b..867a343 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -24,7 +24,7 @@
#include
class Wallpaper;
-struct ImplSplitSet;
+class ImplSplitSet;
typedef sal_uInt16 SplitWindowItemBits;
@@ -57,9 +57,9 @@ private:
longmnMSplitPos;
WinBits mnWinStyle;
WindowAlign meAlign;
-sal_uInt16 mnSplitTest;
-sal_uInt16 mnSplitPos;
-sal_uInt16 mnMouseModifier;
+sal_uInt16 mnSplitTest;
+sal_uInt16 mnSplitPos;
+sal_uInt16 mnMouseModifier;
boolmbDragFull:1,
mbHorz:1,
mbBottomRight:1,
@@ -145,10 +145,10 @@ public:
virtual boolPreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
voidInsertItem( sal_uInt16 nId, vcl::Window* pWindow, long
nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nIntoSetId = 0,
SplitWindowItemBits nBits = 0 );
voidInsertItem( sal_uInt16 nId, long nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nIntoSetId = 0,
SplitWindowItemBits nBits = 0 );
voidRemoveItem( sal_uInt16 nId, bool bHide = true );
voidClear();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 160e204..34f8e09 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -36,10 +36,25 @@
#include
#include
-// Attention: Must not contain non-PODs because array is enlarged/copied
-// with the use of memmove/memcpy.
-struct ImplSplitItem
+
+#define SPLITWIN_SPLITSIZE 4
+#define SPLITWIN_SPLITSIZEEX4
+#define SPLITWIN_SPLITSIZEEXLN 7
+#define SPLITWIN_SPLITSIZEAUTOHIDE 72
+#define SPLITWIN_SPLITSIZEFADE 72
+
+#define SPLIT_HORZ ((sal_uInt16)0x0001)
+#define SPLIT_VERT ((sal_uInt16)0x0002)
+#define SPLIT_WINDOW((sal_uInt16)0x0004)
+#define SPLIT_NOSPLIT ((sal_uInt16)0x8000)
+
+class ImplSplitItem
{
+public:
+ImplSplitItem();
+~ImplSplitItem();
+void dispose();
+
longmnSize;
longmnPixSize;
longmnLeft;
@@ -65,18 +80,78 @@ struct ImplSplitItem
longmnMaxSize;
};
-struct ImplSplitSet
+typedef std::vector< ImplSplitItem* > ImplSplitItems;
+
+class ImplSplitSet
{
-ImplSplitItem* mpItems;
+public:
+ImplSplitSet();
+~ImplSplitSet();
+void dispose();
+
+ImplSplitItems mpItems;
Wallpaper* mpWallpaper;
Bitmap* mpBitmap;
longmnLastSize;
longmnSplitSize;
-sal_uInt16 mnItems;
-sal_uInt16 mnId;
+sal_uInt16 mnId;
boolmbCalcPix;
};
+ImplSplitItem::ImplSplitItem() :
+mpSet( NULL )
+{
+}
+
+ImplSplitItem::~ImplSplitItem()
+{
+dispose();
+}
+
+void ImplSplitItem::dispose()
+{
+if (mpSet) {
+delete mpSet ;
+mpSet = NULL;
+}
+mpWindow.clear();
+mpOrgParent.clear();
+}
+
+ImplSplitSet::ImplSplitSet() :
+mpWallpaper( NULL ),
+mpBitmap( NULL ),
+mnLastSize( 0 ),
+mnSplitSize( SPLITWIN_SPLITSIZE ),
+mnId( 0 ),
+mbCalcPix( true )
+{
+}
+
+ImplSplitSet::~ImplSplitSet()
+{
+dispose();
+}
+
+void ImplSplitSet::dispose()
+{
+size_t nItems = mpItems.size();
+
+for ( size_t i = 0; i < nItems; i++ )
+delete mpItems[i];
+mpItems.clear();
+
+if ( mpWallpaper ) {
+delete mpWallpaper;
+mpWallpaper = NULL;
+}
+
+if ( mpBitmap ) {
+delete mpBitmap;
+mpBitmap = NULL;
+}
+}
+
/** Check wh
[Libreoffice-commits] core.git: include/writerperfect writerperfect/source
include/writerperfect/WPFTEncodingDialog.hxx |4 ---
writerperfect/source/calc/MSWorksCalcImportFilter.cxx |2 -
writerperfect/source/common/WPFTEncodingDialog.cxx| 20 ++
writerperfect/source/writer/MSWorksImportFilter.cxx |5 +---
4 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit de323517555bdb812c65112f6f091f4f6f6c0b93
Author: Stephan Bergmann
Date: Tue May 19 10:35:35 2015 +0200
Clean up WPFTEncodingDialog ctor params
Change-Id: I28304671deb4e619e76f9ad5d8a2f9a9ec3a0d4f
diff --git a/include/writerperfect/WPFTEncodingDialog.hxx
b/include/writerperfect/WPFTEncodingDialog.hxx
index ebc5355..ff35db1 100644
--- a/include/writerperfect/WPFTEncodingDialog.hxx
+++ b/include/writerperfect/WPFTEncodingDialog.hxx
@@ -25,9 +25,7 @@ namespace writerperfect {
class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
{
public:
-WPFTEncodingDialog( vcl::Window* pParent,
- const OUString* pStrTitle = 0,
- const OUString* defEncoding = 0);
+WPFTEncodingDialog( const OUString& title, const OUString& defEncoding);
virtual ~WPFTEncodingDialog();
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 8d7dc75..f1363a5 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -58,7 +58,7 @@ bool
MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp
}
try
{
-const ScopedVclPtrInstance
pDlg(nullptr, &title, &encoding);
+const ScopedVclPtrInstance
pDlg(title, encoding);
if (pDlg->Execute() == RET_OK)
{
if (!pDlg->GetEncoding().isEmpty())
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 4c69a77..1e35993 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -32,7 +32,7 @@ struct EncodingImplementation
static int numEncodings();
static void insertEncodings(ListBox *box);
-static void selectEncoding(ListBox *box, const OUString *encoding);
+static void selectEncoding(ListBox *box, const OUString &encoding);
static OUString getEncoding(ListBox *box);
};
@@ -99,14 +99,12 @@ void EncodingImplementation::insertEncodings(ListBox *box)
}
}
-void EncodingImplementation::selectEncoding(ListBox *box, const OUString
*encoding)
+void EncodingImplementation::selectEncoding(ListBox *box, const OUString
&encoding)
{
-if (!encoding)
-return;
sal_IntPtr num=sal_IntPtr(numEncodings());
for (sal_IntPtr i=0; iSelectEntryPos(i);
return;
}
@@ -123,10 +121,8 @@ OUString EncodingImplementation::getEncoding(ListBox *box)
}
WPFTEncodingDialog::WPFTEncodingDialog(
-vcl::Window *pParent,
-const OUString *pStrTitle,
-const OUString *encoding)
-: ModalDialog(pParent, "WPFTEncodingDialog",
"writerperfect/ui/wpftencodingdialog.ui"),
+const OUString &title, const OUString &encoding)
+: ModalDialog(nullptr, "WPFTEncodingDialog",
"writerperfect/ui/wpftencodingdialog.ui"),
m_pLbCharset(), m_pBtnOk(), m_pBtnCancel(), m_userHasCancelled(false)
{
get(m_pLbCharset, "comboboxtext");
@@ -139,12 +135,10 @@ WPFTEncodingDialog::WPFTEncodingDialog(
m_pLbCharset->SetStyle(m_pLbCharset->GetStyle() | WB_SORT);
// m_pLbCharset->set_height_request(6 * m_pLbCharset->GetTextHeight());
m_pLbCharset->SetDoubleClickHdl(LINK(this, WPFTEncodingDialog,
DoubleClickHdl));
-if (encoding)
-EncodingImplementation::selectEncoding(m_pLbCharset, encoding);
+EncodingImplementation::selectEncoding(m_pLbCharset, encoding);
m_pLbCharset->Show();
-if (pStrTitle)
-SetText(*pStrTitle);
+SetText(title);
}
WPFTEncodingDialog::~WPFTEncodingDialog()
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index d5e0947..ddfd785 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -45,9 +45,8 @@ bool
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
{
if ((kind == libwps::WPS_TEXT) && (confidence ==
libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
{
-OUString title("Import MsWorks files(libwps)");
-OUString encoding("CP850");
-const ScopedVclPtrInstance
pDlg(nullptr, &title, &encoding);
+const ScopedVclPtrInstance pDlg(
+"Import MsWorks files(libwps)", "CP850");
if (pDlg->Execute() == RET_OK)
{
if (!pDlg->GetEncoding().isEmpty())
_
[Bug 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.documentfoundation.org/show_bug.cgi?id=55786 David Tardon changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED Whiteboard|EasyHack DifficultyBeginner |target:5.0.0 |SkillCpp| -- 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: writerperfect/source
writerperfect/source/calc/MSWorksCalcImportFilter.cxx |3 ++-
writerperfect/source/writer/MSWorksImportFilter.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0a5f8dcdf2f1dcaf3e0ef1b626906f6496de6b23
Author: Stephan Bergmann
Date: Tue May 19 10:28:49 2015 +0200
...assuming these want to actually catch css::uno::Exceptions
(which ones? or is this just needless cargo cult anyway?)
Change-Id: If1450d4f34acd1475eb71c49e0eaf99c40833a8e
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index f68b4a0..8d7dc75 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -68,8 +68,9 @@ bool
MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp
else if (pDlg->hasUserCalledCancel())
return false;
}
-catch (...)
+catch (css::uno::Exception & e)
{
+SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
}
}
return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator,
"", fileEncoding.c_str());
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index f06a21a..d5e0947 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -58,8 +58,9 @@ bool
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
return false;
}
}
-catch (...)
+catch (css::uno::Exception & e)
{
+SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
}
return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator,
"", fileEncoding.c_str());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source writerperfect/uiconfig
writerperfect/source/common/WPFTEncodingDialog.cxx |2 +-
writerperfect/uiconfig/ui/wpftencodingdialog.ui|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b8f3b8fd99a0b7c784b0f361f0c28a663839695c
Author: Stephan Bergmann
Date: Tue May 19 10:25:11 2015 +0200
Fix wpftencodingdialog.ui
Change-Id: I03430895a9289331bcbbd1f4a442dabddab5e751
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index f6afb90..4c69a77 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -126,7 +126,7 @@ WPFTEncodingDialog::WPFTEncodingDialog(
vcl::Window *pParent,
const OUString *pStrTitle,
const OUString *encoding)
-: ModalDialog(pParent, "WPFTEncodingDialog",
"writerperfect/ui/WPFTEncodingDialog.ui"),
+: ModalDialog(pParent, "WPFTEncodingDialog",
"writerperfect/ui/wpftencodingdialog.ui"),
m_pLbCharset(), m_pBtnOk(), m_pBtnCancel(), m_userHasCancelled(false)
{
get(m_pLbCharset, "comboboxtext");
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
index bf00869..8c47bf8 100644
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
+++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
@@ -34,7 +34,7 @@
-gtk-undo
+gtk-cancel
True
True
True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - oox/source
oox/source/export/chartexport.cxx |6 +-
oox/source/export/drawingml.cxx |5 -
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 0c75ccb527dac3c7d221f9cb2eb21ec7cda3ea6a
Author: Caolán McNamara
Date: Tue May 19 09:19:48 2015 +0100
coverity#1298896 dead code
Change-Id: I27b27b4f6ca4b443ebbfb0898cef7481b47658f9
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 36c0a96..832914f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1786,8 +1786,6 @@ sal_Int32 DrawingML::getBulletMarginIndentation
(Reference< XPropertySet > rXPro
const PropertyValue* pPropValue = aPropertySequence.getArray();
-sal_Int16 nNumberingType = SVX_NUM_NUMBER_NONE;
-
for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
{
const void* pValue = pPropValue[ i ].Value.getValue();
@@ -1800,9 +1798,6 @@ sal_Int32 DrawingML::getBulletMarginIndentation
(Reference< XPropertySet > rXPro
}
}
-if (nNumberingType == SVX_NUM_NUMBER_NONE)
-return 0;
-
return 0;
}
commit 7c78bcc6f115ad43a064b0be11d9bcc2aa7bdd00
Author: Caolán McNamara
Date: Tue May 19 09:14:33 2015 +0100
coverity#1298897 deadcode
Change-Id: I61892eeeb3d90e50f23cb1dbaf303aabaa1225fa
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index b9b9be5..2f0853b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -122,12 +122,8 @@ namespace {
sal_Int32 translateFromChart2AxisIndexToOox(sal_Int32 nIndex)
{
assert(nIndex == 0 || nIndex == 1);
-if (nIndex == 0)
-return AXIS_PRIMARY_Y;
-else if (nIndex == 1)
+if (nIndex == 1)
return AXIS_SECONDARY_Y;
-
-// good default value for release builds
return AXIS_PRIMARY_Y;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |2 +-
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx|2 +-
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |2 +-
chart2/source/controller/main/ChartController.cxx |2 +-
chart2/source/controller/main/ChartFrameloader.cxx|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4b4c23acc74f7a13e29122c2b12415f9cc69b792
Author: Noel Grandin
Date: Tue May 19 10:11:53 2015 +0200
fix old GCC build
after my commit 10749bbf8247f0b17201b33f95a090dfc4fc3211
"remove the last of the OUString #defines in header files"
Change-Id: I592e918f7b718ddff99a8eaff04b11064fad65d9
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 2c2663e..33c06dc 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1575,7 +1575,7 @@ OUString SAL_CALL
ChartDocumentWrapper::getImplementationName()
OUString ChartDocumentWrapper::getImplementationName_Static()
{
-return CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME;
+return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString&
rServiceName )
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index c2415b7..67e827f 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -48,7 +48,7 @@ OUString SAL_CALL ChartTypeUnoDlg::getImplementationName()
throw(uno::RuntimeExc
OUString ChartTypeUnoDlg::getImplementationName_Static()
throw(uno::RuntimeException)
{
-return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
::comphelper::StringSequence SAL_CALL
ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException,
std::exception)
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 34df8ac..f445f63 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -65,7 +65,7 @@ OUString SAL_CALL
CreationWizardUnoDlg::getImplementationName()
OUString CreationWizardUnoDlg::getImplementationName_Static()
{
-return CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString&
rServiceName )
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 40e6cac..b53ebf6 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -311,7 +311,7 @@ OUString SAL_CALL ChartController::getImplementationName()
OUString ChartController::getImplementationName_Static()
{
-return CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartController::supportsService( const OUString&
rServiceName )
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx
b/chart2/source/controller/main/ChartFrameloader.cxx
index aad49b6..daca898 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -65,7 +65,7 @@ OUString SAL_CALL ChartFrameLoader::getImplementationName()
OUString ChartFrameLoader::getImplementationName_Static()
{
-return CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString&
rServiceName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/model/filter/XMLFilter.cxx |2 +-
chart2/source/model/main/ChartModel.cxx |2 +-
chart2/source/view/main/ChartView.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f4b4db10da454af98ec6071e20ef0a7e068e11fb
Author: Noel Grandin
Date: Tue May 19 10:04:54 2015 +0200
fix old GCC build
after my commit 10749bbf8247f0b17201b33f95a090dfc4fc3211
"remove the last of the OUString #defines in header files"
Change-Id: I7666cfb28d8a28d541c9d7a51f014ebe53c50551
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index a12c1f6..feb94a2 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -809,7 +809,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence<
beans::PropertyValue >
}
OUString XMLReportFilterHelper::getMediaType(bool )
{
-return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII;
+return OUString(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII);
}
} // namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index 6ea5367..e38dfce 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -324,7 +324,7 @@ OUString SAL_CALL ChartModel::getImplementationName()
OUString ChartModel::getImplementationName_Static()
{
-return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 97b3181..b95b5ab 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1396,7 +1396,7 @@ OUString SAL_CALL ChartView::getImplementationName()
OUString ChartView::getImplementationName_Static()
{
-return CHART_VIEW_SERVICE_IMPLEMENTATION_NAME;
+return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName )
___
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/BorderHandler.cxx|3
writerfilter/source/dmapper/CellColorHandler.cxx |3
writerfilter/source/dmapper/CellMarginHandler.cxx|3
writerfilter/source/dmapper/DomainMapper.cxx | 24 +-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 123 +++---
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 65 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 37 ++--
writerfilter/source/dmapper/FFDataHandler.cxx|7
writerfilter/source/dmapper/FontTable.cxx| 10 -
writerfilter/source/dmapper/GraphicHelpers.cxx |7
writerfilter/source/dmapper/GraphicImport.cxx|9 -
writerfilter/source/dmapper/LatentStyleHandler.cxx |5
writerfilter/source/dmapper/LoggedResources.cxx | 28 +--
writerfilter/source/dmapper/LoggedResources.hxx |9 -
writerfilter/source/dmapper/MeasureHandler.cxx |3
writerfilter/source/dmapper/NumberingManager.cxx |6
writerfilter/source/dmapper/OLEHandler.cxx |4
writerfilter/source/dmapper/PageBordersHandler.cxx |4
writerfilter/source/dmapper/PropertyMap.cxx | 71
writerfilter/source/dmapper/PropertyMap.hxx |2
writerfilter/source/dmapper/PropertyMapHelper.cxx| 39 ++--
writerfilter/source/dmapper/PropertyMapHelper.hxx|9 -
writerfilter/source/dmapper/SectionColumnHandler.cxx |4
writerfilter/source/dmapper/SettingsTable.cxx|9 -
writerfilter/source/dmapper/StyleSheetTable.cxx |9 -
writerfilter/source/dmapper/TDefTableHandler.cxx |4
writerfilter/source/dmapper/TableManager.cxx | 125 +--
writerfilter/source/dmapper/TableManager.hxx | 10 -
writerfilter/source/dmapper/TablePositionHandler.cxx |5
writerfilter/source/dmapper/TablePropertiesHandler.cxx |9 -
writerfilter/source/dmapper/TagLogger.cxx| 28 ---
writerfilter/source/dmapper/TagLogger.hxx| 10 -
writerfilter/source/dmapper/TblStylePrHandler.cxx|9 -
writerfilter/source/dmapper/TextEffectsHandler.cxx |3
writerfilter/source/dmapper/ThemeTable.cxx | 19 +-
writerfilter/source/dmapper/TrackChangesHandler.cxx |3
writerfilter/source/dmapper/WrapPolygonHandler.cxx |3
writerfilter/source/dmapper/dmapperLoggers.hxx | 33 ---
writerfilter/source/dmapper/domainmapperfactory.cxx |5
39 files changed, 311 insertions(+), 448 deletions(-)
New commits:
commit bf41d6df35ce9d023b9865cbb007a405d6be02e6
Author: Noel Grandin
Date: Sat May 16 19:59:36 2015 +0200
TagLogger can be static
since we only ever instantiate one of them
Change-Id: I48b3b976b4f33044c4bf6542ac5cce58f26e6244
Reviewed-on: https://gerrit.libreoffice.org/15759
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx
b/writerfilter/source/dmapper/BorderHandler.cxx
index 5b0ea80..38fd788 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
@@ -34,7 +33,7 @@ using namespace ::com::sun::star;
BorderHandler::BorderHandler( bool bOOXML ) :
-LoggedProperties(dmapper_logger, "BorderHandler"),
+LoggedProperties("BorderHandler"),
m_nCurrentBorderPosition( BORDER_TOP ),
m_nLineWidth(15), // Word default, in twips
m_nLineType(0),
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 98a4e5e..6845c8a 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -26,7 +26,6 @@
#include
#include
#include
-#include "dmapperLoggers.hxx"
namespace writerfilter {
namespace dmapper {
@@ -34,7 +33,7 @@ namespace dmapper {
using namespace ::com::sun::star;
CellColorHandler::CellColorHandler() :
-LoggedProperties(dmapper_logger, "CellColorHandler"),
+LoggedProperties("CellColorHandler"),
m_nShadingPattern( drawing::ShadingPattern::CLEAR ),
m_nColor( 0x ),
m_nFillColor( 0x ),
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx
b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 32a745a..922a50b 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -20,7 +20,6 @@
#include
#include
#include
-#include "dmapperLoggers.hxx"
#include
namespace writerfilter {
@@ -30,7 +29,7 @@ using namespace ::com::sun::star;
using namespace ::writerfilter;
CellMarginHandler::CellMarginHandler() :
-LoggedProperties(dmapper_logger, "CellMarginHandler"),
+LoggedProperties("CellMar
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xiescher.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 32bfeac4b160dc522b19171e861668598e21fbe8
Author: Noel Grandin
Date: Tue May 19 09:56:05 2015 +0200
fix Windows build
after my commit 10749bbf8247f0b17201b33f95a090dfc4fc3211
"remove the last of the OUString #defines in header files"
Change-Id: I0db573b59571ed859d14e5e7d5550cfa0335234d
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 0e540c4..ff10e8b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2874,7 +2874,7 @@ OUString XclImpPictureObj::GetOleStorageName() const
OUString aStrgName;
if( (mbEmbedded || mbLinked) && !mbControl && (mnStorageId > 0) )
{
-aStrgName = mbEmbedded ? EXC_STORAGE_OLE_EMBEDDED :
EXC_STORAGE_OLE_LINKED;
+aStrgName = mbEmbedded ? OUString(EXC_STORAGE_OLE_EMBEDDED) :
OUString(EXC_STORAGE_OLE_LINKED);
static const sal_Char spcHexChars[] = "0123456789ABCDEF";
for( sal_uInt8 nIndex = 32; nIndex > 0; nIndex -= 4 )
aStrgName += OUString( sal_Unicode( spcHexChars[ ::extract_value<
sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source dbaccess/source filter/source framework/source include/comphelper include/framework reportdesign/source sc/source sfx2/source svx/source
chart2/source/inc/servicenames.hxx | 14 ++--
chart2/source/model/filter/XMLFilter.cxx|4 -
dbaccess/source/core/dataaccess/databasedocument.cxx|2
filter/source/svg/svgwriter.hxx |6 -
framework/source/classes/menumanager.cxx|5 -
framework/source/fwe/classes/addonsoptions.cxx |2
framework/source/uielement/menubarmanager.cxx |5 -
include/comphelper/documentconstants.hxx|6 -
include/framework/addonsoptions.hxx |2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |2
sc/source/filter/inc/excdefs.hxx|4 -
sc/source/filter/inc/xlconst.hxx|8 +-
sc/source/filter/inc/xlpivot.hxx|2
sfx2/source/menu/virtmenu.cxx |4 -
svx/source/inc/docrecovery.hxx | 22 +++---
svx/source/inc/fmservs.hxx | 38 ++--
16 files changed, 55 insertions(+), 71 deletions(-)
New commits:
commit 10749bbf8247f0b17201b33f95a090dfc4fc3211
Author: Noel Grandin
Date: Sun May 17 09:47:07 2015 +0200
remove the last of the OUString #defines in header files
Change-Id: Id9e8ce7987e055e83b52c7024413570f262e6e8d
diff --git a/chart2/source/inc/servicenames.hxx
b/chart2/source/inc/servicenames.hxx
index 212632e..c34870c 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -22,28 +22,28 @@
namespace chart
{
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartModel" )
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartModel"
#define CHART_MODEL_SERVICE_NAME "com.sun.star.chart2.ChartDocument"
//@todo create your own service containing the service
com.sun.star.document.OfficeDocument
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartController" )
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartController"
#define CHART_CONTROLLER_SERVICE_NAME "com.sun.star.chart2.ChartController"
//@todo create your own service containing the service
com.sun.star.frame.Controller
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartView" )
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartView"
#define CHART_VIEW_SERVICE_NAME "com.sun.star.chart2.ChartView"
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartFrameLoader" )
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartFrameLoader"
#define CHART_FRAMELOADER_SERVICE_NAME
"com.sun.star.frame.SynchronousFrameLoader"
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.WizardDialog" )
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.WizardDialog"
#define CHART_WIZARD_DIALOG_SERVICE_NAME "com.sun.star.chart2.WizardDialog"
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartTypeDialog" )
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartTypeDialog"
#define CHART_TYPE_DIALOG_SERVICE_NAME "com.sun.star.chart2.ChartTypeDialog"
// wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME OUString(
"com.sun.star.comp.chart2.ChartDocumentWrapper" )
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME
"com.sun.star.comp.chart2.ChartDocumentWrapper"
#define CHART_CHARTAPIWRAPPER_SERVICE_NAME
"com.sun.star.chart2.ChartDocumentWrapper"
// accessibility
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 0712508..a12c1f6 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -775,7 +775,7 @@ void XMLFilter::isOasisFormat(const Sequence<
beans::PropertyValue >& _rMediaDes
}
OUString XMLFilter::getMediaType(bool _bOasis)
{
-return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART :
MIMETYPE_VND_SUN_XML_CHART;
+return _bOasis ? OUString(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII) :
OUString(MIMETYPE_VND_SUN_XML_CHART_ASCII);
}
OUString SAL_CALL XMLFilter::getImplementationName()
@@ -809,7 +809,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence<
beans::PropertyValue >
}
OUString XMLReportFilterHelper::getMediaType(bool )
{
-return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART;
+return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII;
}
} // namespace chart
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 7028a9d..926b1b2 100644
-
[Libreoffice-commits] core.git: include/writerperfect writerperfect/source
include/writerperfect/WPFTEncodingDialog.hxx |2 ++
writerperfect/source/common/WPFTEncodingDialog.cxx |9 +
2 files changed, 11 insertions(+)
New commits:
commit df64e7c709fc6d771546554b4026583c55609105
Author: Stephan Bergmann
Date: Tue May 19 09:40:21 2015 +0200
loplugin:vclwidgets
Change-Id: Id6f15ca62c6ba32ea462e45a51e4cea597dae73d
diff --git a/include/writerperfect/WPFTEncodingDialog.hxx
b/include/writerperfect/WPFTEncodingDialog.hxx
index 5288083..ebc5355 100644
--- a/include/writerperfect/WPFTEncodingDialog.hxx
+++ b/include/writerperfect/WPFTEncodingDialog.hxx
@@ -45,6 +45,8 @@ private:
DECL_LINK( DoubleClickHdl, ListBox* );
DECL_LINK(CancelHdl, void*);
+void dispose() SAL_OVERRIDE;
+
WPFTEncodingDialog(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;
WPFTEncodingDialog &operator=(WPFTEncodingDialog const &)
SAL_DELETED_FUNCTION;
};
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index fa0be53..f6afb90 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -149,6 +149,7 @@ WPFTEncodingDialog::WPFTEncodingDialog(
WPFTEncodingDialog::~WPFTEncodingDialog()
{
+disposeOnce();
}
OUString WPFTEncodingDialog::GetEncoding() const
@@ -172,6 +173,14 @@ IMPL_LINK(WPFTEncodingDialog, DoubleClickHdl, ListBox *,
pLb)
return 0;
}
+void WPFTEncodingDialog::dispose()
+{
+m_pLbCharset.disposeAndClear();
+m_pBtnOk.disposeAndClear();
+m_pBtnCancel.disposeAndClear();
+ModalDialog::dispose();
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/subsequent_filters-test.cxx |3 ++-
sc/source/core/data/column2.cxx |3 ++-
sc/source/core/data/dpdimsave.cxx|2 +-
sc/source/core/data/dpgroup.cxx |7 ++-
sc/source/core/data/dpobject.cxx | 12 +---
sc/source/core/tool/rangelst.cxx | 11 +++
sc/source/core/tool/userlist.cxx |5 ++---
sc/source/filter/excel/xelink.cxx| 13 +++--
sc/source/filter/excel/xestyle.cxx |4 ++--
sc/source/ui/docshell/externalrefmgr.cxx |4 +---
10 files changed, 23 insertions(+), 41 deletions(-)
New commits:
commit 023e945ab298bfa6e73eb6b82789fc2fca97f247
Author: Takeshi Abe
Date: Mon May 18 15:16:17 2015 +0900
sc: simplify code by replacing std::find_if with std::any_of
... or std::none_of.
Change-Id: I84808bedbaf098f7c4c987ea62d0ccc4a2b7c2f5
Reviewed-on: https://gerrit.libreoffice.org/15780
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index b0286e6..c0b12d3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -75,6 +75,7 @@
#include "helper/qahelper.hxx"
#include "helper/shared_test_impl.hxx"
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1701,7 +1702,7 @@ public:
bool hasDimension(const std::vector& rDims, const
OUString& aName)
{
-return std::find_if(rDims.begin(), rDims.end(), FindDimByName(aName)) !=
rDims.end();
+return std::any_of(rDims.begin(), rDims.end(), FindDimByName(aName));
}
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 9301078..eca99eb 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -67,6 +67,7 @@
#include
#include
+#include
// factor from font size to optimal cell height (text width)
#define SC_ROT_BREAK_FACTOR 6
@@ -2481,7 +2482,7 @@ bool hasNonEmpty( const
sc::FormulaGroupContext::StrArrayType& rArray, SCROW nRo
std::advance(it, nRow1);
sc::FormulaGroupContext::StrArrayType::const_iterator itEnd = it;
std::advance(itEnd, nRow2-nRow1+1);
-return std::find_if(it, itEnd, NonNullStringFinder()) != itEnd;
+return std::any_of(it, itEnd, NonNullStringFinder());
}
}
diff --git a/sc/source/core/data/dpdimsave.cxx
b/sc/source/core/data/dpdimsave.cxx
index 40dcb3f..ffa721d 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -602,7 +602,7 @@ bool ScDPDimensionSaveData::operator==( const
ScDPDimensionSaveData& ) const
void ScDPDimensionSaveData::AddGroupDimension( const ScDPSaveGroupDimension&
rGroupDim )
{
-OSL_ENSURE( ::std::find_if( maGroupDims.begin(), maGroupDims.end(),
ScDPSaveGroupDimNameFunc( rGroupDim.GetGroupDimName() ) ) == maGroupDims.end(),
+OSL_ENSURE( ::std::none_of( maGroupDims.begin(), maGroupDims.end(),
ScDPSaveGroupDimNameFunc( rGroupDim.GetGroupDimName() ) ),
"ScDPDimensionSaveData::AddGroupDimension - group dimension exists
already" );
// ReplaceGroupDimension() adds new or replaces existing
ReplaceGroupDimension( rGroupDim );
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 49edcfb..b9c5572 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
@@ -755,11 +756,7 @@ void
ScDPGroupTableData::ModifyFilterCriteria(vector::iterator it =
-std::find_if(
-aMatchValues.begin(), aMatchValues.end(),
FindCaseInsensitive(pGrpItem->GetName()));
-
-if (it == aMatchValues.end())
+if (std::none_of(aMatchValues.begin(), aMatchValues.end(),
FindCaseInsensitive(pGrpItem->GetName(
continue;
pGrpItem->FillGroupFilter(*pGrpFilter);
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 30884cc..ab982c4 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
using ::std::vector;
@@ -2588,7 +2589,7 @@ void ScDPObject::ConvertOrientation(
{
// if set via api, a data column may occur several times
// (if the function hasn't been changed yet) -> also look for
duplicate data column
-bFirst = std::find_if(itrBeg, itr, FindByOriginalDim(nCol)) ==
itr;
+bFirst = std::none_of(itrBeg, itr, FindByOriginalDim(nCol));
}
sheet::GeneralFunction eFunc =
ScDataPilotConversion::FirstFunc(rField.nFuncMask);
@@ -3682,20 +3683,17 @@ ScRangeList ScDPCollection::GetAl
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6c3e4b8e5430a80678bd5a77b781a2218be349a1 Author: Robert Antoni Buj Gelonch Date: Tue May 19 08:50:37 2015 +0200 odt2mediawiki.xsl: hide table of contents if there is a customized toc Change-Id: I3be7f0929db94658ac1eabb0996364f53b52034c Reviewed-on: https://gerrit.libreoffice.org/15795 Tested-by: David Tardon Reviewed-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index f0a9f12..d599749 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -296,6 +296,8 @@ + __NOTOC__ + == == ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/common/WPFTEncodingDialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 685e30c3bdd010d09ac585bd621dd17149e5cb77
Author: Stephan Bergmann
Date: Tue May 19 09:27:49 2015 +0200
loplugin:cstylecast
Change-Id: I0ef11bcb30bcfbecf5afe5c4c38391acc7b72968
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 4e04304..fa0be53 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -114,7 +114,7 @@ void EncodingImplementation::selectEncoding(ListBox *box,
const OUString *encodi
OUString EncodingImplementation::getEncoding(ListBox *box)
{
-sal_IntPtr pos=(sal_IntPtr) box->GetSelectEntryData();
+sal_IntPtr pos = reinterpret_cast(box->GetSelectEntryData());
if (pos<0||pos>=numEncodings())
return OUString();
return s_encodings[2*pos];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
