[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938
--- Comment #34 from Alexandre Vicenzi ---
What's the correct way to convert this?
sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName )
throw( RuntimeException )
{
return
(rServiceName == "com.sun.star.document.ImportFilter" ) ||
(rServiceName == "com.sun.star.document.ExportFilter" );
}
--
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
Sketches and diagrams in open source software development
Hello everybody, I'm a Ph.D. student at the Software Engineering Group of Trier University (Germany). Our group is currently investigating the use of sketches and diagrams in software development. I'm especially interested in how software developers create, use, and share sketches and diagrams in large open source projects like LibreOffice. I write to this mailing list to ask for hints on where to find sketches and diagrams related to the development of LibreOffice (maybe your version control system, bug tracking system, or wiki?). I'm primarily looking for sketches and diagrams directly related to source code (e.g. architecture diagrams, sketches visualizing a bug or a certain data structure). Thank you for any help you can provide! Best regards, Sebastian smime.p7s Description: S/MIME Cryptographic Signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
how to detect compiler warning
Hi Eike, Just out of interest: your commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=d39525f1cfef7a01e45adc9ce5e6e8ebba4250c5 init 'fLastPos' [-Werror=maybe-uninitialized], fdo#73146 follow-up Did you find a situation where fLastPos would be without valid value, or is just to get rid of the warning? In the latter case, how do you find this warning in the long, long list of make output? If I know how too, I may be able to catch these warnings before submitting patches :) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2014-01-31
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + Finally fix the new commiters issue in mail digest in https://gerrit.libreoffice.org/7752 from Mathias M * Merged changes on master for project dev-tools changed in the last 25 hours: None * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-01-31
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + fdo#74115 Fix for DOCX GradientFill for Chart Wall in https://gerrit.libreoffice.org/7739 from Vinaya Mandke about module chart2, include, oox + fdo#74112 Preserve Chart displayunits properties during ODF import/export in https://gerrit.libreoffice.org/7721 from Sushil Shinde about module chart2, include, offapi, xmloff + fdo#74112 Added properties to store chart display unit information in imp in https://gerrit.libreoffice.org/7720 from Sushil Shinde about module include, oox + fdo#54938 Convert comphelper and vcl to cppu::supportsService in https://gerrit.libreoffice.org/7757 from Alexandre Vicenzi about module comphelper, vcl + fdo#54938 Convert basctl, mysqlc, sdext, svgio, writerp. to cppu::support in https://gerrit.libreoffice.org/7756 from Alexandre Vicenzi about module basctl, mysqlc, sdext, svgio, writerperfect + fdo#54938 Convert odk to cppu::supportsService in https://gerrit.libreoffice.org/7755 from Alexandre Vicenzi about module odk + fdo#54938 Convert framework to cppu::supportsService in https://gerrit.libreoffice.org/7754 from Alexandre Vicenzi about module framework + fdo#54938 Convert to cppu::supportsService in https://gerrit.libreoffice.org/7649 from Alexandre Vicenzi about module animations, basegfx, cppuhelper, cui, embeddedobj, forms, package, unotools + fdo#74112 Write Chart Displayunits information back to XML. in https://gerrit.libreoffice.org/7722 from Sushil Shinde about module chart2, oox + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad about module chart2, oox + make Calc function PERCENTRANK comply with ODF1.2 in https://gerrit.libreoffice.org/7747 from Winfried Donkers about module sc + Doxygen warnings corrected in https://gerrit.libreoffice.org/7725 from Chris Sherlock about module include, solenv, vcl + fdo#35143 PDF import: Reimplementation of whitespace detection function in https://gerrit.libreoffice.org/7564 from Vort about module sdext + fdo#74215:Fix for empty imagedata in Number Pic bullet in https://gerrit.libreoffice.org/7744 from Ravindra Vidhate about module sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + Added unit test for fdo#72221:Fixed for doughnut chart - RT is invalid in https://gerrit.libreoffice.org/7493 from Priyanka Gaikwad + don't generate invalid xml files in https://gerrit.libreoffice.org/6980 from Markus Mohrhard + Translate German comments and fix a few missed one in https://gerrit.libreoffice.org/7753 from Philipp Weissenbacher + fdo#63154: Remove SVBT8 from solar.h in https://gerrit.libreoffice.org/7645 from Marcos Souza + User grants debug Mysql part: first steps in https://gerrit.libreoffice.org/7140 from Julien Nabet + User grants debug Mysql part: retrieve IS_GRANTABLE + update column privs in https://gerrit.libreoffice.org/7155 from Julien Nabet + We want to drop the user here not revoke some rights in https://gerrit.libreoffice.org/7178 from Julien Nabet + fdo#71810 make argument names consistent with Gnumeric and Excel in https://gerrit.libreoffice.org/7408 from Winfried Donkers + fdo#63154 Removed unused solar.h ref. in vcl in https://gerrit.libreoffice.org/7738 from Alexandre Vicenzi + fdo#73146 Add Excel 2010 functions in https://gerrit.libreoffice.org/7319 from Winfried Donkers + fdo#73869 fix highlight RTL Problem at the StartCenter window. in https://gerrit.libreoffice.org/7719 from Faisal al-otaibi + Sidebar Text panel cleanup in https://gerrit.libreoffice.org/7687 from Maxim Monastirsky + Subscript/Superscript also don't depend on args in https://gerrit.libreoffice.org/7676 from Maxim Monastirsky + fdo#39468 Translate German comments (include/svx/(fmsearch|svdopath).hxx) in https://gerrit.libreoffice.org/7705 from Sven Wehner + Assert in X11SalSystem::GetDisplayScreenPosSizePixel in https://gerrit.libreoffice.org/7694 from Chris Sherlock + Disable Increase/Decrease buttons when limits are reached in https://gerrit.libreoffice.org/7654 from Maxim Monastirsky + Add Increase/Decrease font functionality to drawing objects in https://gerrit.libreoffice.org/7655 from Maxim Monastirsky + fdo#39468 Translate German comments in https://gerrit.libreoffice.org/7716 from Sven Wehner + fdo#63154 Removed unused solar.h ref. in svx in https://gerrit.libreoffice.org/7737 from Alexandre Vicenzi + fdo#63154 Removed unused solar.h ref. in sfx2 in https://gerrit.libreoffice.org/7736 from Alexandre Vicenzi + fdo#63154 Removed unused solar.h ref. in basic and formula in https://gerrit.libreoffice.org/7735 from Alexandre Vicenzi + fdo#63154 Removed unused solar.h ref. in svl in https://gerrit.libreoffice.org/7734 from Alexandre Vicenzi + EMF+: Only draw endcap outline if not filled
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/global.hxx |4
sc/source/core/data/column2.cxx | 22 ++
sc/source/filter/excel/colrowst.cxx |4 ++--
3 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit 29b322ea0c40423a39efe2f6c2c85a7d2108c512
Author: Kohei Yoshida
Date: Thu Jan 30 22:43:05 2014 -0500
Keep the standard row height situation under control.
With this change, applying cell attributes to default cells will
no longer change the row heights inadvertently.
Change-Id: I57c3546e1725c5e8b37696242e9642b1617f59c3
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a381224..13e4cdf 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -132,10 +132,6 @@ const SCSIZE MAXSUBTOTAL= 3;
/* standard row height: text + margin -
STD_ROWHEIGHT_DIFF */
#define STD_ROWHEIGHT_DIFF 23
-/// use ScGlobal::nStdRowHeight instead of STD_ROW_HEIGHT !
-
-#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT)/* 256 Twips, 0.45 cm
*/
-
namespace sc
{
inline long TwipsToHMM( long nTwips ) { return (nTwips * 127 + 36) /
72; }
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 794a462..e1f832d 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -725,10 +725,11 @@ sal_uInt16 ScColumn::GetOptimalColWidth(
static sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern,
sal_uInt16 nFontHeightId )
{
-sal_uInt16 nHeight = (sal_uInt16) ((const SvxFontHeightItem&)
rPattern.GetItem(nFontHeightId)).GetHeight();
-const SvxMarginItem* pMargin = (const SvxMarginItem*)
&rPattern.GetItem(ATTR_MARGIN);
-nHeight += nHeight / 5;
-// for 10pt gives 240
+const SvxFontHeightItem& rFontHeight =
+static_cast(rPattern.GetItem(nFontHeightId));
+
+sal_uInt16 nHeight = rFontHeight.GetHeight();
+nHeight *= 1.18;
if ( ((const SvxEmphasisMarkItem&)rPattern.
GetItem(ATTR_FONT_EMPHASISMARK)).GetEmphasisMark() !=
EMPHASISMARK_NONE )
@@ -738,19 +739,16 @@ static sal_uInt16 lcl_GetAttribHeight( const
ScPatternAttr& rPattern, sal_uInt16
nHeight += nHeight / 4;
}
-if ( nHeight + 240 > ScGlobal::nDefFontHeight )
-{
-nHeight = sal::static_int_cast( nHeight +
ScGlobal::nDefFontHeight );
-nHeight -= 240;
-}
+const SvxMarginItem& rMargin =
+static_cast(rPattern.GetItem(ATTR_MARGIN));
-// Standard height: TextHeight + margin - 23
-// -> 257 for Windows
+nHeight += rMargin.GetTopMargin() + rMargin.GetBottomMargin();
if (nHeight > STD_ROWHEIGHT_DIFF)
nHeight -= STD_ROWHEIGHT_DIFF;
-nHeight += pMargin->GetTopMargin() + pMargin->GetBottomMargin();
+if (nHeight < ScGlobal::nStdRowHeight)
+nHeight = ScGlobal::nStdRowHeight;
return nHeight;
}
diff --git a/sc/source/filter/excel/colrowst.cxx
b/sc/source/filter/excel/colrowst.cxx
index bc43a1e..dc6eae0 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -50,7 +50,7 @@ XclImpColRowSettings::XclImpColRowSettings( const XclImpRoot&
rRoot ) :
maHiddenRows(0, MAXROWCOUNT, false),
mnLastScRow( -1 ),
mnDefWidth( STD_COL_WIDTH ),
-mnDefHeight( static_cast< sal_uInt16 >( STD_ROW_HEIGHT ) ),
+mnDefHeight( static_cast< sal_uInt16 >( ScGlobal::nStdRowHeight ) ),
mnDefRowFlags( EXC_DEFROW_DEFAULTFLAGS ),
mbHasStdWidthRec( false ),
mbHasDefHeight( false ),
@@ -117,7 +117,7 @@ void XclImpColRowSettings::SetDefHeight( sal_uInt16
nDefHeight, sal_uInt16 nFlag
mnDefRowFlags = nFlags;
if( mnDefHeight == 0 )
{
-mnDefHeight = static_cast< sal_uInt16 >( STD_ROW_HEIGHT );
+mnDefHeight = static_cast< sal_uInt16 >( ScGlobal::nStdRowHeight );
::set_flag( mnDefRowFlags, EXC_DEFROW_HIDDEN );
}
mbHasDefHeight = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx | 11 +++
chart2/qa/extras/data/docx/doughnutChart.docx |binary
2 files changed, 11 insertions(+)
New commits:
commit d6f97891c1fb0d45e1405afe724aafd1e86efd29
Author: PriyankaGaikwad
Date: Fri Jan 17 10:19:09 2014 +0530
Added unit test for fdo#72221:Fixed for doughnut chart - RT is invalid
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I3540884f680f5042da8d12865a06e9ce2f2046d8
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index b62c254..e164296 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -41,6 +41,7 @@ public:
void testEmbeddingsGrabBag();
void testAreaChartLoad();
void testUpDownBars();
+void testDoughnutChart();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -54,6 +55,7 @@ public:
CPPUNIT_TEST(testEmbeddingsGrabBag);
CPPUNIT_TEST(testAreaChartLoad);
CPPUNIT_TEST(testUpDownBars);
+CPPUNIT_TEST(testDoughnutChart);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -522,6 +524,15 @@ void Chart2ExportTest::testUpDownBars()
assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars");
}
+void Chart2ExportTest::testDoughnutChart()
+{
+load("/chart2/qa/extras/data/docx/", "doughnutChart.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart",
"1");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/doughnutChart.docx
b/chart2/qa/extras/data/docx/doughnutChart.docx
new file mode 100644
index 000..f0642d4
Binary files /dev/null and b/chart2/qa/extras/data/docx/doughnutChart.docx
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/vmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d48568d37c54669f1a90eef1fdb11a1b779e3345
Author: Markus Mohrhard
Date: Sun Dec 8 00:53:27 2013 +0100
don't generate invalid xml files
VmlCommentExporter::StartShape already adds a XML_type to the attribute
list, so we would be exporting the same attribute twice which makes the
xml file invalid. This file could therefore not be imported again.
Change-Id: I2aed2805ea59c15b1f7e60ab9cab10f7a8e81412
Reviewed-on: https://gerrit.libreoffice.org/6980
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 0960029..c0acded 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1022,7 +1022,7 @@ sal_Int32 VMLExport::StartShape()
// add style
m_pShapeAttrList->add( XML_style, m_pShapeStyle->makeStringAndClear() );
-if ( nShapeElement >= 0 )
+if ( nShapeElement >= 0 && !m_pShapeAttrList->hasAttribute( XML_type ) )
{
if ( bReferToShapeType )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sw/source
sc/source/ui/docshell/docsh.cxx |2
sw/source/core/layout/flowfrm.cxx |5 --
sw/source/core/layout/fly.cxx | 83 ++
3 files changed, 43 insertions(+), 47 deletions(-)
New commits:
commit 1c3ce40d97bffca5ea3df3e0f5bbac74a01846fb
Author: Philipp Weissenbacher
Date: Fri Jan 31 00:13:56 2014 +0100
Translate German comments and fix a few missed one
Change-Id: Ieb5798a98453d0a6b0e368f7444150c758a9c7ac
Reviewed-on: https://gerrit.libreoffice.org/7753
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 4f3bbf0..5c4e728 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1473,7 +1473,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
aMark.SetMarkArea( aColWidthRange );
aMark.MarkToMulti();
-// Order is important: First width, then height (cf. WHAT?!
hund.rtf)
+// Order is important: First width, then height
if ( bSetColWidths )
{
for ( SCCOL nCol=0; nCol <= nEndCol; nCol++ )
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index dd88178..cadb1c2 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1071,8 +1071,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
|*
|* SwFrm::GetPrevLeaf()
|*
-|* BeschreibungReturns the previous layout leaf where we can move
-|* the frame.
+|* Returns the previous layout leaf where we can move the frame.
|*
|*/
@@ -2540,7 +2539,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
PROTOCOL_ENTER( &m_rThis, PROT_MOVE_BWD, 0, 0 );
if ( pNewUpper->IsFtnContFrm() )
{
-//Kann sein, dass ich einen Container bekam.
+// I may have gotten a Container
SwFtnFrm *pOld = m_rThis.FindFtnFrm();
SwFtnFrm *pNew = new SwFtnFrm( pOld->GetFmt(), pOld,
pOld->GetRef(), pOld->GetAttr() );
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 677677b..1a2291d 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -87,7 +87,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm
*pAnch ) :
bLocked = bMinHeight =
bHeightClipped = bWidthClipped = bFormatHeightOnly = sal_False;
-//Grosseneinstellung, Fixe groesse ist immer die Breite
+// Size setting: Fixed size is always the width
const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
sal_uInt16 nDir =
((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
@@ -146,16 +146,16 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm
*pAnch ) :
// insert columns, if necessary
InsertColumns();
-//Erst das Init, dann den Inhalt, denn zum Inhalt koennen widerum
-//Objekte/Rahmen gehoeren die dann angemeldet werden.
+// First the Init, then the Content:
+// This is due to the fact that the Content may have Objects/Frames,
+// which are then registered
InitDrawObj( sal_False );
Chain( pAnch );
InsertCnt();
-//Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht
-//unnoetig viel formatiert wird.
+// Put it somewhere outside so that out document is not formatted
unnecessarily often
Frm().Pos().setX(FAR_AWAY);
Frm().Pos().setY(FAR_AWAY);
}
@@ -198,7 +198,7 @@ void SwFlyFrm::InsertCnt()
const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( no content prepared." );
sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex();
-// Lower() bedeutet SwColumnFrm, eingefuegt werden muss der Inhalt
dann in den (Column)BodyFrm
+// Lower() means SwColumnFrm; the Content then needs to be instered
into the (Column)BodyFrm
::_InsertCnt( Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)Lower())->Lower()
: (SwLayoutFrm*)this,
GetFmt()->GetDoc(), nIndex );
@@ -227,13 +227,11 @@ void SwFlyFrm::InsertCnt()
const SwFmtCol &rCol = GetFmt()->GetCol();
if ( rCol.GetNumCols() > 1 )
{
-//PrtArea ersteinmal so gross wie der Frm, damit die Spalten
-//vernuenftig eingesetzt werden koennen; das schaukelt sich dann
-//schon zurecht.
+// Start off PrtArea to be as large as Frm, so that we can put in the
columns
+// properly. It'll adjust later on.
Prt().Width( Frm().Width() );
Prt().Height( Frm().Height() );
-const SwFmtCol aOld; //ChgColumns() verlaesst sich darauf, dass auch
ein
- //Old-Wert hereingereicht wird.
+const SwFmtCol aOld; // ChgColumns() also needs an old
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - drawinglayer/source
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 60c3bcff81dcebc1f4b9f00407ed021f28db0fd6 Author: Stephan Bergmann Date: Fri Jan 17 22:03:01 2014 +0100 -Werror,-Wunused-variable (cherry-picked from 849482c0ea88c4aa70ec56adfefe7e59b6060950) Change-Id: I39d15f863f4e1fd585b03bfc5f8854fb66af3b4c Reviewed-on: https://gerrit.libreoffice.org/7749 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index de1a02d..290c87a 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -275,7 +275,6 @@ namespace drawinglayer // Convert a rectanglar polygon into a line. basegfx::B2DPolygon aDash2; basegfx::B2DRange aRange = aDash.getB2DRange(); -basegfx::B2DPoint aPt(aRange.getMinX(), aRange.getMinY()); aDash2.append(basegfx::B2DPoint(aRange.getMinX(), aRange.getMinY())); aDash2.append(basegfx::B2DPoint(aRange.getMaxX(), aRange.getMinY())); xRetval[i] = Primitive2DReference( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/formdlg/dwfunctr.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6592543a598994e44823b7e1158e34b0c6ec82d3
Author: Eike Rathke
Date: Mon Jan 27 13:02:29 2014 +0100
guard against null pointer access on LRU function list, fdo#60036
... which may have happened if the config's LRU contained enums of
non-existing functions, i.e. if they were shifted by an update.
Change-Id: I9a005f41cc74c530cf37d1782ce8c53b8f5dce6e
(cherry picked from commit a94f0f92e8b09f6cd3989b646500ff5814274621)
Reviewed-on: https://gerrit.libreoffice.org/7750
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 7967163..322cf4b 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -791,12 +791,12 @@ void ScFunctionDockWin::UpdateFunctionList()
}
else // LRU-Liste
{
-for(::std::vector::iterator
iter=aLRUList.begin();iter!=aLRUList.end();++iter)
+for (::std::vector::iterator
iter=aLRUList.begin();
+iter != aLRUList.end(); ++iter)
{
const formula::IFunctionDescription* pDesc = *iter;
-pAllFuncList->SetEntryData(
-pAllFuncList->InsertEntry(pDesc->getFunctionName()),
-(void*)pDesc );
+if (pDesc)
+pAllFuncList->SetEntryData( pAllFuncList->InsertEntry(
pDesc->getFunctionName()), (void*)pDesc);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/unoobj/shapeuno.cxx |3 +--
sc/source/ui/view/printfun.cxx |9 +++--
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 2fe174915f7f2f58dbd800b961ecfd1a3bec01d4
Author: Eike Rathke
Date: Thu Jan 30 19:00:51 2014 +0100
fdo#74194 Revert "Resolves: #i121136# Improve Spreadsheet performance ..."
This reverts commit 6a62557d8632290ae7150f3922dece65f51af4bc.
pPageRows[] is a member array, so when not allocating MAXROWCOUNT
entries but nRealCnt instead it also needs some tracking mechanism to
reallocate in case a subsequent call needs more elements than the first
call.
Change-Id: Iadb7d2ceadcb8bd99d57c6188571d295c6b99fba
(cherry picked from commit 41a859234eac6126693393ff64efc7bfcdec9c54)
Reviewed-on: https://gerrit.libreoffice.org/7751
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 2b71b12..53e32aa 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -841,8 +841,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const
OUString& aPropertyName )
}
else
{
-if(!pShapePropertySet) //performance consideration
-GetShapePropertySet();
+GetShapePropertySet();
if (pShapePropertySet)
aAny = pShapePropertySet->getPropertyValue( aPropertyName );
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 87c508b..36d927d 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2963,9 +2963,8 @@ static void lcl_SetHidden( ScDocument* pDoc, SCTAB
nPrintTab, ScPageRowEntry& rP
void ScPrintFunc::CalcPages() // calculates aPageRect and pages
from nZoom
{
if (!pPageEndX) pPageEndX = new SCCOL[MAXCOL+1];
-//performance impact
-// if (!pPageEndY) pPageEndY = new SCROW[MAXROW+1];
-// if (!pPageRows) pPageRows = new ScPageRowEntry[MAXROW+1]; //! count
before
+if (!pPageEndY) pPageEndY = new SCROW[MAXROW+1];
+if (!pPageRows) pPageRows = new ScPageRowEntry[MAXROW+1]; //! count
before
pDoc->SetPageSize( nPrintTab, GetDocPageSize() );
if (aAreaParam.bPrintArea)
@@ -2975,9 +2974,7 @@ void ScPrintFunc::CalcPages() // calculates
aPageRect and pages fr
}
else
pDoc->UpdatePageBreaks( nPrintTab, NULL ); // else, end is marked
-SCROW nRealCnt = nEndRow-nStartRow+1;
-if (!pPageEndY) pPageEndY = new SCROW[nRealCnt+1];
-if (!pPageRows) pPageRows = new ScPageRowEntry[nRealCnt+1]; //! vorher
zaehlen
+
//
// Page alignment/splitting after breaks in Col/RowFlags
// Of several breaks in a hidden area, only one counts.
___
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/customize/eventdlg.cxx | 12
cui/source/customize/macropg.cxx | 10 --
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 4ca5536f008d1503a9c9fa8b65150baeb92e4b4c
Author: Kohei Yoshida
Date: Thu Jan 30 20:16:12 2014 -0500
fdo#74252: Fix crash on exit with the customize dialog.
pEventLB gets accessed after it's been deleted. Moving the code that
accesses it to before it gets deleted fixes the crash.
Change-Id: If559fe3ea7dd76a3394d0aa7c18c9329188aa17f
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index 02888d3..dd61fc2 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
@@ -108,7 +109,18 @@ void SvxEventConfigPage::LateInit( const uno::Reference<
frame::XFrame >& _rxFra
SvxEventConfigPage::~SvxEventConfigPage()
{
+// need to delete the user data
+SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
+SvTreeListEntry* pE = rListBox.GetEntry( 0 );
+while( pE )
+{
+OUString* pEventName = (OUString*)pE->GetUserData();
+delete pEventName;
+pE->SetUserData((void*)0);
+pE = rListBox.NextSibling( pE );
+}
delete mpImpl->pEventLB;
+
delete mpImpl->pAssignFT;
delete mpImpl->pAssignPB;
delete mpImpl->pDeletePB;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 99b962f..9f0fe1d 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -250,16 +250,6 @@ _SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const
OString& rID,
_SvxMacroTabPage::~_SvxMacroTabPage()
{
-// need to delete the user data
-SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-SvTreeListEntry* pE = rListBox.GetEntry( 0 );
-while( pE )
-{
-OUString* pEventName = (OUString*)pE->GetUserData();
-delete pEventName;
-pE->SetUserData((void*)0);
-pE = rListBox.NextSibling( pE );
-}
DELETEZ( mpImpl );
}
//
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
NOTE: Impress remote clients have been moved to their own repos
Impress clients, ios/android/firefoxos have been moved out of core.git and into git://gerrit.libreoffice.org/impress_remote Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74014, which changed state. Bug 74014 Summary: Editing: Cell formula not updating on redo, even with a forced recalculation https://bugs.freedesktop.org/show_bug.cgi?id=74014 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/column.hxx|5 +++--
sc/inc/document.hxx |4 ++--
sc/inc/table.hxx |2 +-
sc/source/core/data/column.cxx |4 ++--
sc/source/core/data/column3.cxx | 12
sc/source/core/data/document.cxx |9 +
sc/source/core/data/table2.cxx |4 ++--
sc/source/ui/undo/undoblk.cxx|5 -
8 files changed, 27 insertions(+), 18 deletions(-)
New commits:
commit 92346fb7714ca7c6a467771d8a8b01305c1b17d1
Author: Kohei Yoshida
Date: Wed Jan 29 14:00:47 2014 -0500
fdo#74014: Broadcast changes during undo and redo after paste.
Change-Id: I271bbba5e5eb70e48274a4a062d125456af8ff6c
(cherry picked from commit f5d8029a456c2c708cbc2b67f2d7875540dff1ab)
Reviewed-on: https://gerrit.libreoffice.org/7728
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 032ef8e..67d7572 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -213,7 +213,8 @@ public:
bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const;
voidInsertRow( SCROW nStartRow, SCSIZE nSize );
voidDeleteRow( SCROW nStartRow, SCSIZE nSize );
-voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
+void DeleteArea(
+SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag, bool bBroadcast =
true );
void CopyToClip(
sc::CopyToClipContext& rCxt, SCROW nRow1, SCROW nRow2, ScColumn&
rColumn ) const;
void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol);
@@ -408,7 +409,7 @@ public:
voidRemoveProtected( SCROW nStartRow, SCROW nEndRow );
SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const
ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
-voidDeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark
);
+void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool
bBroadcast );
voidClearSelectionItems( const sal_uInt16* pWhich, const
ScMarkData& rMark );
voidChangeSelectionIndent( bool bIncrement, const ScMarkData&
rMark );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 665fb35..1f8ced4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1441,8 +1441,8 @@ public:
SC_DLLPUBLIC voidApplySelectionPattern( const ScPatternAttr&
rAttr, const ScMarkData& rMark,
ScEditDataArray* pDataArray = NULL
);
-voidDeleteSelection( sal_uInt16 nDelFlag, const ScMarkData&
rMark );
-voidDeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const
ScMarkData& rMark );
+void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool
bBroadcast = true );
+void DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const
ScMarkData& rMark, bool bBroadcast = true );
SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab,
sal_uInt16 nNewWidth );
SC_DLLPUBLIC void SetColWidthOnly( SCCOL nCol, SCTAB nTab,
sal_uInt16 nNewWidth );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7877a1c..2e1cfd5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -622,7 +622,7 @@ public:
boolRemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
SCROW nEndRow, sal_Int16 nFlags );
voidApplySelectionCache( SfxItemPoolCache* pCache, const
ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
-voidDeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark
);
+void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool
bBroadcast = true );
voidClearSelectionItems( const sal_uInt16* pWhich, const
ScMarkData& rMark );
voidChangeSelectionIndent( bool bIncrement, const ScMarkData&
rMark );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8c6102f..7771f0e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -484,7 +484,7 @@ void ScColumn::ClearSelectionItems( const sal_uInt16*
pWhich,const ScMarkData& r
}
-void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
+void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark,
bool bBroadcast )
{
SCROW nTop;
SCROW nBottom;
@@ -493,7 +493,7 @@ void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const
ScMarkData& rMark )
{
ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol );
while (aMarkIter.Next( nTop, nBottom ))
-DeleteArea(nTop, nBottom, nDelFlag);
+DeleteArea(nTop, nBottom, nDelFlag, bBroadcast);
}
}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 798d544..54b53f2 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -574,7 +574,8 @@ public:
}
-void ScColumn::Delete
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/document.hxx |2 ++
sc/source/core/data/documen7.cxx | 24
sc/source/ui/docshell/impex.cxx | 19 +++
sc/source/ui/inc/impex.hxx |2 ++
sc/source/ui/undo/undobase.cxx | 20 +---
sc/source/ui/view/viewfun5.cxx |1 +
6 files changed, 45 insertions(+), 23 deletions(-)
New commits:
commit 383e5543593848cbd1458d5c5dad5e7b7b17ee09
Author: Kohei Yoshida
Date: Wed Jan 29 11:42:27 2014 -0500
fdo#74014: More on broadcasting at appropriate places.
Also, call PostDataChanged() to re-paint re-calculated formula cells,
and brodcast only when pasting, not during file import.
(cherry picked from commit 8a36879eaf0977448b113c2239014d2e2b7ab258)
(cherry picked from commit 3d869cda8db03820dea8c4ba463eb155d05e933b)
Conflicts:
sc/source/core/data/documen7.cxx
sc/source/ui/undo/undobase.cxx
sc/qa/unit/ucalc.cxx
Change-Id: I63161329d4bfe937f754773fd68c37e3836c4950
Reviewed-on: https://gerrit.libreoffice.org/7727
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 65d573f..665fb35 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1809,6 +1809,8 @@ public:
*/
voidBroadcast( const ScHint& rHint );
+void BroadcastCells( const ScRange& rRange, sal_uLong nHint );
+
/// only area, no cell broadcast
voidAreaBroadcast( const ScHint& rHint );
/// only areas in range, no cell broadcasts
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 7dd9821..210d87b 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -104,6 +104,30 @@ void ScDocument::Broadcast( const ScHint& rHint )
}
}
+void ScDocument::BroadcastCells( const ScRange& rRange, sal_uLong nHint )
+{
+CellContentModified();
+
+ScBulkBroadcast aBulkBroadcast(pBASM);
+
+ScHint aHint(nHint, ScAddress());
+ScAddress& rPos = aHint.GetAddress();
+for (SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); ++nTab)
+{
+rPos.SetTab(nTab);
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col();
++nCol)
+{
+rPos.SetCol(nCol);
+for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row();
++nRow)
+{
+rPos.SetRow(nRow);
+Broadcast(aHint);
+}
+}
+}
+
+BroadcastUno(SfxSimpleHint(SC_HINT_DATACHANGED));
+}
void ScDocument::AreaBroadcast( const ScHint& rHint )
{
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 1ca265e..5b58b4e 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -88,7 +88,7 @@ ScImportExport::ScImportExport( ScDocument* p )
bFormulas( false ), bIncludeFiltered( true ),
bAll( true ), bSingle( true ), bUndo( false ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -104,7 +104,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScAddress& rPt )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -121,7 +121,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScRange& r )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( false ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -139,7 +139,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
OUString& rPos )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -946,6 +946,12 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
}
EndPaste();
+if (bOk && mbImportBroadcast)
+{
+pDoc->BroadcastCells(aRange, SC_HINT_DATACHANGED);
+pDocSh->PostDataChanged();
+}
+
return bOk;
}
@@ -1483,6 +1489,11 @@ bool ScImportExport::ExtText2Doc(
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc.cxx|1 +
sc/source/ui/docshell/impex.cxx | 17 ++---
sc/source/ui/inc/impex.hxx |2 ++
sc/source/ui/view/viewfun5.cxx |1 +
4 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 3d869cda8db03820dea8c4ba463eb155d05e933b
Author: Kohei Yoshida
Date: Thu Jan 30 17:41:23 2014 -0500
fdo#74014: Brodcast only when pasting, not during file import.
Change-Id: I7cca5d459491fca782f24093dcdd7d0c1c69bdc9
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7e9bba7..5811dc0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5194,6 +5194,7 @@ void Test::testImportStream()
aOpt.SetFieldSeps(",");
ScImportExport aObj(m_pDoc, ScAddress(0,0,0));
+aObj.SetImportBroadcast(true);
aObj.SetExtOptions(aOpt);
aObj.ImportString("1,2,3", FORMAT_STRING);
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index bf1c048..d6ce4f3 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -89,7 +89,7 @@ ScImportExport::ScImportExport( ScDocument* p )
bFormulas( false ), bIncludeFiltered( true ),
bAll( true ), bSingle( true ), bUndo( false ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -105,7 +105,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScAddress& rPt )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -122,7 +122,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScRange& r )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( false ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -140,7 +140,7 @@ ScImportExport::ScImportExport( ScDocument* p, const
OUString& rPos )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -947,7 +947,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
}
EndPaste();
-if (bOk)
+if (bOk && mbImportBroadcast)
{
pDoc->BroadcastCells(aRange, SC_HINT_DATACHANGED);
pDocSh->PostDataChanged();
@@ -1490,8 +1490,11 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
if (bRangeIsDetermined)
EndPaste(false);
-pDoc->BroadcastCells(aRange, SC_HINT_DATACHANGED);
-pDocSh->PostDataChanged();
+if (mbImportBroadcast)
+{
+pDoc->BroadcastCells(aRange, SC_HINT_DATACHANGED);
+pDocSh->PostDataChanged();
+}
return true;
}
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 4356154..b21511d 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -65,6 +65,7 @@ class ScImportExport
boolbOverflowCol; // too many columns
boolbOverflowCell; // too much data for a cell
boolmbApi;
+boolmbImportBroadcast; // whether or not to broadcast after data
import.
ScExportTextOptions mExportTextOptions;
ScAsciiOptions* pExtOptions;// extended options
@@ -151,6 +152,7 @@ public:
bool IsApi() const { return mbApi; }
void SetApi( bool bApi ) { mbApi = bApi; }
+void SetImportBroadcast( bool b ) { mbImportBroadcast = b; }
const ScExportTextOptions& GetExportTextOptions() { return
mExportTextOptions; }
void SetExportTextOptions( const ScExportTextOptions& options ) {
mExportTextOptions = options; }
};
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 5045e06..a4d5394 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -288,6 +288,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
{
ScAddress aCellPos( nPosX, nPosY, GetViewData()->GetTabNo() );
ScImportExport aObj( GetViewData()->GetDocument(), aCellPos );
+aObj.SetImportBroadcast(true);
OUString aStr;
SotStorageStreamRef xStream;
___
Libreoffice-commits mailing lis
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/win
vcl/win/source/gdi/salgdi.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 9957d5854dcc65db37f0631c19e3421df1311089
Author: Armin Le Grand
Date: Thu Jan 30 21:34:57 2014 +
i12355 Corrected case that in WinSalGraphics::setClipRegion an empty
Polygon is handed over
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 0040c6d..276dfca 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -1017,13 +1017,19 @@ bool WinSalGraphics::setClipRegion( const Region&
i_rClip )
}
// create clip region from ClipRgnData
-if ( mpClipRgnData->rdh.nCount == 1 )
+if(0 == mpClipRgnData->rdh.nCount)
+{
+// #123585# region is empty; this may happen when e.g. a
PolyPolygon is given
+// that contains no polygons or only empty ones (no width/height).
This is
+// perfectly fine and we are done, except setting it (see end of
method)
+}
+else if(1 == mpClipRgnData->rdh.nCount)
{
RECT* pRect = &(mpClipRgnData->rdh.rcBound);
mhRegion = CreateRectRgn( pRect->left, pRect->top,
pRect->right,
pRect->bottom );
}
-else if( mpClipRgnData->rdh.nCount > 1 )
+else if(mpClipRgnData->rdh.nCount > 1)
{
ULONG nSize = mpClipRgnData->rdh.nRgnSize+sizeof(RGNDATAHEADER);
mhRegion = ExtCreateRegion( NULL, nSize, mpClipRgnData );
@@ -1063,8 +1069,14 @@ bool WinSalGraphics::setClipRegion( const Region&
i_rClip )
//
//bool bBla = true;
}
+else
+{
+// #123585# See above, this is a valid case, execute it
+SelectClipRgn( getHDC(), 0 );
+}
-return mhRegion != 0;
+// #123585# retval no longer dependent of mhRegion, see TaskId comments
above
+return true;
}
// ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/core/text/porlay.cxx | 142 +
1 file changed, 61 insertions(+), 81 deletions(-)
New commits:
commit 59239c29269d69a7dec9b093b7832dd032dec1e8
Author: Matteo Casalin
Date: Sun Jan 26 19:17:41 2014 +0100
Use += when possible
Change-Id: I6dad55d3a397becab18f1159f3e8d84cffd7517b
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index d19515e..29861eb 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -352,7 +352,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
}
const sal_Int32 nPorSttIdx = rInf.GetLineStart() + nLineLength;
-nLineLength = nLineLength + pPos->GetLen();
+nLineLength += pPos->GetLen();
AddPrtWidth( pPos->Width() );
// #i3952#
@@ -1629,7 +1629,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray,
sal_Int32 nIdx, sal_Int32 nL
sal_Int32 nChg = GetCompStart( nCompIdx );
sal_Int32 nCompLen = GetCompLen( nCompIdx );
sal_uInt16 nI = 0;
-nLen = nLen + nIdx;
+nLen += nIdx;
if( nChg > nIdx )
{
@@ -1650,7 +1650,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray,
sal_Int32 nIdx, sal_Int32 nL
#ifdef DBG_UTIL
SAL_WARN_IF( nType != CompType( nIdx ), "sw.core", "Gimme the right
type!" );
#endif
-nCompLen = nCompLen + nIdx;
+nCompLen += nIdx;
if( nCompLen > nLen )
nCompLen = nLen;
@@ -2093,7 +2093,7 @@ sal_Int32 SwParaPortion::GetParLen() const
const SwLineLayout *pLay = this;
while( pLay )
{
-nLen = nLen + pLay->GetLen();
+nLen += pLay->GetLen();
pLay = pLay->GetNext();
}
return nLen;
commit 6a9b0aac0362f98a11e9a1f33809b43a30b2c7c7
Author: Matteo Casalin
Date: Sun Jan 26 18:32:50 2014 +0100
Bail out early
Change-Id: Id2a77996cfe9a9ec755766295141123870b4eaf2
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 09445be..d19515e 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -750,20 +750,18 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode&
rNode, sal_Bool bRTL )
{
while( nCntComp < CountCompChg() )
{
-if ( nChg > GetCompStart( nCntComp ) )
-nCntComp++;
-else
+if ( nChg <= GetCompStart( nCntComp ) )
break;
+nCntComp++;
}
}
if ( bAdjustBlock )
{
while( nCntKash < CountKashida() )
{
-if ( nChg > GetKashida( nCntKash ) )
-nCntKash++;
-else
+if ( nChg <= GetKashida( nCntKash ) )
break;
+nCntKash++;
}
}
}
@@ -888,10 +886,9 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode,
sal_Bool bRTL )
while( com::sun::star::i18n::CTLScriptType::CTL_UNKNOWN ==
nCurrentScriptType || nScriptType == nCurrentScriptType )
{
nNextCTLScriptStart = ScriptTypeDetector::endOfCTLScriptType(
rTxt, nNextCTLScriptStart );
-if( nNextCTLScriptStart < rTxt.getLength() &&
nNextCTLScriptStart < nChg )
-nCurrentScriptType = ScriptTypeDetector::getCTLScriptType(
rTxt, nNextCTLScriptStart );
-else
+if( nNextCTLScriptStart >= rTxt.getLength() ||
nNextCTLScriptStart >= nChg )
break;
+nCurrentScriptType = ScriptTypeDetector::getCTLScriptType(
rTxt, nNextCTLScriptStart );
}
nChg = std::min( nChg, nNextCTLScriptStart );
}
@@ -1698,27 +1695,24 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray,
sal_Int32 nIdx, sal_Int32 nL
}
}
-if( nIdx < nLen )
+if( nIdx >= nLen )
+break;
+
+sal_Int32 nTmpChg = nLen;
+if( ++nCompIdx < nCompCount )
{
-sal_Int32 nTmpChg;
-if( ++nCompIdx < nCompCount )
-{
-nTmpChg = GetCompStart( nCompIdx );
-if( nTmpChg > nLen )
-nTmpChg = nLen;
-nCompLen = GetCompLen( nCompIdx );
-}
-else
+nTmpChg = GetCompStart( nCompIdx );
+if( nTmpChg > nLen )
nTmpChg = nLen;
-while( nIdx < nTmpChg )
-{
-nLast = pKernArray[ nI ];
-pKernArray[ nI++ ] -= nSub;
-++nIdx;
-}
+nCompLen = GetCompLen( nCompIdx );
+}
+
+while( nIdx < nTmpChg )
+{
+nLast = pKernArray[ nI ];
+pKernArray[ nI++ ] -= nSub;
+++nIdx;
}
-else
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a736cb467bb2e448bc2fbd5abc26f24a5c4845e Author: Christian Lohmaier Date: Thu Jan 30 21:43:24 2014 +0100 bump version to 4.1.5.2.0+ Change-Id: I3317d4cd36b3ba159dc170de437d9f4804199bf4 diff --git a/configure.ac b/configure.ac index 6bb2dd8..8c3ae99 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.5.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.5.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.5.2'
Tag 'libreoffice-4.1.5.2' created by Christian Lohmaier at 2014-01-30 20:41 -0800 Tag libreoffice-4.1.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJS6rj+AAoJEPQ0oe+v7q6jrXMQAJMZ2I2DsS13ix1E6o2HeqC+ 2VsvbGjAs4Ua4fM0aUluZSdoCCxErqm2OXgn30sgXQgxb8/8tePdTfvVcP9MjL7v E1UM5U+bs1jxwR1rAirEUFC9qL/57RcvYRrYnx/lLUGgZ+tf/x/kdbQd1uZwBU/4 sACd6cVo8YcKhjFFlBJu7NK4M7pmhGodbc3ZFpCDs29ADJnrcRKHdIOCsyydPhiL m2Us3E2HjN7aHQOgNf6WLWgFLin7zdES4LCAcmH+rWfP3Lcpyx5ddkR1kJoLH7Z1 /eEnoXgb1V7QZjkG3A6tTfUFgITLNb5z2f7le9KhjSByPzgTISPvrpXDx4/E0vX1 Sj0X9yL5senrLQJm2u9rtNEjrT+IxPF7qp4pXQER4miIoi1N4ekor+j4UpMLFitb tM/+Rt6+oAbkjsCHGskS6HfdwqSsVQHAw2PZaNGI+/glhJwlseuIGClWxlH0EO54 8XELqE/HPfBCfZtWrCQhrC+UpZg9ViUJJFlLceG4exOliQ0Ws5dmOmdBRWaSQwsV grLevD2RRO7JdA0A+7fFz9FNbbLyoZs193IciU+d1OSkfyB+DzGvERJCXuOmSuhi vL7Xp0XHaddCLlJRFT5z1nVRXVYKF3pLXy1qmfT5kIX9P6VT2dczK9ia9VCyqxoV /qnHmcPRLhStgJDqG1n5 =f0ZR -END PGP SIGNATURE- Changes since cp-4.1-2-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.5.2'
Tag 'libreoffice-4.1.5.2' created by Christian Lohmaier at 2014-01-30 20:41 -0800 Tag libreoffice-4.1.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJS6rj5AAoJEPQ0oe+v7q6jvHgP/i5H9vH1JWy0GjsCLR/7i4Hh hZt7k65hxxjaldb/vtAo2Id3vIVX8y975k3q1akLx7PbyhXpP87y1L8jyE78nrrh 5/9nqV23skGe4M/tDBM0kcq64N8Bh/4Ggy1dWBq5n7OvHL+5GW18MTbYXooYKnQU bQ27dTiK2OjYgCsLdDiTJLeVxuKZajMfp4wLE82ncfiw56tlanXhwdhHEuA7H9K/ u3+iu/btvS6r8D7B6JShP0zYNkE9FeQ/ykm1lsD17vlVqA+BK6HEP7fZjuwvKoen AfRmlXrJItZZHhN7umwOXYtKHRWMxP8xQKyAcANQRbT3U3OZT/P8aacc2UE5wDzn k8T/IqUDfr6YkYrwRgihQYuaSwaW+n8+aq/bHEvrD5eJu8QGL9QUzDIsELVdxhDm cv1KuvAX9ogbPn2BnWfhz7j7S1oUZjGIsjcl39LAuMmRBKYV/Yi8Ho9QXXCWHAGW QsVdgKet3L0u4SPisvSrA5SXOqWJ4Pxasmxp4OsXVYtCypk6FRu/QGZIo0E0COgq kq2eF4oGNrHYlUqusvc0w5rTmgVgpWOxENiMVhWKlc1SzLO7pvvxoOIDBHvSCLll T74SKxnA3lJmBL75QchDPNaq5ANVIY0ya0a7sbAYpSZZdcUnnclD+AsrMrySgQV3 F05iqA4E9BqO2PMO6Gzt =HEg2 -END PGP SIGNATURE- Changes since cp-4.1-1-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.5.2'
Tag 'libreoffice-4.1.5.2' created by Christian Lohmaier at 2014-01-30 20:41 -0800 Tag libreoffice-4.1.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJS6rj0AAoJEPQ0oe+v7q6jgSAQALNgqMYqW7/0zW+cWK6uYAId Y8CR8R1p14D/Kdkc1pkdRP0QSnGzsTPWuC09hUSE2Pq/md6QRJPZR2hw7tsSZyBM 9gDlkZQtaMya5to+cqvsbDQA6xqaldg49sng2+zatFL8db2lIg2ewieRox/HTwCi vUTzLLKSx9nbJaLYS3RPO9LCYeGEH9gfX0usbW4oONIRvbrWtu55cPO+ujV+tX2f VD24cNXKR1TTRCvtqcJ1WiEJOvVLEqOnckdTkGJolp48VoNnqfxraHexj2hjeZNU l9sHwoCcm14KNdTe752XNCBw8MFwp2po3LgANh8Mgiact0sTjoXt++rkJHNEdtyk G6x76YpWHsWJq/q8S5rAW22dGNeSJgTLKSA/J08q8jai6TKSFsjT8ayiqegP/Xp8 +8bgAL/tidpwKQqSyEKyXB3GooJtQNP/WZ4kmeuSkmdTJJYpHuXl0lKvBXLVIrL4 gaKJY0ulHicjiLTohvWyiTJ50hhhO+A8jJf/yOi7aeheBzJh64d0YSurDmjT8BS6 9dfR7Qvxh2cdX/IQhHUhJr2aYp0//MNaG9Nuak+CpCwihOBvyMGWSh4HEY9zADDC 7OAsoLQTmb0r/ge6S7AXe/1ddomOEL1+O8UQc1f08/RVxpGN9ayjisRyZbBpSD7Q ylJj0gistCk6YQzELjAr =5g+a -END PGP SIGNATURE- Changes since cp-4.1-branch-point-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.5.2'
Tag 'libreoffice-4.1.5.2' created by Christian Lohmaier at 2014-01-30 20:41 -0800 Tag libreoffice-4.1.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJS6rkHAAoJEPQ0oe+v7q6jkkMQAIQmnUdlsl256RsOCZPUC8Pr eIwX3/1u9iArh+PeD4LHUvGXqjXNWgXTMRyenY/UbYZli8uev9rqDAHIZHkAe2g2 1DeoIGvRrPlrp9cQCxmDOh59g8NXsogw3cC1Tvj080hrJD1vJDgUtaH6DgUCOkls ZQDGu2SZSLjawWEhtE7xqE0ScDWl9XYOHh8wKw9AYEXK4xZrcKAx4lwMPTOBfktq e5QufrP+dkizDeJd2K8jIFONd/scGJbYGjBXkK/lBXoKkxNRWqs9PD1TAkaudVNV uuQuFNaOlD8XfX4V7N2pgKjCN89njRO+TKoXKrel6btpGtzCBJrQys6kWpo5Qy/5 UdrvTKiblA2SjFRSn0iK/2S8UUtvLDGDYzZLwlpGT7NpOefTtK/WrCfOw/zTr1j5 Z6byzDVphxdMRqQoPbBcRsL9FiDBAsZDq1YtN1K+P6qXRSNfmHVFPKSsrpJgtwfH /sKtO1v+jPBdBykO5IqteYMfVZyHdX+AcZjX4Y+bCqSlZl9w/FIh5jrlnj0xFIIg k91Gv2E+MYcYJAZrHDKznbTU8NIfwx25LsWKRLo54XQqcirURiK+ET90ouhhIvU8 /L1cECO9e/xq1zHdf6ayrAe156awpZNXFAykMVRfvUSGvhXdutN2UaG4JUccYBW4 Uggy7aeFXwqUJwT+T5mO =kfIa -END PGP SIGNATURE- Changes since cp-4.1-branch-point-247: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30731ad2ab5173d4f76381ed06763673e2ef1cc2 Author: Christian Lohmaier Date: Thu Jan 30 20:54:36 2014 +0100 Updated core Project: translations 18a4076d256e3626b719a191571c1e9085ef08c9 diff --git a/translations b/translations index b8ed9a4..18a4076 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b8ed9a4b452ca5f1583b12b79bfbcc90ee48d1f9 +Subproject commit 18a4076d256e3626b719a191571c1e9085ef08c9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
export config a11y speedup prototype
The export config page is still super slow with a11y enabled, the
attached prototype patch knocks about 5 minutes off it (in dbgutil
mode).
It's clearly a rubbish patch, statics need to become member variables
and I need to find the right place to invalidate the cache when
something gets added/removed from the list and then wrap the whole thing
with some fancy class name so it looks like it was designed rather than
grown. I probably won't get around to looking at this again until next
week so if someone wants to take this and run with it in the meantime
feel free.
C.
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index adb759c..f01ff64 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -436,9 +436,20 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
{
+static sal_uLong nCachedEntryPos;
+static sal_uLong nKnownStartIndex;
+static sal_uLong nKnownStartPos;
+
SvTreeListEntry* pEntry = NULL;
-sal_uLong i, nPos = 0, nCount = GetLevelChildCount( NULL );
-for ( i = 0; i < nCount; ++i )
+sal_uLong i = 0, nPos = 0, nCount = GetLevelChildCount( NULL );
+
+if (_nEntryPos >= nCachedEntryPos)
+{
+i = nKnownStartIndex;
+nPos = nKnownStartPos;
+}
+
+while (i < nCount)
{
SvTreeListEntry* pParent = GetEntry(i);
if ( nPos == _nEntryPos )
@@ -453,8 +464,12 @@ SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
if ( pEntry )
break;
}
+++i;
}
+nCachedEntryPos = _nEntryPos;
+nKnownStartIndex = i;
+nKnownStartPos = nPos;
return pEntry;
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 34/2ebf4c79972ba3e1159831fce04cdef80f585b
34/2ebf4c79972ba3e1159831fce04cdef80f585b |1 + 1 file changed, 1 insertion(+) New commits: commit ffc5c9a092cefd8104f96edb0087218bffa15a18 Author: Caolán McNamara Date: Thu Jan 30 18:46:03 2014 + Notes added by 'git notes add' diff --git a/34/2ebf4c79972ba3e1159831fce04cdef80f585b b/34/2ebf4c79972ba3e1159831fce04cdef80f585b new file mode 100644 index 000..1fd5c32 --- /dev/null +++ b/34/2ebf4c79972ba3e1159831fce04cdef80f585b @@ -0,0 +1 @@ +reject: works for me ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr3.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d39525f1cfef7a01e45adc9ce5e6e8ebba4250c5
Author: Eike Rathke
Date: Thu Jan 30 19:27:37 2014 +0100
init 'fLastPos' [-Werror=maybe-uninitialized], fdo#73146 follow-up
Change-Id: I77d91bbcd600ae209799d2139c3510697e922730
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 03f6c5b..4a01b07 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3849,7 +3849,8 @@ void ScInterpreter::ScRank( bool bAverage )
PushNoValue();
else
{
-double fLastPos, fFirstPos = -1.0;
+double fLastPos = 0;
+double fFirstPos = -1.0;
bool bFinished = false;
SCSIZE i;
for ( i = 0; i < nSize && !bFinished && !nGlobalError; i++ )
___
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/unoobj/shapeuno.cxx |3 +--
sc/source/ui/view/printfun.cxx |9 +++--
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 41a859234eac6126693393ff64efc7bfcdec9c54
Author: Eike Rathke
Date: Thu Jan 30 19:00:51 2014 +0100
fdo#74194 Revert "Resolves: #i121136# Improve Spreadsheet performance ..."
This reverts commit 6a62557d8632290ae7150f3922dece65f51af4bc.
pPageRows[] is a member array, so when not allocating MAXROWCOUNT
entries but nRealCnt instead it also needs some tracking mechanism to
reallocate in case a subsequent call needs more elements than the first
call.
Change-Id: Iadb7d2ceadcb8bd99d57c6188571d295c6b99fba
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index c233d86..7259aae 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -842,8 +842,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const
OUString& aPropertyName )
}
else
{
-if(!pShapePropertySet) //performance consideration
-GetShapePropertySet();
+GetShapePropertySet();
if (pShapePropertySet)
aAny = pShapePropertySet->getPropertyValue( aPropertyName );
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 0c37a18..b509e2b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2963,9 +2963,8 @@ static void lcl_SetHidden( ScDocument* pDoc, SCTAB
nPrintTab, ScPageRowEntry& rP
void ScPrintFunc::CalcPages() // calculates aPageRect and pages
from nZoom
{
if (!pPageEndX) pPageEndX = new SCCOL[MAXCOL+1];
-//performance impact
-// if (!pPageEndY) pPageEndY = new SCROW[MAXROW+1];
-// if (!pPageRows) pPageRows = new ScPageRowEntry[MAXROW+1]; //! count
before
+if (!pPageEndY) pPageEndY = new SCROW[MAXROW+1];
+if (!pPageRows) pPageRows = new ScPageRowEntry[MAXROW+1]; //! count
before
pDoc->SetPageSize( nPrintTab, GetDocPageSize() );
if (aAreaParam.bPrintArea)
@@ -2975,9 +2974,7 @@ void ScPrintFunc::CalcPages() // calculates
aPageRect and pages fr
}
else
pDoc->UpdatePageBreaks( nPrintTab, NULL ); // else, end is marked
-SCROW nRealCnt = nEndRow-nStartRow+1;
-if (!pPageEndY) pPageEndY = new SCROW[nRealCnt+1];
-if (!pPageRows) pPageRows = new ScPageRowEntry[nRealCnt+1]; //! vorher
zaehlen
+
//
// Page alignment/splitting after breaks in Col/RowFlags
// Of several breaks in a hidden area, only one counts.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - canvas/source
canvas/source/vcl/canvascustomsprite.cxx |9 -
canvas/source/vcl/spritehelper.cxx |8 +++-
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 342ebf4c79972ba3e1159831fce04cdef80f585b
Author: Armin Le Grand
Date: Thu Jan 30 17:27:11 2014 +
i12355 Allow 1bit masks for all OSes except Linux (see i122485)
diff --git a/canvas/source/vcl/canvascustomsprite.cxx
b/canvas/source/vcl/canvascustomsprite.cxx
index 1287ed7..39ae9d6 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -81,7 +81,14 @@ namespace vclcanvas
pBackBuffer->setSize( aSize );
// create mask backbuffer, with one bit color depth #122485# use full
depth to avoid problem with 1bit depth, get AAed masks
-BackBufferSharedPtr pBackBufferMask( new BackBuffer(
rOutDevProvider->getOutDev() ) ); // , true ) ); // #122485#
+BackBufferSharedPtr pBackBufferMask(
+#if defined LINUX || defined FREEBSD || defined NETBSD
+// #122485# no 1bit buffers on Linuxes, 1bit Vdev seems to work no
longer
+new BackBuffer( rOutDevProvider->getOutDev() ) );
+#else
+// 1bit mask buffer for all others
+new BackBuffer( rOutDevProvider->getOutDev(), true ) );
+#endif
pBackBufferMask->setSize( aSize );
// TODO(F1): Implement alpha vdev (could prolly enable
diff --git a/canvas/source/vcl/spritehelper.cxx
b/canvas/source/vcl/spritehelper.cxx
index 2440ad3..b793090 100755
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -159,7 +159,13 @@ namespace vclcanvas
// bitmasks are much faster than alphamasks on some
platforms
// so convert to bitmask if useful
-#ifndef QUARTZ
+#if defined LINUX || defined FREEBSD || defined NETBSD || defined QUARTZ
+// #122485# allow more than 1bit masks for Linux and Mac,
+// but reduce to mono now
+aMask.MakeMono(255);
+#else
+// #122485# assert when mask uses more than 1bit and reduce
+// to mono
if( aMask.GetBitCount() != 1 )
{
OSL_ENSURE(false,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/document10.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 862bec45fa81b5583e764abf845c14689b339753
Author: Kohei Yoshida
Date: Thu Jan 30 13:03:10 2014 -0500
This could cause crasher too.
Change-Id: I47d9ad36937bf07cd0b79fa5eec7710ce84ce4a9
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index ae190c1..d36df55 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -132,8 +132,11 @@ bool ScDocument::CopyOneCellFromClip(
{
svl::SharedString aStr = rSrcCell.mpFormula->GetString();
if (aStr.isEmpty())
+{
// do not clone empty string
rSrcCell.clear();
+break;
+}
// Turn this into a string or edit cell.
if (rSrcCell.mpFormula->IsMultilineResult())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: modification of print dialog
Hey Alex, yes, that's easy :) Just write a small macro to check if the actual document has a URL and if, check the flag isModified(). If this flag is true or the Document do not have an url you do have unsaved changes - so you can act with a own dialog. Otherwise call uno:print - that is the same as using the print-button or the menu: file - print. Then - create an extension out of your code, create an addon.xcu file which replace the existing commands (file - print and print-Button) with your marco. Define the moduls were it should work (i.E. Writer, Calc). Install your extension - ready :) Now - when the user klick on the print-button, your macro will check the document and react as you want. Best regards Thomas Am 30.01.2014 15:05, schrieb Кораблёв Алексей Анатольевич: > Hello ! I faced with the following problem: I need to launch an > additional dialog box while user pushing the "Print" button: I would > like to check if he has saved the document that he's trying to print > in order to prevent the printing of the unsaved documents. Are there > any methods of the solution of this task without modification of a > source code? > > Yours truly, Alex. > > > > > ___ LibreOffice mailing > list LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- ## Unterstützung der freien Office Suite ## http://de.libreOffice.org - www.LibreOffice.org ## Vorstand Freies Office Deutschland e.V. ## Mitglieder willkommen: www.FroDeV.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/document10.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 3b2a30ca8cbb46a137bfd0819d3a6b84757bbcee
Author: Kohei Yoshida
Date: Thu Jan 30 12:41:59 2014 -0500
Prevent crash.
Change-Id: Id30e6dfa14c08ecad5c15df6a79d20a5cdc50a59
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index bd1e385..ae190c1 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -119,8 +119,11 @@ bool ScDocument::CopyOneCellFromClip(
{
bool bPaste =
rCxt.isDateCell(pSrcTab->aCol[aSrcPos.Col()], aSrcPos.Row()) ? bDateTime :
bNumeric;
if (!bPaste)
+{
// Don't paste this.
rSrcCell.clear();
+break;
+}
// Turn this into a numeric cell.
rSrcCell.set(rSrcCell.mpFormula->GetValue());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero changed: What|Removed |Added Depends on|63271 | -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Dave Barton changed: What|Removed |Added Depends on||63271 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #74 from Dave Barton --- I nominate bug 63271 Clicking the "Apply" button should NOT close the hyperlink dialog. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 55/aeb4ebc2da692490c1ec5ac69941f51c01970d
55/aeb4ebc2da692490c1ec5ac69941f51c01970d |1 + 1 file changed, 1 insertion(+) New commits: commit 6da2a1a898f2c6e91b478d24ed99eb102a85c717 Author: Caolán McNamara Date: Thu Jan 30 17:03:22 2014 + Notes added by 'git notes add' diff --git a/55/aeb4ebc2da692490c1ec5ac69941f51c01970d b/55/aeb4ebc2da692490c1ec5ac69941f51c01970d new file mode 100644 index 000..10e3342 --- /dev/null +++ b/55/aeb4ebc2da692490c1ec5ac69941f51c01970d @@ -0,0 +1 @@ +prefer: 1563162131ae00cd2a33c59349567a7b820dc5db ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idlc/Executable_idlc.mk idlc/inc idlc/source idlc/test
idlc/Executable_idlc.mk |2
idlc/inc/idlc/astarray.hxx | 55
idlc/inc/idlc/astdeclaration.hxx |3
idlc/inc/idlc/astunion.hxx | 61 -
idlc/inc/idlc/astunionbranch.hxx | 39 ---
idlc/inc/idlc/astunionlabel.hxx | 45 ---
idlc/inc/idlc/errorhandler.hxx | 15 -
idlc/inc/idlc/idlctypes.hxx | 33 --
idlc/source/astarray.cxx | 66 -
idlc/source/astdeclaration.cxx |3
idlc/source/astscope.cxx |6
idlc/source/astunion.cxx | 382
idlc/source/errorhandler.cxx | 71 --
idlc/source/fehelper.cxx | 21 -
idlc/source/idlc.cxx |5
idlc/source/parser.y | 453 ---
idlc/source/scanner.l|5
idlc/test/struct.idl |6
idlc/test/typelookup.idl |4
idlc/test/union.idl | 55
20 files changed, 7 insertions(+), 1323 deletions(-)
New commits:
commit 8e71d9400bd350d63723c5489ddaadb3d3610baf
Author: Stephan Bergmann
Date: Thu Jan 30 17:53:02 2014 +0100
Remove UNOIDL "array" and "union" vaporware from idlc
Change-Id: Iccd5a78b54620796cfde672388b70ad97d17b7a5
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index 2eaa30c..1ddc72a 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_Executable_add_exception_objects,idlc,\
idlc/source/astoperation \
idlc/source/astconstant \
idlc/source/astenum \
-idlc/source/astarray \
-idlc/source/astunion \
idlc/source/astexpression \
idlc/source/astservice \
))
diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
deleted file mode 100644
index e75e010..000
--- a/idlc/inc/idlc/astarray.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _IDLC_ASTARRAY_HXX_
-#define _IDLC_ASTARRAY_HXX_
-
-#include
-#include
-
-class AstArray : public AstType
-{
-public:
-AstArray(const OString& name, AstType* pType, const ExprList& rDimExpr,
AstScope* pScope);
-AstArray(AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
-
-virtual ~AstArray() {}
-
-AstType* getType()
-{ return m_pType; }
-void setType(AstType* pType)
-{
-m_pType = pType;
-setName(makeName());
-}
-ExprList* getDimExpressions()
-{ return &m_dimExpressions; }
-sal_uInt32 getDimension()
-{ return m_dimension; }
-
-private:
-OString makeName();
-
-AstType*m_pType;
-sal_uInt32 m_dimension;
-ExprListm_dimExpressions;
-};
-
-#endif // _IDLC_ASTARRAY_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index a52565a..424e5b2 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -43,8 +43,6 @@ enum NodeType
NT_property,// Denotes an property
NT_operation, // Denotes an operation
NT_parameter, // Denotes an op. parameter
-NT_union, // Denotes a union
-NT_union_branch,// Denotes a union branch
NT_struct, // Denotes either a plain struct type, or a
// polymorphic struct type template
NT_type_parameter, // Denotes a type parameter of a polymorphic struct
@@ -53,7 +51,6 @@ enum NodeType
NT_member, // Denotes a member in structure, exception
NT_enum,// Denotes an enumeration
NT_enum_val,// Denotes an enum. value
-NT_array, // Denotes an IDL array
NT_sequence,// Denotes an IDL sequence
NT_typedef, // Denotes a typedef
NT_predefined, // Denotes a predefined type
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
deleted file mode 100644
index d1b9b47..000
--- a/idlc/inc/idlc/astunion.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-wid
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #47 from Commit Notification --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=73d713a1b38651c6f90826b3b7a2c69181e1622f fdo#63154: Remove SVBT8 from solar.h The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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/tools lotuswordpro/source sw/source vcl/source
include/tools/solar.h |3 -
lotuswordpro/source/filter/lwpobjstrm.cxx |6 +-
sw/source/filter/ww1/w1class.cxx | 38 +++
sw/source/filter/ww1/w1class.hxx |2
sw/source/filter/ww1/w1filter.cxx |6 +-
sw/source/filter/ww1/w1sprm.cxx | 12 ++---
sw/source/filter/ww1/w1struct.hxx | 72 +-
sw/source/filter/ww8/wrtw8num.cxx | 14 ++---
sw/source/filter/ww8/ww8atr.cxx |2
sw/source/filter/ww8/ww8graf.cxx | 13 ++---
sw/source/filter/ww8/ww8graf2.cxx | 14 ++---
sw/source/filter/ww8/ww8par.cxx |4 -
sw/source/filter/ww8/ww8par2.cxx | 44 --
sw/source/filter/ww8/ww8par6.cxx |4 -
sw/source/filter/ww8/ww8scan.cxx |2
sw/source/filter/ww8/ww8struc.hxx | 58
vcl/source/gdi/gdimtf.cxx |5 --
17 files changed, 140 insertions(+), 159 deletions(-)
New commits:
commit 73d713a1b38651c6f90826b3b7a2c69181e1622f
Author: Marcos Paulo de Souza
Date: Sat Jan 25 10:16:24 2014 -0200
fdo#63154: Remove SVBT8 from solar.h
Conflicts:
sw/source/filter/ww8/ww8par2.cxx
Change-Id: I4e500cf0ca89468494fd3f0892839f5ca6cce725
Reviewed-on: https://gerrit.libreoffice.org/7645
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 42316ef..914f0de 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -41,14 +41,12 @@ typedef sal_uIntPtrsal_uLong; /* Replaces type ULONG */
always little endian;
not necessarily aligned */
-typedef sal_uInt8 SVBT8[1];
typedef sal_uInt8 SVBT16[2];
typedef sal_uInt8 SVBT32[4];
typedef sal_uInt8 SVBT64[8];
#ifdef __cplusplus
-inline sal_uInt8 SVBT8ToByte ( const SVBT8 p ) { return p[0]; }
inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return (sal_uInt16)p[0]
+ ((sal_uInt16)p[1] << 8);
}
inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0]
@@ -79,7 +77,6 @@ inline double SVBT64ToDouble( const SVBT64 p ) { double n;
return n; }
#endif
-inline void ByteToSVBT8 ( sal_uInt8 n, SVBT8 p ) { p[0] = n; }
inline void ShortToSVBT16( sal_uInt16 n, SVBT16 p ) { p[0] = (sal_uInt8) n;
p[1] = (sal_uInt8)(n >>
8); }
inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] =
(sal_uInt8) n;
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx
b/lotuswordpro/source/filter/lwpobjstrm.cxx
index b9dc392..52949e4 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -263,11 +263,11 @@ sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure)
*/
sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure)
{
-SVBT8 aValue = {0};
-sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
+sal_uInt8 aValue = 0;
+sal_uInt16 nRead = QuickRead(&aValue, sizeof(aValue));
if (pFailure)
*pFailure = (nRead != sizeof(aValue));
-return SVBT8ToByte(aValue);
+return aValue;
}
/**
* @descr Quick read double
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index be05e22..bfcbf3b 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -103,7 +103,7 @@ void Ww1Style::SetDefaults(sal_uInt8 stc)
sal_uInt16 Ww1Style::ReadName( sal_uInt8*&p, sal_uInt16& rnCountBytes,
sal_uInt16 stc )
{
-sal_uInt8 nCountBytes = SVBT8ToByte(p);
+sal_uInt8 nCountBytes = *p;
p++;
rnCountBytes--;
if( !nCountBytes ) // default
@@ -168,7 +168,7 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*&p, sal_uInt16&
rnCountBytes, sal_uInt1
sal_uInt16 Ww1Style::ReadChpx( sal_uInt8*&p, sal_uInt16& rnCountBytes )
{
-sal_uInt16 nCountBytes = SVBT8ToByte(p);
+sal_uInt16 nCountBytes = *p;
p++;
rnCountBytes--;
if (nCountBytes != 255 // unused
@@ -186,7 +186,7 @@ sal_uInt16 Ww1Style::ReadChpx( sal_uInt8*&p, sal_uInt16&
rnCountBytes )
sal_uInt16 Ww1Style::ReadPapx(sal_uInt8*&p, sal_uInt16& rnCountBytes)
{
-sal_uInt16 nCountBytes = SVBT8ToByte(p);
+sal_uInt16 nCountBytes = *p;
p++;
rnCountBytes--;
if (nCountBytes != 255)
@@ -203,10 +203,10 @@ sal_uInt16 Ww1Style::ReadPapx(sal_uInt8*&p, sal_uInt16&
rnCountBytes)
sal_uInt16 Ww1Style::ReadEstcp(sal_uInt8*&p, sal_uInt16& rnCountBytes)
{
-stcNext = SVBT8ToByte(p);
+stcNext = *p;
p++;
rnCountBytes--;
-stcBase = SVBT8ToByte(p);
+stcBase = *p;
p++;
OSL_ENSURE(rnCountBytes>0, "Ww1Style");
rnCountBytes--;
@@ -442,11 +442,10 @@ Ww1Sprm::Ww1Sprm(SvStream& rStream, sal_uLong ulFilePos)
pArr(NULL),
count(0)
{
-
[Libreoffice-commits] core.git: sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |2
sc/inc/cellvalues.hxx | 44 +++
sc/inc/column.hxx |6
sc/inc/document.hxx| 13 +
sc/inc/table.hxx |5
sc/source/core/data/cellvalues.cxx | 116
++
sc/source/core/data/column4.cxx| 84 +++
sc/source/core/data/document10.cxx | 27 ++
sc/source/core/data/table7.cxx | 24 ++
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 18 +
sc/source/ui/collab/sendfunc.cxx |7
sc/source/ui/collab/sendfunc.hxx |1
sc/source/ui/docshell/docfunc.cxx | 35 +++
sc/source/ui/inc/docfunc.hxx |1
sc/source/ui/inc/undocell.hxx | 31 ++
sc/source/ui/undo/undocell2.cxx| 69 +
16 files changed, 477 insertions(+), 6 deletions(-)
New commits:
commit a0bd814fb5c2ed1d8a1583eb59c783290c7c3dc9
Author: Kohei Yoshida
Date: Wed Jan 29 23:35:34 2014 -0500
Speed up filling of random number generation over entire column.
Because nobody wants to wait forever...
Change-Id: Ie52bff944893b7e3fe9e7908be19d27c692fc1ea
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 1ed89c6..dcced7f 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/bcaslot \
sc/source/core/data/bigrange \
sc/source/core/data/cellvalue \
+sc/source/core/data/cellvalues \
sc/source/core/data/clipcontext \
sc/source/core/data/clipparam \
sc/source/core/data/column \
@@ -512,6 +513,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/undoblk2 \
sc/source/ui/undo/undoblk3 \
sc/source/ui/undo/undocell \
+sc/source/ui/undo/undocell2 \
sc/source/ui/undo/undodat \
sc/source/ui/undo/undodraw \
sc/source/ui/undo/undoolk \
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
new file mode 100644
index 000..8b249b4
--- /dev/null
+++ b/sc/inc/cellvalues.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_CELLVALUES_HXX
+#define SC_CELLVALUES_HXX
+
+#include
+
+class ScColumn;
+
+namespace sc {
+
+struct CellValuesImpl;
+
+class CellValues
+{
+CellValuesImpl* mpImpl;
+
+CellValues( const CellValues& ); // disabled
+CellValues& operator= ( const CellValues& ); // disabled
+
+public:
+CellValues();
+~CellValues();
+
+void transferFrom( ScColumn& rCol, SCROW nRow, size_t nLen );
+void copyTo( ScColumn& rCol, SCROW nRow ) const;
+
+void assign( const std::vector& rVals );
+
+size_t size() const;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 1ac1e3f..69ba1af 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -56,6 +56,7 @@ struct RefUpdateMoveTabContext;
class EditTextIterator;
struct NoteEntry;
class DocumentStreamAccess;
+class CellValues;
}
@@ -143,6 +144,7 @@ friend class sc::DocumentStreamAccess;
friend class sc::SingleColumnSpanSet;
friend class sc::ColumnSpanSet;
friend class sc::EditTextIterator;
+friend class sc::CellValues;
ScColumn(const ScColumn&); // disabled
ScColumn& operator= (const ScColumn&); // disabled
@@ -294,6 +296,7 @@ public:
void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const
OUString& rStr, bool bBroadcast = true );
void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const
svl::SharedString& rStr, bool bBroadcast = true );
void SetValue( SCROW nRow, double fVal );
+void SetValues( SCROW nRow, const std::vector& rVals );
void SetValue( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, double
fVal, bool bBroadcast = true );
voidSetError( SCROW nRow, const sal_uInt16 nError);
@@ -539,6 +542,9 @@ public:
*/
void RegroupFormulaCells();
+void TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rDest
);
+void CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc );
+
#if DEBUG_COLUMN_STORAGE
void DumpFormulaGroups() const;
#endif
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index d39cb09..b241859 100644
--- a/sc/inc/document.hxx
+++ b/s
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4
1 file changed, 4 deletions(-)
New commits:
commit a28dc1dbedb32d18f8be4ef7eebff2281454e12b
Author: Stephan Bergmann
Date: Thu Jan 30 17:27:23 2014 +0100
LibreLogo is not a UNO component
Change-Id: I48055d84fd078a131ed8f620575a462fcb101019
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index 8186273..8fc0c0c 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1701,9 +1701,5 @@ def __gotoline__(n):
_.doc.CurrentController.getViewCursor().gotoRange(_.cursor.getStart(),
False)
g_exportedScripts = left, right, goforward, gobackward, run, stop, home,
clearscreen, commandline, __translate__
-g_ImplementationHelper = unohelper.ImplementationHelper()
-g_ImplementationHelper.addImplementation( \
-None,"org.openoffice.script.LibreLogo", \
-("org.openoffice.script.ServiceLibreLogo",),)
# 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: odk/CustomTarget_settings.mk odk/settings
odk/CustomTarget_settings.mk |4 +++- odk/settings/dk.mk |3 ++- odk/settings/settings.mk |4 3 files changed, 5 insertions(+), 6 deletions(-) New commits: commit b3db695a338f1acddbe46102138a0167fc346f58 Author: Stephan Bergmann Date: Thu Jan 30 17:12:40 2014 +0100 SDK: Split PLATFORMID at build time rather than runtime ...where $(shell printf ...) in settings.mk likely doesn't work on Windows. Change-Id: I64a51203d1bf131160768f9a9069f428228aa6b1 diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index fe3b1e4..c48a734 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -13,7 +13,9 @@ $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) $(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) - tr -d "\015" < $< | sed -e 's/@@PLATFORMID@@/$(PLATFORMID)/' \ + tr -d "\015" < $< | sed \ + -e 's/@@PLATFORM@@/$(firstword $(subst _, ,$(PLATFORMID)))/' \ + -e 's/@@PROCTYPE@@/$(subst $(WHITESPACE),_,$(wordlist 2,$(words $(subst _, ,$(PLATFORMID))),$(subst _, ,$(PLATFORMID/' \ -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ -e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@ diff --git a/odk/settings/dk.mk b/odk/settings/dk.mk index f890321..8f41b7e1 100644 --- a/odk/settings/dk.mk +++ b/odk/settings/dk.mk @@ -1,4 +1,5 @@ -PLATFORMID=@@PLATFORMID@@ +PLATFORM=@@PLATFORM@@ +PROCTYPE=@@PROCTYPE@@ SDKVERSION=@@RELEASE@@ BUILDID=@@BUILDID@@ LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@ diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 1153746..740233e 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -21,10 +21,6 @@ include $(OO_SDK_HOME)/settings/dk.mk -# test for the platform -PLATFORM := $(shell printf '%s' $(PLATFORMID) | cut -f 1 -d _) -PROCTYPE := $(shell printf '%s' $(PLATFORMID) | cut -f 2- -d _) - # debug option, default is no debug DEBUG=no ifeq "$(MAKECMDGOALS)" "debug" ___ 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/text/TextPropertyPanel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53351ad6179dbac6829cff91a6692dd5025d38d9 Author: Michael Stahl Date: Thu Jan 30 17:05:05 2014 +0100 svx: fix presumed C++11ism Change-Id: I4d6e7ec99ea889ae45ca12c3470b9f5d9e3c134b diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 1daedd6..c1a61f8 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -158,7 +158,7 @@ void TextPropertyPanel::HandleContextChange ( maContext = aContext; -if (maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application::Application_Calc) +if (maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_Calc) mpToolBoxIncDec->Hide(); else mpToolBoxIncDec->Show(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - animations/source
animations/source/animcore/animcore.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 55aeb4ebc2da692490c1ec5ac69941f51c01970d
Author: Armin Le Grand
Date: Thu Jan 30 15:46:33 2014 +
i12355 in AnimationNode take invalid parent into account
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 592eb3c..dbb93aa 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2078,6 +2078,18 @@ void AnimationNode::fireChangeListener()
}
}
+// #i123585# check mpParent, it is extracted from mxParent (see
AnimationNode::setParent)
+// and may be invalid when mxParent got deleted in the meantime
+if(mpParent)
+{
+Reference< XInterface > xCheckReference(mxParent);
+
+if(!xCheckReference.is())
+{
+mpParent = 0;
+}
+}
+
if( mpParent )
mpParent->fireChangeListener();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mysql/YCatalog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d1bc27c2aa49b3ed3526a27c4713c708ca6401f4
Author: Julien Nabet
Date: Wed Dec 18 23:14:42 2013 +0100
User grants debug Mysql part: first steps
Select all user/host instead of just user
so we'll have 'root'@'localhost', 'root'@'127.0.0.1', etc. instead of just
root
Next step: retrieve IS_GRANTABLE value (so patch mysqlcppconn)
Change-Id: Ib0ce7d0745ace17ce8058f3ff9806bea2bdc56f1
Reviewed-on: https://gerrit.libreoffice.org/7140
Reviewed-by: Lionel Elie Mamane
Tested-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx
b/connectivity/source/drivers/mysql/YCatalog.cxx
index 3541ea8..df97f2d 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers()
{
TStringVector aVector;
Reference< XStatement > xStmt = m_xConnection->createStatement( );
-Reference< XResultSet > xResult = xStmt->executeQuery(OUString("select
User from mysql.user group by User"));
+Reference< XResultSet > xResult = xStmt->executeQuery(OUString("SELECT
grantee FROM information_schema.user_privileges GROUP BY grantee"));
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present + Eike, Norbert, Lionel, David, Thorsten, Cloph, Miklos, Caolan, Andras, Stephan, Bjoern, Cedric, Kendy * Completed Action Items * Pending Action Items: + GSOC mentors - prune / remove already done ideas from each side (All) + create a general ideas page, dis-connected from GSoC (Fridrich) + look into non-functioning 'install' button in update dialog (Kendy / Andras) [ Kendy has security concerns around downloading & executing pieces here not a trivial fix. Signing / build verification discussion stalled. Investigation ongoing. ]. + Online Help needs update to match current behavior (Help -> Check for Updates -> Help) https://help.libreoffice.org/swriter/EXTENSIONS_HID_CHECK_FOR_UPD_DLG * Release Engineering update (Christian) + 4.2 RC4 status + released as final a few hours ago + some last-minute website tweaks. + various last minute fixes required an RC4 + thanks to everyone who raced to get RC4 done things in + Markus, Kohei, Eike, Michael S, Cloph, Norbert, Caolan & more. + 4.1.5 RC2 status + scheduled for this week. + three patches in gerrit from Michael S. https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-1-5,n,z + if written by Michael S, reviewed by Caolan & Milos -> rubber stamp them. + submitted new Android remote as public to the app store + new iOS app submitted for review, but not been reviewed yet + average review time is ~5 days + if we're average - expected tomorrow. * GSoC update (Cedric) + not much changed in last 2x weeks, would be good to update tasks & mentoring data. + we will update the page shortly after FOSDEM * Crashtest update (Markus) * UX Hackfest bits (Kendy/Michael) + https://wiki.documentfoundation.org/Hackfest/FOSDEM2014#Participants + removed sidebar tracker from 4.2 MABs (Michael) + lots of sidebar usability issues, but ... better to punt this lot to the UX hack-fest: https://bugs.freedesktop.org/showdependencytree.cgi?id=65138&hide_resolved=1 + other bits - Cor's stuff above ? + https://bugs.freedesktop.org/show_bug.cgi?id=73051 + need design for copying styles between templates (Cor Nouws/other UX?) cf. http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html [ UX hack-fest item for progress ? ] + preview of files in Startcenter - not only odf, but other filetypes too + ideas from Mirek and the design team as/when we're there. * FOSDEM this weekend (Kendy) + send 'dish' choice to Fridrich for Saturday dinner (Eike) + dev-room: check your https://penta.fosdem.org/search/person and provide your biography/profile in the "Description" -> "Abstract" + Standard Hotel 'Astrid' bookings to share at: + http://www.astridhotel.be/index-en.html * Certification update (Kendy/Bjoern/Stephan) * UNO component re-work (Kendy / Stephan) + reducing component linkage helps a lot - 10's of MB saved for mobile. + reducing global initializers too saving a lot. + caused problems with crash-on-exit, and saves startup time (Tor) * unused method list ? (Miklos) + what's the status of that - not updated recently. + not found too many docs on it; is it 'make find-unused' + it should be ut ... (Caolan) + script + Makefile just broken at the moment. + removed a lot of generated code in writerfilter & wanted to look (Miklos) + should start to find and remove resource constructors from unused code from UI conversion (Caolan) * Window & OutputDevice sub-class (Michael) + Chris Sherlock looking at API documentation + trying to move to get OutputDevice ripped out of Window, Window should not be an OutputDevice sub-class + will make native dialogs much easier (Caolan) * QA (Bjoern) + Robinson in transit to FOSDEM + Bugzilla Migration update + no update. + Need-advice bug list bits ? + need to work through & remind some CC'd devs. * QA stats: Querying overall / top bug stats + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html +169-160(+9 overall) many thanks to the top bug squashers: Jean-Baptiste Faure 27 bfoman 14 tommy27 12 Caolán McNamara 9 Michael Stahl8 Foss 7 Eike Rathke 6 Kohei Yoshida6 Maxim Monastirsky6 Jorendc 5 * Open 4.2 MAB + 18/85 17/70 17/65 17/59 21/58 15/45 14/38 21% 24% 26% 28% 36% 33% 37% + https://bugs.freedesktop.org/showdependencytree.cgi?id=65675&hide_resolved=1
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/export/drawingml.hxx |2 +-
oox/source/export/drawingml.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 491b348a64699332142febef90534aa9f70d5156
Author: Jacobo Aragunde Pérez
Date: Thu Jan 30 16:10:34 2014 +0100
drawingML: complete the fix of nAlpha param in DrawingML
Change-Id: I1aec870ee52180d1b1b96762f69fab94370acbde
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 08fb539..f2ec9e7 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -116,7 +116,7 @@ public:
OUString WriteImage( const Graphic &rGraphic );
-void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = 0 );
+void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
void WriteLineArrow( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet, sal_Bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry,
sal_Int32 nStartID, sal_Int32 nEndID );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5363df2..459b425 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -189,7 +189,7 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor,
sal_Int32 nAlpha )
void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha )
{
mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
-if( nAlpha )
+if( nAlpha < MAX_PERCENT )
{
mpFS->startElementNS( XML_a, XML_schemeClr, XML_val,
OUStringToOString( sSchemeName, RTL_TEXTENCODING_ASCII_US
).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mysql/YUsers.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2d01704330cbabb6d87609f3dbc3f2786bec41e4
Author: Julien Nabet
Date: Sun Dec 22 12:34:04 2013 +0100
We want to drop the user here not revoke some rights
Change-Id: Ia31345d9e3cf8dce147402bc6c6592fd57bc88b9
Reviewed-on: https://gerrit.libreoffice.org/7178
Reviewed-by: Andrzej Hunt
Tested-by: Andrzej Hunt
Tested-by: Lionel Elie Mamane
Reviewed-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx
b/connectivity/source/drivers/mysql/YUsers.cxx
index a841819..f71549d 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -93,7 +93,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString&
_rForName, const Referen
// XDrop
void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
{
-OUString aSql( "REVOKE ALL ON * FROM " );
+OUString aSql( "DROP USER " );
OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString(
);
aSql += ::dbtools::quoteName(aQuote,_sElementName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source external/mysqlcppconn
connectivity/source/drivers/mysql/YUser.cxx |2 -
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1
external/mysqlcppconn/patches/retrieve_grants.patch.1 | 31 ++
3 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit bfefe113f69031ff3c3196858bd8dfd11add44ac
Author: Julien Nabet
Date: Fri Dec 20 22:17:50 2013 +0100
User grants debug Mysql part: retrieve IS_GRANTABLE + update column privs
(See http://dev.mysql.com/doc/refman/5.6/en/grant-table-structure.html
Table 6.7. Set-Type Privilege Column Values Section)
Change-Id: I6173ba0df84f722a872afa59d7d7dc9eefe3e368
Reviewed-on: https://gerrit.libreoffice.org/7155
Reviewed-by: Lionel Elie Mamane
Tested-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/mysql/YUser.cxx
b/connectivity/source/drivers/mysql/YUser.cxx
index d44c345..aff9841 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -126,7 +126,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const
OUString& objName, sal_I
static const OUString sREAD( "READ" );
static const OUString sCREATE( "CREATE" );
static const OUString sALTER( "ALTER" );
-static const OUString sREFERENCE( "REFERENCE" );
+static const OUString sREFERENCE( "REFERENCES" );
static const OUString sDROP( "DROP" );
static const OUString sYes( "YES" );
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index ae0f267..dd2b98e 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -18,6 +18,7 @@ $(eval $(call
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/default_to_protocol_tcp.patch \
+ external/mysqlcppconn/patches/retrieve_grants.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/retrieve_grants.patch.1
b/external/mysqlcppconn/patches/retrieve_grants.patch.1
new file mode 100644
index 000..eb63cff
--- /dev/null
+++ b/external/mysqlcppconn/patches/retrieve_grants.patch.1
@@ -0,0 +1,31 @@
+diff -ur mysqlcppconn.org/driver/mysql_metadata.cpp
mysqlcppconn/driver/mysql_metadata.cpp
+--- mysqlcppconn.org/driver/mysql_metadata.cpp 2013-12-20 22:12:07.044698692
+0100
mysqlcppconn/driver/mysql_metadata.cpp 2013-12-20 22:14:56.320394472
+0100
+@@ -3633,12 +3633,14 @@
+- sql::SQLString strAllPrivs("ALTER, DELETE, DROP, INDEX, INSERT, LOCK
TABLES, SELECT, UPDATE");
++ sql::SQLString strAllPrivs("SELECT, INSERT, UPDATE, DELETE, CREATE,
DROPT, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER");
+
+ sql::SQLString cQuote(getIdentifierQuoteString());
++ size_t posIsGrantable = sql::SQLString::npos;
+
+ while (rs->next() ) {
+ sql::SQLString aGrant = rs->getString(1);
+ aGrant = aGrant.replace(0, 6, "");
+
+ size_t pos = aGrant.find("ALL PRIVILEGES");
++ posIsGrantable = aGrant.find("WITH GRANT OPTION");
+
+ if (pos != sql::SQLString::npos) {
+ aGrant = aGrant.replace(pos, sizeof("ALL PRIVILEGES") -
1, strAllPrivs);
+@@ -3737,7 +3739,10 @@
+ rs_data_row.push_back("");
// GRANTOR
+
rs_data_row.push_back(getUserName()); // GRANTEE
+
rs_data_row.push_back(privToken); // PRIVILEGE
+- rs_data_row.push_back("");
// IS_GRANTABLE - ToDo maybe here WITH GRANT OPTION??
++if (posIsGrantable !=
sql::SQLString::npos)
++
rs_data_row.push_back("YES");
++else
++ rs_data_row.push_back("");
// IS_GRANTABLE
+
+ rs_data->push_back(rs_data_row);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 50470] PyUno objects not introspectable on Python 3
https://bugs.freedesktop.org/show_bug.cgi?id=50470 alexjay...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |alexjay...@gmail.com |desktop.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: Branch 'libreoffice-4-1-5' - sw/source
sw/source/core/layout/trvlfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 41e7a4e9a7199cc1e93792ca34c74e3784a93274
Author: Michael Stahl
Date: Fri Jan 24 23:04:03 2014 +0100
fdo#68876: sw: layout should never care about IsFirstShared()
With 75084f6c42c27dc95418df9cefed2fddfb26000e the layout should put the
"first" frame-format on every first-page of a page style; unfortunately
SwFrm::OnFirstPage() was not adapted with this change and that results
in various misbehaviour in the layout.
Change-Id: Ia31add0d72ca581963b7e8e40c3ea932361b7fd6
(cherry picked from commit ecf617ee0cb74526e3989500c122835c32082845)
Reviewed-on: https://gerrit.libreoffice.org/7639
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit 34afdbfd9689ecfa2ea3e93cd7812d192016baf3)
Reviewed-on: https://gerrit.libreoffice.org/7678
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-by: Björn Michaelsen
Reviewed-by: Norbert Thiebaud
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index fcaa4af..6d0624e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1909,7 +1909,7 @@ bool SwFrm::OnFirstPage() const
if (pPrevFrm)
{
const SwPageDesc* pDesc = pPage->GetPageDesc();
-bRet = pPrevFrm->GetPageDesc() != pDesc && !pDesc->IsFirstShared();
+bRet = pPrevFrm->GetPageDesc() != pDesc;
}
else
bRet = 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-1-5' - sw/source
sw/source/core/text/txtfly.cxx|6 +++--- sw/source/core/txtnode/fntcap.cxx |4 ++-- sw/source/core/txtnode/swfont.cxx |8 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 28c613edb7bde90c49c61c56c9bb32fb312070e9 Author: Michael Stahl Date: Tue Jan 21 11:16:20 2014 +0100 fdo#68959: sw: fix painting of tab fill characters in small caps text The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7568 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 7cdf5a6995a017e295e9b1099abc6dcb1987ae9e) Reviewed-on: https://gerrit.libreoffice.org/7576 Reviewed-by: Eike Rathke Reviewed-by: Norbert Thiebaud diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 54635d7..3a140b6 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) } Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() ); -const Point &rOld = rInf.GetPos(); +const Point aOldPos(rInf.GetPos()); rInf.SetPos( aPos ); if( !bOpaque ) @@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) rInf.GetFont()->_DrawStretchText( rInf ); else rInf.GetFont()->_DrawText( rInf ); -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_False; } else if( !aRegion.empty() ) @@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) rInf.GetFont()->_DrawText( rInf ); } } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_True; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 9735b2c..3f827f2 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -536,9 +536,9 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf ) if( rInf.GetLen() == STRING_LEN ) rInf.SetLen( rInf.GetText().getLength() ); -const Point& rOldPos = rInf.GetPos(); +const Point aOldPos = rInf.GetPos(); const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); -rInf.SetPos( rOldPos ); +rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != UNDERLINE_NONE || GetOverline() != UNDERLINE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 977b6d2..8a4ed6d 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -849,12 +849,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() ); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); -const Point &rOld = rInf.GetPos(); rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); @@ -955,7 +955,7 @@ static sal_Char const sDoubleSpace[] = " "; rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf ) @@ -980,13 +980,13 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf ) rInf.ApplyAutoColor(); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); -const Point &rOld = rInf.GetPos(); rInf.SetPos( aPos ); if( IsCapital() ) @@ -1038,7 +1038,7 @@ static sal_Char const sDoubleSpace[] = " "; rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 50470] PyUno objects not introspectable on Python 3
https://bugs.freedesktop.org/show_bug.cgi?id=50470 alexjay...@gmail.com changed: What|Removed |Added Assignee|alexjay...@gmail.com|libreoffice-b...@lists.free ||desktop.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
[Bug 50470] PyUno objects not introspectable on Python 3
https://bugs.freedesktop.org/show_bug.cgi?id=50470 alexjay...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |alexjay...@gmail.com |desktop.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: Branch 'refs/notes/commits' - d8/2fd7455a66f9709f8b49b4af853ef250cf2cd3
d8/2fd7455a66f9709f8b49b4af853ef250cf2cd3 |1 + 1 file changed, 1 insertion(+) New commits: commit 05f8b7efcf9c68c83aae8220c24f381075f05e1d Author: Caolán McNamara Date: Thu Jan 30 15:05:18 2014 + Notes added by 'git notes add' diff --git a/d8/2fd7455a66f9709f8b49b4af853ef250cf2cd3 b/d8/2fd7455a66f9709f8b49b4af853ef250cf2cd3 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/d8/2fd7455a66f9709f8b49b4af853ef250cf2cd3 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3f/d8702f6d2c4f1075a01205de6aa69b88015af1
3f/d8702f6d2c4f1075a01205de6aa69b88015af1 |1 + 1 file changed, 1 insertion(+) New commits: commit d2e45d2c664283580b4e0d4e2d427eb0fd862332 Author: Caolán McNamara Date: Thu Jan 30 15:04:48 2014 + Notes added by 'git notes add' diff --git a/3f/d8702f6d2c4f1075a01205de6aa69b88015af1 b/3f/d8702f6d2c4f1075a01205de6aa69b88015af1 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/3f/d8702f6d2c4f1075a01205de6aa69b88015af1 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/rel-size-round.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
writerfilter/source/dmapper/GraphicImport.cxx |3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 1af6cf096ade2276b364aff8d465f8782f77db53
Author: Miklos Vajna
Date: Thu Jan 30 15:37:37 2014 +0100
DOCX import: round wp14:pctWidth/Height
sw core supports integers only ATM, so at least let e.g. 9.8 be 10, not
9.
Change-Id: I94842d7190bfa264f0fa0331d7418c411ef191d9
diff --git a/sw/qa/extras/ooxmlimport/data/rel-size-round.docx
b/sw/qa/extras/ooxmlimport/data/rel-size-round.docx
new file mode 100755
index 000..ccd076a
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/rel-size-round.docx
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bfcaa26..c2f3c95 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1748,6 +1748,12 @@ DECLARE_OOXMLIMPORT_TEST(testPageRelSize,
"pagerelsize.docx")
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getProperty(xTextFrame, "RelativeWidthRelation"));
}
+DECLARE_OOXMLIMPORT_TEST(testRelSizeRound, "rel-size-round.docx")
+{
+// This was 9: 9.8 was imported as 9 instead of being rounded to 10.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(10), getProperty(getShape(1),
"RelativeHeight"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 2f7cfd0..e615ddf 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -43,6 +43,7 @@
#include
#include
+#include
#include
#include
@@ -936,7 +937,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_SizeRelV_pctHeight:
if (m_xShape.is() && !m_pImpl->m_rPositivePercentages.empty())
{
-sal_Int16 nPositivePercentage =
m_pImpl->m_rPositivePercentages.front().toInt32() / 1000;
+sal_Int16 nPositivePercentage =
rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() / 1000);
m_pImpl->m_rPositivePercentages.pop();
uno::Reference xServiceInfo(m_xShape,
uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
modification of print dialog
Hello ! I faced with the following problem: I need to launch an additional dialog box while user pushing the "Print" button: I would like to check if he has saved the document that he's trying to print in order to prevent the printing of the unsaved documents. Are there any methods of the solution of this task without modification of a source code? Yours truly, Alex. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/dicimp.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit bcfa89158e1ce8cecf9c078ef852225180472a55
Author: László Németh
Date: Thu Jan 30 15:19:56 2014 +0100
fdo#44314 non-standard hyphenation (fix previous commit)
Change-Id: Ib830cf5b57051039106d1f60059fe8a3bdbecf1a
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 1306253..2e83a06 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -608,20 +608,22 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
{
if (aWord1[ nIdx1 ] == cIgnBeg)
IgnState = true;
-if (IgnState || aWord1[ nIdx1++ ] == cIgnChar)
+if (IgnState || aWord1[ nIdx1 ] == cIgnChar)
nNumIgnChar1++;
if (aWord1[ nIdx1] == cIgnEnd)
IgnState = false;
+nIdx1++;
}
IgnState = false;
while (nIdx2 < nLen2 )
{
-if (aWord1[ nIdx2 ] == cIgnBeg)
+if (aWord2[ nIdx2 ] == cIgnBeg)
IgnState = true;
-if (aWord2[ nIdx2++ ] == cIgnChar)
+if (IgnState || aWord2[ nIdx2 ] == cIgnChar)
nNumIgnChar2++;
-if (aWord1[ nIdx1] == cIgnEnd)
+if (aWord2[ nIdx2 ] == cIgnEnd)
IgnState = false;
+nIdx2++;
}
nRes = ((sal_Int32) nLen1 - nNumIgnChar1) - ((sal_Int32) nLen2 -
nNumIgnChar2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in
configure.in | 30 +-
1 file changed, 13 insertions(+), 17 deletions(-)
New commits:
commit d82fd7455a66f9709f8b49b4af853ef250cf2cd3
Author: Herbert Dürr
Date: Thu Jan 30 13:30:10 2014 +
#i114728# improve configure diagnostics for the OSX SDK check
diff --git a/configure.in b/configure.in
index 5179219..c8ebd1c 100644
--- a/configure.in
+++ b/configure.in
@@ -3907,7 +3907,7 @@ AC_SUBST(LIBXML_LIBS)
dnl ===
-dnl Checks for a MacOS platform SDK which supports a OSX 10.7 deployment target
+dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment
target
dnl ===
if test "$_os" = "Darwin"; then
sdk_target=10.7
@@ -3918,13 +3918,13 @@ if test "$_os" = "Darwin"; then
if test "$sdk_minor" -lt "7"; then
AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
else
- AC_MSG_RESULT([yes])
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- AC_MSG_CHECKING([for SDKs compatible with $MACOSX_DEPLOYMENT_TARGET])
sdk_found=`xcodebuild -showsdks | grep "sdk macosx10.[[789]]" | sed -e
"s/.*sdk //" | head -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
+ else
+ AC_MSG_RESULT([yes, by using SDK $sdk_found])
fi
sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
@@ -3932,7 +3932,7 @@ if test "$_os" = "Darwin"; then
if test -d "$sdk_path"; then
AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([MacOS SDK $sdk_found is not available at $sdk_path])
+ AC_MSG_ERROR([not found!])
fi
MACOSX_SDK_PATH=$sdk_path
commit 3fd8702f6d2c4f1075a01205de6aa69b88015af1
Author: Herbert Dürr
Date: Thu Jan 30 13:03:38 2014 +
#i114728# allow OSX platform SDKs that support OSX 10.7
Some newer Mac SDKs are backward compatible with an OSX 10.7 deployment
target.
Allowing the build with such compatible SDKs enables the use of plain XCode,
even when XCode>=5 dropped the 10.7 SDK.
diff --git a/configure.in b/configure.in
index dc02c61..5179219 100644
--- a/configure.in
+++ b/configure.in
@@ -937,10 +937,6 @@ AC_ARG_WITH(rat-scan,
a separately installed library.
],with_rat_scan=$withval,)
-AC_ARG_WITH(macosx-sdk-version,
-[ --with-macosx-sdk-version= Specify the MacOSX platform SDK
version, default is 10.7. Only 10.7 or higher is supported.
-],,)
-
BUILD_TYPE="OOo"
ADDITIONAL_REPOSITORIES="../ext_libraries"
SCPDEFS=""
@@ -3911,32 +3907,32 @@ AC_SUBST(LIBXML_LIBS)
dnl ===
-dnl Checks for MacOS platform SDK. Default is 10.7
+dnl Checks for a MacOS platform SDK which supports a OSX 10.7 deployment target
dnl ===
if test "$_os" = "Darwin"; then
- AC_MSG_CHECKING([checking MacOS platform SDK])
- sdk_version=10.7
+ sdk_target=10.7
+ AC_MSG_CHECKING([checking SDK compatiblity with OSX $sdk_target])
- if test -n "$with_macosx_sdk_version"; then
- sdk_version=$with_macosx_sdk_version
- fi
-
- sdk_minor=`echo $sdk_version | cut -d"." -f2`
+ sdk_minor=`echo $sdk_target | cut -d"." -f2`
if test "$sdk_minor" -lt "7"; then
AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
else
AC_MSG_RESULT([yes])
- if test "$sdk_minor" -ge "7"; then
- MACOSX_DEPLOYMENT_TARGET=$sdk_version
+ MACOSX_DEPLOYMENT_TARGET=$sdk_target
+
+ AC_MSG_CHECKING([for SDKs compatible with $MACOSX_DEPLOYMENT_TARGET])
+ sdk_found=`xcodebuild -showsdks | grep "sdk macosx10.[[789]]" | sed -e
"s/.*sdk //" | head -n1`
+ if test -z "$sdk_found"; then
+ AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
fi
- sdk_path=`xcodebuild -version -sdk macosx$MACOSX_DEPLOYMENT_TARGET Path`
+ sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
AC_MSG_CHECKING([for $sdk_path])
if test -d "$sdk_path"; then
AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([No proper MacOS platform SDK, not found])
+ AC_MSG_ERROR([MacOS SDK $sdk_found is not available at $sdk_path])
fi
MACOSX_SDK_PATH=$sdk_path
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/pagerelsize.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 +-
writerfilter/source/dmapper/GraphicImport.cxx | 22 ++
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit da5b9bc95c32bd233595a28bd276f8ed1f4fc859
Author: Miklos Vajna
Date: Thu Jan 30 14:33:44 2014 +0100
DOCX import of wp14:sizeRelH/V relativeFrom="page"
Change-Id: Idd9dcc60f415081cb7a727b46a89d45af04465d0
diff --git a/sw/qa/extras/ooxmlimport/data/pagerelsize.docx
b/sw/qa/extras/ooxmlimport/data/pagerelsize.docx
new file mode 100755
index 000..3b6c1ff
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/pagerelsize.docx
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ab69ced..bfcaa26 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1734,9 +1734,21 @@ DECLARE_OOXMLIMPORT_TEST(testDMLGroupshapeSdt,
"dml-groupshape-sdt.docx")
// The text in the groupshape was missing due to the w:sdt and
w:sdtContent wrapper around it.
CPPUNIT_ASSERT_EQUAL(OUString("sdt and sdtContent inside groupshape"),
uno::Reference(xGroupShape->getByIndex(1),
uno::UNO_QUERY)->getString());
}
-#endif
+DECLARE_OOXMLIMPORT_TEST(testPageRelSize, "pagerelsize.docx")
+{
+// First textframe: width is relative from page, but not height.
+uno::Reference xTextFrame = getShape(1);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty(xTextFrame, "RelativeWidthRelation"));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getProperty(xTextFrame, "RelativeHeightRelation"));
+// Second textframe: height is relative from page, but not height.
+xTextFrame = getShape(2);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty(xTextFrame, "RelativeHeightRelation"));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getProperty(xTextFrame, "RelativeWidthRelation"));
+}
+
+#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 7f2079a..2f7cfd0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -739,6 +739,17 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
{
case NS_ooxml::LN_ST_SizeRelFromH_margin:
break;
+case NS_ooxml::LN_ST_SizeRelFromH_page:
+if (m_xShape.is())
+{
+uno::Reference
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
+if
(xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
+{
+uno::Reference
xPropertySet(m_xShape, uno::UNO_QUERY);
+
xPropertySet->setPropertyValue("RelativeWidthRelation",
uno::makeAny(text::RelOrientation::PAGE_FRAME));
+}
+}
+break;
default:
SAL_WARN("writerfilter", "GraphicImport::lcl_attribute:
unhandled NS_ooxml::LN_CT_SizeRelH_relativeFrom value: " << nIntValue);
break;
@@ -751,6 +762,17 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
{
case NS_ooxml::LN_ST_SizeRelFromV_margin:
break;
+case NS_ooxml::LN_ST_SizeRelFromV_page:
+if (m_xShape.is())
+{
+uno::Reference
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
+if
(xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
+{
+uno::Reference
xPropertySet(m_xShape, uno::UNO_QUERY);
+
xPropertySet->setPropertyValue("RelativeHeightRelation",
uno::makeAny(text::RelOrientation::PAGE_FRAME));
+}
+}
+break;
default:
SAL_WARN("writerfilter", "GraphicImport::lcl_attribute:
unhandled NS_ooxml::LN_CT_SizeRelV_relativeFrom value: " << nIntValue);
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source lingucomponent/source linguistic/source
cui/source/options/optdict.cxx| 19
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 28 ---
linguistic/source/dicimp.cxx | 29 ++-
linguistic/source/hyphdsp.cxx | 70 +-
linguistic/source/misc.cxx|4 -
5 files changed, 118 insertions(+), 32 deletions(-)
New commits:
commit e63923b0334ae381e0fcc576a6b6e08a62e657cf
Author: László Németh
Date: Thu Jan 30 14:56:30 2014 +0100
fdo#44314 non-standard hyphenation at soft hyphens + with pers. dic.
Change-Id: I25e7c13036c6ce1948cc33d45901ef69a258fb03
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index ba626c4..af00987 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -54,6 +54,23 @@ static long nStaticTabs[]=
static OUString getNormDicEntry_Impl(const OUString &rText)
{
OUString aTmp(comphelper::string::stripEnd(rText, '.'));
+// non-standard hyphenation
+if (aTmp.indexOf('[') > -1)
+{
+OUStringBuffer aTmp2 ( aTmp.getLength() );
+sal_Bool bSkip = sal_False;
+for (sal_Int32 i = 0; i < aTmp.getLength(); i++)
+{
+sal_Unicode cTmp = aTmp[i];
+if (cTmp == '[')
+bSkip = sal_True;
+else if (!bSkip)
+aTmp2.append( cTmp );
+else if (cTmp == ']')
+bSkip = sal_False;
+}
+aTmp = aTmp2.makeStringAndClear();
+}
return comphelper::string::remove(aTmp, '=');
}
@@ -68,7 +85,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1,
const OUString &rTex
eRes = CDE_EQUAL;
else
{ // similar = equal up to trailing '.' and hyphenation positions
-// marked with '='
+// marked with '=' and '[' + alternative spelling pattern + ']'
if (getNormDicEntry_Impl( rText1 ) == getNormDicEntry_Impl( rText2 ))
eRes = CDE_SIMILAR;
}
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 64fe545..1cb7996 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -508,16 +508,22 @@ Reference< XHyphenatedWord > SAL_CALL
Hyphenator::hyphenate( const OUString& aWo
Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
-const OUString& /*aWord*/,
-const ::com::sun::star::lang::Locale& /*aLocale*/,
-sal_Int16 /*nIndex*/,
-const ::com::sun::star::beans::PropertyValues& /*aProperties*/ )
+const OUString& aWord,
+const ::com::sun::star::lang::Locale& aLocale,
+sal_Int16 nIndex,
+const ::com::sun::star::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
{
- /* alternative spelling isn't supported by tex dictionaries */
- /* XXX: OOo's extended libhjn algorithm can support alternative spellings
with extended TeX dic. */
- /* TASK: implement queryAlternativeSpelling() */
- return NULL;
+// FIXME: multiple character change, eg. briddzsel -> bridzs-dzsel is not
supported,
+// because Writer has got a layout problem here.
+// Firstly we allow only one plus character before the hyphen to avoid to
miss the right break point:
+for (int extrachar = 1; extrachar < 2; extrachar++) // temporarily i < 2
instead of i <= 2
+{
+Reference< XHyphenatedWord > xRes = hyphenate(aWord, aLocale, nIndex +
1 + extrachar, aProperties);
+if (xRes.is() && xRes->isAlternativeSpelling() &&
xRes->getHyphenationPos() == nIndex)
+return xRes;
+}
+return NULL;
}
Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens(
const OUString& aWord,
@@ -658,7 +664,7 @@ Reference< XPossibleHyphens > SAL_CALL
Hyphenator::createPossibleHyphens( const
for ( i = 0; i < encWord.getLength(); i++)
{
-if (hyphens[i]&1 && (!rep || !rep[i]))
+if (hyphens[i]&1)
nHyphCount++;
}
@@ -670,8 +676,8 @@ Reference< XPossibleHyphens > SAL_CALL
Hyphenator::createPossibleHyphens( const
for (i = 0; i < nWord.getLength(); i++)
{
hyphenatedWordBuffer.append(aWord[i]);
-// hyphenation position (not alternative)
-if (hyphens[i]&1 && (!rep || !rep[i]))
+// hyphenation position
+if (hyphens[i]&1)
{
pPos[nHyphCount] = i;
hyphenatedWordBuffer.append('=');
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index f50c942..1306253 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -550,24 +550,37 @@ int DictionaryNeo::cmpDicEntry(const OUString& rWord1,
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/literaltoboolconversion.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1aa702861694fb114403b3f2746a33eb315ed87 Author: Noel Grandin Date: Thu Jan 30 15:37:52 2014 +0200 literaltobool conversion plugin, reduce spurious warnings with clang 3.3 It appears that clang 3.3 also generates spurious warnings, so adjust the ifdef Change-Id: Idb57f7eafd55effd4c7c8b1f96c03c2ea6ddaba3 diff --git a/compilerplugins/clang/literaltoboolconversion.cxx b/compilerplugins/clang/literaltoboolconversion.cxx index 5c61647..d156e9b 100644 --- a/compilerplugins/clang/literaltoboolconversion.cxx +++ b/compilerplugins/clang/literaltoboolconversion.cxx @@ -121,7 +121,7 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr( // // as "implicit conversion (IntegralToBoolean) of null pointer constant of type // 'std::size_t' (aka 'unsigned long') to 'bool'": -#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 +#if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3 } else if (sub->isNullPointerConstant( compiler.getASTContext(), Expr::NPC_ValueDependentIsNull) != Expr::NPCK_NotNull) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/databasedocument.cxx | 27 ---
1 file changed, 12 insertions(+), 15 deletions(-)
New commits:
commit ce445c50d64062ea1476404a226c369aa96fd1fa
Author: Lionel Elie Mamane
Date: Thu Jan 30 14:36:17 2014 +0100
merge property map for import and export
why would they ever need to be different?
There was maybe/probably a bug lurking behind their being different.
Change-Id: I5db7f1596aec0d2a504ec7901c001054fd7fd121
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 37e4688..7cf642b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -481,20 +481,25 @@ void ODatabaseDocument::impl_reset_nothrow()
m_pImpl->m_bDocumentReadOnly = sal_False;
}
-void ODatabaseDocument::impl_import_nolck_throw( const Reference<
XComponentContext >& _rContext, const Reference< XInterface >&
_rxTargetComponent,
- const
::comphelper::NamedValueCollection& _rResource )
+namespace
{
-Sequence< Any > aFilterCreationArgs;
-Reference< XStatusIndicator > xStatusIndicator;
-lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator,
aFilterCreationArgs );
-
-/** property map for import info set */
+/** property map for import/exmport info set */
comphelper::PropertyMapEntry const aExportInfoMap[] =
{
{ OUString("BaseURI"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0),
beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
+}
+
+void ODatabaseDocument::impl_import_nolck_throw( const Reference<
XComponentContext >& _rContext, const Reference< XInterface >&
_rxTargetComponent,
+ const
::comphelper::NamedValueCollection& _rResource )
+{
+Sequence< Any > aFilterCreationArgs;
+Reference< XStatusIndicator > xStatusIndicator;
+lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator,
aFilterCreationArgs );
+
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
xInfoSet->setPropertyValue("BaseURI",
uno::makeAny(_rResource.getOrDefault("URL",OUString(;
xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("content.xml")));
@@ -1606,14 +1611,6 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
Sequence< Any > aDelegatorArguments;
lcl_extractStatusIndicator( _rMediaDescriptor, aDelegatorArguments );
-/** property map for export info set */
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ OUString("BaseURI"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("StreamName"), 0, ::getCppuType( (OUString *)0
),beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(), 0, css::uno::Type(), 0, 0 }
-};
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
SvtSaveOptions aSaveOpt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 88eee0c3d591b210257298f3fd094727bd0dc05e
Author: Lionel Elie Mamane
Date: Thu Jan 30 06:07:56 2014 +0100
fdo#74160 firebird XParameters::setString truncate to 65535 characters
as opposed to 17 characters
Change-Id: I65c82243946c22eee0f033977b1cd0c5a84d226b
Reviewed-on: https://gerrit.libreoffice.org/7745
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 128f357..739f18a 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -208,10 +208,11 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
nParameterIndex,
switch (dtype) {
case SQL_VARYING:
{
+const sal_Int32 max_varchar_len = 0x;
// First 2 bytes indicate string size
-if (str.getLength() > (2^16)-1)
+if (str.getLength() > max_varchar_len)
{
-str = str.copy(0, (2^16)-1);
+str = str.copy(0, max_varchar_len);
}
const short nLength = str.getLength();
memcpy(pVar->sqldata, &nLength, 2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/odfexport/odfexport.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5013d67f0d2cc8bec46e76932a5f58d913962d7a
Author: Miklos Vajna
Date: Thu Jan 30 13:54:54 2014 +0100
swpagerelsize: add layout tests
Change-Id: I0c5b606518ce782ffb5e48a859910c4e9e09c76d
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 333f00d..c2e5c0c 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -318,6 +318,9 @@ DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty(xTextFrame, "RelativeHeightRelation"));
// Make sure rel-height-rel doesn't affect width.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getProperty(xTextFrame, "RelativeWidthRelation"));
+
+// This was 2601, 20% height was relative from margin, not page.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3168),
parseDump("/root/page/body/txt/anchored/fly/infos/bounds", "height").toInt32());
}
DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
@@ -327,6 +330,9 @@ DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty(xTextFrame, "RelativeWidthRelation"));
// Make sure rel-width-rel doesn't affect height.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getProperty(xTextFrame, "RelativeHeightRelation"));
+
+// This was 3762, 40% width was relative from margin, not page.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4896),
parseDump("/root/page/body/txt/anchored/fly/infos/bounds", "width").toInt32());
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source forms/source svx/source sw/source vcl/inc
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |4 ++--
forms/source/runtime/formoperations.cxx |2 +-
svx/source/dialog/imapdlg.cxx |2 +-
svx/source/inc/fmcontrolbordermanager.hxx |4 ++--
svx/source/inc/formcontroller.hxx |2 +-
sw/source/ui/app/swmodul1.cxx |2 +-
vcl/inc/osx/saldata.hxx |2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 45befb368528a0c273b695e37d53a56ab90503e5
Author: Michael Stahl
Date: Thu Jan 30 14:01:15 2014 +0100
"stati" considered both pretentious and incorrect Latin
As one knows, the Latin plural of the noun status is statūs.
Change-Id: I6b19c57aa2aedcc1337736becc93d8802fe03f2e
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 00d0059..ea0a64e 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -64,8 +64,8 @@ namespace
{
/** helper class for graphic context
-This class allows to hold a complete status of classic
-VCL OutputDevice stati. This data is needed for correct
+This class allows to hold a complete representation of classic
+VCL OutputDevice state. This data is needed for correct
interpretation of the MetaFile action flow.
*/
class PropertyHolder
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index aee7e6a..5cdeddf4 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -707,7 +707,7 @@ namespace frm
if ( bCanInsert )
m_xUpdateCursor->moveToInsertRow();
else
-// move record to update stati
+// move record to update status
m_xCursor->first();
}
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 11d0cba..c873f6a 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -763,7 +763,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
aTbxIMapDlg1.EnableItem( TBI_POLY, bDrawEnabled );
aTbxIMapDlg1.EnableItem( TBI_FREEPOLY, bDrawEnabled );
-// BezierEditor-Stati
+// BezierEditor State
aTbxIMapDlg1.EnableItem( TBI_POLYEDIT, bPolyEdit );
aTbxIMapDlg1.EnableItem( TBI_POLYMOVE, !bDrawEnabled );
aTbxIMapDlg1.EnableItem( TBI_POLYINSERT, !bDrawEnabled );
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx
b/svx/source/inc/fmcontrolbordermanager.hxx
index 6d90b75..0886ec9 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -186,7 +186,7 @@ namespace svxform
voidrestoreAll();
private:
-/** called when a control got one of the two possible stati (focused,
and hovered with the mouse)
+/** called when a control got one of the two possible statuses
(focused, and hovered with the mouse)
@param _rxControl
the control which gained the status
@param _rControlData
@@ -197,7 +197,7 @@ namespace svxform
ControlData& _rControlData
) SAL_THROW(());
-/** called when a control lost one of the two possible stati (focused,
and hovered with the mouse)
+/** called when a control lost one of the two possible statuses
(focused, and hovered with the mouse)
@param _rxControl
the control which lost the status
@param _rControlData
diff --git a/svx/source/inc/formcontroller.hxx
b/svx/source/inc/formcontroller.hxx
index c74d7e5..62e178d 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -319,7 +319,7 @@ namespace svxform
// XGridControlListener
virtual void SAL_CALL columnChanged( const
::com::sun::star::lang::EventObject& _event ) throw
(::com::sun::star::uno::RuntimeException);
-// ::com::sun::star::beans::XPropertyChangeListener -> aenderung der stati
+// ::com::sun::star::beans::XPropertyChangeListener -> change of states
virtual void SAL_CALL propertyChange(const
::com::sun::star::beans::PropertyChangeEvent& evt) throw(
::com::sun::star::uno::RuntimeException );
// XTextListener -> modify setzen
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 73fe0a1..7469e6c 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -577,7 +577,7 @@ sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
return static_cast< sal_uInt16 >(pPref->GetMetric());
}
-// Pass-through Update-Stati
+// Pass-thro
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a750bb73502cc74980d1bd4e3cbabf6214c65c0d
Author: Winfried Donkers
Date: Mon Jan 13 15:52:23 2014 +0100
fdo#71810 make argument names consistent with Gnumeric and Excel
Using "Number" as name for both argument 1 and 2 can be confusing, too.
Change-Id: I9fcc7cdfd32b0549a8df9d32c03f4207c040401c
Reviewed-on: https://gerrit.libreoffice.org/7408
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index ac97442..45fe3d2 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -11321,7 +11321,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 2 // Name of Parameter 1
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number1" ;
};
String 3 // Description of Parameter 1
{
@@ -11329,7 +11329,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 4 // Name of Parameter 2
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number2" ;
};
String 5 // Description of Parameter 2
{
@@ -11352,7 +11352,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 2 // Name of Parameter 1
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number1" ;
};
String 3 // Description of Parameter 1
{
@@ -11360,7 +11360,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 4 // Name of Parameter 2
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number2" ;
};
String 5 // Description of Parameter 2
{
@@ -11383,7 +11383,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 2 // Name of Parameter 1
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number1" ;
};
String 3 // Description of Parameter 1
{
@@ -11391,7 +11391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 4 // Name of Parameter 2
{
-Text [ en-US ] = "Number" ;
+Text [ en-US ] = "Number2" ;
};
String 5 // Description of Parameter 2
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rsc
include/rsc/rsc-vcl-shared-types.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7cd53eeb7fa56f248c8189c14da25da6afa9e4cb
Author: Michael Stahl
Date: Thu Jan 30 13:47:48 2014 +0100
vcl: another missing sal/types.h
Change-Id: I2a7610d6ae41b9351fbe8dc18f6306f26d03e326
diff --git a/include/rsc/rsc-vcl-shared-types.hxx
b/include/rsc/rsc-vcl-shared-types.hxx
index 81048e0..f8090b3 100644
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX
#define INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX
+#include
+
enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS,
TimeFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 56
include/formula/compiler.hrc | 10
include/formula/opcode.hxx |8
sc/inc/helpids.h |8
sc/qa/unit/subsequent_filters-test.cxx | 16 -
sc/qa/unit/ucalc.cxx |8
sc/source/core/inc/interpre.hxx|9
sc/source/core/tool/interpr3.cxx | 301 +
sc/source/core/tool/interpr4.cxx | 14 -
sc/source/filter/excel/xlformula.cxx | 90 ---
sc/source/filter/oox/formulabase.cxx | 10
sc/source/ui/src/scfuncs.src | 288 +++
12 files changed, 626 insertions(+), 192 deletions(-)
New commits:
commit 8185ecf65addcd0c10eda6863a849e39b93684d3
Author: Winfried Donkers
Date: Wed Jan 8 17:15:22 2014 +0100
fdo#73146 Add Excel 2010 functions
PERCENTILE.EXC, PERCENTILE.INC
PERCENTRANK.EXC, PERCENTRANK.INC
QUARTILE.EXC, QUARTILE.INC
RANK.EQ, RANK.AVG
Function ScInterpreter::ScRank() has been rewritten to give the function
the same way of computing as the related functions in this patch.
Change-Id: If3096b265bd47ca5f4afcab7ff746f7c8511df82
Reviewed-on: https://gerrit.libreoffice.org/7319
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 4f74441..d3b3ea3 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -319,6 +319,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_RANK { Text = "RANK" ; };
String SC_OPCODE_PERCENTILE { Text = "PERCENTILE" ; };
String SC_OPCODE_PERCENT_RANK { Text = "PERCENTRANK" ; };
+String SC_OPCODE_PERCENTILE_INC { Text = "COM.MICROSOFT.PERCENTILE.INC" ;
};
+String SC_OPCODE_PERCENT_RANK_INC { Text = "COM.MICROSOFT.PERCENTRANK.INC"
; };
+String SC_OPCODE_QUARTILE_INC { Text = "COM.MICROSOFT.QUARTILE.INC" ; };
+String SC_OPCODE_RANK_EQ { Text = "COM.MICROSOFT.RANK.EQ" ; };
+String SC_OPCODE_PERCENTILE_EXC { Text = "COM.MICROSOFT.PERCENTILE.EXC" ;
};
+String SC_OPCODE_PERCENT_RANK_EXC { Text = "COM.MICROSOFT.PERCENTRANK.EXC"
; };
+String SC_OPCODE_QUARTILE_EXC { Text = "COM.MICROSOFT.QUARTILE.EXC" ; };
+String SC_OPCODE_RANK_AVG { Text = "COM.MICROSOFT.RANK.AVG" ; };
String SC_OPCODE_LARGE { Text = "LARGE" ; };
String SC_OPCODE_SMALL { Text = "SMALL" ; };
String SC_OPCODE_FREQUENCY { Text = "FREQUENCY" ; };
@@ -705,6 +713,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_RANK { Text = "RANK" ; };
String SC_OPCODE_PERCENTILE { Text = "PERCENTILE" ; };
String SC_OPCODE_PERCENT_RANK { Text = "PERCENTRANK" ; };
+String SC_OPCODE_PERCENTILE_INC { Text = "_xlfn.PERCENTILE.INC" ; };
+String SC_OPCODE_PERCENT_RANK_INC { Text = "_xlfn.PERCENTRANK.INC" ; };
+String SC_OPCODE_QUARTILE_INC { Text = "_xlfn.QUARTILE.INC" ; };
+String SC_OPCODE_RANK_EQ { Text = "_xlfn.RANK.EQ" ; };
+String SC_OPCODE_PERCENTILE_EXC { Text = "_xlfn.PERCENTILE.EXC" ; };
+String SC_OPCODE_PERCENT_RANK_EXC { Text = "_xlfn.PERCENTRANK.EXC" ; };
+String SC_OPCODE_QUARTILE_EXC { Text = "_xlfn.QUARTILE.EXC" ; };
+String SC_OPCODE_RANK_AVG { Text = "_xlfn.RANK.AVG" ; };
String SC_OPCODE_LARGE { Text = "LARGE" ; };
String SC_OPCODE_SMALL { Text = "SMALL" ; };
String SC_OPCODE_FREQUENCY { Text = "FREQUENCY" ; };
@@ -1093,6 +1109,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_RANK { Text = "RANK" ; };
String SC_OPCODE_PERCENTILE { Text = "PERCENTILE" ; };
String SC_OPCODE_PERCENT_RANK { Text = "PERCENTRANK" ; };
+String SC_OPCODE_PERCENTILE_INC { Text = "PERCENTILE.INC" ; };
+String SC_OPCODE_PERCENT_RANK_INC { Text = "PERCENTRANK.INC" ; };
+String SC_OPCODE_QUARTILE_INC { Text = "QUARTILE.INC" ; };
+String SC_OPCODE_RANK_EQ { Text = "RANK.EQ" ; };
+String SC_OPCODE_PERCENTILE_EXC { Text = "PERCENTILE.EXC" ; };
+String SC_OPCODE_PERCENT_RANK_EXC { Text = "PERCENTRANK.EXC" ; };
+String SC_OPCODE_QUARTILE_EXC { Text = "QUARTILE.EXC" ; };
+String SC_OPCODE_RANK_AVG { Text = "RANK.AVG" ; };
String SC_OPCODE_LARGE { Text = "LARGE" ; };
String SC_OPCODE_SMALL { Text = "SMALL" ; };
String SC_OPCODE_FREQUENCY { Text = "FREQUENCY" ; };
@@ -2297,6 +2321,38 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "PERCENTRANK" ;
};
+String SC_OPCODE_PERCENTILE_INC
+{
+Text [ en-US ] = "PERCENTILE.INC" ;
+};
+String SC_OPCODE_PERCENT_RANK_INC
+{
+Text [ en-US ] = "PERCENTRANK.INC" ;
+};
+String SC_OPCODE_QUARTILE_INC
+{
+Text [ en-US ] = "QUARTILE.INC" ;
+};
+String SC_OPCODE_RANK_EQ
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ---
1 file changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 6ba4ad5b475eb54002ab2b820d0b327b3961a17e
Author: Andrzej Hunt
Date: Wed Jan 29 18:40:21 2014 +
EMF+: Only draw endcap outline if not filled, fix endcap scaling.
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971
Reviewed-on: https://gerrit.libreoffice.org/7726
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040)
Reviewed-on: https://gerrit.libreoffice.org/7743
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2855c5b..3a95717 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1333,29 +1333,27 @@ namespace cppcanvas
if (!rLineCap.count())
return 0.0;
-// it seems the line caps in EMF+ are 4*larger than what
-// LibreOffice expects, and the mapping in
-// createAreaGeometryForLineStartEnd scales that down, so
-// correct it
-// [unfortunately found no proof for this in the spec :-( - please
-// feel free to correct this if it causes trouble]
-double fWidth = rAttributes.StrokeWidth*4;
-
+// createAreaGeometryForLineStartEnd normalises the arrows height
+// before scaling (i.e. scales down by rPolygon.height), hence
+// we pre-scale it (which means we can avoid changing the logic
+// that would affect arrows rendered outside of EMF+).
+const double fWidth =
rAttributes.StrokeWidth*rLineCap.getB2DRange().getWidth();
+
+// When drawing an outline (as opposed to a filled endCap), we also
+// need to take account that the brush width also adds to the area
+// of the polygon.
+const double fShift = bIsFilled ? 0 : rAttributes.StrokeWidth;
+double fConsumed = 0;
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
+fWidth, fPolyLength, 0, &fConsumed, fShift));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
aArrow.setClosed(rLineCap.isClosed());
-ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
-if (pAction)
-{
-maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
-rParms.mrCurrActionIndex += pAction->getActionCount()-1;
-}
-
+// If the endcap is filled, we draw ONLY the filling, if it isn't
+// filled we draw ONLY the outline, but never both.
if (bIsFilled)
{
bool bWasFillColorSet = rState.isFillColorSet;
@@ -1369,8 +1367,25 @@ namespace cppcanvas
}
rState.isFillColorSet = bWasFillColorSet;
}
+else
+{
+ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
+if (pAction)
+{
+maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
+rParms.mrCurrActionIndex += pAction->getActionCount()-1;
+}
+}
-return rAttributes.StrokeWidth;
+// There isn't any clear definition of how far the line should
extend
+// for arrows, however the following values seem to give best
results
+// (fConsumed/2 draws the line to the center-point of the endcap
+// for filled caps -- however it is likely this will need to be
+// changed once we start taking baseInset into account).
+if (bIsFilled)
+return fConsumed/2;
+else
+return rAttributes.StrokeWidth;
}
void ImplRenderer::EMFPPlusDrawPolygon (const
::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ---
1 file changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 2d0b2cb6b7ca48663d09118acfb01a1dd194a1e1
Author: Andrzej Hunt
Date: Wed Jan 29 18:40:21 2014 +
EMF+: Only draw endcap outline if not filled, fix endcap scaling.
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971
Reviewed-on: https://gerrit.libreoffice.org/7726
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040)
Reviewed-on: https://gerrit.libreoffice.org/7742
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7614bbb..cb0a37b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1336,29 +1336,27 @@ namespace cppcanvas
if (!rLineCap.count())
return 0.0;
-// it seems the line caps in EMF+ are 4*larger than what
-// LibreOffice expects, and the mapping in
-// createAreaGeometryForLineStartEnd scales that down, so
-// correct it
-// [unfortunately found no proof for this in the spec :-( - please
-// feel free to correct this if it causes trouble]
-double fWidth = rAttributes.StrokeWidth*4;
-
+// createAreaGeometryForLineStartEnd normalises the arrows height
+// before scaling (i.e. scales down by rPolygon.height), hence
+// we pre-scale it (which means we can avoid changing the logic
+// that would affect arrows rendered outside of EMF+).
+const double fWidth =
rAttributes.StrokeWidth*rLineCap.getB2DRange().getWidth();
+
+// When drawing an outline (as opposed to a filled endCap), we also
+// need to take account that the brush width also adds to the area
+// of the polygon.
+const double fShift = bIsFilled ? 0 : rAttributes.StrokeWidth;
+double fConsumed = 0;
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
+fWidth, fPolyLength, 0, &fConsumed, fShift));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
aArrow.setClosed(rLineCap.isClosed());
-ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
-if (pAction)
-{
-maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
-rParms.mrCurrActionIndex += pAction->getActionCount()-1;
-}
-
+// If the endcap is filled, we draw ONLY the filling, if it isn't
+// filled we draw ONLY the outline, but never both.
if (bIsFilled)
{
bool bWasFillColorSet = rState.isFillColorSet;
@@ -1372,8 +1370,25 @@ namespace cppcanvas
}
rState.isFillColorSet = bWasFillColorSet;
}
+else
+{
+ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
+if (pAction)
+{
+maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
+rParms.mrCurrActionIndex += pAction->getActionCount()-1;
+}
+}
-return rAttributes.StrokeWidth;
+// There isn't any clear definition of how far the line should
extend
+// for arrows, however the following values seem to give best
results
+// (fConsumed/2 draws the line to the center-point of the endcap
+// for filled caps -- however it is likely this will need to be
+// changed once we start taking baseInset into account).
+if (bIsFilled)
+return fConsumed/2;
+else
+return rAttributes.StrokeWidth;
}
void ImplRenderer::EMFPPlusDrawPolygon (const
::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5115e33e4c5e49e9b79ed32fccc193a99c3dc30
Author: Faisal M. Al-Otaibi
Date: Wed Jan 29 12:49:42 2014 +0300
fdo#73869 fix highlight RTL Problem at the StartCenter window.
Change-Id: I744d8f85c6e4c555ef8916281ebdc709fe6ddfa9
Reviewed-on: https://gerrit.libreoffice.org/7719
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 06f5800..eda19f0 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -86,7 +86,7 @@ ThumbnailView::~ThumbnailView()
void ThumbnailView::MouseMove(const MouseEvent& rMEvt)
{
size_t nItemCount = mFilteredItemList.size();
-Point aPoint = GetPointerState().maPos;
+Point aPoint = rMEvt.GetPosPixel();
OUString aHelp;
for (size_t i = 0; i < nItemCount; i++)
___
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/text/SvxSBFontNameBox.hxx |5
svx/source/sidebar/text/TextPropertyPanel.cxx| 592 +--
svx/source/sidebar/text/TextPropertyPanel.hrc|4
svx/source/sidebar/text/TextPropertyPanel.hxx| 39 -
svx/source/sidebar/text/TextPropertyPanel.src| 22
svx/source/sidebar/text/TextUnderlineControl.cxx |1
svx/source/sidebar/text/TextUnderlinePopup.cxx |2
7 files changed, 42 insertions(+), 623 deletions(-)
New commits:
commit bc46764f12947cbe8d46e03450f181d449c020f4
Author: Maxim Monastirsky
Date: Mon Jan 27 13:58:41 2014 +0200
Sidebar Text panel cleanup
Change-Id: I6cbf5a9e5ad9d61df2abbcc835ba60d45768deeb
Reviewed-on: https://gerrit.libreoffice.org/7687
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index e8db278..6724b9f 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -22,11 +22,6 @@
#include
#include
-namespace svx
-{
-class ToolboxButtonColorUpdater;
-}
-
namespace svx { namespace sidebar {
class SvxSBFontNameBox : public FontNameBox//, public SfxListener
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 2ed39fc..1daedd6 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -22,17 +22,10 @@
#include "svx/dialmgr.hxx"
-#include
-#include
-#include
-#include
#include
#include
#include
-#include
-#include
#include
-#include
#include
#include
#include
@@ -46,14 +39,12 @@
#include
#include
-#include
#include
#include
#include "TextCharacterSpacingControl.hxx"
#include "TextCharacterSpacingPopup.hxx"
#include "TextUnderlineControl.hxx"
#include "TextUnderlinePopup.hxx"
-#include
#include
#include
@@ -64,17 +55,9 @@ using ::sfx2::sidebar::Theme;
using ::sfx2::sidebar::ControlFactory;
const char UNO_BACKCOLOR[] = ".uno:BackColor";
-const char UNO_BOLD[] = ".uno:Bold";
const char UNO_COLOR[] = ".uno:Color";
const char UNO_FONTCOLOR[] = ".uno:FontColor";
-const char UNO_GROW[] = ".uno:Grow";
-const char UNO_ITALIC[] = ".uno:Italic";
-const char UNO_STRIKEOUT[] = ".uno:Strikeout";
-const char UNO_SHADOWED[] = ".uno:Shadowed";
-const char UNO_SHRINK[] = ".uno:Shrink";
const char UNO_SPACING[] = ".uno:Spacing";
-const char UNO_SUBSCRIPT[] = ".uno:SubScript";
-const char UNO_SUPERSCRIPT[] = ".uno:SuperScript";
const char UNO_UNDERLINE[] = ".uno:Underline";
namespace svx { namespace sidebar {
@@ -127,26 +110,14 @@ TextPropertyPanel* TextPropertyPanel::Create (
return maSpacingControl;
}
-TextPropertyPanel::TextPropertyPanel ( Window* pParent, const
cssu::Reference& rxFrame, SfxBindings* pBindings, const
::sfx2::sidebar::EnumContext& rContext )
+TextPropertyPanel::TextPropertyPanel ( Window* pParent, const
cssu::Reference& rxFrame, SfxBindings* pBindings, const
::sfx2::sidebar::EnumContext& /*rContext*/ )
: PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui",
rxFrame),
maFontNameControl (SID_ATTR_CHAR_FONT,*pBindings, *this,
OUString("CharFontName"), rxFrame),
maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this,
OUString("FontHeight"), rxFrame),
-maWeightControl (SID_ATTR_CHAR_WEIGHT, *pBindings, *this,
OUString("Bold"), rxFrame),
-maItalicControl (SID_ATTR_CHAR_POSTURE, *pBindings, *this,
OUString("Italic"), rxFrame),
maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this,
OUString("Underline"),rxFrame),
-maStrikeControl (SID_ATTR_CHAR_STRIKEOUT, *pBindings, *this,
OUString("Strikeout"),rxFrame),
-maShadowControl (SID_ATTR_CHAR_SHADOWED,*pBindings, *this,
OUString("Shadowed"), rxFrame),
-maScriptControlSw (SID_ATTR_CHAR_ESCAPEMENT, *pBindings, *this,
OUString("Escapement"), rxFrame),
-maSuperScriptControl(SID_SET_SUPER_SCRIPT, *pBindings, *this,
OUString("SuperScript"), rxFrame),
-maSubScriptControl (SID_SET_SUB_SCRIPT,*pBindings, *this,
OUString("SubScript"),rxFrame),
maSpacingControl(SID_ATTR_CHAR_KERNING, *pBindings, *this,
OUString("Spacing"), rxFrame),
-maSDFontGrow(SID_GROW_FONT_SIZE,*pBindings, *this,
OUString("Grow"), rxFrame),
-maSDFontShrink (SID_SHRINK_FONT_SIZE, *pBindings, *this,
OUString("Shrink"), rxFrame),
-mpFontList (NULL),
-mbMustDelete(false),
mbFocusOnFontSizeCtrl(false),
-
maCharSpacePopup(this,
::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
maUnderlinePopup(this,
::boost::bind(&TextPropertyPanel::CreateUnd
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviews2.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 6733fdab220c67bfa41321c5b21ae162746dd8d8
Author: Maxim Monastirsky
Date: Mon Jan 27 01:38:05 2014 +0200
Subscript/Superscript also don't depend on args
Change-Id: Ie96876ae402d5497bf5a03bca54f63305ebd9914
Reviewed-on: https://gerrit.libreoffice.org/7676
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index f3347dde..dcf2839 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3027,7 +3027,6 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
}
break;
case SID_SET_SUB_SCRIPT:
-if( rReq.GetArgs() )
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
SvxEscapement eEsc = (SvxEscapement ) ( (const SvxEscapementItem&)
@@ -3040,7 +3039,6 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
}
break;
case SID_SET_SUPER_SCRIPT:
-if( rReq.GetArgs() )
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
SvxEscapement eEsc = (SvxEscapement ) ( (const SvxEscapementItem&)
@@ -3053,8 +3051,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
}
break;
case SID_SHRINK_FONT_SIZE:
-case SID_GROW_FONT_SIZE:
-//if (rReq.GetArgs())
+case SID_GROW_FONT_SIZE:
{
const SvxFontListItem* pFonts = dynamic_cast(GetDocSh()->GetItem( SID_ATTR_CHAR_FONTLIST ) );
const FontList* pFontList = pFonts->GetFontList();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - l10ntools/source sw/AllLangResTarget_sw.mk sw/source translations
l10ntools/source/localize.cxx |2 -
sw/AllLangResTarget_sw.mk |5
sw/source/ui/app/mn.src |2 -
sw/source/ui/inc/misc.hrc | 27 --
sw/source/ui/inc/redline_tmpl.hrc | 39 ++
sw/source/ui/lingu/olmenu.src |2 -
translations |2 -
7 files changed, 48 insertions(+), 31 deletions(-)
New commits:
commit 9c8b8bfb06e38c5afd2f8e3a633b5905f39f7ba7
Author: Andras Timar
Date: Mon Jan 27 22:37:05 2014 +0100
Updated core
Project: translations 952ba056d60e6e59513a61d90e4c9df19fe46d8a
fdo#74119 fix unlocalized redline menu
Change-Id: I82aac1a6af3d7e27feffa90b7617365c98d8e7e8
Reviewed-on: https://gerrit.libreoffice.org/7704
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/translations b/translations
index 0c7ce23..952ba05 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0c7ce2344438228bf57a34bbaaba299c94b60c00
+Subproject commit 952ba056d60e6e59513a61d90e4c9df19fe46d8a
commit 726914b6224bce818f6d88be62482653e837ac9c
Author: Andras Timar
Date: Mon Jan 27 22:27:24 2014 +0100
fdo#74119 fix unlocalized redline menu
Conflicts:
sw/AllLangResTarget_sw.mk
Change-Id: Ia4836a69ddd8bebe8cc21cea67be96b029388cb1
Reviewed-on: https://gerrit.libreoffice.org/7703
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 5bd55b4..b8f84d1 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -104,7 +104,7 @@ bool passesPositiveList(const OUString& rUrl) {
{ RTL_CONSTASCII_STRINGPARAM("/description.xml") },
{
RTL_CONSTASCII_STRINGPARAM("/android/sdremote/res/values/strings.xml") },
{ RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") },
-{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") }
+{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/redline_tmpl.hrc") }
};
return matchList(rUrl, list, SAL_N_ELEMENTS(list));
}
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f79cd4e..45a3e71 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \
-I$(call gb_SrsTemplateTarget_get_include_dir,) \
+-I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
@@ -123,4 +124,8 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/wrtsh/wrtsh.src \
))
+$(eval $(call gb_SrsTarget_add_templates,sw/res,\
+sw/source/ui/inc/redline_tmpl.hrc \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 7a762e9..eb5ee0e 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -24,7 +24,7 @@
#include "globals.hrc"
#include "helpid.h"
#include "popup.hrc"
-#include "misc.hrc"
+#include "redline.hrc"
/* - F O R M A T - */
#define SEPARATOR MenuItem { Separator = TRUE; }
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index ff20090..95113ff 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -21,7 +21,6 @@
#define _MISC_HRC
#include "rcid.hrc"
-#include "cmdid.h"
#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
@@ -56,32 +55,6 @@
#error Resource-Id Ueberlauf in #file, #line
#endif
-#define MN_EDIT_REDLINE \
-MenuItem\
-{ \
-Identifier = FN_REDLINE_ACCEPT_DIRECT;\
-HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;
\
-Text [ en-US ] = "Accept Change" ; \
-};\
-MenuItem\
-{ \
-Identifier = FN_REDLINE_REJECT_DIRECT ;
\
-HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;
\
-Text [ en-US ] = "Reject Change" ; \
-}; \
-MenuItem \
-{\
-Identifier = FN_REDLINE_NEXT_CHANGE; \
-HelpId = CMD_FN_REDLINE_NEXT_CHANGE ;\
-Text [ en-US ] = "Next Change" ;
[Libreoffice-commits] core.git: include/svx
include/svx/fmsearch.hxx | 15 ++-
include/svx/svdopath.hxx | 34 +-
2 files changed, 15 insertions(+), 34 deletions(-)
New commits:
commit a1d372085e77d587484821b64389f6fd3db3de96
Author: Sven Wehner
Date: Mon Jan 27 22:22:21 2014 +0100
fdo#39468 Translate German comments (include/svx/(fmsearch|svdopath).hxx)
In include/svx/fmsearch.hxx and include/svx/svdopath.hxx.
Also remove some ASCII art, and redundant comments.
Change-Id: I766150c9d80ec087525713783a483a7057a7130c
Reviewed-on: https://gerrit.libreoffice.org/7705
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index ce5a91c..68a02da 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -37,27 +37,24 @@ namespace com { namespace sun { namespace star {
}
}}}
-//
===
-// Hilfsmethoden
+// Helper methods
SVX_DLLPUBLIC sal_Bool IsSearchableControl( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl,
OUString* pCurrentText = NULL);
// check if the control has one of the interfaces we can use for searching
// *pCurrentText will be filled with the current text of the control (as
used when searching this control)
-//
===
-// Hilfsstrukturen
+
+// Helper structs
struct FmFoundRecordInformation
{
::com::sun::star::uno::Any aPosition; // bookmark of the record in
which the text was found
-sal_Int16 nFieldPos; // ditto : the relative position of the column
(in the string name of the field list in the constructor)
+sal_Int16 nFieldPos; // ditto: the relative position of the column
(in the string name of the field list in the constructor)
sal_Int16 nContext; // the context in which was searched and found
(if the current search knows several contexts)
};
-//
===
-// = struct FmSearchContext - information for the search in different contexts
-//
===
+// FmSearchContext - information for the search in different contexts
struct FmSearchContext
{
@@ -69,7 +66,7 @@ struct FmSearchContext
OUStringstrUsedFields; // a list of field names separeted
by ';'
::std::vector< css::uno::Reference< css::uno::XInterface > >
arrFields; // the corresponding text
interfaces for the fields in strUsedFields
-OUStringsFieldDisplayNames; // if not empty : names to
be displayed for the searchable fields (must have the same token count as
strUsedFields !)
+OUStringsFieldDisplayNames; // if not empty: names to
be displayed for the searchable fields (must have the same token count as
strUsedFields!)
};
#endif // INCLUDED_SVX_FMSEARCH_HXX
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index dcf229c..9acd5bf 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -25,18 +25,10 @@
#include
#include
-//
-// Vorausdeklarationen
-//
-
class ImpPathForDragAndCreate;
-//
-// Hilfsklasse SdrPathObjGeoData
-//
-// fuer Undo/Redo
-//
-//
+// Helper class SdrPathObjGeoData
+// used for undo/redo
class SdrPathObjGeoData : public SdrTextObjGeoData
{
@@ -48,9 +40,6 @@ public:
virtual ~SdrPathObjGeoData();
};
-//
-// SdrPathObj
-//
class SVX_DLLPUBLIC SdrPathObj : public SdrTextObj
{
@@ -70,7 +59,7 @@ protected:
double mdBrightness;
protected:
-// Hilfsfunktion fuer GET/SET/INS/etc. PNT
+// helper functions for GET, SET, INS etc. PNT
void ImpSetClosed(sal_Bool bClose);
void ImpForceKind();
void ImpForceLineWink();
@@ -138,11 +127,11 @@ public:
virtual Point GetPoint(sal_uInt32 nHdlNum) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum);
-// Punkt einfuegen
+// insert point
sal_uInt32 NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_Bool
bHideHim);
sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, sal_Bool bNewObj,
sal_Bool bHideHim);
-// An diesem Punkt auftrennen
+// rip at given point
SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNe
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #101 from Commit Notification --- Sven Wehner committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=a1d372085e77d587484821b64389f6fd3db3de96 fdo#39468 Translate German comments (include/svx/(fmsearch|svdopath).hxx) The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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/unx
vcl/unx/x11/x11sys.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 424e957ab51687ece4d69984c482e608089e0e6f
Author: Chris Sherlock
Date: Tue Jan 28 01:33:14 2014 +1100
Assert in X11SalSystem::GetDisplayScreenPosSizePixel
If we detect that the display is using Xinerama, then we shouldn't be
able to pick a screen more than the number of screens available!
Therefore, assert if we meet this condition.
Also remove a comment decoration.
Change-Id: Ic8d2e0acf3e65825b76472adbd4a355e5435b6df
Reviewed-on: https://gerrit.libreoffice.org/7694
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 6d6f5b9..7a08533 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -37,8 +37,6 @@ SalSystem* X11SalInstance::CreateSalSystem()
return new X11SalSystem();
}
-// ---
-
X11SalSystem::~X11SalSystem()
{
}
@@ -71,6 +69,10 @@ Rectangle X11SalSystem::GetDisplayScreenPosSizePixel(
unsigned int nScreen )
if( pSalDisp->IsXinerama() )
{
const std::vector< Rectangle >& rScreens =
pSalDisp->GetXineramaScreens();
+
+// we shouldn't be able to pick a screen > number of screens available
+assert(nScreen < rScreens.size() );
+
if( nScreen < rScreens.size() )
aRet = rScreens[nScreen];
}
@@ -154,5 +156,4 @@ int X11SalSystem::ShowNativeDialog( const OUString& rTitle,
const OUString& rMes
return nRet;
}
-
/* 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: sw/source
sw/source/ui/shells/txtattr.cxx | 71 +---
1 file changed, 31 insertions(+), 40 deletions(-)
New commits:
commit 535c4c01b6d9e6341464d48077917fb7a5c242bb
Author: Maxim Monastirsky
Date: Thu Jan 30 11:02:53 2014 +0200
Disable Increase/Decrease buttons when limits are reached
And simplify the code:
- Use sal_uInt32 directly, without useless casting to SwTwips.
- Check for slot id directly, without an additional variable.
- Remove the redundant loop.
Change-Id: Ica76a166c88213cdd39e44482ce834d3555afb60
Reviewed-on: https://gerrit.libreoffice.org/7654
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 2059b5c..1451982 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -55,8 +55,8 @@
#include
#include "swabstdlg.hxx"
#include "chrdlg.hrc"
-const SwTwips lFontInc = 40;// 2pt
-const SwTwips lFontMaxSz = 19998; // 999.9pt
+const sal_uInt32 nFontInc = 40; // 2pt
+const sal_uInt32 nFontMaxSz = 19998; // 999.9pt
@@ -174,7 +174,6 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
sal_uInt16 nSlot = rReq.GetSlot();
const SfxItemSet* pArgs = rReq.GetArgs();
bool bArgs = pArgs != 0 && pArgs->Count() > 0;
-int bGrow = sal_False;
SwWrtShell& rWrtSh = GetShell();
SwTxtFmtColl* pColl = 0;
@@ -220,49 +219,30 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
break;
case FN_GROW_FONT_SIZE:
-bGrow = sal_True;
-// No break !!
case FN_SHRINK_FONT_SIZE:
{
SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, rPool );
rWrtSh.GetCurAttr( aSetItem.GetItemSet() );
SfxItemSet aAttrSet( rPool, aSetItem.GetItemSet().GetRanges() );
-const SfxPoolItem* pI;
-static const sal_uInt16 aScrTypes[] = {
-SCRIPTTYPE_LATIN, SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX, 0 };
-sal_uInt16 nScriptType = rWrtSh.GetScriptType();
-for( const sal_uInt16* pScrpTyp = aScrTypes; *pScrpTyp; ++pScrpTyp
)
-if( ( nScriptType & *pScrpTyp ) &&
-0 != ( pI = aSetItem.GetItemOfScript( *pScrpTyp )))
-{
-SvxFontHeightItem aSize( *(const SvxFontHeightItem*)pI );
-SwTwips lSize = (SwTwips) aSize.GetHeight();
+sal_uInt16 nScriptTypes = rWrtSh.GetScriptType();
+SvxFontHeightItem aSize( *static_cast(
aSetItem.GetItemOfScript( nScriptTypes ) ) );
+sal_uInt32 nSize = aSize.GetHeight();
+
+if ( nSlot == FN_GROW_FONT_SIZE && ( nSize += nFontInc ) >
nFontMaxSz )
+nSize = nFontMaxSz;
+else if ( nSlot == FN_SHRINK_FONT_SIZE && ( nSize -= nFontInc ) <
nFontInc )
+nSize = nFontInc;
+
+aSize.SetHeight( nSize );
+aSetItem.PutItemForScriptType( nScriptTypes, aSize );
+aAttrSet.Put( aSetItem.GetItemSet() );
+
+if( pColl )
+pColl->SetFmtAttr( aAttrSet );
+else
+rWrtSh.SetAttrSet( aAttrSet );
-if ( bGrow )
-{
-if( lSize == lFontMaxSz )
-break; // That's all, further up is not
possible
-if( ( lSize += lFontInc ) > lFontMaxSz )
-lSize = lFontMaxSz;
-}
-else
-{
-if( lSize == lFontInc )
-break;
-if( ( lSize -= lFontInc ) < lFontInc )
-lSize = lFontInc;
-}
-aSize.SetHeight( lSize );
-aAttrSet.Put( aSize );
-}
-if( aAttrSet.Count() )
-{
-if( pColl )
-pColl->SetFmtAttr( aAttrSet );
-else
-rWrtSh.SetAttrSet( aAttrSet );
-}
rReq.Done();
}
break;
@@ -618,8 +598,19 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT,
*rSet.GetPool() );
aSetItem.GetItemSet().Put( aCoreSet, false );
-if( !aSetItem.GetItemOfScript( rSh.GetScriptType() ))
+const SvxFontHeightItem* aSize( static_cast(
+aSetItem.GetItemOfScript(
rSh.GetScriptType() ) ) );
+
+if( !aSize )
rSet.DisableItem( nSlot );
+else
+{
+sal_uInt32 nSize = aSize->GetHeight();
+if( nSize == nFontMaxSz )
+
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/sfxdefs.hxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 087e3dc82d832d56f4440d839b56e0c2cba057f2 Author: Michael Stahl Date: Thu Jan 30 12:39:46 2014 +0100 sfxdefs.hxx: include the header that declares the used sal types Change-Id: I1aeadbb0add8eae3e6b5ee46ce5524391862db57 diff --git a/include/sfx2/sfxdefs.hxx b/include/sfx2/sfxdefs.hxx index 0e92214..2533f1f 100644 --- a/include/sfx2/sfxdefs.hxx +++ b/include/sfx2/sfxdefs.hxx @@ -20,7 +20,9 @@ #ifndef INCLUDED_SFX2_SFXDEFS_HXX #define INCLUDED_SFX2_SFXDEFS_HXX -#define SfxFilterFlags sal_uLong +#include + +typedef sal_uInt32 SfxFilterFlags; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/sdremote-2.0.0'
Tag 'sdremote-2.0.0' created by Christian Lohmaier at 2014-01-30 11:43 -0800 Tag sdremote-2.0.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJS6jrMAAoJEPQ0oe+v7q6jzXYP/A6wcU96Z/Cr3W23+IHiZwO+ jDroKkykvPSYO0TJdvzgAybaBsW2E1scH1xTelnJ4wEJzeftO5ly4CQVsMGSCYai b6njQ0Pi4xJyCU8y+hjtocREn5iVhjhkLZDE4omYqsJHc1lYqT23vgI54/2i1KyT 0otXh5xoOn0WqOpw//n5MbTsezI0Sfv0eqaeW8+PCzDtPhKCoidy1Ggj8p2iH05c 4T4JNeArus3wj0QVUobYEmCk9ho2ORJGZv2Xp1XHEem578Lc5jPZ6dAHSvn5zibr qnVP6yfm4Hg+ek/V4ohM6hf/JnCSKj/uClYAOMQ/AMP2FnQF2/Fmlty7bnwGeb6F VejhR5hL02pOpr4Dg/AgkE5OgyOwIFNTgVuAKEsIeIiKXELipAEJACSEhEyMu3YU Q9UNtBaNq9oJNlReKRn5w5aTvR2YOjxagSg9NyZ/juHFEfyDqaNBzGVA5MFlUDvO 291eOUrQMTd/eeRj31qjKUhFid16b/5lYtESi6i88SDJWQIIqVuy1o4h4c+3qRTF QbVWcNqIY89pdC/BZ/ZYvQgHdLf5wjzuiWmNhzlr+ES5qz4TzBSAYYCWFv51ueUB YNaKaHEy/eZyyJdEWASePnADe64esOnwm9JDMCNe+c+rPUdZ3b0J8tfkLmtkaI1I DUeoczY6igZkgP0aEoSP =oxF8 -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-4281: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 squeezech...@gmx.de changed: What|Removed |Added Depends on||65074 --- Comment #73 from squeezech...@gmx.de --- please add #65074 _ bug is not entirely fixed in LibreOffice 4.2 _ XLSX cells with 2 conditional formatting rules are not displayed correctly: 1. p.ex. cell values =$H$13:$H$427 have a color scale 2. cell values equal or smaller than =MIN(H$13:H$428)*1,1 should be bold (Arial unicode, size 10) In LibreOffice 4.2 the second rule is bold but wrong font and not changeable Spreadsheet can be downloaded here: http://www.squeezechart.com/SqueezeChart2013-preview.xlsx _ Behavior before LibreOffice 4.2: _ cells with with conditional formatting sometimes show the numbers not centered and without points; cell borders are not shown (see for example I13 to I21..) Steps to reproduce: Spreadsheet can be downloaded here: http://www.squeezechart.com/SqueezeChart2013-preview.xlsx screenshot from Excel: http://www.squeezechart.com/spreadsheet-in-Excel-15.0.4420.png screenshot from LibreOffice: http://www.squeezechart.com/spreadsheet-in-LibreOffice-4.0.0.1.png Current behavior: cells with with conditional formatting sometimes show the numbers not centered and without points; cell borders are not shown Expected behavior: All cells in the main table must contain centered numbers with thousand points. Operating System: Windows 8 Version: 4.0.3.3 release -- 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: sw/sdi sw/source sw/uiconfig
sw/sdi/drwtxtsh.sdi| 13 +
sw/source/ui/shells/drwtxtex.cxx | 50 +
sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml |2
sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml |2
sw/uiconfig/swform/toolbar/drawtextobjectbar.xml |2
sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml |2
sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml |2
sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml |2
8 files changed, 75 insertions(+)
New commits:
commit c885850e2e54da986bd85cfc00bc8a23c272704d
Author: Maxim Monastirsky
Date: Thu Jan 30 10:26:28 2014 +0200
Add Increase/Decrease font functionality to drawing objects
Change-Id: I9abfca6f8cefd1e1211a98fa36ce07a407c2fd06
Reviewed-on: https://gerrit.libreoffice.org/7655
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 23402a3..e019b76 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -609,6 +609,19 @@ interface TextDrawText
StateMethod = GetStatePropPanelAttr ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+FN_GROW_FONT_SIZE
+[
+ExecMethod = Execute ;
+StateMethod = GetDrawTxtCtrlState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+FN_SHRINK_FONT_SIZE
+[
+ExecMethod = Execute ;
+StateMethod = GetDrawTxtCtrlState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
}
interface TextDrawFont
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 80a1049..43b0dfb 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -101,6 +101,8 @@
#include "chrdlg.hrc"
#include "misc.hrc"
+const sal_uInt32 nFontInc = 40; // 2pt
+const sal_uInt32 nFontMaxSz = 19998; // 999.9pt
using namespace ::com::sun::star;
@@ -548,6 +550,32 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
rSh.GetView().AttrChangedNotify( &rSh );
}
return;
+
+case FN_GROW_FONT_SIZE:
+case FN_SHRINK_FONT_SIZE:
+{
+SfxItemPool* pPool2 = aEditAttr.GetPool()->GetSecondaryPool();
+if( !pPool2 )
+pPool2 = aEditAttr.GetPool();
+
+SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, *pPool2 );
+aSetItem.GetItemSet().Put( aEditAttr, false );
+
+sal_uInt16 nScriptTypes = pOLV->GetSelectedScriptType();
+SvxFontHeightItem aSize( *static_cast(
aSetItem.GetItemOfScript( nScriptTypes ) ) );
+sal_uInt32 nSize = aSize.GetHeight();
+
+if( nSlot == FN_GROW_FONT_SIZE && ( nSize += nFontInc ) >
nFontMaxSz )
+nSize = nFontMaxSz;
+else if( nSlot == FN_SHRINK_FONT_SIZE && ( nSize -= nFontInc ) <
nFontInc )
+nSize = nFontInc;
+
+aSize.SetHeight( nSize );
+aSetItem.PutItemForScriptType( nScriptTypes, aSize );
+aNewAttr.Put( aSetItem.GetItemSet() );
+}
+break;
+
default:
OSL_ENSURE(!this, "wrong dispatcher");
return;
@@ -888,6 +916,28 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
case SID_ATTR_CHAR_SCALEWIDTH: nEEWhich =
EE_CHAR_FONTWIDTH;break;
case SID_ATTR_CHAR_AUTOKERN : nEEWhich = EE_CHAR_PAIRKERNING;
break;
case SID_ATTR_CHAR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT;
break;
+case FN_GROW_FONT_SIZE:
+case FN_SHRINK_FONT_SIZE:
+{
+SfxItemPool* pEditPool =
aEditAttr.GetPool()->GetSecondaryPool();
+if( !pEditPool )
+pEditPool = aEditAttr.GetPool();
+
+SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT,
*pEditPool );
+aSetItem.GetItemSet().Put( aEditAttr, false );
+const SvxFontHeightItem* aSize( static_cast( aSetItem.GetItemOfScript( nScriptType ) ) );
+
+if( !aSize )
+rSet.DisableItem( nSlotId );
+else
+{
+sal_uInt32 nSize = aSize->GetHeight();
+if( nSize == nFontMaxSz )
+rSet.DisableItem( FN_GROW_FONT_SIZE );
+else if( nSize == nFontInc )
+rSet.DisableItem( FN_SHRINK_FONT_SIZE );
+}
+}
}
if(nEEWhich)
rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich);
diff --git a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index f604605..5db228b 100644
--- a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
@@ -27,6 +27,8 @@
+
+
diff --git a/sw/uiconfig/sweb/toolbar/drawtextobjectbar.
[Libreoffice-commits] core.git: extensions/source
extensions/source/bibliography/framectr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5257cee53a7f1c60b67efc174e05b07fa2de5daf Author: Caolán McNamara Date: Thu Jan 30 11:35:08 2014 + reset Stati is presumably to reset state Change-Id: Ib448d4e43178dedea6bdaebfc78d850b07aebe3e diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index dea99c3..37f1943 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -598,7 +598,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen if (bCanInsert) xUpdateCursor->moveToInsertRow(); else -// move data entry to reset Stati +// move data entry to reset state xCursor->first(); } catch(const Exception&) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #100 from Commit Notification --- Sven Wehner committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=2c932dcd77a287ea882dec8e3741699065f183e3 fdo#39468 Translate German comments The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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: extensions/source
extensions/source/bibliography/bibbeam.cxx | 34 +---
extensions/source/bibliography/framectr.cxx | 19 +++
extensions/source/bibliography/general.cxx | 13 --
3 files changed, 22 insertions(+), 44 deletions(-)
New commits:
commit 2c932dcd77a287ea882dec8e3741699065f183e3
Author: Sven Wehner
Date: Tue Jan 28 18:14:29 2014 +0100
fdo#39468 Translate German comments
Also remove ASCII art, and fix minor typos.
Note: I left the unknown word "Stati" as is.
This could be an incorrect plural for "status".
Change-Id: Ic19407c0ebb3aba3ebba4940b2511ba5b8dc825e
Reviewed-on: https://gerrit.libreoffice.org/7716
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extensions/source/bibliography/bibbeam.cxx
b/extensions/source/bibliography/bibbeam.cxx
index c4619f5..e3a86ed 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -42,10 +42,8 @@ using namespace ::com::sun::star::uno;
#define ID_TOOLBAR 1
#define ID_GRIDWIN 2
-//.
namespace bib
{
-//.
using namespace ::com::sun::star::uno;
@@ -69,9 +67,7 @@ namespace bib
}
}
-//=
-//= BibGridwin
-//=
+
class BibGridwin
:public Window //DockingWindow
{
@@ -80,7 +76,7 @@ namespace bib
Reference< awt::XControlModel > m_xGridModel;
Reference< awt::XControl > m_xControl;
Reference< awt::XControlContainer > m_xControlContainer;
-// #100312# -
+// #100312#
Reference< frame::XDispatchProviderInterception>
m_xDispatchProviderInterception;
protected:
@@ -96,13 +92,12 @@ namespace bib
void disposeGridWin();
const Reference< awt::XControlContainer >& getControlContainer()
const { return m_xControlContainer; }
-// #100312# -
+// #100312#
const Reference< frame::XDispatchProviderInterception>&
getDispatchProviderInterception() const { return
m_xDispatchProviderInterception; }
virtual void GetFocus();
};
-//-
BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window(
_pParent, _nStyle )
{
m_xControlContainer = VCLUnoHelper::CreateControlContainer(this);
@@ -110,7 +105,6 @@ namespace bib
AddToTaskPaneList( this );
}
-//-
BibGridwin::~BibGridwin()
{
RemoveFromTaskPaneList( this );
@@ -118,7 +112,6 @@ namespace bib
disposeGridWin();
}
-//-
void BibGridwin::Resize()
{
if(m_xGridWin.is())
@@ -128,7 +121,6 @@ namespace bib
}
}
-//-
void BibGridwin::createGridWin(const uno::Reference< awt::XControlModel >
& xGModel)
{
m_xGridModel = xGModel;
@@ -153,14 +145,14 @@ namespace bib
if ( m_xControl.is() )
{
-// Peer als Child zu dem FrameWindow
+// Peer as Child to the FrameWindow
m_xControlContainer->addControl("GridControl", m_xControl);
m_xGridWin=uno::Reference< awt::XWindow > (m_xControl,
UNO_QUERY );
-// #100312# -
+// #100312#
m_xDispatchProviderInterception=uno::Reference<
frame::XDispatchProviderInterception > (m_xControl, UNO_QUERY );
m_xGridWin->setVisible( sal_True );
m_xControl->setDesignMode( sal_True );
-// initially switch on the desing mode - switch it off
_after_ loading the form
+// initially switch on the design mode - switch it off
_after_ loading the form
::Size aSize = GetOutputSizePixel();
m_xGridWin->setPosSize(0, 0, aSize.Width(),aSize.Height(),
awt::PosSize::POSSIZE);
@@ -169,7 +161,6 @@ namespace bib
}
}
-//-
void BibGridwin::disposeGridWin()
{
if ( m_xControl.is() )
@@ -183,14 +174,12 @@ namespace bib
}
}
-//-
void BibGridwin::GetFocus()
{
if(m_xGridWin.is())
m
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #46 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d57871daaed1de47199e56e869f8a89350f80f3 fdo#63154 Removed unused solar.h ref. in svx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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/svx
include/svx/databaseregistrationui.hxx |6 --
include/svx/dbtoolsclient.hxx | 32 ++--
include/svx/def3d.hxx |5 +
include/svx/fmglob.hxx |3 +--
include/svx/gallery.hxx|3 +--
include/svx/globl3d.hxx|2 --
include/svx/langbox.hxx|3 +--
include/svx/msdffdef.hxx |5 +
include/svx/svdattr.hxx|1 -
include/svx/svdtypes.hxx |7 ---
include/svx/svdviter.hxx |5 -
include/svx/xpoly.hxx | 21 -
12 files changed, 11 insertions(+), 82 deletions(-)
New commits:
commit 0d57871daaed1de47199e56e869f8a89350f80f3
Author: Alexandre Vicenzi
Date: Wed Jan 29 22:17:38 2014 -0200
fdo#63154 Removed unused solar.h ref. in svx
Change-Id: I1671746d6c433fa3b770eb58bc418e4eddbe8dd4
Reviewed-on: https://gerrit.libreoffice.org/7737
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svx/databaseregistrationui.hxx
b/include/svx/databaseregistrationui.hxx
index c4bd916..80df713 100644
--- a/include/svx/databaseregistrationui.hxx
+++ b/include/svx/databaseregistrationui.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
#include
-#include
class Window;
@@ -29,18 +28,13 @@ class Window;
#define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248)
#define SID_SB_DB_REGISTER (RID_OFA_START + 249)
-//
namespace svx
{
-//
-
/** opens a dialog which allows the user to administrate the database
registrations
*/
sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window*
_parentWindow );
-//
} // namespace svx
-//
#endif // INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index 6d8722d..1818e10 100644
--- a/include/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
@@ -23,20 +23,14 @@
#include
#include
#include
+#include
#include
#include
-#include
-//
namespace svxform
{
-//
-
typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection >
SharedConnection;
-//
-//= ODbtoolsClient
-//
/** base class for classes which want to use dbtools features with
load-on-call
of the dbtools lib.
*/
@@ -68,9 +62,6 @@ namespace svxform
static void revokeClient();
};
-//
-//= OStaticDataAccessTools
-//
class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient
{
protected:
@@ -84,19 +75,16 @@ namespace svxform
const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >&
getDataAccessTools() const { return m_xDataAccessTools; }
-//
::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection>& _rxConn,
sal_Bool _bAllowDefault
) const;
-//
sal_Int32 getDefaultNumberFormat(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& _xColumn,
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatTypes >& _xTypes,
const ::com::sun::star::lang::Locale& _rLocale );
-//
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
getConnection_withFeedback(
const OUString& _rDataSourceName,
const OUString& _rUser,
@@ -104,7 +92,6 @@ namespace svxform
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext>& _rxContext
) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
-//
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
connectRowset(
const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XRowSet>& _rxRowSet,
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #44 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=53ba2eefb0d3d6e6c155302479eace25bcf8b657 fdo#63154 Removed unused solar.h ref. in basic and formula The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #45 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=c97b226b5a5480caf00d1c859fc7bcbfddde3a6a fdo#63154 Removed unused solar.h ref. in sfx2 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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/sfx2
include/sfx2/app.hxx |5 -
include/sfx2/chalign.hxx |2 --
include/sfx2/docfac.hxx|7 ---
include/sfx2/docfilt.hxx |1 -
include/sfx2/filedlghelper.hxx |3 ---
include/sfx2/mieclip.hxx |1 -
include/sfx2/objsh.hxx | 36
include/sfx2/progress.hxx |7 ++-
8 files changed, 10 insertions(+), 52 deletions(-)
New commits:
commit c97b226b5a5480caf00d1c859fc7bcbfddde3a6a
Author: Alexandre Vicenzi
Date: Wed Jan 29 21:58:11 2014 -0200
fdo#63154 Removed unused solar.h ref. in sfx2
Change-Id: I7fd8815482c3491d28e0d353e725e7c37aa52fc3
Reviewed-on: https://gerrit.libreoffice.org/7736
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index d811b27..95e987b 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -98,8 +97,6 @@ namespace sfx2
}
}
-//
-
class SfxLinkItem : public SfxPoolItem
{
Link aLink;
@@ -266,8 +263,6 @@ public:
#define SFX_APP() SfxGetpApp()
-//
-
inline SfxApplication* SfxGetpApp()
{
return SfxApplication::GetOrCreate();
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index c964299..bea8eca 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_CHALIGN_HXX
#define INCLUDED_SFX2_CHALIGN_HXX
-#include
-
// New order: first, navigation bar, then vertically docked child windows
// (Explorer!), then horizontally docked child windows (Browser!),
// then the format bar, status bar, and at the end of the toolbar.
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 512a82c..af0b7f9 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
// SFX_IMPL_MODULE_LIB
@@ -39,8 +38,6 @@ struct SfxObjectFactory_Impl;
class SfxFilterContainer;
class SfxBindings;
-//
-
typedef void (*SfxVoidFunc)();
#define SDT_SDT_DOCFACTPRIO 10 // Explorer
@@ -56,8 +53,6 @@ typedef void (*SfxVoidFunc)();
#define SDT_MSG_DOCFACTPRIO110 // Message Document
#define SDT_SDB_DOCFACTPRIO200 // Database Document
-//
-
class SFX2_DLLPUBLIC SfxObjectFactory
{
private:
@@ -107,8 +102,6 @@ private:
SAL_DLLPRIVATE const SfxObjectFactory& operator=(const SfxObjectFactory &);
};
-//=
-
#define SFX_DECL_OBJECTFACTORY()\
public: \
static SfxObjectFactory&Factory(); \
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 85f93da..e746946 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
#define SFX_FILTER_STARTPRESENTATION 0x2000L
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 37e48b1..a68a791 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -35,8 +34,6 @@
#include
#include
-//-
-
namespace com
{
namespace sun
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index bbd8f5b..0fad211 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
class SvStream;
class SotDataObject;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 69b49a6..8cf31db 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -20,10 +20,7 @@
#define INCLUDED_SFX2_OBJSH_HXX
#include
-
#include
-
-#include
#include
#include
#include
@@ -40,10 +37,6 @@
#include
#include
-//
-// include something else
-//
-
#include
#include
#include
@@ -132,8 +125,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFXOBJECTSHELL_STD_SPECIAL ( SFXOBJECTSHELL_DONTLOADFILTERS )
#define SFXOBJECTSHELL_UNDEFINED 0xf00
-//
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ---
1 file changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 35d349af8cb6f9e9feba2ac17ffa0592b81d166a
Author: Andrzej Hunt
Date: Wed Jan 29 18:40:21 2014 +
EMF+: Only draw endcap outline if not filled, fix endcap scaling.
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971
Reviewed-on: https://gerrit.libreoffice.org/7726
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040)
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index c8ec849..4f08c17 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1332,29 +1332,27 @@ namespace cppcanvas
if (!rLineCap.count())
return 0.0;
-// it seems the line caps in EMF+ are 4*larger than what
-// LibreOffice expects, and the mapping in
-// createAreaGeometryForLineStartEnd scales that down, so
-// correct it
-// [unfortunately found no proof for this in the spec :-( - please
-// feel free to correct this if it causes trouble]
-double fWidth = rAttributes.StrokeWidth*4;
-
+// createAreaGeometryForLineStartEnd normalises the arrows height
+// before scaling (i.e. scales down by rPolygon.height), hence
+// we pre-scale it (which means we can avoid changing the logic
+// that would affect arrows rendered outside of EMF+).
+const double fWidth =
rAttributes.StrokeWidth*rLineCap.getB2DRange().getWidth();
+
+// When drawing an outline (as opposed to a filled endCap), we also
+// need to take account that the brush width also adds to the area
+// of the polygon.
+const double fShift = bIsFilled ? 0 : rAttributes.StrokeWidth;
+double fConsumed = 0;
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
+fWidth, fPolyLength, 0, &fConsumed, fShift));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
aArrow.setClosed(rLineCap.isClosed());
-ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
-if (pAction)
-{
-maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
-rParms.mrCurrActionIndex += pAction->getActionCount()-1;
-}
-
+// If the endcap is filled, we draw ONLY the filling, if it isn't
+// filled we draw ONLY the outline, but never both.
if (bIsFilled)
{
bool bWasFillColorSet = rState.isFillColorSet;
@@ -1368,8 +1366,25 @@ namespace cppcanvas
}
rState.isFillColorSet = bWasFillColorSet;
}
+else
+{
+ActionSharedPtr
pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow,
rParms.mrCanvas, rState, rAttributes));
+if (pAction)
+{
+maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
+rParms.mrCurrActionIndex += pAction->getActionCount()-1;
+}
+}
-return rAttributes.StrokeWidth;
+// There isn't any clear definition of how far the line should
extend
+// for arrows, however the following values seem to give best
results
+// (fConsumed/2 draws the line to the center-point of the endcap
+// for filled caps -- however it is likely this will need to be
+// changed once we start taking baseInset into account).
+if (bIsFilled)
+return fConsumed/2;
+else
+return rAttributes.StrokeWidth;
}
void ImplRenderer::EMFPPlusDrawPolygon (const
::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/basic include/formula
include/basic/sbxdef.hxx |1 -
include/formula/errorcodes.hxx |2 --
include/formula/tokenarray.hxx |8 ++--
3 files changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 53ba2eefb0d3d6e6c155302479eace25bcf8b657
Author: Alexandre Vicenzi
Date: Wed Jan 29 21:57:20 2014 -0200
fdo#63154 Removed unused solar.h ref. in basic and formula
Change-Id: Ibf30f29653568929e65ebd897cef474a6838d5cc
Reviewed-on: https://gerrit.libreoffice.org/7735
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 333d7f2..35ea07f 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -23,7 +23,6 @@
#ifndef __RSC
-#include
#include
enum SbxClassType { // SBX-class-IDs (order is important!)
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index d178aec..cea5787 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FORMULA_ERRORCODES_HXX
#include
-#include
namespace ScErrorCodes
{
@@ -94,7 +93,6 @@ inline double CreateDoubleError( sal_uInt16 nErr )
return fVal;
}
-
/** Recreate the error code of a coded double error, if any. */
inline sal_uInt16 GetDoubleErrorValue( double fVal )
{
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9f8fed0..2dde86d 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -20,11 +20,10 @@
#ifndef INCLUDED_FORMULA_TOKENARRAY_HXX
#define INCLUDED_FORMULA_TOKENARRAY_HXX
-#include
+#include
#include
#include
-#include
-#include
+#include
namespace formula
{
@@ -279,10 +278,7 @@ public:
private:
const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
};
-//
=
} // formula
-//
=
-
#endif // INCLUDED_FORMULA_TOKENARRAY_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glew
external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 | 184 ++ external/glew/UnpackedTarball_glew.mk | 1 2 files changed, 185 insertions(+) New commits: commit 75565d7a1798381b90d23414c67ee8e2dd107412 Author: Michael Stahl Date: Thu Jan 30 12:24:38 2014 +0100 glew: stop linking to unneeded Xmu, Xi, Xext libraries Change-Id: I449a08699f0f980a2fe4624363116e6fae2b549c diff --git a/external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 b/external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 new file mode 100644 index 000..2ecf38f --- /dev/null +++ b/external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 @@ -0,0 +1,184 @@ +From 820df42a87322eef69a8d02451caa705d53b7dda Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Thu, 30 Jan 2014 12:12:00 +0100 +Subject: [PATCH] stop linking to unneeded Xmu, Xi, Xext libraries + +Apparently Xmu and Xi were needed when glewinfo was using glut, but that +dependency was removed 11 years ago in +031afdf03be1d123b7a442f64cfa28c6066c1490. +--- + auto/doc/build.html | 2 +- + config/Makefile.cygwin| 2 +- + config/Makefile.darwin| 2 +- + config/Makefile.darwin-ppc| 2 +- + config/Makefile.darwin-x86_64 | 2 +- + config/Makefile.freebsd | 2 +- + config/Makefile.gnu | 2 +- + config/Makefile.kfreebsd | 2 +- + config/Makefile.linux | 2 +- + config/Makefile.netbsd| 2 +- + config/Makefile.openbsd | 2 +- + config/Makefile.solaris | 2 +- + config/Makefile.solaris-gcc | 2 +- + doc/build.html| 2 +- + 14 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin +index b044273..8600fd0 100644 +--- a/config/Makefile.cygwin b/config/Makefile.cygwin +@@ -6,7 +6,7 @@ LD := cc + LN := + LDFLAGS.EXTRA = + LIBDIR = $(GLEW_DEST)/lib +-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -lGL -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic + WARN = -Wall -W +diff --git a/config/Makefile.darwin b/config/Makefile.darwin +index 0c05ed1..bf34a0e 100644 +--- a/config/Makefile.darwin b/config/Makefile.darwin +@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -dynamic -fno-common + LDFLAGS.EXTRA = + ifneq (undefined, $(origin GLEW_APPLE_GLX)) + CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' +-LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 + else + LDFLAGS.GL = -framework AGL -framework OpenGL + endif +diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc +index 2aaf66a..46c8b73 100644 +--- a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc +@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch ppc -dynamic -fno-common + LDFLAGS.EXTRA = -arch ppc + ifneq (undefined, $(origin GLEW_APPLE_GLX)) + CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' +-LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 + else + LDFLAGS.GL = -framework AGL -framework OpenGL + endif +diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 +index 83e5c47..e6eb050 100644 +--- a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 +@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common + LDFLAGS.EXTRA = -arch x86_64 + ifneq (undefined, $(origin GLEW_APPLE_GLX)) + CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' +-LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 + else + LDFLAGS.GL = -framework AGL -framework OpenGL + endif +diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd +index ab9d9d9..bb66fcc 100644 +--- a/config/Makefile.freebsd b/config/Makefile.freebsd +@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) + CC = cc + LD = ld + LDFLAGS.EXTRA = -L/usr/X11R6/lib +-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -lGL -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic + CFLAGS.EXTRA += -I/usr/X11R6/include +diff --git a/config/Makefile.gnu b/config/Makefile.gnu +index 2398ab0..b7c58be 100644 +--- a/config/Makefile.gnu b/config/Makefile.gnu +@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) + CC = cc + LD = cc + LDFLAGS.EXTRA = -L/usr/X11R6/lib +-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -lGL -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic + NAME = GLEW +diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd +index 9501091..faf1046 100644 +--- a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd +@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) + CC = cc + LD = cc + LDFLAGS.EXTRA = -L/usr/X11R6/lib +-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -lGL -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic + NAME = GLEW +diff --git a/config/Makefile.linux b/config/Makefile.linux +index 234adc6..b46
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - sw/source
sw/source/core/fields/reffld.cxx | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 718524619bf8cc96325aed87b72735741fe93912
Author: Michael Stahl
Date: Wed Jan 29 22:38:21 2014 +0100
fdo#63553: sw: fix copy/paste of cross references
If one of aIds or aDestIds contains nSeqNo then adding an identity
mapping for it will actually re-define a previous mapping. Likely this
can only happen when clipboard document is the source.
(regression from 44f971506c0ed37928c48e55d8007f24b0c43a5f)
(also it looks like 4b0b0a5b3045902d9a6b95510ec30a3027181e29 has subtly
changed what the "else" branch does when it is erroneously taken -
results are differently wrong)
Change-Id: I34e2979e45cffeb62ebf3d7b3e5ac6d2afff0c2b
(cherry picked from commit bb665affbd8870652ade3951d626d76e99143f67)
Reviewed-on: https://gerrit.libreoffice.org/7730
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit 139342a9ad5995058081a47a24818b14581735a5)
Reviewed-on: https://gerrit.libreoffice.org/7740
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 4c668b0..ba0e4bb 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -997,7 +997,7 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool
bField )
for ( std::set::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
AddId( GetFirstUnusedId(aIds), *pIt );
-// Change the Sequence number of all the SetExp fields in the
destination document
+// Change the Sequence number of all SetExp fields in the source
document
SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
if( pType )
{
@@ -1051,16 +1051,24 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc,
SwGetRefField& rFld,
{
Init( rDoc, rDestDoc, bField);
-// dann teste mal, ob die Nummer schon vergeben ist
-// oder ob eine neue bestimmt werden muss.
sal_uInt16 nSeqNo = rFld.GetSeqNo();
-if( aIds.count( nSeqNo ) && aDstIds.count( nSeqNo ))
+
+// Check if the number is used in both documents
+// Note: For fields, aIds contains both the ids of SetExp from rDestDoc
+// and the targets of the already remapped ones from rDoc.
+// It is possible that aDstIds contains numbers that aIds does not contain!
+// For example, copying a selection to clipboard that does not contain
+// the first SwSetExpField will result in id 0 missing, then pasting that
+// into empty document gives a mapping 1->0 ... N->N-1 (fdo#63553).
+if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
{
// Number already taken, so need a new one.
if( sequencedIds.count(nSeqNo) )
rFld.SetSeqNo( sequencedIds[nSeqNo] );
else
{
+assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
+
sal_uInt16 n = GetFirstUnusedId( aIds );
// die neue SeqNo eintragen, damit die "belegt" ist
@@ -1082,7 +1090,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc,
SwGetRefField& rFld,
}
else
{
-AddId( nSeqNo, nSeqNo );
+AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in
both!
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/export/drawingml.hxx |5 +++--
oox/source/export/drawingml.cxx |8
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 28db7d7919524989aff96c33051cceeac4adb2a1
Author: Jacobo Aragunde Pérez
Date: Thu Jan 30 12:23:46 2014 +0100
drawingML: fix transparency of shape solid fill
The empty value for transparency in drawingML is 100% and not 0.
Change-Id: I5f34f03b9b72cc20e92e32f9c9bc1bdfae73ff55
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 000cd4e..08fb539 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include "oox/drawingml/drawingmltypes.hxx"
#ifndef PPTX_EXPORT_ROTATE_CLOCKWISIFY
// Our rotation is counter-clockwise and is in 100ths of a degree.
// drawingML rotation is clockwise and is in 6ths of a degree.
@@ -120,8 +121,8 @@ public:
void WriteLineArrow( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet, sal_Bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry,
sal_Int32 nStartID, sal_Int32 nEndID );
-void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = 0 );
-void WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha = 0 );
+void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
+void WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha = MAX_PERCENT
);
void WriteSolidFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteBlipFill( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName,
sal_Int32 nXmlNamespace );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c9eefec..5363df2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -166,7 +166,7 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32
nAlpha )
sColor = sBuf.getStr();
}
-if( nAlpha )
+if( nAlpha < MAX_PERCENT )
{
mpFS->startElementNS( XML_a, XML_srgbClr, XML_val, sColor.getStr(),
FSEND );
mpFS->singleElementNS( XML_a, XML_alpha, XML_val,
OString::number(nAlpha), FSEND );
@@ -231,11 +231,11 @@ void DrawingML::WriteSolidFill( Reference< XPropertySet >
rXPropSet )
aGrabBag[i].Value >>= aStyleProperties;
}
-sal_Int32 nAlpha = 0;
+sal_Int32 nAlpha = MAX_PERCENT;
if( GetProperty( rXPropSet, "FillTransparence" ) )
{
-sal_Int32 nTransparency;
-rXPropSet->getPropertyValue( "FillTransparence" ) >>= nTransparency;
+sal_Int32 nTransparency = 0;
+mAny >>= nTransparency;
// Calculate alpha value (see oox/source/drawingml/color.cxx :
getTransparency())
nAlpha = (MAX_PERCENT - ( PER_PERCENT * nTransparency ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - winaccessibility/source
winaccessibility/source/UAccCOM/MAccessible.cxx | 18 +-
winaccessibility/source/UAccCOM/MAccessible.h |6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit e28dc284596619e2a5000582e4ebd1aa615ddcf8
Author: Julien Nabet
Date: Mon Jan 27 23:46:25 2014 +0100
Typo decendant => descendant in winaccessibility/MAccessible
Change-Id: I2e49ab149b2bbdad623f8694221b6169cdfd2d9a
Reviewed-on: https://gerrit.libreoffice.org/7706
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 6ed3c4e..50b5a35 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -137,7 +137,7 @@ BSTR IA2_STATES_NAME[] =
_T("Horizontal"),
_T("Iconified"),
_T("Invalid Entry"),
-_T("Manages Decendents"),
+_T("Manages Descendants"),
_T("Modal"),
_T("Multi Line"),
_T("Opaque"),
@@ -1467,18 +1467,18 @@ IMAccessible* CMAccessible::GetChildInterface(long
dChildID)//for test
}
/**
-* For List, tree and table,these roles belong to manage_decendant in UNO,
+* For List, tree and table,these roles belong to manage_descendant in UNO,
* need to process specifically when navigate
-* @return BOOL, if it is decendantmanager, return true.
+* @return BOOL, if it is descendantmanager, return true.
*/
-BOOL CMAccessible::IsDecendantManage()
+BOOL CMAccessible::IsDescendantManage()
{
return
(m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE);
}
/**
-* for decendantmanager circumstance,provide child interface when navigate
+* for descendantmanager circumstance,provide child interface when navigate
* @paramvarCur, the current child.
* @paramflags, the navigation direction.
* @return IMAccessible*, the child of the end up node.
@@ -1557,7 +1557,7 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT
varCur, short flags)
/**
* Return first child for parent container, process differently according
-* to whether it is decendant manage
+* to whether it is descendant manage
* @paramvarStart, the start child id of this navigation action.
* @parampvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure.
@@ -1594,7 +1594,7 @@ HRESULT CMAccessible::GetFirstChild(VARIANT
varStart,VARIANT* pvarEndUpAt)
/**
* Return last child for parent container, process differently according
-* to whether it is decendant manage
+* to whether it is descendant manage
* @paramvarStart, the start child id of this navigation action.
* @parampvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure.
@@ -1629,7 +1629,7 @@ HRESULT CMAccessible::GetLastChild(VARIANT
varStart,VARIANT* pvarEndUpAt)
}
/**
-* The method GetNextSibling is general, whatever it is decendant manage or not
+* The method GetNextSibling is general, whatever it is descendant manage or not
* Get the next sibling object.
* @paramvarStart, the start child id of this navigation action.
* @parampvarEndUpAt, [in,out] the end up child of this navigation action.
@@ -1665,7 +1665,7 @@ HRESULT CMAccessible::GetNextSibling(VARIANT
varStart,VARIANT* pvarEndUpAt)
}
/**
-*the method GetPreSibling is general, whatever it is decendant manage or not
+*the method GetPreSibling is general, whatever it is descendant manage or not
* @paramvarStart, the start child id of this navigation action.
* @parampvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure.
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h
b/winaccessibility/source/UAccCOM/MAccessible.h
index 6c073b5..497f5ca 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -197,12 +197,12 @@ private:
// the helper methods in order to implement the above public methods
IMAccessible* GetChildInterface(long dChildIndex);//notice here the
parameter is child index,not child id
-IMAccessible* GetNavigateChildForDM(VARIANT varCur,short flags);//for
decendant manage
+IMAccessible* GetNavigateChildForDM(VARIANT varCur,short flags);//for
descendant manage
HRESULT GetFirstChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for
accNavigate implementation
HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for
accNavigate implementation
HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for
accNavigate implementation
HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for
accNavigate implementation
-BOOL IsDecendantManage();//identify whether the current COM belongs to
manage_decendant roles
+BOOL IsDescendantManage();//identify wheth
