LibreOffice Gerrit News for core on 2014-01-18

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things ! 
+ Removed unused solar.h reference
  in https://gerrit.libreoffice.org/7513 from Alexandre Vicenzi
  about module include, xmloff
+ fdo#57950: Remove chained appends in dbaccess
  in https://gerrit.libreoffice.org/7512 from Anderson Roberto
  about module dbaccess
+ API remove image : change document state #i74651#
  in https://gerrit.libreoffice.org/7286 from Maxime de Roucy
  about module svx
+ fdo#65826 and fdo#73605: set a minimum size to start center
  in https://gerrit.libreoffice.org/7505 from Zolnai Tamás
  about module sfx2
+ fdo#71763: F6 key moves focus on this trip: Menu -> Sidebar -> Thumbnail 
  in https://gerrit.libreoffice.org/7486 from Zolnai Tamás
  about module include, sfx2, vcl
+ Translate some German comments to English, and remove some ASCII art.
  in https://gerrit.libreoffice.org/7504 from Sven Wehner
  about module include, stoc, sw
+ fdo#73546 : faulty value of attribute value in  tag
  in https://gerrit.libreoffice.org/7501 from Umesh Kadam
  about module sw, writerfilter
+ fdo#69407: On transparent frames, shadows are painted in foreground.
  in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR
  about module sw
+ remove SvStream::operator<< methods
  in https://gerrit.libreoffice.org/7495 from Noel Grandin
  about module basic, dbaccess, editeng, idl, include, sc, sd, sot, starmath, 
svtools, svx, sw, tools, vcl
+ convert more SvStream::operator<< calls
  in https://gerrit.libreoffice.org/7494 from Noel Grandin
  about module basic, connectivity, dbaccess, editeng, filter, idl, sc, sd, 
sfx2, svl, svtools, svx, sw, vcl, writerfilter
+ Added unit test for fdo#72221:Fixed for doughnut chart - RT is invalid
  in https://gerrit.libreoffice.org/7493 from Priyanka Gaikwad
  about module chart2
 End of freshness 



* Merged changes on master for project core changed in the last 25 hours:

+ convert custom list implementation to regular std::vector
  in https://gerrit.libreoffice.org/7369 from Noel Grandin
+ Convert chart data source tab page & dialog to .ui
  in https://gerrit.libreoffice.org/7255 from Olivier Hallot
+ Add the Navigation buttons to the Search toolbar
  in https://gerrit.libreoffice.org/7006 from Samuel Mehrbrodt
+ removed some unused code (svx, svtools, unotest)
  in https://gerrit.libreoffice.org/7329 from Petr Vorel
+ Make Flat XML document name consistant with ODF List discussion: http://l
  in https://gerrit.libreoffice.org/7488 from Bryan Quigley
+ Make text choose encoding See thread here: http://lists.freedesktop.org/a
  in https://gerrit.libreoffice.org/7487 from Bryan Quigley
+ Get bundled curl to be used on OS X too Don't force "yes" on Darwin.
  in https://gerrit.libreoffice.org/7197 from Douglas Mencken
+ Additional warnings when processing cmap tables
  in https://gerrit.libreoffice.org/7404 from Chris Sherlock
+ Translate some German comments to English in sw/source/core/text/txtfrm.c
  in https://gerrit.libreoffice.org/7481 from Sven Wehner
+ Translate German DBG_ASSERT() message to English.
  in https://gerrit.libreoffice.org/7497 from Sven Wehner
+ Translate German ("kein break") comments to English ("no break").
  in https://gerrit.libreoffice.org/7498 from Sven Wehner
+ Convert xmlsecurity to cppu::supportsService
  in https://gerrit.libreoffice.org/7435 from Alexandre Vicenzi
+ Convert avmedia to cppu::supportsService
  in https://gerrit.libreoffice.org/7434 from Alexandre Vicenzi
+ Make all UIName localizable for filters
  in https://gerrit.libreoffice.org/7492 from Fridrich Strba
+ Make UIName of filters from writerperfect module localizable
  in https://gerrit.libreoffice.org/7491 from Fridrich Strba
+ fdo#73698 check for empty aOut
  in https://gerrit.libreoffice.org/7474 from Andras Timar
+ Small efficiency fix - move command out of loop.
  in https://gerrit.libreoffice.org/7465 from Adam CloudOn


* Abandoned changes on master for project core changed in the last 25 hours:

+ Related fdo#71764: revive non-native PushButtons so no need for tricks
  in https://gerrit.libreoffice.org/7480 from Zolnai Tamás


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#72563 : Pageref field tag not preserved
  in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ upgrade liborcus
  in https://gerrit.libreoffice.org/7310 from Markus Mohrhard
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ fdo#71788: Unit test case for corruption of file after roundtrip.
  in https://gerrit.libreoffice.org/6853 from Pallavi Jadhav
+ fdo#72804 Add firebird.msg to install.
  in https://gerrit.libreoffice.org/7254 from Andrzej Hunt
+ Export CoreText-related SPI stuff
  in https://gerrit.l

[Libreoffice-commits] core.git: sc/qa

[Kohei Yoshida]

 dev/null   |binary
 sc/qa/unit/subsequent_filters-test.cxx |   91 +++--
 2 files changed, 54 insertions(+), 37 deletions(-)

New commits:
commit a96b6f4708d587d93101e51e52dec4e87b7e
Author: Kohei Yoshida 
Date:   Sat Jan 18 00:48:49 2014 -0500

fdo#73487: Write unit tests for this.

Also remove the files used for the old tests.

Change-Id: I4fbf6acce205d15a35780524120e351e01dc6642

diff --git a/sc/qa/unit/data/xls/border.xls b/sc/qa/unit/data/xls/border.xls
deleted file mode 100644
index 876839b..000
Binary files a/sc/qa/unit/data/xls/border.xls and /dev/null differ
diff --git a/sc/qa/unit/data/xlsx/border.xlsx b/sc/qa/unit/data/xlsx/border.xlsx
deleted file mode 100755
index e33c083..000
Binary files a/sc/qa/unit/data/xlsx/border.xlsx and /dev/null differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f0f8a92..1f3b3d4 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -102,8 +102,8 @@ public:
 void testMatrixODS();
 void testMatrixXLS();
 void testBorderODS();
-void testBorderXLS();
-void testBorderXLSX();
+void testCellBordersXLS();
+void testCellBordersXLSX();
 void testBordersOoo33();
 void testBugFixesODS();
 void testBugFixesXLS();
@@ -174,8 +174,8 @@ public:
 CPPUNIT_TEST(testMatrixODS);
 CPPUNIT_TEST(testMatrixXLS);
 CPPUNIT_TEST(testBorderODS);
-//  CPPUNIT_TEST(testBorderXLS);
-//  CPPUNIT_TEST(testBorderXLSX);
+CPPUNIT_TEST(testCellBordersXLS);
+CPPUNIT_TEST(testCellBordersXLSX);
 CPPUNIT_TEST(testBordersOoo33);
 CPPUNIT_TEST(testBugFixesODS);
 CPPUNIT_TEST(testBugFixesXLS);
@@ -232,7 +232,7 @@ public:
 
 private:
 void testPassword_Impl(const OUString& rFileNameBase);
-void testBorderImpl( sal_uLong nFormatType );
+void testExcelCellBorders( sal_uLong nFormatType );
 uno::Reference m_xCalcComponent;
 };
 
@@ -776,51 +776,68 @@ void ScFiltersTest::testBorderODS()
 xDocSh->DoClose();
 }
 
-void ScFiltersTest::testBorderImpl( sal_uLong nFormatType )
+namespace {
+
+const char* toBorderName( sal_Int16 eStyle )
 {
-ScDocShellRef xDocSh = loadDoc("border.", nFormatType );
+switch (eStyle)
+{
+case table::BorderLineStyle::SOLID: return "SOLID";
+case table::BorderLineStyle::DOTTED: return "DOTTED";
+case table::BorderLineStyle::DASHED: return "DASHED";
+case table::BorderLineStyle::DOUBLE: return "DOUBLE";
+case table::BorderLineStyle::FINE_DASHED: return "FINE_DASHED";
+default:
+;
+}
 
-CPPUNIT_ASSERT_MESSAGE("Failed to load border.xls", xDocSh.Is());
-ScDocument* pDoc = xDocSh->GetDocument();
+return "";
+}
 
-const editeng::SvxBorderLine* pLeft = NULL;
-const editeng::SvxBorderLine* pTop = NULL;
-const editeng::SvxBorderLine* pRight = NULL;
-const editeng::SvxBorderLine* pBottom = NULL;
+}
 
-pDoc->GetBorderLines( 2, 3, 0, &pLeft, &pTop, &pRight, &pBottom );
-CPPUNIT_ASSERT(pRight);
-CPPUNIT_ASSERT_EQUAL(
-table::BorderLineStyle::SOLID, pRight->GetBorderLineStyle());
-CPPUNIT_ASSERT_EQUAL(1L, pRight->GetWidth());
+void ScFiltersTest::testExcelCellBorders( sal_uLong nFormatType )
+{
+ScDocShellRef xDocSh = loadDoc("cell-borders.", nFormatType);
 
-pDoc->GetBorderLines( 3, 5, 0, &pLeft, &pTop, &pRight, &pBottom );
-CPPUNIT_ASSERT(pRight);
-CPPUNIT_ASSERT_EQUAL(
-table::BorderLineStyle::SOLID, pRight->GetBorderLineStyle());
-CPPUNIT_ASSERT_EQUAL(20L, pRight->GetWidth());
+CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is());
+ScDocument* pDoc = xDocSh->GetDocument();
 
-pDoc->GetBorderLines( 5, 7, 0, &pLeft, &pTop, &pRight, &pBottom );
-CPPUNIT_ASSERT(pRight);
-CPPUNIT_ASSERT_EQUAL(
-table::BorderLineStyle::SOLID, pRight->GetBorderLineStyle());
-CPPUNIT_ASSERT_EQUAL(30L, pRight->GetWidth());
+struct
+{
+SCROW mnRow;
+sal_Int16 mnStyle;
+long mnWidth;
+} aChecks[] = {
+{  1, table::BorderLineStyle::SOLID,1L }, // hair
+{  3, table::BorderLineStyle::DOTTED,  15L }, // thin
+{  9, table::BorderLineStyle::FINE_DASHED, 15L }, // dashed
+{ 11, table::BorderLineStyle::SOLID,   15L }, // thin
+{ 19, table::BorderLineStyle::DASHED,  35L }, // medium dashed
+{ 21, table::BorderLineStyle::SOLID,   35L }, // medium
+{ 23, table::BorderLineStyle::SOLID,   50L }, // thick
+{ 25, table::BorderLineStyle::DOUBLE,  -1L }, // double (don't 
check width)
+};
 
-pDoc->GetBorderLines( 7, 9, 0, &pLeft, &pTop, &pRight, &pBottom );
-CPPUNIT_ASSERT(pRight);
-CPPUNIT_ASSERT_EQUAL(
-table::BorderLineStyle::FINE_DASHED, pRight->GetBorderLineStyle());
-CPPUNIT_ASSERT_EQUAL(1L, pRight->GetWidth());
+fo

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

[Tsutomu Uchino]

 wizards/com/sun/star/wizards/letter/LocaleCodes.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e878f6ea157ec0aaa47c1f4dbaf039b9de1a103
Author: Tsutomu Uchino 
Date:   Sat Jan 18 02:36:25 2014 +

#i124045# fix resource id for STR_ARR_SVT_LANGUAGE_TABLE used in Letter 
wizard to match with svtools.hrc

diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java 
b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
index 2078d68..4904364 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
@@ -36,7 +36,7 @@ public class LocaleCodes extends Resource
 public LocaleCodes(XMultiServiceFactory xmsf)
 {
 super(xmsf, UNIT_NAME, MODULE_NAME);
-allLanguageStrings = getStringList(16635);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+allLanguageStrings = getStringList(16638);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
 }
 
 public String getLanguageString(String MSID)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/quartz

[tsahi glik]

 vcl/quartz/salbmp.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit af5b416cc9371440872d24cb17ee842359b3ac4f
Author: tsahi glik 
Date:   Fri Jan 17 17:12:13 2014 -0800

fix dropshadow on ios

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 66576d3..0d665ff 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -138,12 +138,26 @@ bool QuartzSalBitmap::Create( CGImageRef xImage, int 
nBitmapBits,
 
 // copy layer content into the bitmap buffer
 if(mxGraphicContext) // remove warning
+{
+// Flip the image right side up & draw
+CGContextSaveGState(mxGraphicContext);
+
+CGContextScaleCTM(mxGraphicContext, 1.0, -1.0);
+CGContextTranslateCTM(mxGraphicContext, 0.0, -aLayerSize.height);
+
 CGContextDrawImage( mxGraphicContext,
CGRectMake(static_cast(-nX),
-  static_cast(-nY),
+  static_cast(nY),
   aLayerSize.width,
   aLayerSize.height),
xImage );
+
+// Restore the context so that the coordinate system is restored
+CGContextRestoreGState(mxGraphicContext);
+
+}
+
+
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Joel Madero  changed:

   What|Removed |Added

 Depends on|66986   |

-- 
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 'aoo/trunk' - sc/inc sc/source

[Armin Le Grand]

 sc/inc/document.hxx|2 +-
 sc/inc/refdata.hxx |   12 
 sc/source/core/tool/reftokenhelper.cxx |   12 
 sc/source/filter/excel/excform8.cxx|8 
 4 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 5cc9cb9c52617bab6eb6d84331dde8f3d580ee31
Author: Armin Le Grand 
Date:   Fri Jan 17 22:32:30 2014 +

i123870 corrected import values on xml import with chart, avoid 
uninitialized values

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 88980a2..3338e25 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -465,7 +465,7 @@ public:
 public:
 SC_DLLPUBLICScDocument( ScDocumentMode eMode = 
SCDOCMODE_DOCUMENT,
 SfxObjectShell* pDocShell = NULL );
-SC_DLLPUBLIC~ScDocument();
+SC_DLLPUBLICvirtual ~ScDocument();
 
 inline ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >
 GetServiceManager() const { return xServiceManager; }
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index d729d22..9550b82 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -76,6 +76,10 @@ struct SC_DLLPUBLIC ScSingleRefData// Single 
reference (one address) int
 
 // No default ctor, because used in ScRawToken union, set InitFlags!
 inline  void InitFlags() { bFlags = 0; }// all FALSE
+
+// #123870# Make it possible to init members to some defined values
+inline void InitMembers() { nCol = nRow = nTab = nRelCol = nRelRow = 
nRelTab = 0; }
+
 // InitAddress: InitFlags and set address
 inline  void InitAddress( const ScAddress& rAdr );
 inline  void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -157,6 +161,14 @@ struct ScComplexRefData // Complex reference (a 
range) into the sheet
 
 inline  void InitFlags()
 { Ref1.InitFlags(); Ref2.InitFlags(); }
+
+// #123870# Make it possible to init members to some defined values
+inline void InitMembers()
+{
+Ref1.InitMembers();
+Ref2.InitMembers();
+}
+
 inline  void InitRange( const ScRange& rRange )
 {
 Ref1.InitAddress( rRange.aStart );
diff --git a/sc/source/core/tool/reftokenhelper.cxx 
b/sc/source/core/tool/reftokenhelper.cxx
index f15f5a0..7f6fde5 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -146,6 +146,12 @@ bool ScRefTokenHelper::getRangeFromToken(ScRange& rRange, 
const ScSharedTokenRef
 return false;
 
 const ScSingleRefData& rRefData = pToken->GetSingleRef();
+
+if(!rRefData.Valid())
+{
+OSL_ENSURE(false, "RefData out of range, correct before usage 
(!)");
+}
+
 rRange.aStart.SetCol(rRefData.nCol);
 rRange.aStart.SetRow(rRefData.nRow);
 rRange.aStart.SetTab(rRefData.nTab);
@@ -160,6 +166,12 @@ bool ScRefTokenHelper::getRangeFromToken(ScRange& rRange, 
const ScSharedTokenRef
 return false;
 
 const ScComplexRefData& rRefData = pToken->GetDoubleRef();
+
+if(!rRefData.Valid())
+{
+OSL_ENSURE(false, "RefData out of range, correct before usage 
(!)");
+}
+
 rRange.aStart.SetCol(rRefData.Ref1.nCol);
 rRange.aStart.SetRow(rRefData.Ref1.nRow);
 rRange.aStart.SetTab(rRefData.Ref1.nTab);
diff --git a/sc/source/filter/excel/excform8.cxx 
b/sc/source/filter/excel/excform8.cxx
index 84955b4..a940d01 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -124,6 +124,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& 
rpTokArray, XclImpStream& aIn,
 
 sal_Size nEndPos = aIn.GetRecPos() + nFormulaLen;
 
+// #123870# Init members, they are on random values and not all will 
beinitialized in all cases below
+aSRD.InitMembers();
+aCRD.InitMembers();
+
 while( (aIn.GetRecPos() < nEndPos) && !bError )
 {
 aIn >> nOp;
@@ -1244,6 +1248,10 @@ ConvErr ExcelToSc8::ConvertExternName( const 
ScTokenArray*& rpArray, XclImpStrea
 
 sal_Size nEndPos = rStrm.GetRecPos() + nFormulaLen;
 
+// #123870# Init members, they are on random values and not all will 
beinitialized in all cases below
+aSRD.InitMembers();
+aCRD.InitMembers();
+
 while( (rStrm.GetRecPos() < nEndPos) && !bError )
 {
 rStrm >> nOp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/generic

[Khaled Hosny]

 vcl/generic/glyphs/gcach_layout.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 718329232eac6bd2c1e5f46f9c49dbec289c2b86
Author: Khaled Hosny 
Date:   Sat Jan 18 01:20:10 2014 +0200

This is an int, not float

Change-Id: Ie3fbda69c5747f4ca42d84c272356ba9f435194e

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index cb2d521..7f4266a 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -326,7 +326,7 @@ class HbLayoutEngine : public ServerFontLayoutEngine
 private:
 hb_script_t maHbScript;
 hb_face_t*  mpHbFace;
-int mfUnitsPerEM;
+int mnUnitsPerEM;
 
 public:
 HbLayoutEngine(ServerFont&);
@@ -338,14 +338,14 @@ public:
 HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont)
 :   maHbScript(HB_SCRIPT_INVALID),
 mpHbFace(NULL),
-mfUnitsPerEM(0)
+mnUnitsPerEM(0)
 {
 FT_Face aFtFace = rServerFont.GetFtFace();
-mfUnitsPerEM = rServerFont.GetEmUnits();
+mnUnitsPerEM = rServerFont.GetEmUnits();
 
 mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, NULL);
 hb_face_set_index(mpHbFace, aFtFace->face_index);
-hb_face_set_upem(mpHbFace, mfUnitsPerEM);
+hb_face_set_upem(mpHbFace, mnUnitsPerEM);
 }
 
 HbLayoutEngine::~HbLayoutEngine()
@@ -380,8 +380,8 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 hb_font_t *pHbFont = hb_font_create(mpHbFace);
 hb_font_set_funcs(pHbFont, pHbFontFuncs, &rFont, NULL);
 hb_font_set_scale(pHbFont,
-((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) 
mfUnitsPerEM) >> 16,
-((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) 
mfUnitsPerEM) >> 16);
+((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) 
mnUnitsPerEM) >> 16,
+((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) 
mnUnitsPerEM) >> 16);
 hb_font_set_ppem(pHbFont, aFtFace->size->metrics.x_ppem, 
aFtFace->size->metrics.y_ppem);
 
 // allocate temporary arrays, note: round to even
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - vcl/generic vcl/inc vcl/Library_vcl.mk vcl/source

[Khaled Hosny]

 vcl/Library_vcl.mk  |1 
 vcl/generic/glyphs/gcach_layout.cxx |  279 +++-
 vcl/generic/glyphs/scrptrun.cxx |  225 +
 vcl/generic/glyphs/scrptrun.h   |  177 ++
 vcl/inc/sallayout.hxx   |8 -
 vcl/source/gdi/sallayout.cxx|8 -
 6 files changed, 564 insertions(+), 134 deletions(-)

New commits:
commit ee8a36a9678cad3f99a7df96ce59077d237a195f
Author: Khaled Hosny 
Date:   Sat Jan 18 01:08:18 2014 +0200

Simplify

Change-Id: Id018e985110b024ff107f4221501ece2cf27f5d3

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 20677ac..cb2d521 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -34,8 +34,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -326,7 +324,7 @@ static hb_unicode_funcs_t* getUnicodeFuncs(void)
 class HbLayoutEngine : public ServerFontLayoutEngine
 {
 private:
-UScriptCode meScriptCode;
+hb_script_t maHbScript;
 hb_face_t*  mpHbFace;
 int mfUnitsPerEM;
 
@@ -338,7 +336,7 @@ public:
 };
 
 HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont)
-:   meScriptCode(USCRIPT_INVALID_CODE),
+:   maHbScript(HB_SCRIPT_INVALID),
 mpHbFace(NULL),
 mfUnitsPerEM(0)
 {
@@ -359,10 +357,11 @@ struct HbScriptRun
 {
 int32_t mnMin;
 int32_t mnEnd;
-UScriptCode maScript;
+hb_script_t maScript;
 
 HbScriptRun(int32_t nMin, int32_t nEnd, UScriptCode aScript)
-: mnMin(nMin), mnEnd(nEnd), maScript(aScript)
+: mnMin(nMin), mnEnd(nEnd),
+  maScript(hb_icu_script_to_script(aScript))
 {}
 };
 
@@ -432,7 +431,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int nMinRunPos = it->mnMin;
 int nEndRunPos = it->mnEnd;
 int nRunLen = nEndRunPos - nMinRunPos;
-meScriptCode = it->maScript;
+maHbScript = it->maScript;
 
 OString sLanguage = 
OUStringToOString(rArgs.maLanguageTag.getLanguage(), RTL_TEXTENCODING_UTF8);
 
@@ -442,7 +441,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 hb_buffer_t *pHbBuffer = hb_buffer_create();
 hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
 hb_buffer_set_direction(pHbBuffer, bRightToLeft ? 
HB_DIRECTION_RTL: HB_DIRECTION_LTR);
-hb_buffer_set_script(pHbBuffer, 
hb_icu_script_to_script(meScriptCode));
+hb_buffer_set_script(pHbBuffer, maHbScript);
 hb_buffer_set_language(pHbBuffer, 
hb_language_from_string(sLanguage.getStr(), -1));
 hb_buffer_add_utf16(pHbBuffer, rArgs.mpStr, rArgs.mnLength, 
nMinRunPos, nRunLen);
 hb_shape(pHbFont, pHbBuffer, NULL, 0);
@@ -546,7 +545,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 
 // determine need for kashida justification
 if((rArgs.mpDXArray || rArgs.mnLayoutWidth)
-&& ((meScriptCode == USCRIPT_ARABIC) || (meScriptCode == USCRIPT_SYRIAC)))
+&& ((maHbScript == HB_SCRIPT_ARABIC) || (maHbScript == HB_SCRIPT_SYRIAC)))
 rArgs.mnFlags |= SAL_LAYOUT_KASHIDA_JUSTIFICATON;
 
 return true;
commit e41b8ca51465c21e9b0cdde59fa908d908d80879
Author: Khaled Hosny 
Date:   Sat Jan 18 00:57:55 2014 +0200

Minor

Change-Id: Iefaa98350c8d6116aa07d4d91be29104a930b8db

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index f450ee1..20677ac 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -328,7 +328,7 @@ class HbLayoutEngine : public ServerFontLayoutEngine
 private:
 UScriptCode meScriptCode;
 hb_face_t*  mpHbFace;
-int fUnitsPerEM;
+int mfUnitsPerEM;
 
 public:
 HbLayoutEngine(ServerFont&);
@@ -340,14 +340,14 @@ public:
 HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont)
 :   meScriptCode(USCRIPT_INVALID_CODE),
 mpHbFace(NULL),
-fUnitsPerEM(0)
+mfUnitsPerEM(0)
 {
 FT_Face aFtFace = rServerFont.GetFtFace();
-fUnitsPerEM = rServerFont.GetEmUnits();
+mfUnitsPerEM = rServerFont.GetEmUnits();
 
 mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, NULL);
 hb_face_set_index(mpHbFace, aFtFace->face_index);
-hb_face_set_upem(mpHbFace, fUnitsPerEM);
+hb_face_set_upem(mpHbFace, mfUnitsPerEM);
 }
 
 HbLayoutEngine::~HbLayoutEngine()
@@ -381,8 +381,8 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 hb_font_t *pHbFont = hb_font_create(mpHbFace);
 hb_font_set_funcs(pHbFont, pHbFontFuncs, &rFont, NULL);
 hb_font_set_scale(pHbFont,
-((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) 
fUnitsPerEM) >> 16,
- 

[Libreoffice-commits] core.git: sw/source

[Takeshi Abe]

 sw/source/ui/dbui/dbinsdlg.cxx  |6 +++---
 sw/source/ui/dbui/dbmgr.cxx |5 +++--
 sw/source/ui/docvw/SidebarTxtControlAcc.cxx |3 ++-
 sw/source/ui/fldui/DropDownFieldDialog.cxx  |4 +++-
 sw/source/ui/misc/glosdoc.cxx   |5 +++--
 sw/source/ui/shells/tabsh.cxx   |4 +++-
 sw/source/ui/shells/textsh2.cxx |5 +++--
 sw/source/ui/shells/txtcrsr.cxx |4 +++-
 sw/source/ui/uiview/viewling.cxx|5 +++--
 sw/source/ui/uno/unoatxt.cxx|5 +++--
 sw/source/ui/uno/unomailmerge.cxx   |5 +++--
 11 files changed, 32 insertions(+), 19 deletions(-)

New commits:
commit 5e6d1e3332ea4cd31d2c5e739dc27bb37b34b4dc
Author: Takeshi Abe 
Date:   Sat Jan 18 05:54:58 2014 +0900

Replace deprecated std::auto_ptr with boost::scoped_ptr

Change-Id: Ib05c6d509a71e01b50b2e23588da607f29036711

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 0d53502..7c4901d 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -19,8 +19,6 @@
 
 #include "dbinsdlg.hxx"
 
-#include 
-
 #include 
 
 #include 
@@ -92,6 +90,8 @@
 #include 
 #include 
 
+#include 
+
 namespace swui
 {
 SwAbstractDialogFactory * GetFactory();
@@ -968,7 +968,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const 
Sequence& rSelection,
 if( rSh.HasSelection() )
 rSh.DelRight();
 
-::std::auto_ptr pWait;
+boost::scoped_ptr pWait;
 
 Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY );
 Reference  xCols = xColsSupp->getColumns();
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 057b691..3d4c9ed 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -120,12 +120,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+
 using namespace ::osl;
 using namespace ::svx;
 using namespace ::com::sun::star;
@@ -904,7 +905,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* 
pSourceShell,
 SfxObjectShellLock xTargetDocShell;
 
 SwView* pTargetView = 0;
-std::auto_ptr< utl::TempFile > aTempFile;
+boost::scoped_ptr< utl::TempFile > aTempFile;
 OUString sModifiedStartingPageDesc;
 OUString sStartingPageDesc;
 sal_uInt16 nStartingPageNo = 0;
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx 
b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index 7fc6e3b..f7a74cd 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 
+#include 
 
 namespace sw { namespace sidebarwindows {
 
@@ -114,7 +115,7 @@ IMPL_LINK(SidebarTextEditSource, NotifyHdl, EENotify*, 
pNotify)
 {
 if ( pNotify )
 {
-::std::auto_ptr< SfxHint > aHint( 
SvxEditSourceHelper::EENotification2Hint( pNotify ) );
+boost::scoped_ptr< SfxHint > aHint( 
SvxEditSourceHelper::EENotification2Hint( pNotify ) );
 
 if( aHint.get() )
 {
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index ea83cf7..ebb6ae1 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 
@@ -81,7 +83,7 @@ void sw::DropDownFieldDialog::Apply()
 {
 rSh.StartAllAction();
 
-::std::auto_ptr const pCopy(
+boost::scoped_ptr const pCopy(
 static_cast( pDropField->CopyField() ) );
 
 pCopy->SetPar1(sSelect);
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index a56556b..c12b1d0 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -19,7 +19,6 @@
 
 
 #include 
-#include 
 
 #include 
 
@@ -45,6 +44,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -641,7 +642,7 @@ Reference< text::XAutoTextEntry > 
SwGlossaries::GetAutoTextEntry(
 {
 //standard must be created
 sal_Bool bCreate = ( rCompleteGroupName == GetDefName() );
-::std::auto_ptr< SwTextBlocks > pGlosGroup( GetGroupDoc( 
rCompleteGroupName, bCreate ) );
+boost::scoped_ptr< SwTextBlocks > pGlosGroup( GetGroupDoc( 
rCompleteGroupName, bCreate ) );
 
 if ( pGlosGroup.get() && !pGlosGroup->GetError() )
 {
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 9df5372..4152393 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -84,6 +84,8 @@
 #include "swabstdlg.hxx"
 #include 
 
+#include 
+
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
@@ -879,7 +881,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
 if ( FN_TABLE_INSERT_ROW_DLG != nSlot || 
!rSh.I

[Libreoffice-commits] core.git: desktop/source

[Eike Rathke]

 desktop/source/app/langselect.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8e826c7ff7c597e9f585377b2117f4dc24239dcc
Author: Eike Rathke 
Date:   Fri Jan 17 19:21:56 2014 +0100

fdo#73549 do not attempt to resolve an empty locale

... to match installed UI locales

Change-Id: If0ad0fde392bc5ea3cf454f4858330f5e93a

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index 291e708..21228f8 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -53,6 +53,9 @@ OUString foundLocale;
 OUString getInstalledLocale(
 css::uno::Sequence const & installed, OUString const & locale)
 {
+if (locale.isEmpty())
+return OUString();  // do not attempt to resolve anything
+
 for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
 if (installed[i] == locale) {
 return installed[i];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1529286401043b3fbcad23f404aa5cfbe19b07db
Author: Markus Mohrhard 
Date:   Fri Jan 17 23:41:31 2014 +0100

it should be chart2.opengl for the logging

Change-Id: Id1a2c990c8510e70a465e648b3d3ed1120ab283a

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index a8fea00..11a77f3 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -555,7 +555,7 @@ BitmapEx OpenGLRender::GetAsBitmap()
 aWriter.Write( sOutput );
 sOutput.Close();
 } catch (...) {
-SAL_WARN("slideshow.opengl", "Error writing png to " << aName);
+SAL_WARN("chart2.opengl", "Error writing png to " << aName);
 }
 #endif
 
@@ -907,7 +907,7 @@ void OpenGLRender::Release()
 
 glXMakeCurrent(glWin.dpy, None, NULL);
 if( glGetError() != GL_NO_ERROR ) {
-SAL_INFO("slideshow.opengl", "glError: " << (char 
*)gluErrorString(glGetError()));
+SAL_INFO("chart2.opengl", "glError: " << (char 
*)gluErrorString(glGetError()));
 }
 glXDestroyContext(glWin.dpy, glWin.ctx);
 glWin.ctx = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Peilin]

 chart2/source/view/main/OpenGLRender.cxx |6 +++---
 chart2/source/view/main/OpenGLRender.hxx |1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 21a658f44c630580718fe6f04bc89645dea5f64e
Author: Peilin 
Date:   Fri Jan 17 11:36:57 2014 +0800

we only need one variable for the current color

Change-Id: I322199a8bb2ee654d155a1d09473a71847486ac4

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 77018c1..a8fea00 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -605,7 +605,7 @@ int OpenGLRender::RenderLine2FBO(int)
 glUseProgram(m_CommonProID);
 CHECK_GL_ERROR();
 
-glUniform4fv(m_2DColorID, 1, &m_Line2DColor[0]);
+glUniform4fv(m_2DColorID, 1, &m_2DColor[0]);
 CHECK_GL_ERROR();
 glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]);
 //CHECK_GL_ERROR();
@@ -918,7 +918,6 @@ void OpenGLRender::Release()
 
 OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
 m_Model(glm::mat4(1.0f)),
-m_Line2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
 m_TextureObj(0),
 m_FboID(0),
 m_RboID(0),
@@ -926,6 +925,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape 
> xTarget):
 m_iHeight(0),
 mxRenderTarget(xTarget),
 mbArbMultisampleSupported(false),
+m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
 m_TextVertexID(0),
 m_TextTexCoordID(1),
 m_ClearColor(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f))
@@ -995,7 +995,7 @@ int OpenGLRender::CreateBMPHeader(sal_uInt8 *bmpHeader, int 
xsize, int ysize)
 
 void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b)
 {
-m_Line2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b / 
255.0f, m_fAlpha);
+m_2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b / 
255.0f, m_fAlpha);
 }
 
 void OpenGLRender::SetLine2DWidth(int width)
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 2e8e6e0..58a3aef 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -204,7 +204,6 @@ private:
 
 GLint m_RenderProID;
 
-glm::vec4 m_Line2DColor;
 
 GLuint m_VertexBuffer;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scaddins/source

[Noel Grandin]

 scaddins/source/analysis/analysis.cxx   |6 +-
 scaddins/source/analysis/analysishelper.cxx |   13 +-
 scaddins/source/analysis/analysishelper.hxx |   60 +---
 3 files changed, 10 insertions(+), 69 deletions(-)

New commits:
commit 8e694ee17f8d84ac32151b56e4f5aa4663c8c067
Author: Noel Grandin 
Date:   Fri Jan 10 10:29:24 2014 +0200

convert custom list implementation to regular std::vector

Change-Id: I6749307d5b72ddc69581b4aa685091383117073d
Reviewed-on: https://gerrit.libreoffice.org/7369
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index 467b603..bec4960 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -478,8 +478,8 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL 
AnalysisAddIn::getCompatibilityNa
 if( !p )
 return uno::Sequence< sheet::LocalizedName >( 0 );
 
-const StringList&   r = p->GetCompNameList();
-sal_uInt32  nCount = r.Count();
+const std::vector& r = p->GetCompNameList();
+sal_uInt32   nCount = r.size();
 
 uno::Sequence< sheet::LocalizedName >aRet( nCount );
 
@@ -487,7 +487,7 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL 
AnalysisAddIn::getCompatibilityNa
 
 for( sal_uInt32 n = 0 ; n < nCount ; n++ )
 {
-pArray[ n ] = sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
+pArray[ n ] = sheet::LocalizedName( GetLocale( n ), r[n] );
 }
 
 return aRet;
diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 33c035f..11c4eb5 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1441,13 +1441,6 @@ void MyList::Insert( void* p, sal_uInt32 n )
 
 
 
-StringList::~StringList()
-{
-for( OUString* p = ( OUString* ) First() ; p ; p = ( OUString* ) Next() )
-delete p;
-}
-
-
 class AnalysisRscStrArrLoader : public Resource
 {
 private:
@@ -1480,10 +1473,10 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& 
rResMgr ) :
 const ResStringArray&   rArr = aArrLoader.GetStringArray();
 
 sal_uInt16  nCount = sal::static_int_cast( 
rArr.Count() );
-sal_uInt16  n;
 
-for( n = 0 ; n < nCount ; n++ )
-aCompList.Append( rArr.GetString( n ) );
+aCompList.resize( nCount );
+for( sal_uInt16 n = 0 ; n < nCount ; n++ )
+aCompList[n] = rArr.GetString( n );
 }
 
 
diff --git a/scaddins/source/analysis/analysishelper.hxx 
b/scaddins/source/analysis/analysishelper.hxx
index 66a25a5..df56154 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -177,27 +177,6 @@ public:
 };
 
 
-
-
-class StringList : protected MyList
-{
-public:
-virtual ~StringList();
-
-inline const OUString*First( void );
-inline const OUString*Next( void );
-inline const OUString*Get( sal_uInt32 nIndex ) const;
-
-using MyList::Append;
-inline void Append( OUString* pNew );
-inline void Append( const OUString& rNew );
-
-using MyList::Count;
-};
-
-
-
-
 enum FDCategory
 {
 FDCat_AddIn,
@@ -235,7 +214,7 @@ private:
 
 sal_uInt16  nParam; // num of parameters
 sal_uInt16  nCompID;
-StringList  aCompList;  // list of all valid names
+std::vector  aCompList;  // list of all valid names
 FDCategory  eCat;   // function category
 public:
 FuncData( const FuncDataBase& rBaseData, ResMgr& );
@@ -249,7 +228,8 @@ public:
 sal_uInt16  GetStrIndex( sal_uInt16 nParamNum ) const;
 inline sal_Bool Is( const OUString& rCompareTo ) const;
 
-inline const StringList&GetCompNameList( void ) const;
+inline const std::vector &
+GetCompNameList( void ) const;
 
 inline FDCategory   GetCategory( void ) const;
 };
@@ -700,38 +680,6 @@ inline sal_uInt32 MyList::Count( void ) const
 
 
 
-inline const OUString* StringList::First( void )
-{
-return ( const OUString* ) MyList::First();
-}
-
-
-inline const OUString* StringList::Next( void )
-{
-return ( const OUString* ) MyList::Next();
-}
-
-
-inline const OUString* StringList::Get( sal_uInt32 n ) const
-{
-return ( const OUString* ) MyList::GetObject( n );
-}
-
-
-inline void StringList::Append( OUString* p )
-{
-MyList::Append( p );
-}
-
-
-inline void StringList::Append( const OUString& r )
-{
-MyList::Append( new OUString( r ) );
-}
-
-
-
-
 inline sal_uInt16 FuncData::GetUINameID( void ) const
 {
 return nUINameID;
@@ -762,7 +710,7 @@ inline sal_Bool FuncData::Is( const OUString& r ) const
 }
 
 
-inline const StringList& FuncData::

[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/crsr/findtxt.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 156a0235bd8ff06840cecad1e70a57ffc5b8e7e1
Author: Michael Stahl 
Date:   Fri Jan 17 23:09:50 2014 +0100

fdo#73660: sw: fix Find of words containing soft-hyphen

Soft hyphen was not detected if there is no hint (-1).

(regression from ebeff3f074dd94dce4ce6cc55abd0495103684bd)

Change-Id: I09108796a32429a01eff93f797a6de521ab1d08a

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index b3ca32c..135a260 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -89,7 +89,9 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, 
sal_Int32& rEnd,
 bNewHint = true;
 }
 // Check if next stop is a soft hyphen.
-else if (-1 != nSoftHyphen && nSoftHyphen < nHintStart && nSoftHyphen 
< nEnd)
+else if (   -1 != nSoftHyphen
+ && (-1 == nHintStart || nSoftHyphen < nHintStart)
+ && nSoftHyphen < nEnd)
 {
 nStt = nSoftHyphen;
 bNewSoftHyphen = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MABs and priority (was: minutes of ESC call ...)

[Bjoern Michaelsen]

Hi,

On Fri, Jan 17, 2014 at 10:18:18AM -0800, bfoman wrote:
> This proposal seems do not take into account Priority and Severity
> combinations

How so? Or better: What usecase does the new workflow disrespect that worked
before. FWIW, development didnt base anything on priority or severity so far,
so what are we losing?

> and IMHO is not possible with editbugs and canconfirm
> privileges for everyone. Better to not have Pri-wars in the Bugzilla.

Again: nothing is changing really wrt permission as before everyone had the
permissions too to mark a MAB.

> Anyway this workflow should be updated when there will be new bugs triage
> policy change:
> https://wiki.documentfoundation.org/File:Prioritizing_Bugs_Flowchart.jpg.

Yes. This is not yet a policy change, its about enabling to do one later. But
FWIW, we had:
- most MABs were not in priority highest
- most priority highest were not MAB
suggesting that the flowcharts was hardly followed at all (thus making priority
mostly useless). IF everyone would have followed that flowchart, all priority
highest would also have been MAB, which certainly was not at all the case.

Ultimately, this:

 https://plus.google.com/+KoheiYoshida/posts/ZEPmsBjay8K

is another reason for using priority, which inherently has multiple levels
(unlike MABs) and is an inbuild feature of bugzilla without reinventing the
wheel.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Mac OS X 64-bit, libstdc++ vs. libc++

[Norbert Thiebaud]

On Fri, Jan 17, 2014 at 3:02 AM, Stephan Bergmann  wrote:
[...]
> two libraries to work with both flavors of LO.  (And, given the assumption
> that Apple will eventually discontinue the support of libstdc++, recommend
> that native extensions---which there are none yet for Mac OS X 64-bit---use
> libc++.)
>
> Other thoughts?
>
I defer to your expertise on that...
I know it is very very late in the release cycle for 4.2..  otoh if
the premise of your technical argument are true, the switch should be
'transparent' no?
iow, if we are going to take a risk, why not take it right now rather
than actually _have_ released version for 64 bits with 2 different std
lib.
worse case scenario we just do not release the 64 bits version for
4.2... and wait for 4.2.1.

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Minutes of ESC call 2014-01-09

[bfoman]

Jan Holesovsky-4 wrote
> * Completed Action Items:
> + test & document windows debug symbol server (QA guys?)
> http://dev-downloads.libreoffice.org/symstore/symbols/
>   [ Cloph uploading RC2 symbols, and also the source server! - so
> sources will be available
> in the debugger too ]

Hi!
Tested with Version: 4.2.0.2 Build ID:
cd65d6220c5694ee7012d7863bcde3455c9e3c30 Windows 8.1 Enterprise 64 bit
and works flawlessly - example bt with source code section
https://bugs.freedesktop.org/attachment.cgi?id=92304 (bug
https://bugs.freedesktop.org/show_bug.cgi?id=73542 is very nasty crasher).
Once again big thanks for setting this up.
Best regards.




--
View this message in context: 
http://nabble.documentfoundation.org/Minutes-of-ESC-call-2014-01-09-tp4091476p4092722.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: dictionaries

[Martin Srebotnjak]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5d8c377cec1d8b4cc0832ee6f5e848e1f331536
Author: Martin Srebotnjak 
Date:   Fri Jan 17 21:46:33 2014 +0100

Updated core
Project: dictionaries  2c29ae21dc3d2889812b456737474278e82c023b

diff --git a/dictionaries b/dictionaries
index c95f482..2c29ae2 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c95f482ac7ac866047864c47f87a8751e634749d
+Subproject commit 2c29ae21dc3d2889812b456737474278e82c023b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 66986, which changed state.

Bug 66986 Summary: EDITING: PIVOT TABLE, moving a row field to a page field and 
back, change pivot table location one row down.
https://bugs.freedesktop.org/show_bug.cgi?id=66986

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

mariosv  changed:

   What|Removed |Added

 Depends on||66986

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 48775, which changed state.

Bug 48775 Summary: CRASH when opening biblio.odb via tools menu without Base 
module installed
https://bugs.freedesktop.org/show_bug.cgi?id=48775

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/tool/compiler.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit b1e1ab577fe7f402a5367a624963338a1dbf6a55
Author: Tor Lillqvist 
Date:   Fri Jan 17 21:21:23 2014 +0200

Follow-up (micro-?)optimisation

Change-Id: Ia49cb02b2374e1c284bb4dee77e333fe6c8839ce

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 3730d24..ff1cbb1 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1631,24 +1631,34 @@ void ScCompiler::SetRefConvention( 
FormulaGrammar::AddressConvention eConv )
 
 const ScCompiler::Convention* ScCompiler::GetRefConvention( 
FormulaGrammar::AddressConvention eConv )
 {
-static const ConventionOOO_A1 ConvOOO_A1;
-static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
-static const ConventionXL_A1 ConvXL_A1;
-static const ConventionXL_R1C1 ConvXL_R1C1;
-static const ConventionXL_OOX ConvXL_OOX;
 
 switch (eConv)
 {
 case FormulaGrammar::CONV_OOO:
+{
+static const ConventionOOO_A1 ConvOOO_A1;
 return &ConvOOO_A1;
+}
 case FormulaGrammar::CONV_ODF:
+{
+static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
 return &ConvOOO_A1_ODF;
+}
 case FormulaGrammar::CONV_XL_A1:
+{
+static const ConventionXL_A1 ConvXL_A1;
 return &ConvXL_A1;
+}
 case FormulaGrammar::CONV_XL_R1C1:
+{
+static const ConventionXL_R1C1 ConvXL_R1C1;
 return &ConvXL_R1C1;
+}
 case FormulaGrammar::CONV_XL_OOX:
+{
+static const ConventionXL_OOX ConvXL_OOX;
 return &ConvXL_OOX;
+}
 case FormulaGrammar::CONV_UNSPECIFIED:
 default:
 ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MABs and priority (was: minutes of ESC call ...)

[bfoman]

Bjoern Michaelsen wrote
> This is done now too, so right now, all NEW bugs(*) with priority highest
> should
> also block a MAB and all NEW bugs blocking a MAB should be priority
> highest.

Hi!
This proposal seems do not take into account Priority and Severity
combinations and IMHO is not possible with editbugs and canconfirm
privileges for everyone. Better to not have Pri-wars in the Bugzilla.
Anyway this workflow should be updated when there will be new bugs triage
policy change:
https://wiki.documentfoundation.org/File:Prioritizing_Bugs_Flowchart.jpg.
Best regards.
P.S.
I think that without any bugs management process against a target branch or
timeframe a single MAB meta bug (as it was to be in the future) is not a bad
idea after all.




--
View this message in context: 
http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4092566p4092704.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: chart2/source

[Kohei Yoshida]

 chart2/source/controller/dialogs/tp_DataSourceControls.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f63b4f3d688f0c5e4e7a4ceb796487094f63082
Author: Kohei Yoshida 
Date:   Fri Jan 17 12:48:14 2014 -0500

Fix build error.

Change-Id: Ide87ccfe71f42d77246b6b3a2e864b5c89d80647

diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx 
b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index e373469..d92c98a 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -38,7 +38,7 @@ public:
 virtual ~SeriesEntry();
 
 /// the corresponding data series
-::com::sun::star::uno::Reference<::com::sun::star::chart2::XDataSeries > 
m_xDataSeries;
+::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > 
m_xDataSeries;
 
 /// the chart type that contains the series (via XDataSeriesContainer)
 ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > 
m_xChartType;
___
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' - bb/94c19d2c7df1c468d38b7744e0d34e8ac27a99

[Caolán McNamara]

 bb/94c19d2c7df1c468d38b7744e0d34e8ac27a99 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aa0dd264def0c9e2fdab6b62d712321da743be3d
Author: Caolán McNamara 
Date:   Fri Jan 17 17:11:58 2014 +

Notes added by 'git notes add'

diff --git a/bb/94c19d2c7df1c468d38b7744e0d34e8ac27a99 
b/bb/94c19d2c7df1c468d38b7744e0d34e8ac27a99
new file mode 100644
index 000..7f0ed81
--- /dev/null
+++ b/bb/94c19d2c7df1c468d38b7744e0d34e8ac27a99
@@ -0,0 +1 @@
+merged as: 285d62c554956d44a66128f57952de492037ffde
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source svx/source

[Caolán McNamara]

 cui/source/inc/grfpage.hxx  |1 +
 cui/source/tabpages/grfpage.cxx |5 +
 svx/source/svdraw/svdoashp.cxx  |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit dfddb1d3029e1f129e94b5a2e802f32dd03fe188
Author: Caolán McNamara 
Date:   Fri Jan 17 17:10:19 2014 +

need to call SetFrameSize on Resize

otherwise if the crop tab is not the initial tab shown then
it doesn't repaint correctly when it is shown

Change-Id: Ie61819fe3fb089b716547fa5e54352ae04fd8087

diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 474565d..0b13e11 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -36,6 +36,7 @@ public:
 SvxCropExample( Window* pPar, WinBits nStyle );
 
 virtual void Paint( const Rectangle& rRect );
+virtual void Resize();
 virtual Size GetOptimalSize() const;
 
 void SetTopLeft( const Point& rNew ){ aTopLeft = rNew; }
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1a2592f..6b27019 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -786,6 +786,11 @@ void SvxCropExample::Paint( const Rectangle& )
 DrawRect( aRect );
 }
 
+void SvxCropExample::Resize()
+{
+SetFrameSize(aFrameSize);
+}
+
 void SvxCropExample::SetFrameSize( const Size& rSz )
 {
 aFrameSize = rSz;
commit 285d62c554956d44a66128f57952de492037ffde
Author: Andre Fischer 
Date:   Fri Jan 17 15:45:31 2014 +

105491: Switched update of vertical flag and setting the item set to avoid 
infinite recursion.
(cherry picked from commit bb94c19d2c7df1c468d38b7744e0d34e8ac27a99)

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 783f046..7e213b7 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2298,10 +2298,10 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool 
bVertical )
 case SDRTEXTHORZADJUST_BLOCK: 
aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
 }
 
-SetObjectItemSet( aNewSet );
 pOutlinerParaObject = GetOutlinerParaObject();
 if ( pOutlinerParaObject )
 pOutlinerParaObject->SetVertical(bVertical);
+SetObjectItemSet( aNewSet );
 
 // restore object size
 SetSnapRect(aObjectRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sw/qa

[Miklos Vajna]

 oox/source/vml/vmlshapecontext.cxx   |2 ++
 sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 
 3 files changed, 6 insertions(+)

New commits:
commit 75934fc178ed90b56d77eb1efebed5bdac8427b6
Author: Miklos Vajna 
Date:   Fri Jan 17 17:25:08 2014 +0100

VML import: handle shape with text inside groupshape as TextShape

This matches the behavior of the WW8 import and gives us the required
text wrapping when the shape text doesn't fit in a single line.

Change-Id: I32a13516503620344d313593834be29a3dc9f726

diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index 9e51e2a..d8d39eb 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -459,6 +459,8 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 
nElement, const Attri
 dynamic_cast( mrShape ).setService(
 "com.sun.star.text.TextFrame");
 }
+else
+
dynamic_cast(mrShape).setService("com.sun.star.drawing.TextShape");
 return new TextBoxContext( *this, 
mrShapeModel.createTextBox(mrShape.getTypeModel()), rAttribs,
 mrShape.getDrawing().getFilter().getGraphicHelper());
 case VMLX_TOKEN( ClientData ):
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx
index 74dd72a..d401c18 100644
Binary files a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx and 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2e9ff53..0f5de74 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -975,6 +975,10 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, 
"groupshape-child-rotation
 xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY);
 // This was 887, i.e. border distances were included in the height.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height);
+
+uno::Reference 
xShapeDescriptor(xGroupShape->getByIndex(5), uno::UNO_QUERY);
+// This was com.sun.star.drawing.RectangleShape, all shape text in a 
single line.
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), 
xShapeDescriptor->getShapeType());
 }
 
 DECLARE_OOXMLIMPORT_TEST(testN793262, "n793262.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - drawinglayer/source include/drawinglayer include/svtools include/svx sc/qa sc/source svtools/source svx/source vcl/source

[Kohei Yoshida]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |  210 
--
 drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx  |5 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |   84 +++-
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx|   11 
 include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx |3 
 include/drawinglayer/processor2d/vclpixelprocessor2d.hxx  |3 
 include/svtools/borderhelper.hxx  |   17 
 include/svx/framelink.hxx |   23 -
 sc/qa/unit/subsequent_filters-test.cxx|4 
 sc/source/filter/excel/xistyle.cxx|4 
 sc/source/filter/inc/stylesbuffer.hxx |4 
 sc/source/filter/inc/xlconst.hxx  |   11 
 sc/source/filter/oox/stylesbuffer.cxx |   42 +-
 svtools/source/control/ctrlbox.cxx|  110 ++---
 svx/source/dialog/framelink.cxx   |   49 ++
 vcl/source/gdi/outdev6.cxx|   45 +-
 16 files changed, 371 insertions(+), 254 deletions(-)

New commits:
commit 98633cd8fc3fe7e2e5176c3329cf287c913471d7
Author: Kohei Yoshida 
Date:   Mon Jan 13 13:18:25 2014 -0500

fdo#73487: Overhaul cell borders to make them look sane.

Change-Id: I207db352e017214f61baa947ef8f34662c724087

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index c281d8e..de1a02d 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -28,7 +28,23 @@
 #include 
 #include 
 
-//
+namespace {
+
+void moveLine(basegfx::B2DPolygon& rPoly, double fGap, const 
basegfx::B2DVector& rVector)
+{
+if (basegfx::fTools::equalZero(rVector.getX()))
+{
+basegfx::B2DHomMatrix aMat(1, 0, fGap, 0, 1, 0);
+rPoly.transform(aMat);
+}
+else if (basegfx::fTools::equalZero(rVector.getY()))
+{
+basegfx::B2DHomMatrix aMat(1, 0, 0, 0, 1, fGap);
+rPoly.transform(aMat);
+}
+}
+
+}
 
 namespace drawinglayer
 {
@@ -114,7 +130,6 @@ namespace drawinglayer
 if(!getStart().equal(getEnd()) && ( isInsideUsed() || 
isOutsideUsed() ) )
 {
 // get data and vectors
-const double fWidth(getWidth(rViewInformation));
 basegfx::B2DVector aVector(getEnd() - getStart());
 aVector.normalize();
 const basegfx::B2DVector 
aPerpendicular(basegfx::getPerpendicular(aVector));
@@ -124,124 +139,66 @@ namespace drawinglayer
 
 if(isOutsideUsed() && isInsideUsed())
 {
-const double fExt = getWidth(rViewInformation);  // Extend 
a lot: it'll be clipped after
-
-// both used, double line definition. Create left and 
right offset
-xRetval.realloc(2);
-sal_uInt32 nInsert(0);
+basegfx::B2DPolygon aPolygon;
+const double fExt = getWidth(rViewInformation);  // Extend 
a lot: it'll be clipped later.
+const basegfx::B2DPoint aTmpStart(getStart() - (fExt * 
aVector));
+const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * 
aVector));
 
-basegfx::B2DPolygon aGap;
+// Get which is the line to show
+double nWidth = getLeftWidth();
+basegfx::BColor aColor = getRGBColorLeft();
 
-{
-// create geometry for left
-const basegfx::B2DVector aLeftOff(aPerpendicular * 
(0.5 * (lcl_GetCorrectedWidth(mfLeftWidth, getStart(), getEnd(), 
rViewInformation) - fWidth + 1)));
-const basegfx::B2DPoint aTmpStart(getStart() + 
aLeftOff - ( fExt * aVector));
-const basegfx::B2DPoint aTmpEnd(getEnd() + aLeftOff + 
( fExt * aVector));
-basegfx::B2DPolygon aLeft;
-
-if (lcl_UseHairline(mfLeftWidth, getStart(), getEnd(),
-rViewInformation))
-{
-// create hairline primitive
-aLeft.append(aTmpStart);
-aLeft.append(aTmpEnd);
+bool const bIsHairline = lcl_UseHairline(
+nWidth, getStart(), getEnd(), rViewInformation);
+nWidth = lcl_GetCorrectedWidth(nWidth,
+getStart(), getEnd(), rViewInformation);
 
-basegfx::B2DPolyPolygon

[Libreoffice-commits] core.git: chart2/uiconfig

[Caolán McNamara]

 chart2/uiconfig/ui/tp_DataSource.ui   |3 
 chart2/uiconfig/ui/tp_RangeChooser.ui |  245 --
 2 files changed, 119 insertions(+), 129 deletions(-)

New commits:
commit e44e87ae12fcc9b7b84c2386675aeec4acd6432e
Author: Caolán McNamara 
Date:   Fri Jan 17 16:29:21 2014 +

standardize indent between tabpages

Change-Id: I1a8b5e7ad1688b968ad9a91f987e14c1d75b542b

diff --git a/chart2/uiconfig/ui/tp_DataSource.ui 
b/chart2/uiconfig/ui/tp_DataSource.ui
index a0f20a8..d36559f 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -41,7 +41,6 @@
   
 True
 False
-6
 True
 True
 12
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui 
b/chart2/uiconfig/ui/tp_RangeChooser.ui
index 5ef8000..c9bbcc6 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -13,29 +14,42 @@
 6
 12
 
-  
+  
 True
 False
 True
-6
-12
+vertical
+6
 
-  
+  
+True
+False
+0
+Choose a data 
range
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
 True
 False
 True
-6
-vertical
-6
+12
 
-  
+  
 True
 False
 0
-Choose a data 
range
-
-  
-
+_Data 
range:
+True
+ED_RANGE
   
   
 False
@@ -44,140 +58,117 @@
   
 
 
-  
+  
 True
 False
 True
-12
-
-  
-True
-False
-0
-_Data 
range:
-True
-ED_RANGE
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-True
-•
-  
-  
-False
-True
-1
-  
-
-
-  
-True
-False
-True
-Select 
data range
-imageIB_RANGE
-  
-  
-False
-True
-2
-  
-
-  
-  
-False
-True
-2
-  
-
-
-  
-Data series in 
_rows
-True
-False
-False
-True
-0
-True
-True
-RB_DATACOLS
-  
-  
-False
-True
-3
-  
-
-
-  
-Data series in 
_columns
-True
-False
-False
-True
-0
-True
-True
-RB_DATAROWS
+•
   
   
 False
 True
-4
+1
   
 
 
-  
-_First row as 
label
+  
 True
 False
-False
-True
-0
-True
+True
+Select data 
range
+imageIB_RANGE
   
   
 False
 True
-5
-  
-
-
-  
-F_irst column as 
label
-True
-False
-False
-True
-0
-True
-  
-  
-False
-True
-6
-  
-
-
-  
-False
-Data Range
-  
-  
-False
-True
-7
+2
   
 
   
+   

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12ec0a80a4c0b2cc01dece833f3f92523bd13a6d
Author: Caolán McNamara 
Date:   Fri Jan 17 16:17:17 2014 +

Updated core
Project: help  48be01cfea8e46888219d8b384031ce09c1d829d

diff --git a/helpcontent2 b/helpcontent2
index f9723f6..48be01c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f9723f6b047938a0bb00dfaae407cc3184acd697
+Subproject commit 48be01cfea8e46888219d8b384031ce09c1d829d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst  |   11 ---
 source/text/schart/01/wiz_data_series.xhp |   21 +++--
 2 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 48be01cfea8e46888219d8b384031ce09c1d829d
Author: Caolán McNamara 
Date:   Fri Jan 17 16:17:17 2014 +

update help ids for data series tab page .ui conversion

Change-Id: I3a7465ffc521e07531b964f53868adfb45bdf2b3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0bbfd60..de03375 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2996,7 +2996,6 @@ HID_SCH_CTL_DATA,63290,
 HID_SCH_CTL_TYPE,63293,
 HID_SCH_CTL_VARIANT,63294,
 HID_SCH_CT_INDICATE,63291,
-HID_SCH_DATA_RANGES_LIST,63296,
 HID_SCH_DATA_SERIES_LABEL,63367,
 HID_SCH_LB_BAR_GEOMETRY,63325,
 HID_SCH_LEGEND_POS_BOTTOM,63343,
@@ -3005,7 +3004,6 @@ HID_SCH_LEGEND_POS_RIGHT,63342,
 HID_SCH_LEGEND_POS_TOP,63341,
 HID_SCH_LEGEND_SHOW,63366,
 HID_SCH_NUM_OF_LINES,63323,
-HID_SCH_SERIES_LIST,63295,
 HID_SCH_STATISTIK_BIGERROR,63349,
 HID_SCH_STATISTIK_BIGERROR_VALUE,63352,
 HID_SCH_STATISTIK_MEANVALUE,63344,
@@ -5519,22 +5517,13 @@ chart2_CheckBox_TP_CHARTTYPE_CB_SPLINES,551781380,
 chart2_CheckBox_TP_CHARTTYPE_CB_STACKED,551781379,
 chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381,
 chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377,
-chart2_Edit_TP_DATA_SOURCE_EDT_CATEGORIES,551848056,
-chart2_Edit_TP_DATA_SOURCE_EDT_RANGE,551848016,
 chart2_FL_GRIDS_TP_WIZARD_TITLEANDOBJECTS,551813120,
-chart2_ImageButton_TP_DATA_SOURCE_IMB_RANGE_CAT,551857794,
-chart2_ImageButton_TP_DATA_SOURCE_IMB_RANGE_MAIN,551857754,
 chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937,
 chart2_ListBox_TP_LOCATION_LB_TABLE,551833089,
 chart2_PushButton_TP_CHARTTYPE_PB_SPLINE_DIALOG,551784961,
-chart2_PushButton_TP_DATA_SOURCE_BTN_ADD,551850526,
-chart2_PushButton_TP_DATA_SOURCE_BTN_DOWN,551850646,
-chart2_PushButton_TP_DATA_SOURCE_BTN_REMOVE,551850536,
-chart2_PushButton_TP_DATA_SOURCE_BTN_UP,551850636,
 chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y,551780866,
 chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867,
 chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868,
-chart2_TabPage_TP_DATA_SOURCE,551845888,
 chart2_TabPage_TP_LAYOUT,551731200,
 chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
diff --git a/source/text/schart/01/wiz_data_series.xhp 
b/source/text/schart/01/wiz_data_series.xhp
index f4cc182..7559fd1 100644
--- a/source/text/schart/01/wiz_data_series.xhp
+++ b/source/text/schart/01/wiz_data_series.xhp
@@ -79,17 +79,18 @@
 Enter or select a cell range that will be used as text for 
categories or data labels. UFI: red text means 
what?
 
 
+
 Depending on the chart type, the texts are shown on the X axis or as 
data labels. Regina: If you enter a range here, the check 
box "First column as label" (assumed data series in columns) on the Data Range 
page of the dialog is marked automatically and if you erase the entry in the 
input field, it is unchecked automatically.data series list 
box
-Shows a list of 
all data series in the chart. Click an entry to view and edit that data series. 
Click Add to insert a new series into the list after the selected 
entry.data ranges list box
-Shows all the data ranges used by the data series that is 
selected in the Data Series list box. Each data range shows the role name and 
the source range address.range for ... & 
shrinky
-
-Shows the source 
range address from the second column of the Data Range list box. You can change 
the range in the text box or by dragging in the document. To minimize this 
dialog while you select the data range in Calc, click the Select data 
range button.categories & 
shrinky
-
-Shows the source 
range address of the categories (the texts you can see on the x-axis of a 
category chart). For an XY-chart, the text box contains the source range of the 
data labels which are displayed for the data points. To minimize this dialog 
while you select the data range in Calc, click the Select data 
range button.add button
-Adds a new entry 
below the current entry in the Data Series list. If an entry is selected, the 
new data series gets the same chart type.Remove 
button
-Removes the 
selected entry from the Data Series list.^ up 
button
-Moves up the 
selected entry in the Data Series list.v down 
button
-Moves down the 
selected entry in the Data Series list.
+Shows a list of 
all data series in the chart. Click an entry to view and edit that data series. 
Click Add to insert a new series into the list after the selected 
entry.data ranges list box
+Shows all the 
data ranges used by the data series that is selected in the Data Series list 
box. Each data range shows the role name and the source range 
address.range for ... & shrinky
+
+Shows the source 
range address from the second column of the Data Range list box. You can change 
the range in the text box or by dragging in the document. To minimize th

Re: [libreoffice-dev] - libreoffice 4.2 extension - waiting on multiple sockets

[Neeraj Rai]

Sorry,  this was a false alarm.
I was deploying my lib built with 4.0 to 4.2. Once I recompiled with new
options needed with 4.2, and redeployed, everything works as before.

Thanks
Neeraj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

[Andre Fischer]

 svx/source/svdraw/svdoashp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb94c19d2c7df1c468d38b7744e0d34e8ac27a99
Author: Andre Fischer 
Date:   Fri Jan 17 15:45:31 2014 +

105491: Switched update of vertical flag and setting the item set to avoid 
infinite recursion.

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a82c5cc..771f158 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2598,10 +2598,10 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool 
bVertical )
 case SDRTEXTHORZADJUST_BLOCK: 
aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
 }
 
-SetObjectItemSet( aNewSet );
 pOutlinerParaObject = GetOutlinerParaObject();
 if ( pOutlinerParaObject )
 pOutlinerParaObject->SetVertical(bVertical);
+SetObjectItemSet( aNewSet );
 
 // restore object size
 SetSnapRect(aObjectRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: data streams in 4.2

[Neeraj Rai]

Thanks Kohei. I'll browse around
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [lo-4.2] regview fails to show rdb files

[Neeraj Rai]

No trivial issues encountered. -O was the only change needed

Thanks
Neeraj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Tor Lillqvist]

 sc/inc/compiler.hxx  |6 --
 sc/source/core/tool/compiler.cxx |   37 ++---
 2 files changed, 14 insertions(+), 29 deletions(-)

New commits:
commit 92bede3900e84d4f08efb81757ec95c518c7fa76
Author: Tor Lillqvist 
Date:   Fri Jan 17 16:21:48 2014 +0200

Avoid some global statics that drag in lots of code in the static linking 
case

When doing static linking, i.e. when building the single executable
for an iOS app, or the single DSO for an Android app, we list all our
libraries (which all are static archives) on the linker command
line. Static initializers in any library always get linked in, so it
is a good idea to avoid such in the cases where they drag in a large
amount of code. Which was the case here.

Change-Id: Idef9aec1c10686c86f517ad10cf540a313d9c829

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index a8757e7..0a1763b 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -289,12 +289,6 @@ private:
 static CharClass*pCharClassEnglish;  // 
character classification for en_US locale
 static const Convention *pConventions[ 
formula::FormulaGrammar::CONV_LAST ];
 
-static const Convention * const pConvOOO_A1;
-static const Convention * const pConvOOO_A1_ODF;
-static const Convention * const pConvXL_A1;
-static const Convention * const pConvXL_R1C1;
-static const Convention * const pConvXL_OOX;
-
 static struct AddInMap
 {
 const char* pODFF;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 7b9bced..3730d24 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -272,7 +272,7 @@ void ScCompiler::SetGrammarAndRefConvention(
 if (pDoc)
 SetRefConvention( pDoc->GetAddressConvention());
 else
-SetRefConvention( pConvOOO_A1);
+SetRefConvention( GetRefConvention( FormulaGrammar::CONV_OOO ) );
 }
 else
 SetRefConvention( eConv );
@@ -922,9 +922,6 @@ struct ConventionOOO_A1 : public Convention_A1
 }
 };
 
-static const ConventionOOO_A1 ConvOOO_A1;
-const ScCompiler::Convention * const ScCompiler::pConvOOO_A1 = &ConvOOO_A1;
-
 struct ConventionOOO_A1_ODF : public ConventionOOO_A1
 {
 ConventionOOO_A1_ODF() : ConventionOOO_A1 (FormulaGrammar::CONV_ODF) { }
@@ -983,9 +980,6 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1
 }
 };
 
-static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
-const ScCompiler::Convention * const ScCompiler::pConvOOO_A1_ODF = 
&ConvOOO_A1_ODF;
-
 struct ConventionXL
 {
 static void GetTab(
@@ -1307,17 +1301,11 @@ struct ConventionXL_A1 : public Convention_A1, public 
ConventionXL
 }
 };
 
-static const ConventionXL_A1 ConvXL_A1;
-const ScCompiler::Convention * const ScCompiler::pConvXL_A1 = &ConvXL_A1;
-
 struct ConventionXL_OOX : public ConventionXL_A1
 {
 ConventionXL_OOX() : ConventionXL_A1( FormulaGrammar::CONV_XL_OOX ) { }
 };
 
-static const ConventionXL_OOX ConvXL_OOX;
-const ScCompiler::Convention * const ScCompiler::pConvXL_OOX = &ConvXL_OOX;
-
 static void
 r1c1_add_col( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const 
ScAddress& rAbsRef )
 {
@@ -1526,9 +1514,6 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 }
 };
 
-static const ConventionXL_R1C1 ConvXL_R1C1;
-const ScCompiler::Convention * const ScCompiler::pConvXL_R1C1 = &ConvXL_R1C1;
-
 ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& 
rPos,ScTokenArray& rArr)
 : FormulaCompiler(rArr),
 pDoc( pDocument ),
@@ -1537,7 +1522,7 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const 
ScAddress& rPos,ScTokenArra
 pCharClass( ScGlobal::pCharClass ),
 mnPredetectedReference(0),
 mnRangeOpPosInSymbol(-1),
-pConv( pConvOOO_A1 ),
+pConv( GetRefConvention( FormulaGrammar::CONV_OOO ) ),
 meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ),
 mbCloseBrackets( true ),
 mbRewind( false )
@@ -1563,7 +1548,7 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const 
ScAddress& rPos)
 pCharClass( ScGlobal::pCharClass ),
 mnPredetectedReference(0),
 mnRangeOpPosInSymbol(-1),
-pConv( pConvOOO_A1 ),
+pConv( GetRefConvention( FormulaGrammar::CONV_OOO ) ),
 meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ),
 mbCloseBrackets( true ),
 mbRewind( false )
@@ -1646,18 +1631,24 @@ void ScCompiler::SetRefConvention( 
FormulaGrammar::AddressConvention eConv )
 
 const ScCompiler::Convention* ScCompiler::GetRefConvention( 
FormulaGrammar::AddressConvention eConv )
 {
+static const ConventionOOO_A1 ConvOOO_A1;
+static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
+static const ConventionXL_A1 ConvXL_A1;
+static const ConventionXL_R1C1 ConvXL_R1C1;
+static const ConventionXL_OOX C

[Libreoffice-commits] core.git: oox/source sw/qa

[Miklos Vajna]

 oox/source/vml/vmlshape.cxx  |2 ++
 sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 
 3 files changed, 6 insertions(+)

New commits:
commit 734cf8395d745db73f52fd6d625d7deb77ba6d40
Author: Miklos Vajna 
Date:   Fri Jan 17 16:09:14 2014 +0100

VML import: fix height of textboxes when border distance is non-zero

The VML concept is that the height / width of a textbox is absolute, and
border distances only affect the position of the shape text, not the
size of it. OTOH, when we set the Text*Distance UNO properties on a
textbox, the size may change. Make sure that during VML import setting
those properties doesn't change the size.

Change-Id: I53b328b66572fc05027be344869bc1a78d88

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 9e6f208..17b8818 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -620,10 +620,12 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 getTextBox()->convert(xShape);
 if (getTextBox()->borderDistanceSet)
 {
+awt::Size aSize = xShape->getSize();
 PropertySet(xShape).setAnyProperty(PROP_TextLeftDistance, 
makeAny(sal_Int32(getTextBox()->borderDistanceLeft)));
 PropertySet(xShape).setAnyProperty(PROP_TextUpperDistance, 
makeAny(sal_Int32(getTextBox()->borderDistanceTop)));
 PropertySet(xShape).setAnyProperty(PROP_TextRightDistance, 
makeAny(sal_Int32(getTextBox()->borderDistanceRight)));
 PropertySet(xShape).setAnyProperty(PROP_TextLowerDistance, 
makeAny(sal_Int32(getTextBox()->borderDistanceBottom)));
+xShape->setSize(aSize);
 }
 }
 }
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx
index 06aa39d..74dd72a 100644
Binary files a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx and 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 32e54d2..2e9ff53 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -971,6 +971,10 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, 
"groupshape-child-rotation
 uno::Reference xShape(xGroupShape->getByIndex(0), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().X);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().Y);
+
+xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY);
+// This was 887, i.e. border distances were included in the height.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height);
 }
 
 DECLARE_OOXMLIMPORT_TEST(testN793262, "n793262.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/README icon-themes/tango officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

[Samuel Mehrbrodt]

 icon-themes/README  |2 
 icon-themes/tango/links.txt |4 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   21 +++
 sw/inc/cmdid.h  |7 -
 sw/sdi/_viewsh.sdi  |   10 +
 sw/sdi/swriter.sdi  |   53 
+-
 sw/source/ui/inc/view.hxx   |2 
 sw/source/ui/ribbar/workctrl.cxx|   13 --
 sw/source/ui/uiview/view2.cxx   |   31 
-
 sw/uiconfig/swriter/toolbar/findbar.xml |4 
 10 files changed, 123 insertions(+), 24 deletions(-)

New commits:
commit 0f86895fcd1001324974d644a728152b97b22ab0
Author: Samuel Mehrbrodt 
Date:   Mon Dec 9 11:12:13 2013 +0100

Add the Navigation buttons to the Search toolbar

They were remove from below the scrollbar before and it was decided to put 
them on the Search toolbar: 
http://nabble.documentfoundation.org/Libreoffice-ux-advise-Remove-the-Navigator-button-below-the-scrollbar-in-Writer-tp4083097p4086370.html

Change-Id: I5f7dfc0aa522e97cf3821c494525c967dcd6a92c
Reviewed-on: https://gerrit.libreoffice.org/7006
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/README b/icon-themes/README
index 00d9fbc..b18813a 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -78,7 +78,7 @@ How to add a new icon for a new command:
 
 
   Here, you need to define a property named "Properties", with its value set
-  to 1.  (TODO: Check if this step is still necessary.)
+  to 1 so that the icons show up.
 
 - Now, you need to add 2 new icon images under icon-themes/galaxy/cmd/, one
   for the large size and one for the smaller size.  The name of each image
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 3bf1ba3..b615f5e 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -94,6 +94,10 @@ sd/imglst/sc27095.png cmd/sc_toggleobjectrotatemode.png
 cmd/lc_browseforward.png cmd/lc_pagedown.png
 cmd/lc_navigateforward.png cmd/lc_pagedown.png
 cmd/lc_nextpage.png cmd/lc_pagedown.png
+cmd/lc_scrolltoprevious.png cmd/lc_pageup.png
+cmd/sc_scrolltoprevious.png cmd/sc_pageup.png
+cmd/lc_scrolltonext.png cmd/lc_pagedown.png
+cmd/sc_scrolltonext.png cmd/sc_pagedown.png
 res/lc06300.png cmd/lc_pagedown.png
 cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
 cmd/sc_closewin.png cmd/sc_closedoc.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 88ec469..4ed20add 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2319,6 +2319,27 @@
   Continue previous numbering
 
   
+  
+
+  Navigate by
+
+  
+  
+
+  Previous Element
+
+
+1
+
+  
+  
+
+  Next Element
+
+
+1
+
+  
   
 
   Back
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 2c7afac..4ed35a4 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -204,8 +204,7 @@ included in c-context files, so c++ style stuff will cause 
problems.
 #define FN_DROP_REGION_LINK (FN_VIEW + 38)  /**/
 #define FN_DROP_REGION_COPY (FN_VIEW + 39)  /**/
 
-#define FN_SCROLL_NAVIGATION(FN_VIEW + 40)  /* Navigation Controller in 
the scrollbar */
-#define FN_SCROLL_NEXT_PREV (FN_VIEW + 41)  /* processes MoveType */
+#define FN_SCROLL_NAVIGATION(FN_VIEW + 40)  /* Navigation Controller */
 
 #define FN_VIEW_HIDDEN_PARA (FN_VIEW + 42)  /* View hidden paragraphs */
 #define FN_VIEW_SMOOTH_SCROLL   (FN_VIEW + 43)
@@ -223,6 +222,10 @@ included in c-context files, so c++ style stuff will cause 
problems.
 #define FN_VSCROLL_METRIC(FN_VIEW + 54) /* Metric vertical scrollbar */
 #define FN_VIEW_NOTES(FN_VIEW + 55)
 
+#define FN_NAVIGATION_POPUP (FN_VIEW + 56)  /* Navigation Popup */
+#define FN_SCROLL_PREV  (FN_VIEW + 57)  /* uno:ScrollToPrevious */
+#define FN_SCROLL_NEXT  (FN_VIEW + 58)  /* uno:ScrollToNext */
+
 /*
 Region: Insert
  */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 54152af..7513606 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -76,7 +76,15 @@ interface BaseTextEditView
 ExecMethod = NoExec ;
 StateMethod = NoState ;
 ]
-FN_SCROLL_NEXT_PREV
+FN_NAVIGATION_POPUP
+[
+

[Libreoffice-commits] core.git: include/unotest unotest/source

[Michael Stahl]

 include/unotest/bootstrapfixturebase.hxx|3 +++
 unotest/source/cpp/bootstrapfixturebase.cxx |8 
 2 files changed, 11 insertions(+)

New commits:
commit 769778e489722f454fa3d81ffcf73f1934a0a88b
Author: Michael Stahl 
Date:   Fri Jan 17 16:07:36 2014 +0100

test::BootstrapFixtureBase::getPathFromWorkdir not unused

Change-Id: I4ddad27d1e5a4de9885956b80db37f1e2f80a96e

diff --git a/include/unotest/bootstrapfixturebase.hxx 
b/include/unotest/bootstrapfixturebase.hxx
index d69be43..c447f4f 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -62,9 +62,12 @@ public:
   // return a Path to a given c-str path from the source directory
   OUString getPathFromSrc( const char *pPath );
 
+
   // return a URL to a given c-str path from the workdir directory
   OUString getURLFromWorkdir( const char *pPath );
 
+  // return a Path to a given c-str path from the workdir directory
+  OUString getPathFromWorkdir( const char *pPath );
   virtual void setUp();
   virtual void tearDown();
 
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bootstrapfixturebase.cxx
index cc8ae3f..87a72a7 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -83,6 +83,14 @@ OUString test::BootstrapFixtureBase::getURLFromWorkdir( 
const char *pPath )
 return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
 }
 
+#ifdef _WIN32 // ifdef just to keep it out of unusedcode.easy
+OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
+{
+return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
+
+}
+#endif
+
 void test::BootstrapFixtureBase::setUp()
 {
 // set UserInstallation to user profile dir in test/user-template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

[Caolán McNamara]

 cui/source/inc/align.hxx|5 
 cui/source/tabpages/align.cxx   |   13 +
 dbaccess/AllLangResTarget_dbu.mk|1 
 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/control/FieldDescControl.cxx |3 
 dbaccess/source/ui/dlg/dlgattr.cxx  |   35 +
 dbaccess/source/ui/dlg/dlgattr.src  |   77 ---
 dbaccess/source/ui/inc/UITools.hxx  |1 
 dbaccess/source/ui/inc/dbu_resource.hrc |1 
 dbaccess/source/ui/inc/dlgattr.hrc  |   30 
 dbaccess/source/ui/inc/dlgattr.hxx  |7 -
 dbaccess/source/ui/misc/UITools.cxx |   16 --
 dbaccess/uiconfig/ui/fielddialog.ui |  159 
 13 files changed, 197 insertions(+), 152 deletions(-)

New commits:
commit 2681f6442faa7b50fb49c48d64f64d3fddcc776e
Author: Caolán McNamara 
Date:   Fri Jan 17 14:59:01 2014 +

fix up logic to hide empty frames for e.g. field format in dbaccess

Change-Id: I85a71cbc3f072940a369c10e13fe40a13008df66

diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index c56925e..d6b6937 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,6 +81,7 @@ private:
 ListBox* m_pLbHorAlign;
 FixedText*   m_pFtIndent;
 MetricField* m_pEdIndent;
+FixedText*   m_pFtVerAlign;
 ListBox* m_pLbVerAlign;
 
 DialControl* m_pCtrlDial;
@@ -103,6 +105,9 @@ private:
 FixedText*   m_pFtCelLock;
 FixedText*   m_pFtABCD;
 
+VclContainer*m_pAlignmentFrame;
+VclContainer*m_pOrientFrame;
+VclContainer*m_pPropertiesFrame;
 };
 
 // 
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 5ba830a..7e07163 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -160,6 +160,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const 
SfxItemSet& rCoreAttr
 get(m_pLbHorAlign,"comboboxHorzAlign");
 get(m_pFtIndent,"labelIndent");
 get(m_pEdIndent,"spinIndentFrom");
+get(m_pFtVerAlign,"labelVertAlign");
 get(m_pLbVerAlign,"comboboxVertAlign");
 
 //text rotation
@@ -188,6 +189,10 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const 
SfxItemSet& rCoreAttr
 get(m_pFtCelLock,"labelSTR_CELLLOCK");
 get(m_pFtABCD,"labelABCD");
 
+get(m_pAlignmentFrame, "alignment");
+get(m_pOrientFrame, "orientation");
+get(m_pPropertiesFrame, "properties");
+
 m_pCtrlDial->SetText(m_pFtABCD->GetText());
 
 InitVsRefEgde();
@@ -227,6 +232,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const 
SfxItemSet& rCoreAttr
 AddItemConnection( new HorJustConnection( SID_ATTR_ALIGN_HOR_JUSTIFY, 
*m_pLbHorAlign, s_pHorJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
 AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_INDENT, 
*m_pFtIndent, sfx::ITEMCONN_HIDE_UNKNOWN ) );
 AddItemConnection( new sfx::UInt16MetricConnection( SID_ATTR_ALIGN_INDENT, 
*m_pEdIndent, FUNIT_TWIP, sfx::ITEMCONN_HIDE_UNKNOWN ) );
+AddItemConnection( new sfx::DummyItemConnection( 
SID_ATTR_ALIGN_VER_JUSTIFY, *m_pFtVerAlign, sfx::ITEMCONN_HIDE_UNKNOWN ) );
 AddItemConnection( new VerJustConnection( SID_ATTR_ALIGN_VER_JUSTIFY, 
*m_pLbVerAlign, s_pVerJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
 AddItemConnection( new DialControlConnection( SID_ATTR_ALIGN_DEGREES, 
*m_pCtrlDial, sfx::ITEMCONN_HIDE_UNKNOWN ) );
 AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_DEGREES, 
*m_pFtRotate, sfx::ITEMCONN_HIDE_UNKNOWN ) );
@@ -370,6 +376,13 @@ void AlignmentTabPage::UpdateEnableControls()
 // shrink only without automatic line break, and not for block, fill or 
distribute.
 m_pBtnShrink->Enable( (m_pBtnWrap->GetState() == STATE_NOCHECK) && 
!bHorBlock && !bHorFill && !bHorDist );
 
+// visibility of frames
+m_pAlignmentFrame->Show(m_pLbHorAlign->IsVisible() || 
m_pEdIndent->IsVisible() ||
+m_pLbVerAlign->IsVisible());
+m_pOrientFrame->Show(m_pCtrlDial->IsVisible() || m_pVsRefEdge->IsVisible() 
||
+m_pCbStacked->IsVisible() || m_pCbAsianMode->IsVisible());
+m_pPropertiesFrame->Show(m_pBtnWrap->IsVisible() || 
m_pBtnHyphen->IsVisible() ||
+m_pBtnShrink->IsVisible() || m_pLbFrameDir->IsVisible());
 }
 
 bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 
nWhich ) const
commit 3a806d027cb744cde08e0c4472bec5159d5a541d
Author: Caolán McNamara 
Date:   Fri Jan 17 14:06:13 2014 +

convert field dialog to .ui

Change-Id: Ic268c17941038319240bb70d59d04c9b9a7a2412

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
ind

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - drawinglayer/source

[Michael Stahl]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9c569b326c9d2d71132e722a1783e7e201c1bf3c
Author: Michael Stahl 
Date:   Fri Jan 17 15:17:55 2014 +0100

fdo#72530: drawinglayer: fix PDF export of lossless picture

Don't pass empty Rectangle to PDFExtOutDevData::EndGroup(), it will
result in early return from PDFWriterImpl::drawJPGBitmap() and no
picture in the PDF.  Passing in the same Rectangle for the 3rd and 4th
parameter will avoid cropping in PDFExtOutDevData.

(regression from 677df250becd5cde71c6310f647e78ac3763347e)

Change-Id: Icf110fe3e635319419fcacc7bc684c792a34d6ad
(cherry picked from commit c8e9038b13c64df430fb4e3fecac65a3c507e3e8)
Reviewed-on: https://gerrit.libreoffice.org/7502
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index f6aad73..94fc972 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -824,7 +824,8 @@ namespace drawinglayer
 sal_Int32(floor(aCurrentRange.getMinX())), 
sal_Int32(floor(aCurrentRange.getMinY())),
 sal_Int32(ceil(aCurrentRange.getMaxX())), 
sal_Int32(ceil(aCurrentRange.getMaxY(;
 const GraphicAttr& rAttr = 
rGraphicPrimitive.getGraphicAttr();
-Rectangle aCropRect;
+// fdo#72530 don't pass empty Rectangle to EndGroup
+Rectangle aCropRect(aCurrentRect);
 
 if(rAttr.IsCropped())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

[Michael Stahl]

 external/curl/ExternalProject_curl.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7edb1f5f32b21a934e3ed4999482ceb07568dfd0
Author: Michael Stahl 
Date:   Fri Jan 17 15:54:59 2014 +0100

curl: we really want --with-darwinssl on Mac for libcmis

(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7)

Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 208a556..42cb4e8 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -35,14 +35,16 @@ ifeq ($(SYSTEM_NSS),NO)
 curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
 endif
 
+# use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter 
IOS,$(OS)),--with-darwinssl,--without-ssl) \
-   $(if $(filter MACOSX,$(OS)),,\
+   $(if $(filter MACOSX IOS,$(OS)),\
+   --with-darwinssl, \
--with-nss$(if $(filter 
NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+   --without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Foss  changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=54157

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Foss  changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=65675

-- 
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-0' - sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 99251c897665cf45e2be813a53eb850aa67ffda1
Author: Caolán McNamara 
Date:   Fri Jan 17 12:31:28 2014 +

ellipsize incorrectly set here for some reason

so the opencl options dialog has ellipsized strings in it

(cherry picked from commit 251f21699ef786557134fc00ff1293acb57e4158)
(cherry picked from commit ca1b5e35ba4f0b476cebc99cc0cbf562271171e7)

Change-Id: I85b89c59c3545aef538da47a3d3727110cff4a82
Reviewed-on: https://gerrit.libreoffice.org/7500
Reviewed-by: Markus Mohrhard 
Reviewed-by: Fridrich Strba 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui 
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 2e1b93b..305e8e3 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -178,7 +178,6 @@
 0
 0
 True
-end
 56
   
   
@@ -291,7 +290,7 @@
 vertical
 2
 
-  
+  
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Stephan Bergmann]

On 01/17/2014 01:24 PM, Philipp Weissenbacher wrote:

BTW: It's good practice to at least run ./autogen.sh before commiting
(that catches these nasty syntax errors).


That would only catch syntax errors in configure.ac.  Preferable to run 
"make check" or at least "make", but that can of course be way beyond 
the scope of a "clean up comments" task.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Stephan Bergmann]

On 01/17/2014 12:50 PM, Sven Wehner wrote:

sorry, I guess I misspoke:
Those examples, which I listed, are rather obvious problems that aren't 
translation related.
So let me rephrase:
How to call a developer's attention to small pieces of code?
And especially: may I combine that with translation patches?


I did get that (and think Philipp gave a good response in the 
meantime---I'd only add that if you do find something that looks 
genuinely broken, best raise it on the dev ML or IRC channel).



I thought "OSL_ENSURE(false, …)" would be "problematic", because firstly there is an 
"OSL_FAIL" definition in "include/osl/diagnose.h", which seems to do exactly that.
Secondly, the place I saw this (cui/source/tabpages/numpages.cxx line 2791 ff.) 
encapsulates that statement in an if clause.
Together with the error message ("cannot happen"), it implies that could be 
reduced from…
--- snip ---
 if (SVX_MAX_NUM <= nLvl)
 {
 OSL_ENSURE(false, "cannot happen.");
 return;
 }
--- snap ---
… to something like this:
--- snip ---
 OSL_ENSURE_RETURN(!(SVX_MAX_NUM <= nLvl), "cannot happen.");
--- snap ---
(with OSL_ENSURE_RETURN being a OSL_ENSURE including a return statement.)

If OSL_ENSURE is deprecated anyway, I guess this is irrelevant anyway.


That specific case should probably be rewritten as either

  if (nLvl >= SVX_MAX_NUM) {
 SAL_WARN("cui.tabpages", "should never happen");
 return;
  }

or

  assert(nLvl < SVX_MAX_NUM)

depending on context (see 
 
for details), but there is already EasyHack 
 "Clean up 
OSL_ASSERT, DBG_ASSERT, etc.," so no need to call developers' attention 
on OSL_ENSURE(false,...) in general.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 72530, which changed state.

Bug 72530 Summary: Certain graphics lost in PDF export if lossless compression 
used
https://bugs.freedesktop.org/show_bug.cgi?id=72530

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: drawinglayer/source

[Michael Stahl]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c8e9038b13c64df430fb4e3fecac65a3c507e3e8
Author: Michael Stahl 
Date:   Fri Jan 17 15:17:55 2014 +0100

fdo#72530: drawinglayer: fix PDF export of lossless picture

Don't pass empty Rectangle to PDFExtOutDevData::EndGroup(), it will
result in early return from PDFWriterImpl::drawJPGBitmap() and no
picture in the PDF.  Passing in the same Rectangle for the 3rd and 4th
parameter will avoid cropping in PDFExtOutDevData.

(regression from 677df250becd5cde71c6310f647e78ac3763347e)

Change-Id: Icf110fe3e635319419fcacc7bc684c792a34d6ad

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index ac5d6e7..5e14161 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -824,7 +824,8 @@ namespace drawinglayer
 sal_Int32(floor(aCurrentRange.getMinX())), 
sal_Int32(floor(aCurrentRange.getMinY())),
 sal_Int32(ceil(aCurrentRange.getMaxX())), 
sal_Int32(ceil(aCurrentRange.getMaxY(;
 const GraphicAttr& rAttr = 
rGraphicPrimitive.getGraphicAttr();
-Rectangle aCropRect;
+// fdo#72530 don't pass empty Rectangle to EndGroup
+Rectangle aCropRect(aCurrentRect);
 
 if(rAttr.IsCropped())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools include/svx include/unotest svtools/source svx/source unotest/source unusedcode.easy

[Petr Vorel]

 include/svtools/toolpanel/toolpaneldeck.hxx  |1 -
 include/svx/dialcontrol.hxx  |2 --
 include/unotest/bootstrapfixturebase.hxx |3 ---
 svtools/source/toolpanel/toolpaneldeck.cxx   |6 --
 svx/source/dialog/dialcontrol.cxx|5 -
 svx/source/sidebar/line/LineWidthControl.cxx |8 
 svx/source/sidebar/line/LineWidthControl.hxx |1 -
 unotest/source/cpp/bootstrapfixturebase.cxx  |6 --
 unusedcode.easy  |4 
 9 files changed, 36 deletions(-)

New commits:
commit db27efd29761a87fe3ab946c99c18530e828e58a
Author: Petr Vorel 
Date:   Thu Jan 9 08:52:53 2014 +0100

removed some unused code (svx, svtools, unotest)

Change-Id: I1250581d69423030bd0a93a1529458b8d424ce3e
Reviewed-on: https://gerrit.libreoffice.org/7329
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx 
b/include/svtools/toolpanel/toolpaneldeck.hxx
index 8ba584b..3ad4fcd 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -155,7 +155,6 @@ namespace svt
 
 Calling this method has no effect if CreateAccessible had always 
been called.
 */
-voidSetAccessibleParentWindow( ::Window* 
i_pAccessibleParent );
 ::Window*   GetAccessibleParentWindow() const;
 
 // IToolPanelDeck
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index f50cb59..06fecd1 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -119,8 +119,6 @@ public:
 
 /** The passed handler is called whenever the totation value changes. */
 voidSetModifyHdl( const Link& rLink );
-/** Returns the current modify handler. */
-const Link& GetModifyHdl() const;
 
 /** Save value for later comparison */
 voidSaveValue();
diff --git a/include/unotest/bootstrapfixturebase.hxx 
b/include/unotest/bootstrapfixturebase.hxx
index c447f4f..d69be43 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -62,12 +62,9 @@ public:
   // return a Path to a given c-str path from the source directory
   OUString getPathFromSrc( const char *pPath );
 
-
   // return a URL to a given c-str path from the workdir directory
   OUString getURLFromWorkdir( const char *pPath );
 
-  // return a Path to a given c-str path from the workdir directory
-  OUString getPathFromWorkdir( const char *pPath );
   virtual void setUp();
   virtual void tearDown();
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx 
b/svtools/source/toolpanel/toolpaneldeck.cxx
index 81b6dac..92cbc87 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -516,12 +516,6 @@ namespace svt
 }
 
 //
-void ToolPanelDeck::SetAccessibleParentWindow( Window* i_pAccessibleParent 
)
-{
-m_pImpl->SetAccessibleParentWindow( i_pAccessibleParent );
-}
-
-//
 Window* ToolPanelDeck::GetAccessibleParentWindow() const
 {
 Window* pAccessibleParent( m_pImpl->GetAccessibleParentWindow() );
diff --git a/svx/source/dialog/dialcontrol.cxx 
b/svx/source/dialog/dialcontrol.cxx
index 4a780a6..2e21ec9 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -432,11 +432,6 @@ void DialControl::SetModifyHdl( const Link& rLink )
 mpImpl->maModifyHdl = rLink;
 }
 
-const Link& DialControl::GetModifyHdl() const
-{
-return mpImpl->maModifyHdl;
-}
-
 // private 
 
 void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx 
b/svx/source/sidebar/line/LineWidthControl.cxx
index 816f34e..7db6d4c 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -192,14 +192,6 @@ void LineWidthControl::GetFocus()
 
 
 
-ValueSet& LineWidthControl::GetValueSet()
-{
-return maVSWidth;
-}
-
-
-
-
 void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit 
eMapUnit)
 {
 mbVSFocus = true;
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx 
b/svx/source/sidebar/line/LineWidthControl.hxx
index e4060f9..b9808f1 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -38,7 +38,6 @@ public:
 virtual void Paint(const Rectangle& rect);
 
 void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit);
-ValueSet& GetValueSet();
 bool IsCloseByEdit();
 long GetTmpCustomWidth();
 
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bo

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - include/svx vcl/source

[Kohei Yoshida]

 include/svx/framelinkarray.hxx |6 +++---
 vcl/source/gdi/outdev6.cxx |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 341ec4a0ae1104a0fde20043bb43acd9a415fcdc
Author: Kohei Yoshida 
Date:   Fri Jan 17 08:45:20 2014 -0500

Remove warning and build error with MSVC.

Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957

diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 9383748..caf0623 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -23,11 +23,11 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 
+#include 
+
 namespace svx {
 namespace frame {
 
@@ -380,7 +380,7 @@ public:
 // 
 
 private:
-typedef std::auto_ptr< ArrayImpl > ArrayImplPtr;
+typedef boost::scoped_ptr ArrayImplPtr;
 
 ArrayImplPtrmxImpl;
 };
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index ef1def5..1b194d5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -58,8 +58,8 @@ Polygon toPolygon( const basegfx::B2DPolygon& rPoly )
 // This polygon not empty but is too small to display.  Approximate it
 // with a rectangle large enough to be displayed.
 double nX = aRange.getMinX(), nY = aRange.getMinY();
-double nW = std::max(1.0, round(fW));
-double nH = std::max(1.0, round(fH));
+double nW = std::max(1.0, rtl::math::round(fW));
+double nH = std::max(1.0, rtl::math::round(fH));
 
 Polygon aTarget;
 aTarget.Insert(0, Point(nX, nY));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

[Matúš Kukan]

 solenv/bin/native-code.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 0ee948fe59d4a2d1e00c16718cbfb18260847dc4
Author: Matúš Kukan 
Date:   Fri Jan 17 14:41:10 2014 +0100

Add some missing implementations from fwk component.

There will be more needed.

Change-Id: Ibb3dff0e080370f25a3e8ff07ab78c1e9b73be52

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2657438..9e8f1a2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -50,6 +50,12 @@ core_factory_list = [
 ]
 
 core_constructor_list = [
+# framework/util/fwk.component
+"com_sun_star_comp_framework_ModuleManager_get_implementation",
+"com_sun_star_comp_framework_URLTransformer_get_implementation",
+"com_sun_star_comp_framework_Frame_get_implementation",
+"com_sun_star_comp_framework_LayoutManager_get_implementation",
+"com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation",
 # sax/source/expatwrap/expwrap.component
 "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Bryan Quigley]

 filter/source/config/fragments/filters/ODG_FlatXML.xcu |2 +-
 filter/source/config/fragments/filters/ODP_FlatXML.xcu |2 +-
 filter/source/config/fragments/filters/ODS_FlatXML.xcu |2 +-
 filter/source/config/fragments/filters/ODT_FlatXML.xcu |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 17f39da974adcb39a1d4e2abfd071eff66eee8b5
Author: Bryan Quigley 
Date:   Sun Nov 10 14:29:31 2013 -0500

Make Flat XML document name consistant with ODF
List discussion: 
http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html

Change-Id: I4ddaa7adcffefbedab895f5e94eb6bd92201386e
Reviewed-on: https://gerrit.libreoffice.org/7488
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu 
b/filter/source/config/fragments/filters/ODG_FlatXML.xcu
index f370f43..ff5fefc 100644
--- a/filter/source/config/fragments/filters/ODG_FlatXML.xcu
+++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu
@@ -24,7 +24,7 @@
 com.sun.star.comp.Writer.XmlFilterAdaptor
 
 
-OpenDocument Drawing (Flat XML)
+Flat XML ODF Drawing
 
 IMPORT EXPORT OWN 
3RDPARTYFILTER
 
diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu 
b/filter/source/config/fragments/filters/ODP_FlatXML.xcu
index c45962f..d568b43 100644
--- a/filter/source/config/fragments/filters/ODP_FlatXML.xcu
+++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu
@@ -24,7 +24,7 @@
 com.sun.star.comp.Writer.XmlFilterAdaptor
 
 
-OpenDocument Presentation (Flat XML)
+Flat XML ODF Presentation
 
 IMPORT EXPORT OWN 
3RDPARTYFILTER
 
diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu 
b/filter/source/config/fragments/filters/ODS_FlatXML.xcu
index 4c8b7b6..e7b1ed7 100644
--- a/filter/source/config/fragments/filters/ODS_FlatXML.xcu
+++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu
@@ -24,7 +24,7 @@
 com.sun.star.comp.Writer.XmlFilterAdaptor
 
 
-OpenDocument Spreadsheet (Flat XML)
+Flat XML ODF Spreadsheet
 
 IMPORT EXPORT OWN 
3RDPARTYFILTER
 
diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu 
b/filter/source/config/fragments/filters/ODT_FlatXML.xcu
index aa28ef5..e23b17e 100644
--- a/filter/source/config/fragments/filters/ODT_FlatXML.xcu
+++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu
@@ -24,7 +24,7 @@
 com.sun.star.comp.Writer.XmlFilterAdaptor
 
 
-OpenDocument Text (Flat XML)
+Flat XML ODF Text Document
 
 IMPORT EXPORT OWN 
3RDPARTYFILTER
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Bryan Quigley]

 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
 |2 +-
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu  
  |2 +-
 filter/source/config/fragments/filters/Text__encoded__ui.xcu   
  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a14419439103676916590b5fda110a514585b80
Author: Bryan Quigley 
Date:   Sun Nov 10 12:51:14 2013 -0500

Make text choose encoding
See thread here: 
http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html

Change-Id: I1de7c24f8be8a7d1142275311f94b6e4e7800229
Reviewed-on: https://gerrit.libreoffice.org/7487
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
index d7e8fc0..ea8bdb7 100644
--- 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
+++ 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
@@ -17,6 +17,6 @@
 -->
 
 
-Text Encoded (Master Document)
+Text - Choose Encoding (Master 
Document)
 
 
diff --git 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
index 025d63f..5d6fa4b 100644
--- 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
+++ 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
@@ -17,6 +17,6 @@
 -->
 
 
-Text Encoded (Writer/Web)
+Text - Choose Encoding (Writer/Web)
 
 
diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu 
b/filter/source/config/fragments/filters/Text__encoded__ui.xcu
index f4d8b29..81353c9 100644
--- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded__ui.xcu
@@ -17,6 +17,6 @@
 -->
 
 
-Text Encoded
+Text - Choose Encoding
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Advice needed : making options dialog slightly wider

[Caolán McNamara]

On Thu, 2014-01-16 at 19:47 +0100, Jean-Baptiste Faure wrote:
> Doing some tests (before this commit) I discovered that the apparent
> size of the font in the UI (and, as consequence, if all widgets have
> enough room in the dialog) depends on at least two factors:
> 1/ if the checkbox "Use the system font for the user interface" is
> checked or not ;
> 2/ at the OS level, what scale factor is used for the text.

And I think there is another input. There is some black magic somewhere
that multiplies the width of an average character by a
language-dependent X, e.g. * 1.2 for French and 1.3 for Russian. I can't
remember where that code/table is but hopefully we can get rid of it at
some stage.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/ui/dbgui/pvfundlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77590bf00d09def49c1c6d41f42843328af18d77
Author: Caolán McNamara 
Date:   Fri Jan 17 13:04:34 2014 +

drop WB_CLIPCHILDREN so that enable/disable redraws correctly

Change-Id: I0df16b743e451f5b9ac05f09ed694f34779c0465

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7e4424f..3f5839e 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -164,7 +164,7 @@ ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, 
WinBits nStyle)
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeScDPFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap)
 {
-WinBits nWinStyle = 
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
 OString sBorder = VclBuilder::extractCustomProperty(rMap);
 if (!sBorder.isEmpty())
 nWinStyle |= WB_BORDER;
___
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/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ca1b5e35ba4f0b476cebc99cc0cbf562271171e7
Author: Caolán McNamara 
Date:   Fri Jan 17 12:31:28 2014 +

ellipsize incorrectly set here for some reason

Change-Id: I85b89c59c3545aef538da47a3d3727110cff4a82
(cherry picked from commit 251f21699ef786557134fc00ff1293acb57e4158)

diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui 
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 2e1b93b..305e8e3 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -178,7 +178,6 @@
 0
 0
 True
-end
 56
   
   
@@ -291,7 +290,7 @@
 vertical
 2
 
-  
+  
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig

[Caolán McNamara]

 sc/source/ui/dbgui/pvfundlg.cxx   |   11 ++-
 sc/source/ui/inc/pvfundlg.hxx |3 +--
 sc/uiconfig/scalc/ui/datafielddialog.ui   |6 +-
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |3 +--
 sc/uiconfig/scalc/ui/pivotfielddialog.ui  |   10 --
 5 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 251f21699ef786557134fc00ff1293acb57e4158
Author: Caolán McNamara 
Date:   Fri Jan 17 12:31:28 2014 +

ellipsize incorrectly set here for some reason

Change-Id: I85b89c59c3545aef538da47a3d3727110cff4a82

diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui 
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 2e1b93b..305e8e3 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -178,7 +178,6 @@
 0
 0
 True
-end
 56
   
   
@@ -291,7 +290,7 @@
 vertical
 2
 
-  
+  
 True
 True
 True
commit e36321236417f3b900519bab10cf25e7aeba68e3
Author: Caolán McNamara 
Date:   Fri Jan 17 11:27:50 2014 +

tweak MultiListBox to ListBox

Change-Id: I94e39f29c2920eea57262cf047f899eb0bbe62c4

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index c6f5e13..7e4424f 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -157,13 +157,7 @@ static const ScDPListBoxWrapper::MapEntryType 
spShowFromMap[] =
 // 
 
 ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle)
-: MultiListBox(pParent, nStyle)
-{
-FillFunctionNames();
-}
-
-ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, const ResId& rResId)
-: MultiListBox(pParent, rResId)
+: ListBox(pParent, nStyle)
 {
 FillFunctionNames();
 }
@@ -225,8 +219,6 @@ ScDPFunctionDlg::ScDPFunctionDlg(
 get(mpBtnOk, "ok");
 
 Init( rLabelData, rFuncData );
-
-mpLbFunc->EnableMultiSelection(false);
 }
 
 sal_uInt16 ScDPFunctionDlg::GetFuncMask() const
@@ -438,6 +430,7 @@ ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, 
ScDPObject& rDPObj,
 get(mpCbShowAll, "showall");
 get(mpFtName, "name");
 get(mpLbFunc, "functions");
+mpLbFunc->EnableMultiSelection(true);
 mpLbFunc->set_height_request(mpLbFunc->GetTextHeight() * 8);
 get(mpRbNone, "none");
 get(mpRbAuto, "auto");
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index a885541..44e6300 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -45,11 +45,10 @@ class ScDPObject;
 
 // 
 
-class ScDPFunctionListBox : public MultiListBox
+class ScDPFunctionListBox : public ListBox
 {
 public:
 ScDPFunctionListBox(Window* pParent, WinBits nStyle);
-ScDPFunctionListBox(Window* pParent, const ResId& rResId);
 
 voidSetSelection( sal_uInt16 nFuncMask );
 sal_uInt16  GetSelection() const;
diff --git a/sc/uiconfig/scalc/ui/datafielddialog.ui 
b/sc/uiconfig/scalc/ui/datafielddialog.ui
index da0decc..3b24ff6 100644
--- a/sc/uiconfig/scalc/ui/datafielddialog.ui
+++ b/sc/uiconfig/scalc/ui/datafielddialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -84,6 +84,7 @@
 True
 False
 True
+True
 0
 none
 
@@ -92,12 +93,15 @@
 False
 6
 True
+True
 6
 12
 
   
 True
 False
+True
+True
 6
 
   
diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui 
b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
index dcf9127..bc4972a 100644
--- a/sc/uiconfig/scalc/ui/pivotfielddialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -99,6 +99,7 @@
 True
 False
 True
+True
 0
 none
 
@@ -107,12 +108,15 @@
 False
 6
 True
+True
 6
 12
 
   
 True
 False
+True
+True
 6
 

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Philipp Weissenbacher]

Hi Sven,

I hope Stephan does not mind I chime in on this. I am in the same
situation: still wanting to contribute, but not investing too much free
time.

> How to call a developer's attention to small pieces of code?
>

In my experience the developers already know about that and there's no need
to worry.
I know these weird macros create an itch one really would like to tackle
right away, but it's just not worth the trouble if you can't/don't want to
compile.

If, however, you find a "2do" or a "Sollte noch optimiert werden" feel free
to append a TODO/FIXME.


> And especially: may I combine that with translation patches?
>

Keep in mind that a commit should be concise and as much as possible
constrained to what the commit message says.
That way people can keep the quality work (translation of a language they
don't understand) from the "clean up the mess" work.

In most of my commits I translate and remove the ASCII art as that yields a
lot of benefits.

BTW: It's good practice to at least run ./autogen.sh before commiting (that
catches these nasty syntax errors).
See here for more:
https://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines#Keep_German_comment_translation_separate

Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-2-0' - source/sl

[Andras Timar]

 source/sl/cui/uiconfig/ui.po|  265 ++-
 source/sl/dictionaries/pt_BR/dialog.po  |   37 +++
 source/sl/sc/source/ui/StatisticsDialogs.po |4 
 source/sl/sc/source/ui/src.po   |   14 -
 source/sl/sc/uiconfig/scalc/ui.po   |  266 ++--
 source/sl/sd/uiconfig/simpress/ui.po|   50 ++---
 source/sl/sfx2/uiconfig/ui.po   |   39 +---
 source/sl/starmath/source.po|4 
 source/sl/sw/uiconfig/swriter/ui.po |8 
 source/sl/wizards/source/euro.po|4 
 10 files changed, 364 insertions(+), 327 deletions(-)

New commits:
commit 1818fb9d154cc8b2ae1a2c8ca050b864e2f0def4
Author: Andras Timar 
Date:   Fri Jan 17 13:12:25 2014 +0100

updated Slovenian translation

Change-Id: Ida1a6a187fab2ed3ef22de14ca84393a369f3d8c

diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 1372dfd..3398626 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2014-01-06 13:11+0100\n"
-"PO-Revision-Date: 2013-12-29 00:51+0200\n"
+"POT-Creation-Date: 2014-01-16 21:02+0100\n"
+"PO-Revision-Date: 2014-01-16 22:51+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -2867,8 +2867,8 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Registered databases"
-msgstr "Registrirane zbirke podatkov"
+msgid "Connection pool"
+msgstr "Zaloga povezav"
 
 #: cuiimapdlg.ui
 msgctxt ""
@@ -8876,20 +8876,20 @@ msgstr "Shrani URL-je glede na datotečni sistem"
 #: optsavepage.ui
 msgctxt ""
 "optsavepage.ui\n"
-"relative_inet\n"
+"docinfo\n"
 "label\n"
 "string.text"
-msgid "Save URLs relative to internet"
-msgstr "Shrani URL-je glede na internet"
+msgid "_Edit document properties before saving"
+msgstr "_Uredi lastnosti dokumenta pred shranjevanjem"
 
 #: optsavepage.ui
 msgctxt ""
 "optsavepage.ui\n"
-"docinfo\n"
+"relative_inet\n"
 "label\n"
 "string.text"
-msgid "_Edit document properties before saving"
-msgstr "_Uredi lastnosti dokumenta pred shranjevanjem"
+msgid "Save URLs relative to internet"
+msgstr "Shrani URL-je glede na internet"
 
 #: optsavepage.ui
 msgctxt ""
@@ -9557,6 +9557,132 @@ msgstr "Naslov"
 #: optviewpage.ui
 msgctxt ""
 "optviewpage.ui\n"
+"useaccel\n"
+"label\n"
+"string.text"
+msgid "Use hard_ware acceleration"
+msgstr "Uporabi pospe_Å¡evanje strojne opreme"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"useaa\n"
+"label\n"
+"string.text"
+msgid "Use Anti-A_liasing"
+msgstr "Uporabi g_lajenje robov"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label2\n"
+"label\n"
+"string.text"
+msgid "Graphics output"
+msgstr "Grafični izhod"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"trans\n"
+"label\n"
+"string.text"
+msgid "_Transparency"
+msgstr "_Prosojnost"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"transmf\n"
+"text\n"
+"string.text"
+msgid "75"
+msgstr "75"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label14\n"
+"label\n"
+"string.text"
+msgid "Selection"
+msgstr "Izbor"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label13\n"
+"label\n"
+"string.text"
+msgid "Icons in men_us"
+msgstr "Ikone v meniji_h"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"0\n"
+"stringlist.text"
+msgid "Automatic"
+msgstr "Samodejno"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"1\n"
+"stringlist.text"
+msgid "Hide"
+msgstr "Skrij"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"2\n"
+"stringlist.text"
+msgid "Show"
+msgstr "Pokaži"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Menu"
+msgstr "Meni"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"showfontpreview\n"
+"label\n"
+"string.text"
+msgid "Show p_review of fonts"
+msgstr "Pokaži p_redogled pisav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"showfonthistory\n"
+"label\n"
+"string.text"
+msgid "Show font h_istory"
+msgstr "Pokaži zgodovino p_isav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label5\n"
+"label\n"
+"string.text"
+msgid "Font Lists"
+msgstr "Seznami pisav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
 "label7\n"
 "label\n"
 "string.text"
@@ -9737,105 +9863,6 @@ msgstr "Uporabniški vmesnik"
 #: optviewpage.ui
 msgctxt ""
 "optviewpage.ui\n"
-"label13\n"
-"label\n"
-"string.text"
-msgid "Icons in men_us

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - translations

[Andras Timar]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d3cfec26a0c4208e946ed331a6baec35f1f8f530
Author: Andras Timar 
Date:   Fri Jan 17 13:12:25 2014 +0100

Updated core
Project: translations  1818fb9d154cc8b2ae1a2c8ca050b864e2f0def4

diff --git a/translations b/translations
index 2e7419e..1818fb9 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2e7419e686a7a1799d35c31cac5c541aa5c98dda
+Subproject commit 1818fb9d154cc8b2ae1a2c8ca050b864e2f0def4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations

[Andras Timar]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e2307f42b1ea2058cc74c3c4485261928d32e1a
Author: Andras Timar 
Date:   Fri Jan 17 13:12:25 2014 +0100

Updated core
Project: translations  0c7ce2344438228bf57a34bbaaba299c94b60c00

diff --git a/translations b/translations
index 8daeef7..0c7ce23 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8daeef732b33780c8d91835ff1e61c2eb7cf1472
+Subproject commit 0c7ce2344438228bf57a34bbaaba299c94b60c00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-2' - source/sl

[Andras Timar]

 source/sl/cui/uiconfig/ui.po|  265 ++-
 source/sl/dictionaries/pt_BR/dialog.po  |   37 +++
 source/sl/sc/source/ui/StatisticsDialogs.po |4 
 source/sl/sc/source/ui/src.po   |   14 -
 source/sl/sc/uiconfig/scalc/ui.po   |  266 ++--
 source/sl/sd/uiconfig/simpress/ui.po|   50 ++---
 source/sl/sfx2/uiconfig/ui.po   |   39 +---
 source/sl/starmath/source.po|4 
 source/sl/sw/uiconfig/swriter/ui.po |8 
 source/sl/wizards/source/euro.po|4 
 10 files changed, 364 insertions(+), 327 deletions(-)

New commits:
commit 0c7ce2344438228bf57a34bbaaba299c94b60c00
Author: Andras Timar 
Date:   Fri Jan 17 13:12:25 2014 +0100

updated Slovenian translation

Change-Id: Ida1a6a187fab2ed3ef22de14ca84393a369f3d8c

diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 1372dfd..3398626 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2014-01-06 13:11+0100\n"
-"PO-Revision-Date: 2013-12-29 00:51+0200\n"
+"POT-Creation-Date: 2014-01-16 21:02+0100\n"
+"PO-Revision-Date: 2014-01-16 22:51+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -2867,8 +2867,8 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Registered databases"
-msgstr "Registrirane zbirke podatkov"
+msgid "Connection pool"
+msgstr "Zaloga povezav"
 
 #: cuiimapdlg.ui
 msgctxt ""
@@ -8876,20 +8876,20 @@ msgstr "Shrani URL-je glede na datotečni sistem"
 #: optsavepage.ui
 msgctxt ""
 "optsavepage.ui\n"
-"relative_inet\n"
+"docinfo\n"
 "label\n"
 "string.text"
-msgid "Save URLs relative to internet"
-msgstr "Shrani URL-je glede na internet"
+msgid "_Edit document properties before saving"
+msgstr "_Uredi lastnosti dokumenta pred shranjevanjem"
 
 #: optsavepage.ui
 msgctxt ""
 "optsavepage.ui\n"
-"docinfo\n"
+"relative_inet\n"
 "label\n"
 "string.text"
-msgid "_Edit document properties before saving"
-msgstr "_Uredi lastnosti dokumenta pred shranjevanjem"
+msgid "Save URLs relative to internet"
+msgstr "Shrani URL-je glede na internet"
 
 #: optsavepage.ui
 msgctxt ""
@@ -9557,6 +9557,132 @@ msgstr "Naslov"
 #: optviewpage.ui
 msgctxt ""
 "optviewpage.ui\n"
+"useaccel\n"
+"label\n"
+"string.text"
+msgid "Use hard_ware acceleration"
+msgstr "Uporabi pospe_Å¡evanje strojne opreme"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"useaa\n"
+"label\n"
+"string.text"
+msgid "Use Anti-A_liasing"
+msgstr "Uporabi g_lajenje robov"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label2\n"
+"label\n"
+"string.text"
+msgid "Graphics output"
+msgstr "Grafični izhod"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"trans\n"
+"label\n"
+"string.text"
+msgid "_Transparency"
+msgstr "_Prosojnost"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"transmf\n"
+"text\n"
+"string.text"
+msgid "75"
+msgstr "75"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label14\n"
+"label\n"
+"string.text"
+msgid "Selection"
+msgstr "Izbor"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label13\n"
+"label\n"
+"string.text"
+msgid "Icons in men_us"
+msgstr "Ikone v meniji_h"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"0\n"
+"stringlist.text"
+msgid "Automatic"
+msgstr "Samodejno"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"1\n"
+"stringlist.text"
+msgid "Hide"
+msgstr "Skrij"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"menuicons\n"
+"2\n"
+"stringlist.text"
+msgid "Show"
+msgstr "Pokaži"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Menu"
+msgstr "Meni"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"showfontpreview\n"
+"label\n"
+"string.text"
+msgid "Show p_review of fonts"
+msgstr "Pokaži p_redogled pisav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"showfonthistory\n"
+"label\n"
+"string.text"
+msgid "Show font h_istory"
+msgstr "Pokaži zgodovino p_isav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
+"label5\n"
+"label\n"
+"string.text"
+msgid "Font Lists"
+msgstr "Seznami pisav"
+
+#: optviewpage.ui
+msgctxt ""
+"optviewpage.ui\n"
 "label7\n"
 "label\n"
 "string.text"
@@ -9737,105 +9863,6 @@ msgstr "Uporabniški vmesnik"
 #: optviewpage.ui
 msgctxt ""
 "optviewpage.ui\n"
-"label13\n"
-"label\n"
-"string.text"
-msgid "Icons in men_us

[Libreoffice-commits] core.git: framework/source

[Matúš Kukan]

 framework/source/services/urltransformer.cxx |   22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 9e18f7e3cfec960b788eb5df3b53daf9efd092ab
Author: Matúš Kukan 
Date:   Fri Jan 17 12:56:23 2014 +0100

disambiguate URLTransformer

Change-Id: I27a80a7593889105c7a75c04de08eebe28e5c541

diff --git a/framework/source/services/urltransformer.cxx 
b/framework/source/services/urltransformer.cxx
index a534639..d8aaacf 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -30,12 +30,6 @@
 #include 
 #include 
 
-using namespace ::osl;
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-
 namespace {
 
 class URLTransformer : public ::cppu::WeakImplHelper2< 
css::util::XURLTransformer, css::lang::XServiceInfo>
@@ -80,7 +74,7 @@ public:
 
 namespace
 {
-void lcl_ParserHelper(INetURLObject& _rParser,URL& _rURL,bool _bUseIntern)
+void lcl_ParserHelper(INetURLObject& _rParser, css::util::URL& _rURL,bool 
_bUseIntern)
 {
 // Get all information about this URL.
 _rURL.Protocol  = INetURLObject::GetScheme( _rParser.GetProtocol() );
@@ -132,7 +126,7 @@ namespace
 
//*
 //  XURLTransformer
 
//*
-sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( 
RuntimeException )
+sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( 
css::uno::RuntimeException )
 {
 // Safe impossible cases.
 if  (( &aURL==  NULL)   ||
@@ -185,8 +179,8 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) 
throw( RuntimeExcepti
 
//*
 //  XURLTransformer
 
//*
-sal_Bool SAL_CALL URLTransformer::parseSmart(   URL&aURL   
 ,
-const   OUString&
sSmartProtocol  ) throw( RuntimeException )
+sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
+const   OUString&
sSmartProtocol  ) throw( css::uno::RuntimeException )
 {
 // Safe impossible cases.
 if  (( &aURL==  NULL) ||
@@ -241,7 +235,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart(   
URL&aURL
 
//*
 //  XURLTransformer
 
//*
-sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( 
RuntimeException )
+sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( 
css::uno::RuntimeException )
 {
 // Safe impossible cases.
 if  ( &aURL == NULL )
@@ -304,8 +298,8 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) 
throw( RuntimeException
 
//*
 //  XURLTransformer
 
//*
-OUString SAL_CALL URLTransformer::getPresentation(   const   URL&aURL  
  ,
-sal_Bool
bWithPassword   ) throw( RuntimeException )
+OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
+sal_Bool
bWithPassword   ) throw( css::uno::RuntimeException )
 {
 // Safe impossible cases.
 if  (( &aURL==  NULL)   ||
@@ -317,7 +311,7 @@ OUString SAL_CALL URLTransformer::getPresentation(   const  
 URL&aURL
 }
 
 // Check given URL
-URL aTestURL = aURL;
+css::util::URL aTestURL = aURL;
 sal_Bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol );
 if ( bParseResult )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

@Developers, please give us room!

[Olivier Hallot]

Hi Guys

I would like to bring to your attention one of the few but recurrent
issue we translators have for non English languages.

Please give us at least 50% more room to fit our translated strings in
dialogs with fixed dimensions.

The English language is very concise in characters and words, so en-US
strings tend to be much shorter than many other languages. If you
compute VCL widget sizes and position to fit exactly the size of en-US
strings, most translators will have trouble to make their work fit in
the dialog.

To give a single example: "toolbar" = "barra de ferramentas", more than
twice the size, so 50% more room for strings is a guesstimate, at best.

The New GTK widget UI is supposed to fix that but until all the new
development uses it, we will still have the issue on each translation cycle.

Thanks in advance for that. Have a good day!
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac external/curl

[Douglas Mencken]

 configure.ac  |9 +
 external/curl/ExternalPackage_curl.mk |2 ++
 external/curl/ExternalProject_curl.mk |5 ++---
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 2fd70b6bf799843d2d9987cc90a5b373f31039f7
Author: Douglas Mencken 
Date:   Tue Dec 24 12:36:59 2013 -0500

Get bundled curl to be used on OS X too
Don't force "yes" on Darwin.

Change-Id: I3a6a2ecdf15325d07fb22b9a6bb0da7b313036cb
Reviewed-on: https://gerrit.libreoffice.org/7197
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 24d7ce7..9e5f7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8654,14 +8654,7 @@ dnl Check for system curl
 dnl ===
 AC_MSG_CHECKING([which libcurl to use])
 if test "$with_system_curl" = "auto"; then
-case "$_os" in
-Darwin)
-with_system_curl=yes
-;;
-*)
-with_system_curl="$with_system_libs"
-;;
-esac
+with_system_curl="$with_system_libs"
 fi
 
 if test "$with_system_curl" = "yes"; then
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 6e3c7fd..6266912 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -17,6 +17,8 @@ ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
 else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
+else ifeq ($(OS),MACOSX)
+$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 81d46f6..208a556 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -40,10 +40,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   $(if $(filter MACOSX IOS,$(OS)),\
-   --with-darwinssl, \
+   $(if $(filter 
IOS,$(OS)),--with-darwinssl,--without-ssl) \
+   $(if $(filter MACOSX,$(OS)),,\
--with-nss$(if $(filter 
NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
-   --without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Sven Wehner]

Hi Stephan, Hi List,

sorry, I guess I misspoke:
Those examples, which I listed, are rather obvious problems that aren't 
translation related.
So let me rephrase:
How to call a developer's attention to small pieces of code?
And especially: may I combine that with translation patches?


I thought "OSL_ENSURE(false, …)" would be "problematic", because firstly there 
is an "OSL_FAIL" definition in "include/osl/diagnose.h", which seems to do 
exactly that.
Secondly, the place I saw this (cui/source/tabpages/numpages.cxx line 2791 ff.) 
encapsulates that statement in an if clause.
Together with the error message ("cannot happen"), it implies that could be 
reduced from…
--- snip ---
if (SVX_MAX_NUM <= nLvl)
{
OSL_ENSURE(false, "cannot happen.");
return;
} 
--- snap ---
… to something like this:
--- snip ---
OSL_ENSURE_RETURN(!(SVX_MAX_NUM <= nLvl), "cannot happen.");
--- snap ---
(with OSL_ENSURE_RETURN being a OSL_ENSURE including a return statement.)

If OSL_ENSURE is deprecated anyway, I guess this is irrelevant anyway.


Yours,
Sven

On Friday 17 January 2014 12:08:15 Stephan Bergmann wrote:
> [would probably have been better to start a new mail thread]
> 
> On 01/17/2014 11:34 AM, Sven Wehner wrote:
> > When I scroll through the source code, I sometimes see odd code.
> > Things that a real developer should seriously take a look at.
> > Something like one of the multiple "DELETEZ" defines, an "OSL_ENSURE(false, 
> > \"cannot happen.\")", German function names etc.
> 
> Not sure what "a real developer should seriously take a look at" in an
> 
>OSL_ENSURE(false, "cannot happen.")
> 
> (other than OSL_ENSURE being deprecated).  Those are generally 
> assertions that program logic cannot reach that point (like a default 
> case in a switch statement) unless there is a bug.
> 
> Stephan
> 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: oox/source sw/qa

[Miklos Vajna]

 oox/source/vml/vmlshape.cxx  |   10 +++---
 sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   11 +++
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 40a8b1f92c8befa39fc42e845994a00a70edab9f
Author: Miklos Vajna 
Date:   Fri Jan 17 12:16:04 2014 +0100

VML import: fix rotation of simple shapes inside group shapes

Change-Id: I28d2e2d801b06b92b5348123d88604fb4d10d828

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 31828db..9e6f208 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -642,9 +642,13 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 if (oRotation)
 {
 lcl_SetRotation(aPropertySet, *oRotation);
-// If rotation is used, simple setPosition() is not enough.
-aPropertySet.setAnyProperty(PROP_HoriOrientPosition, makeAny( 
aShapeRect.X ) );
-aPropertySet.setAnyProperty(PROP_VertOrientPosition, makeAny( 
aShapeRect.Y ) );
+uno::Reference xServiceInfo(rxShapes, 
uno::UNO_QUERY);
+if 
(!xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"))
+{
+// If rotation is used, simple setPosition() is not enough.
+aPropertySet.setAnyProperty(PROP_HoriOrientPosition, 
makeAny(aShapeRect.X));
+aPropertySet.setAnyProperty(PROP_VertOrientPosition, 
makeAny(aShapeRect.Y));
+}
 }
 
 // When flip has 'x' or 'y', the associated ShapeRect will be changed 
but direction change doesn't occur.
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx
new file mode 100644
index 000..06aa39d
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b79b6fb..32e54d2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -962,6 +962,17 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeLine, 
"groupshape-line.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getSize().Height);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, 
"groupshape-child-rotation.docx")
+{
+// The problem was that (due to incorrect handling of rotation inside
+// groupshapes), the first child wasn't in the top left corner of an inline
+// groupshape.
+uno::Reference xGroupShape(getShape(1), uno::UNO_QUERY);
+uno::Reference xShape(xGroupShape->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().Y);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testN793262, "n793262.docx")
 {
 uno::Reference xHeaderText = getProperty< 
uno::Reference 
>(getStyles("PageStyles")->getByName(DEFAULT_STYLE), "HeaderText");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - sc/inc sc/source

[Noel Grandin]

 sc/inc/addruno.hxx |6 +++---
 sc/inc/afmtuno.hxx |4 ++--
 sc/inc/arealink.hxx|2 +-
 sc/inc/autoform.hxx|4 ++--
 sc/inc/bigrange.hxx|   14 +++---
 sc/inc/cellsuno.hxx|6 +++---
 sc/inc/chartpos.hxx|   13 ++---
 sc/source/core/tool/autoform.cxx   |8 
 sc/source/core/tool/chartpos.cxx   |2 +-
 sc/source/ui/docshell/arealink.cxx |6 +++---
 sc/source/ui/unoobj/addruno.cxx|   20 ++--
 sc/source/ui/unoobj/cellsuno.cxx   |8 
 sc/source/ui/unoobj/servuno.cxx|4 ++--
 13 files changed, 48 insertions(+), 49 deletions(-)

New commits:
commit d930faddc9e8c5d3ec933b423aa0fe8fc74060f9
Author: Noel Grandin 
Date:   Fri Jan 17 12:04:53 2014 +0200

sal_Bool->bool

Change-Id: Id38995252172df650e995504d929e265c023d2bc

diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 89fb675..4f1a234 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -180,15 +180,15 @@ public:
 { aStart.GetVars( nCol1, nRow1, nTab1 );
 aEnd.GetVars( nCol2, nRow2, nTab2 ); }
 
-sal_BoolIsValid( const ScDocument* pDoc ) const
+boolIsValid( const ScDocument* pDoc ) const
 { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
 inline ScRange  MakeRange() const
 { return ScRange( aStart.MakeAddress(),
 aEnd.MakeAddress() ); }
 
-inline sal_Bool In( const ScBigAddress& ) const;///< is Address& in 
range?
-inline sal_Bool In( const ScBigRange& ) const;  ///< is Range& in 
range?
-inline sal_Bool Intersects( const ScBigRange& ) const;  ///< do two ranges 
overlap?
+inline bool In( const ScBigAddress& ) const;///< is Address& in range?
+inline bool In( const ScBigRange& ) const;  ///< is Range& in range?
+inline bool Intersects( const ScBigRange& ) const;  ///< do two ranges 
overlap?
 
 ScBigRange& operator=( const ScBigRange& r )
 { aStart = r.aStart; aEnd = r.aEnd; return *this; }
@@ -202,7 +202,7 @@ public:
 };
 
 
-inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) const
+inline bool ScBigRange::In( const ScBigAddress& rAddr ) const
 {
 return
 aStart.Col() <= rAddr.Col() && rAddr.Col() <= aEnd.Col() &&
@@ -211,7 +211,7 @@ inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) 
const
 }
 
 
-inline sal_Bool ScBigRange::In( const ScBigRange& r ) const
+inline bool ScBigRange::In( const ScBigRange& r ) const
 {
 return
 aStart.Col() <= r.aStart.Col() && r.aEnd.Col() <= aEnd.Col() &&
@@ -220,7 +220,7 @@ inline sal_Bool ScBigRange::In( const ScBigRange& r ) const
 }
 
 
-inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const
+inline bool ScBigRange::Intersects( const ScBigRange& r ) const
 {
 return !(
 std::min( aEnd.Col(), r.aEnd.Col() ) < std::max( aStart.Col(), 
r.aStart.Col() )
commit 300c8917dca86fc84ae0343598bf27a32d7e1a88
Author: Noel Grandin 
Date:   Fri Jan 17 11:39:25 2014 +0200

sal_Bool->bool

Change-Id: Iba9022efc96bf4e28e05305af089df4342d172fe

diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index eea6b15..9c12752 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -244,8 +244,8 @@ public:
 voidSetRotateAngle( const SfxInt32Item& rRotateAngle )  { 
aRotateAngle.SetValue( rRotateAngle.GetValue() ); }
 voidSetRotateMode( const SvxRotateModeItem& rRotateMode )   { 
aRotateMode.SetValue( rRotateMode.GetValue() ); }
 
-sal_BoolLoad( SvStream& rStream, const 
ScAfVersions& rVersions, sal_uInt16 nVer );
-sal_BoolSave( SvStream& rStream, sal_uInt16 
fileVersion );
+boolLoad( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 
nVer );
+boolSave( SvStream& rStream, sal_uInt16 fileVersion );
 };
 
 
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index d1dc79a..cbf36cd 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -292,7 +292,7 @@ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& 
rAdjust )
 aItem = *(ItemType*)pNew;   \
 delete pNew;
 
-sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& 
rVersions, sal_uInt16 nVer )
+bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& 
rVersions, sal_uInt16 nVer )
 {
 SfxPoolItem* pNew;
 SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0 );
@@ -378,7 +378,7 @@ sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, 
const ScAfVersions& rVe
 return (rStream.GetError() == 0);
 }
 
-sal_Bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 
fileVersion )
+bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion )
 

[Libreoffice-commits] core.git: vcl/source

[Chris Sherlock]

 vcl/source/gdi/impfont.cxx |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 683764db4c435f27a83a2fdcf532be245c7fe4c9
Author: Chris Sherlock 
Date:   Tue Jan 14 00:04:46 2014 +1100

Additional warnings when processing cmap tables

Small enhancements to the code:
* Removed unused code that clips unicode characters to the baseplane
* Add a SAL_WARNING if the maximum character is greater than the
  minimum character.

Change-Id: I783fba75435e7f98a65afab2e091b737efc9ddc6
Reviewed-on: https://gerrit.libreoffice.org/7404
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index bfe99dc..9b27e3a 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -419,10 +419,14 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 const sal_UCS4 cMaxChar = Getsal_uInt16( pLimitBase + 2*i );
 const int nGlyphDelta  = GetSShort( pDeltaBase + 2*i );
 const int nRangeOffset = Getsal_uInt16( pOffsetBase + 2*i );
-if( cMinChar > cMaxChar )   // no sane font should trigger this
+if( cMinChar > cMaxChar ) {  // no sane font should trigger this
+SAL_WARN("vcl.gdi", "Min char should never be more than the 
max char!");
 break;
-if( cMaxChar == 0x )
+}
+if( cMaxChar == 0x ) {
+SAL_WARN("vcl.gdi", "Format 4 char should not be 0x");
 break;
+}
 *(pCP++) = cMinChar;
 *(pCP++) = cMaxChar + 1;
 if( !nRangeOffset ) {
@@ -454,15 +458,12 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 sal_UCS4 cMaxChar = GetUInt( pGroup + 4 );
 int nGlyphId = GetUInt( pGroup + 8 );
 pGroup += 12;
-#if 0   // TODO: remove unicode baseplane clipping for UCS-4 support
-if( cMinChar > 0x )
-continue;
-if( cMaxChar > 0x )
-cMaxChar = 0x;
-#else
-if( cMinChar > cMaxChar )   // no sane font should trigger this
+
+if( cMinChar > cMaxChar ) {   // no sane font should trigger this
+SAL_WARN("vcl.gdi", "Min char should never be more than the 
max char!");
 break;
-#endif
+}
+
 *(pCP++) = cMinChar;
 *(pCP++) = cMaxChar + 1;
 pStartGlyphs[i] = nGlyphId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

[Tor Lillqvist]

 solenv/bin/native-code.py |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 970384c2e85ed9caa72d435a698bb2ee88537967
Author: Tor Lillqvist 
Date:   Fri Jan 17 13:36:56 2014 +0200

Add a few more components that at least TiledLibreOffice needs

Change-Id: Icdce8b7165f53caed1878e8f97a933cdaf3471ff

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1368f47..2657438 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -35,9 +35,11 @@ core_factory_list = [
 ("libpackage2.a", "package2_component_getFactory"),
 ("libsotlo.a", "sot_component_getFactory"),
 ("libspelllo.a", "spell_component_getFactory"),
+("libsrtrs1.a", "srtrs1_component_getFactory"),
 ("libtklo.a", "tk_component_getFactory"),
 ("libucb1.a", "ucb_component_getFactory"),
 ("libucpfile1.a", "ucpfile_component_getFactory"),
+("libucphier1.a", "ucphier1_component_getFactory"),
 ("libunordflo.a", "unordf_component_getFactory"),
 ("libunoxmllo.a", "unoxml_component_getFactory"),
 ("libutllo.a", "utl_component_getFactory"),
@@ -52,6 +54,7 @@ core_constructor_list = [
 "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
 # sfx2/util/sfx.component
+"com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
 "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
 "com_sun_star_comp_office_FrameLoader_get_implementation",
 "SfxDocumentMetaData_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Sven Wehner]

 sw/source/core/text/txtfrm.cxx |  132 +++--
 1 file changed, 63 insertions(+), 69 deletions(-)

New commits:
commit 321cb8314750c960ef69e7e0ff54a52abce8
Author: Sven Wehner 
Date:   Thu Jan 16 20:25:50 2014 +0100

Translate some German comments to English in sw/source/core/text/txtfrm.cxx.

Change-Id: I54ee2e7341edbe3bbfe6429bedb4315a64bfb593
Reviewed-on: https://gerrit.libreoffice.org/7481
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index af43321..1e3dea6 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -335,14 +335,14 @@ SwDigitModeModifier::~SwDigitModeModifier()
 
 void SwTxtFrm::Init()
 {
-OSL_ENSURE( !IsLocked(), "+SwTxtFrm::Init: this ist locked." );
+OSL_ENSURE( !IsLocked(), "+SwTxtFrm::Init: this is locked." );
 if( !IsLocked() )
 {
 ClearPara();
 ResetBlinkPor();
-//Die Flags direkt setzen um ResetPreps und damit ein unnuetzes GetPara
-//einzusparen.
-// Nicht bOrphan, bLocked oder bWait auf sal_False setzen !
+// set flags directly to save a ResetPreps call,
+// and thereby an unnecessary GetPara call
+// don't set bOrphan, bLocked or bWait to false!
 // bOrphan = bFlag7 = bFlag8 = sal_False;
 }
 }
@@ -410,7 +410,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
 SwFrmSwapper aSwapper( this, sal_True );
 
 if( !Frm().Width() && IsValid() && GetUpper()->IsValid() )
-   //bei Stackueberlauf (StackHack) 
invalid!
+   // invalid when stack overflows 
(StackHack)!
 {
 //OSL_FAIL( "SwTxtFrm::IsHiddenNow: thin frame" );
 return sal_True;
@@ -440,7 +440,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
 /*
  *SwTxtFrm::HideHidden()
  */
-// Entfernt die Anhaengsel des Textfrms wenn dieser hidden ist
+// removes Textfrm's attachments, when it's hidden
 
 void SwTxtFrm::HideHidden()
 {
@@ -452,7 +452,7 @@ void SwTxtFrm::HideHidden()
 // OD 2004-01-15 #110582#
 HideAndShowObjects();
 
-//Die Formatinfos sind jetzt obsolete
+// format information is obsolete
 ClearPara();
 }
 
@@ -636,10 +636,10 @@ void SwTxtFrm::HideAndShowObjects()
 /*
  *  SwTxtFrm::FindBrk()
  *
- * Liefert die erste Trennmoeglichkeit in der aktuellen Zeile zurueck.
- * Die Methode wird in SwTxtFrm::Format() benutzt, um festzustellen, ob
- * die Vorgaengerzeile mitformatiert werden muss.
- * nFound ist <= nEndLine.
+ * Returns the first possible break point in the current line.
+ * This method is used in SwTxtFrm::Format() to decide whether the previous
+ * line has to be formatted as well.
+ * nFound is <= nEndLine.
  */
 
 sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
@@ -649,7 +649,7 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
 sal_Int32 nFound = nStart;
 const sal_Int32 nEndLine = std::min( nEnd, rTxt.getLength() - 1 );
 
-// Wir ueberlesen erst alle Blanks am Anfang der Zeile (vgl. Bug 2235).
+// skip all leading blanks (see bug #2235).
 while( nFound <= nEndLine && ' ' == rTxt[nFound] )
 {
  nFound++;
@@ -673,16 +673,15 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
 
 sal_Bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) 
const
 {
-if( GetOfst() > nPos + nLen ) // d.h., der Bereich liegt komplett vor uns.
+if( GetOfst() > nPos + nLen ) // the range preceded us
 return sal_False;
 
-if( !GetFollow() ) // der Bereich liegt nicht komplett vor uns,
-return sal_True;   // nach uns kommt niemand mehr.
+if( !GetFollow() )// the range doesn't precede us,
+return sal_True;  // nobody follows us.
 
 const sal_Int32 nMax = GetFollow()->GetOfst();
 
-// der Bereich liegt nicht komplett hinter uns bzw.
-// unser Text ist geloescht worden.
+// either the range overlap or our text has been deleted
 if( nMax > nPos || nMax > GetTxt().getLength() )
 return sal_True;
 
@@ -775,7 +774,7 @@ void SwTxtFrm::CalcLineSpace()
 aNewSize.Height() = (aLine.Y() - Frm().Top()) + aLine.GetLineHeight();
 
 SwTwips nDelta = aNewSize.Height() - Prt().Height();
-// 4291: Unterlauf bei Flys
+// 4291: underflow with free-flying frames
 if( aInf.GetTxtFly()->IsOn() )
 {
 SwRect aTmpFrm( Frm() );
@@ -795,13 +794,12 @@ void SwTxtFrm::CalcLineSpace()
 SwTxtFrmBreak aBreak( this );
 if( GetFollow() || aBreak.IsBreakNow( aLine ) )

[Libreoffice-commits] core.git: cui/source

[Sven Wehner]

 cui/source/tabpages/numpages.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c49deaafa0a1e7c2ee9769583e560b8256e91a93
Author: Sven Wehner 
Date:   Fri Jan 17 11:36:25 2014 +0100

Translate German DBG_ASSERT() message to English.

Change-Id: I647d55c2b64ab3ea8b33a132e998ed023d91f000
Reviewed-on: https://gerrit.libreoffice.org/7497
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d646da2..58130e2 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -298,7 +298,7 @@ void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& 
rSet )
 eState = SFX_ITEM_SET;
 }
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
@@ -457,7 +457,7 @@ void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
 }
 
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
@@ -654,7 +654,7 @@ void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
 }
 
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
@@ -901,7 +901,7 @@ void  SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
 }
 
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
@@ -1222,7 +1222,7 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet& 
rSet )
 }
 
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
@@ -2990,7 +2990,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet 
)
 }
 
 }
-DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+DBG_ASSERT(eState == SFX_ITEM_SET, "no item found!");
 delete pSaveNum;
 pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source svl/source sw/source

[Sven Wehner]

 cui/source/tabpages/paragrph.cxx|2 -
 svl/source/svdde/ddecli.cxx |2 -
 sw/source/core/layout/pagechg.cxx   |2 -
 sw/source/core/txtnode/thints.cxx   |2 -
 sw/source/core/unocore/unostyle.cxx |   40 ++--
 sw/source/filter/html/parcss1.cxx   |2 -
 sw/source/filter/html/swhtml.cxx|2 -
 7 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 5e997f4503cd34767c668c60893c4975c46b4daf
Author: Sven Wehner 
Date:   Fri Jan 17 11:48:15 2014 +0100

Translate German ("kein break") comments to English ("no break").

Change-Id: Ibbc706d1c3cd36e21da2a15077392f9d75ba39fd
Reviewed-on: https://gerrit.libreoffice.org/7498
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5854608..1f549cd 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2014,7 +2014,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl)
 if ( m_pWidowBox->GetState() == STATE_NOCHECK )
 m_pKeepTogetherBox->Enable();
 
-// kein break
+// no break
 case STATE_DONTKNOW:
 m_pOrphanRowNo->Enable(sal_False);
 m_pOrphanRowLabel->Enable(sal_False);
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 96cf5f3..78e10c6 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -120,7 +120,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( WORD nCode, 
WORD nCbType,
 nRet = (HDDEDATA)DDE_FACK;
 break;
 }
-// kein break;
+// no break
 
 case XTYP_REQUEST:
 if( !hData && XTYP_REQUEST == nCode )
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 0cbf9f3..9508435 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -617,7 +617,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const 
SfxPoolItem *pNew,
 rInvFlags |= 0x10;
 CheckDirChange();
 }
-/* kein break hier */
+// no break
 case RES_FRM_SIZE:
 {
 const SwRect aOldPageFrmRect( Frm() );
diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index f4477e1..f3fdc96 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1160,7 +1160,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
 {
 case RES_HIDDENPARAFLD:
 SetCalcHiddenParaField();
-// kein break !
+// no break
 case RES_DBSETNUMBERFLD:
 case RES_GETEXPFLD:
 case RES_DBFLD:
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 7c27d16..8e1f9da 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3066,45 +3066,45 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
 switch(pEntry->nWID)
 {
 case FN_UNO_FOOTER_ON:  bFooter = true;
-//kein break;
+// no break
 case FN_UNO_HEADER_ON:  nRes = 
SID_ATTR_PAGE_ON;
 break;
 case FN_UNO_FOOTER_BACKGROUND:  bFooter = true;
-// kein break;
+// no break
 case FN_UNO_HEADER_BACKGROUND:  nRes = 
RES_BACKGROUND; nItemType = TYPE_BRUSH;
 break;
 case FN_UNO_FOOTER_BOX: bFooter = true;
-// kein break;
+// no break
 case FN_UNO_HEADER_BOX: nRes = 
RES_BOX; nItemType = TYPE_BOX;
 break;
 case FN_UNO_FOOTER_LR_SPACE:bFooter = true;
-// kein break;
+// no break
 case FN_UNO_HEADER_LR_SPACE:nRes = 
RES_LR_SPACE;nItemType = TYPE_LRSPACE;
 break;
 case FN_UNO_FOOTER_SHADOW:  bFooter = true;
-// kein break;
+// no break
 case FN_UNO_HEADER_SHADOW:  nRes = 
RES_SHADOW;nItemType = TYPE_SHADOW;
 break;
 case FN_UNO_FOOTER_BODY_DISTANCE:   bFooter = true;
-// kein break;
+// no break
 case FN_UNO_HEADER_BODY_DISTANCE:   nRes = 
RES_UL_SPACE;nItemType = TYPE_

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/brwbox1.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 873be8f3ff28fd06b531b17d2c7cc41cbc1385e8
Author: Lionel Elie Mamane 
Date:   Tue Jan 14 18:44:24 2014 +0100

fdo#51180 reset (Multi)Selection on Clear()

Change-Id: I06dde63093eab4e5e1c692f6363aca70b89de96a
Reviewed-on: https://gerrit.libreoffice.org/7429
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index 0fbca4c..91e29cf 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -1149,6 +1149,13 @@ void BrowseBox::Clear()
 DoHideCursor( "Clear" );
 long nOldRowCount = nRowCount;
 nRowCount = 0;
+if(bMultiSelection)
+{
+assert(uRow.pSel);
+*uRow.pSel = MultiSelection();
+}
+else
+uRow.nSel = BROWSER_ENDOFSELECTION;
 nCurRow = BROWSER_ENDOFSELECTION;
 nTopRow = 0;
 nCurColId = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst  |7 ---
 source/text/scalc/01/12090105.xhp |   20 ++--
 2 files changed, 10 insertions(+), 17 deletions(-)

New commits:
commit f9723f6b047938a0bb00dfaae407cc3184acd697
Author: Caolán McNamara 
Date:   Fri Jan 17 11:14:43 2014 +

update help ids for pivot data field dialog .ui conversion

Change-Id: I161036c87468382f87879f8a6742dcba44220168

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ad43d3d..0bbfd60 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3091,7 +3091,6 @@ HID_SC_NAVIPI_TOOLBOX,58867,
 HID_SC_NAVIPI_UP,58858,
 HID_SC_NAVIPI_ZOOM,58860,
 HID_SC_PIVOTFILTER,58869,
-HID_SC_PIVOTSUBT,58871,
 HID_SC_REDLIN_CTR,58934,
 HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
@@ -5904,7 +5903,6 @@ sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_VALUE,1493845018,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_UNIQUE,1493746689,
-sc_CheckBox_RID_SCDLG_PIVOTSUBT_CB_SHOWALL,1493828609,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT,2567504922,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN,2567504926,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER,2567504925,
@@ -5990,7 +5988,6 @@ sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
 sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
-sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
@@ -6001,7 +5998,6 @@ 
sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
-sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_DOC,1495667213,
@@ -6030,9 +6026,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_DIV,1493434911,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_MUL,1493434910,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_NOOP,1493434907,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
diff --git a/source/text/scalc/01/12090105.xhp 
b/source/text/scalc/01/12090105.xhp
index 0c9ae40..c84f8ce 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -27,33 +27,33 @@
 
 
 
-
+
 
 calculating;pivot table
 
 Data field
 The contents of this dialog is different for data fields in the 
Data area, and data fields in the Row or 
Column area of the Pivot Table dialog.
 Subtotals
-Specify the subtotals that you want to 
calculate.
+Specify the subtotals 
that you want to calculate.
 None
-Does not 
calculate subtotals.
+Does not 
calculate subtotals.
 Automatic
-Automatically calculates 
subtotals.
+Automatically 
calculates subtotals.
 User-defined
-Select this 
option, and then click the type of subtotal that you want to calculate in the 
list.
-
+Select this 
option, and then click the type of subtotal that you want to calculate in the 
list.
+
 
 Function
-Click the 
type of subtotal that you want to calculate. This option is only available if 
the User-defined option is selected.
-
+Click the 
type of subtotal that you want to calculate. This option is only available if 
the User-defined option is selected.
+
 Show elements without data
-Includes 
empty columns and rows in the results table.
+Includes 
empty columns and rows in the results table.
 Name:
 Lists the name of the selected data field.
 
 More
 Expands or reduces the dialog. The More 
button is visible for data fields only.
-
+
 Options
 Opens the Data Field Options dialog. The 
Options button is visible for column, row, or page fields 
only.
 If 
the dialog is expanded by the More button, the following items are 
added to the dialog:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

[Caolán McNamara]

 sc/UIConfig_scalc.mk |1 
 sc/inc/helpids.h |1 
 sc/inc/sc.hrc|1 
 sc/inc/scabstdlg.hxx |2 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   16 -
 sc/source/ui/attrdlg/scdlgfact.hxx   |2 
 sc/source/ui/dbgui/pvfundlg.cxx  |   72 +++
 sc/source/ui/dbgui/pvfundlg.src  |  100 --
 sc/source/ui/dbgui/pvlaydlg.cxx  |2 
 sc/source/ui/inc/pvfundlg.hxx|   28 +--
 sc/uiconfig/scalc/ui/pivotfielddialog.ui |  282 +++
 11 files changed, 335 insertions(+), 172 deletions(-)

New commits:
commit 8634c127d488a5aa8e994664b9ebc80860055fbf
Author: Caolán McNamara 
Date:   Fri Jan 17 11:01:13 2014 +

convert pivot table subtotals data field dialog to .ui

Change-Id: I4ac7fb3a13cdc03d3c75cdd730bf39a7d814de99

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 729ae69..f688073 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/pagetemplatedialog \
sc/uiconfig/scalc/ui/paradialog \
sc/uiconfig/scalc/ui/paratemplatedialog \
+   sc/uiconfig/scalc/ui/pivotfielddialog \
sc/uiconfig/scalc/ui/printareasdialog \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2e0cf5e..f9fd155 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -53,7 +53,6 @@
 // Hilfe IDs fuer Dialoge / Pages (max.70) ---
 #define HID_SC_PIVOTFILTER  
"SC_HID_SC_PIVOTFILTER"
 #define HID_SC_INPORTOPT
"SC_HID_SC_INPORTOPT"
-#define HID_SC_PIVOTSUBT
"SC_HID_SC_PIVOTSUBT"
 
 #define HID_SC_NAVIGATOR
"SC_HID_SC_NAVIGATOR"
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 97630f8..9c51d90 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1017,7 +1017,6 @@
 #define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
 #define RID_SCDLG_PIVOT_LAYOUT  (SC_DIALOGS_START + 34)
 #define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
-#define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38)
 #define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
 #define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b63ee0..068e544 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -421,7 +421,7 @@ public:
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData ) = 0;
 
-virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, 
int nId,
+virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent,
 ScDPObject& 
rDPObj,
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 01a2c54..0229bfb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -890,26 +890,14 @@ AbstractScDPFunctionDlg * 
ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg (
 }
 
 AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg 
( Window* pParent,
-int nId,
 ScDPObject& 
rDPObj,
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData,
 const 
ScDPNameVec& rDataFields,
 bool 
bEnableLayout )
 {
-ScDPSubtotalDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_PIVOTSUBT :
-pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, 
rFuncData, rDataFields, bEnableLayout );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScDPSubtotalDlg_Impl( pDlg );
-return 0;
+ScDPSubtotalDlg * pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, 
rFuncData, rDataFields, bEnableLayout );
+return new AbstractScDPSubtotalDlg_Impl( pDlg );
 }
 
 AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgf

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0deae796266da18442aaaec7759e8c64c65632ef
Author: Caolán McNamara 
Date:   Fri Jan 17 11:14:43 2014 +

Updated core
Project: help  f9723f6b047938a0bb00dfaae407cc3184acd697

diff --git a/helpcontent2 b/helpcontent2
index 70e4047..f9723f6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 70e404728857f43ff48da7892a42c4d4df969153
+Subproject commit f9723f6b047938a0bb00dfaae407cc3184acd697
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Stephan Bergmann]

[would probably have been better to start a new mail thread]

On 01/17/2014 11:34 AM, Sven Wehner wrote:

When I scroll through the source code, I sometimes see odd code.
Things that a real developer should seriously take a look at.
Something like one of the multiple "DELETEZ" defines, an "OSL_ENSURE(false, \"cannot 
happen.\")", German function names etc.


Not sure what "a real developer should seriously take a look at" in an

  OSL_ENSURE(false, "cannot happen.")

(other than OSL_ENSURE being deprecated).  Those are generally 
assertions that program logic cannot reach that point (like a default 
case in a switch statement) unless there is a bug.


Stephan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

MABs and priority (was: minutes of ESC call ...)

[Bjoern Michaelsen]

Hi,

On Thu, Jan 16, 2014 at 06:21:48PM +, Michael Meeks wrote:
> + All Most Annoying Bugs -> priority Highest (Bjoern)

This is done now too, so right now, all NEW bugs(*) with priority highest should
also block a MAB and all NEW bugs blocking a MAB should be priority highest.

I updated the MAB instructions to include setting "priority: highest" when
adding a bug to MAB.

for QA, this means two things, one short term, one long term.

== short term ==

To keep the highest=MAB equivalence clean, some regular (weekly?) checking for
bugs that are priority:highest and not a MAB would be needed. Such bugs could
be seen as "proposed MABs" and either be:
- promoted to a MAB with the usual procedure (rationale etc.)
- or respectfully rejected and bumped to priority:high

Someone volunteering for this task?

If so, it would be interesting:
- how many such bugs there are each week
- what is their quality (as in: how many are good MABs? how many are well 
triaged?)

== long term ==

If the above short term activity show that the number of false positives is
low, QA and development might investigate simply using priority highest 
directly.
QA would then need make sure the total number of priority:highest bugs is
ideally somewhere between 50-100 (exact number would be discussed on the ESC).
It would do so by watching for example the bugs that were added to
priority:highest in the last week with a query like this(**):

 
https://bugs.freedesktop.org/buglist.cgi?priority=highest&list_id=383855&resolution=---&chfieldto=Now&query_format=advanced&chfield=priority&chfieldfrom=-7d&bug_status=NEW&product=LibreOffice

Development would simply query for bugs with priority highest, or, if that has
to much noise by stuff not sanity checked by the QA, only those bugs in
priority:highest that have been in that state for more than 7 days (and thus
likely checked by QA), e.g.:

 
https://bugs.freedesktop.org/buglist.cgi?priority=highest&f1=priority&list_id=383863&o1=changedafter&resolution=---&n1=1&query_format=advanced&bug_status=NEW&v1=-7d&product=LibreOffice

So, lets see how this evolves! Personally, I would love to see us move away from
the MAB tracker bug patchwork solution to something simpler and cleaner.

Best,

Bjoern


(*) Unresolved bugs are mostly uninteresting for tracking MABs, but while
checking for this, I found a few unresolved MAB that I missed to put in
priority highest because they where not in NEW:
- 2  NEEDINFO
- 2  ASSIGNED
- 11 REOPENED
I would assume the assigned ones to resolve themselves soonish. The
needinfo ones seem a bit dubious to me: A bug that isnt completely triaged
doesnt seem like a good MAB. We will see what happens to the REOPENED ones 
--
the high count of them seems curious.

(**) Note that this query is currently providing so many results because of the
 bulk move.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 6 commits - sc/source writerfilter/source

[Stephan Bergmann]

 sc/source/core/opencl/openclwrapper.cxx   |   66 ++
 sc/source/core/opencl/openclwrapper.hxx   |   22 +++
 sc/source/filter/excel/xecontent.cxx  |   16 ++---
 sc/source/filter/excel/xeescher.cxx   |2 
 sc/source/filter/excel/xltoolbar.hxx  |9 +--
 sc/source/filter/inc/scflt.hxx|   10 +--
 sc/source/filter/oox/unitconverter.cxx|2 
 sc/source/filter/starcalc/scflt.cxx   |8 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 
 writerfilter/source/dmapper/PropertyMap.cxx   |2 
 writerfilter/source/dmapper/PropertyMap.hxx   |2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|   10 +--
 12 files changed, 73 insertions(+), 78 deletions(-)

New commits:
commit dbf05f8eece93127407c28e1a3f7dda8ad29e564
Author: Stephan Bergmann 
Date:   Fri Jan 17 11:54:47 2014 +0100

bool improvements

Change-Id: Id890cfe8767b1ee760bb2049191a5cfc356f1af8

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index da9a279..2c92bfe 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -900,13 +900,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 {
 bool bFmla2 = false;
 ScConditionMode eOperation = mrFormatEntry.GetOperation();
-sal_Int32 nAboveAverage = eOperation == SC_COND_ABOVE_AVERAGE ||
+bool nAboveAverage = eOperation == SC_COND_ABOVE_AVERAGE ||
 eOperation == SC_COND_ABOVE_EQUAL_AVERAGE;
-sal_Int32 nEqualAverage = eOperation == SC_COND_ABOVE_EQUAL_AVERAGE ||
+bool nEqualAverage = eOperation == SC_COND_ABOVE_EQUAL_AVERAGE ||
 eOperation == SC_COND_BELOW_EQUAL_AVERAGE;
-sal_Int32 nBottom = eOperation == SC_COND_BOTTOM10
+bool nBottom = eOperation == SC_COND_BOTTOM10
 || eOperation == SC_COND_BOTTOM_PERCENT;
-sal_Int32 nPercent = eOperation == SC_COND_TOP_PERCENT ||
+bool nPercent = eOperation == SC_COND_TOP_PERCENT ||
 eOperation == SC_COND_BOTTOM_PERCENT;
 OString aRank("0");
 if(IsTopBottomRule(eOperation))
@@ -931,10 +931,10 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
 XML_type, GetTypeString( mrFormatEntry.GetOperation() ),
 XML_priority, OString::number( mnPriority + 1 ).getStr(),
 XML_operator, GetOperatorString( mrFormatEntry.GetOperation(), 
bFmla2 ),
-XML_aboveAverage, OString::number( nAboveAverage ).getStr(),
-XML_equalAverage, OString::number( nEqualAverage ).getStr(),
-XML_bottom, OString::number( nBottom ).getStr(),
-XML_percent, OString::number( nPercent ).getStr(),
+XML_aboveAverage, OString::number( int(nAboveAverage) ).getStr(),
+XML_equalAverage, OString::number( int(nEqualAverage) ).getStr(),
+XML_bottom, OString::number( int(nBottom) ).getStr(),
+XML_percent, OString::number( int(nPercent) ).getStr(),
 XML_rank, aRank.getStr(),
 XML_text, aText.getStr(),
 XML_dxfId, OString::number( GetDxfs().GetDxfId( 
mrFormatEntry.GetStyle() ) ).getStr(),
diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index 7d48615..f58bd9c 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1247,7 +1247,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const 
ScAddress& rScPos,
 meTVA   = pCaption->GetTextVerticalAdjust();
 meTHA   = pCaption->GetTextHorizontalAdjust();
 mbAutoScale = pCaption->GetFitToSize()?true:false;
-mbLocked= pCaption->IsMoveProtect() | 
pCaption->IsResizeProtect();
+mbLocked= pCaption->IsMoveProtect() || 
pCaption->IsResizeProtect();
 
 // AutoFill style would change if Postit.cxx object 
creation values are changed
 OUString aCol(((XFillColorItem &)GETITEM(aItemSet, 
XFillColorItem , XATTR_FILLCOLOR)).GetValue());
diff --git a/sc/source/filter/excel/xltoolbar.hxx 
b/sc/source/filter/excel/xltoolbar.hxx
index ebb4f8e..9161f19 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -17,12 +17,13 @@ class ScCTBWrapper;
 class TBCCmd : public TBBase
 {
 public:
-TBCCmd() : cmdID(0), A(0), B(0), cmdType(0), C(0), reserved3(0) {}
+TBCCmd() : cmdID(0), A(false), B(false), cmdType(0), C(false), reserved3(0)
+{}
 sal_uInt16 cmdID;
-sal_uInt16 A:1;
-sal_uInt16 B:1;
+bool A:1;
+bool B:1;
 sal_uInt16 cmdType:5;
-sal_uInt16 C:1;
+bool C:1;
 sal_uInt16 reserved3:8;
 bool Read( SvStream& rS );
 void Print(FILE* fp);
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 4f15782..0c75fbd 100644
--- a/sc

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/89d402b3df00c2402ac86896eb2ce4c3f7b7d0

[Caolán McNamara]

 bc/89d402b3df00c2402ac86896eb2ce4c3f7b7d0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2408e0190fdba44cbf76439fe418f201014fbf00
Author: Caolán McNamara 
Date:   Fri Jan 17 10:45:29 2014 +

Notes added by 'git notes add'

diff --git a/bc/89d402b3df00c2402ac86896eb2ce4c3f7b7d0 
b/bc/89d402b3df00c2402ac86896eb2ce4c3f7b7d0
new file mode 100644
index 000..a6de85b
--- /dev/null
+++ b/bc/89d402b3df00c2402ac86896eb2ce4c3f7b7d0
@@ -0,0 +1 @@
+merged as: 87432aeecdfa7194bb5050f912656e03294cf6c7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svgio/source svx/source

[Armin Le Grand]

 sfx2/source/appl/fileobj.cxx|4 +++-
 svgio/source/svgreader/svgimagenode.cxx |   29 -
 svx/source/svdraw/svdograf.cxx  |   12 +---
 3 files changed, 32 insertions(+), 13 deletions(-)

New commits:
commit 87432aeecdfa7194bb5050f912656e03294cf6c7
Author: Armin Le Grand 
Date:   Fri Jan 17 01:37:00 2014 +

Resolves: #i123042# corrected reload of linked content...

to have access to its own path

(cherry picked from commit bc89d402b3df00c2402ac86896eb2ce4c3f7b7d0)

Conflicts:
sfx2/source/appl/fileobj.cxx
svgio/source/svgreader/svgimagenode.cxx
svx/source/svdraw/svdograf.cxx

Change-Id: I4f3e98588f17b4271465359a7f56f9845029e012

diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 4ab7ec9..13dbfc2 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -324,7 +324,9 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, 
SvStream* pStream )
 else if( !pDownLoadData )
 {
 pStream->Seek( STREAM_SEEK_TO_BEGIN );
-nRes = rGF.ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
+
+// #i123042# for e.g. SVG the path is needed, see same TaskID in svx 
for more info
+nRes = rGF.ImportGraphic( rGrf, sFileNm, *pStream, nFilter );
 }
 else
 {
diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index 533d1be..0219a0e 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -234,21 +234,32 @@ namespace svgio
 else if(!maUrl.isEmpty())
 {
 const OUString& rPath = 
getDocument().getAbsolutePath();
-const OUString 
aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
 
-if(!aAbsUrl.isEmpty())
+if (!rPath.isEmpty())
 {
-SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
-Graphic aGraphic;
+const OUString 
aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
 
-if(GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(
-aGraphic,
-aAbsUrl,
-aStream))
+if (!aAbsUrl.isEmpty())
 {
-extractFromGraphic(aGraphic, aNewTarget, 
aViewBox, aBitmapEx);
+SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
+Graphic aGraphic;
+
+if(GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(
+aGraphic,
+aAbsUrl,
+aStream))
+{
+extractFromGraphic(aGraphic, aNewTarget, 
aViewBox, aBitmapEx);
+}
 }
 }
+else
+{
+// #i123042# detect missing path and assert - 
content will be missing. The
+// absolute path to itself needs to be set to 
correctly import linked
+// content in a SVG file
+OSL_ENSURE(false, "SVG graphic with internal links 
is interpreted, but local AbsolutePath is not set: linked content will be 
missing (!)");
+}
 }
 else if(!maXLink.isEmpty())
 {
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ff644a5..58955ef 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -119,7 +119,6 @@ const Graphic ImpLoadLinkedGraphic( const OUString& 
aFileName, const OUString& a
 ? rGF.GetImportFormatNumber( aFilterName )
 : GRFILTER_FORMAT_DONTKNOW;
 
-OUString aEmptyStr;
 css::uno::Sequence< css::beans::PropertyValue > aFilterData( 1 );
 
 // TODO: Room for improvement:
@@ -127,8 +126,15 @@ const Graphic ImpLoadLinkedGraphic( const OUString& 
aFileName, const OUString& a
 // But this link is required by some filters to access the native 
graphic (PDF export/MS export),
 // there we should create a new service to provide this data if needed
 aFilterData[ 0 ].Name = "CreateNativeLink";
-aFilterData[ 0 ].Value = Any( true );
-rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, 
&aFilterData );
+aFilterData[ 0 ].Value = Any( sal_True );
+
+// #i123042# for e.g SVG the path is needed, so hand it over here. I 
have no real id

[Libreoffice-commits] core.git: basctl/source

[Stephan Bergmann]

 basctl/source/basicide/doceventnotifier.cxx |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit ad1390b8c278ee43430296b35d748cb8cdd4625b
Author: Stephan Bergmann 
Date:   Fri Jan 17 11:38:06 2014 +0100

Remove use of deprecated css::document::XEventBroadcaster/Listener

Change-Id: I178ae590fec87f53e90db5aa6e560cd146c0676b

diff --git a/basctl/source/basicide/doceventnotifier.cxx 
b/basctl/source/basicide/doceventnotifier.cxx
index 9aa94f0..95ed06f 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -22,7 +22,7 @@
 #include "scriptdocument.hxx"
 
 #include 
-#include 
+#include 
 
 #include 
 
@@ -41,9 +41,9 @@ namespace basctl
 {
 //
 
-using ::com::sun::star::document::XEventBroadcaster;
-using ::com::sun::star::document::XEventListener;
-using ::com::sun::star::document::EventObject;
+using ::com::sun::star::document::XDocumentEventBroadcaster;
+using ::com::sun::star::document::XDocumentEventListener;
+using ::com::sun::star::document::DocumentEvent;
 using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Reference;
@@ -58,7 +58,7 @@ namespace basctl
 //
 //= DocumentEventNotifier::Impl
 //
-typedef ::cppu::WeakComponentImplHelper1<   XEventListener
+typedef ::cppu::WeakComponentImplHelper1<   XDocumentEventListener
 >   
DocumentEventNotifier_Impl_Base;
 
 enum ListenerAction
@@ -77,10 +77,10 @@ namespace basctl
 Impl (DocumentEventListener&, Reference const& rxDocument);
 ~Impl ();
 
-// document::XEventListener
-virtual void SAL_CALL notifyEvent( const EventObject& Event ) throw 
(RuntimeException);
+// XDocumentEventListener
+virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event 
) throw (RuntimeException);
 
-// lang::XEventListener
+// XEventListener
 virtual void SAL_CALL disposing( const csslang::EventObject& Event ) 
throw (RuntimeException);
 
 // ComponentHelper
@@ -123,7 +123,7 @@ namespace basctl
 }
 
 //
-void SAL_CALL DocumentEventNotifier::Impl::notifyEvent( const EventObject& 
_rEvent ) throw (RuntimeException)
+void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const 
DocumentEvent& _rEvent ) throw (RuntimeException)
 {
 ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -205,18 +205,18 @@ namespace basctl
 {
 try
 {
-Reference< XEventBroadcaster > xBroadcaster;
+Reference< XDocumentEventBroadcaster > xBroadcaster;
 if ( m_xModel.is() )
 xBroadcaster.set( m_xModel, UNO_QUERY_THROW );
 else
 {
 Reference< com::sun::star::uno::XComponentContext > aContext(
 comphelper::getProcessComponentContext() );
-xBroadcaster.set( theGlobalEventBroadcaster::get(aContext), 
UNO_QUERY_THROW );
+xBroadcaster = theGlobalEventBroadcaster::get(aContext);
 }
 
-void ( SAL_CALL XEventBroadcaster::*listenerAction )( const 
Reference< XEventListener >& ) =
-( _eAction == RegisterListener ) ? 
&XEventBroadcaster::addEventListener : &XEventBroadcaster::removeEventListener;
+void ( SAL_CALL XDocumentEventBroadcaster::*listenerAction )( 
const Reference< XDocumentEventListener >& ) =
+( _eAction == RegisterListener ) ? 
&XDocumentEventBroadcaster::addDocumentEventListener : 
&XDocumentEventBroadcaster::removeDocumentEventListener;
 (xBroadcaster.get()->*listenerAction)( this );
 }
 catch( const Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] vcl/source/window/status.cxx: Translate German comments

[Sven Wehner]

Hi Miklos, Hi List,

I was just wondering:
When I scroll through the source code, I sometimes see odd code.
Things that a real developer should seriously take a look at.
Something like one of the multiple "DELETEZ" defines, an "OSL_ENSURE(false, 
\"cannot happen.\")", German function names etc.

Shall I mark them ("//TODO: …")? May I use the same commit/patch as the 
translation?
Shall I open a ticket?

I don't want to fix it myself, because I want to keep my involvement as much as 
"20 minutes a day" as possible.
And compiling, testing etc. would take some additional time.

Yours,
Sven


On Friday 17 January 2014 10:12:30 Miklos Vajna wrote:
> Hi Sven,
> 
> On Sat, Jan 11, 2014 at 05:55:35PM +0100, Sven Wehner  
> wrote:
> > here's my small contribution:
> > I translated all comments in 'vcl/source/window/status.cxx' from
> > German to English.
> 
> Pushed, thanks!
> 
> Miklos

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/ab293354bb322a7d57b7eaf21bcd2479453e87

[Caolán McNamara]

 93/ab293354bb322a7d57b7eaf21bcd2479453e87 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 20d569d19c811d200a63343218ef1941952aaf1c
Author: Caolán McNamara 
Date:   Fri Jan 17 10:16:38 2014 +

Notes added by 'git notes add'

diff --git a/93/ab293354bb322a7d57b7eaf21bcd2479453e87 
b/93/ab293354bb322a7d57b7eaf21bcd2479453e87
new file mode 100644
index 000..b104169
--- /dev/null
+++ b/93/ab293354bb322a7d57b7eaf21bcd2479453e87
@@ -0,0 +1 @@
+merged as: 59fd33c1f0495231e741437d6e9702b7687fc766
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d320ce0d31cb181f56deefb1aaf101a681c3755
Author: Caolán McNamara 
Date:   Fri Jan 17 10:14:55 2014 +

Updated core
Project: help  70e404728857f43ff48da7892a42c4d4df969153

diff --git a/helpcontent2 b/helpcontent2
index 303b537..70e4047 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 303b537732b914243c12f589ce2f8f48c0ccb919
+Subproject commit 70e404728857f43ff48da7892a42c4d4df969153
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst  |6 --
 source/text/scalc/01/12090105.xhp |   14 ++
 2 files changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 70e404728857f43ff48da7892a42c4d4df969153
Author: Caolán McNamara 
Date:   Fri Jan 17 10:14:55 2014 +

update help ids for data field dialog .ui conversion

Change-Id: I955c6a3be8d1867775a2df948ac0e7d55fa0aaac

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d3657bb..ad43d3d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3048,7 +3048,6 @@ HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
 HID_SC_CHANGES_COMMENT,58990,
-HID_SC_DPDATAFIELD,59008,
 HID_SC_DPDATEGROUP,59012,
 HID_SC_DPDATEGROUP_LB,59013,
 HID_SC_DPLAY_COLUMN,59003,
@@ -5957,9 +5956,6 @@ sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
 sc_ListBox_RID_SCDLG_DAPIDATA_LB_DATABASE,1495354899,
 sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEFIELD,1495387651,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEITEM,1495387652,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_TYPE,1495387650,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_HIERARCHY,1495404041,
 sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT,1495404038,
@@ -5990,12 +5986,10 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
-sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
 sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
-sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137,
 sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
diff --git a/source/text/scalc/01/12090105.xhp 
b/source/text/scalc/01/12090105.xhp
index 9c17733..0c9ae40 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -28,23 +28,21 @@
 
 
 
+
 calculating;pivot table
 
 Data field
 The contents of this dialog is different for data fields in the 
Data area, and data fields in the Row or 
Column area of the Pivot Table dialog.
 Subtotals
 Specify the subtotals that you want to 
calculate.
-
 None
 Does not 
calculate subtotals.
-
 Automatic
 Automatically calculates 
subtotals.
-
 User-defined
 Select this 
option, and then click the type of subtotal that you want to calculate in the 
list.
 
-
+
 Function
 Click the 
type of subtotal that you want to calculate. This option is only available if 
the User-defined option is selected.
 
@@ -52,7 +50,7 @@
 Includes 
empty columns and rows in the results table.
 Name:
 Lists the name of the selected data field.
-
+
 More
 Expands or reduces the dialog. The More 
button is visible for data fields only.
 
@@ -61,7 +59,7 @@
 If 
the dialog is expanded by the More button, the following items are 
added to the dialog:
 Displayed value
 For each data field, you can select the type of 
display. For some types you can select additional information for a 
base field and a base item.
-
+
 Type
 Select the type of calculating of the 
displayed value for the data field.
 
@@ -157,10 +155,10 @@
 
 
 
-
+
 Base field
 Select the field from which the respective 
value is taken as base for the calculation.
-
+
 Base item
 Select the item of the base field from which 
the respective value is taken as base for the calculation.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - extras/source sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sw/source

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |4 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/inc/sc.hrc  |1 
 sc/inc/scabstdlg.hxx   |2 
 sc/source/ui/attrdlg/scdlgfact.cxx |   16 -
 sc/source/ui/attrdlg/scdlgfact.hxx |2 
 sc/source/ui/dbgui/pvfundlg.cxx|  153 +-
 sc/source/ui/dbgui/pvfundlg.src|  137 -
 sc/source/ui/dbgui/pvlaydlg.cxx|2 
 sc/source/ui/inc/pvfundlg.hxx  |   35 +-
 sc/uiconfig/scalc/ui/datafielddialog.ui|  352 +
 sw/source/core/doc/docbm.cxx   |   76 +++--
 sw/source/core/inc/MarkManager.hxx |1 
 14 files changed, 511 insertions(+), 272 deletions(-)

New commits:
commit b33c7476e6975ecd7cfb233a7a0e8b417870bea5
Author: Caolán McNamara 
Date:   Fri Jan 17 09:40:03 2014 +

convert data field dialog to .ui

Change-Id: I68da93c1227e8140511f3ad4071c87b3cf0443c0

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 6d7a6dc..56572f2 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -578,6 +578,10 @@
 generic-name="CondFormatList" parent="GtkDrawingArea"
 icon-name="widget-gtk-drawingarea"/>
 
+
+
 
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 9fb69cf..729ae69 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/covariancedialog \
sc/uiconfig/scalc/ui/createnamesdialog \
sc/uiconfig/scalc/ui/databaroptions \
+   sc/uiconfig/scalc/ui/datafielddialog \
sc/uiconfig/scalc/ui/dataform \
sc/uiconfig/scalc/ui/datastreams \
sc/uiconfig/scalc/ui/definedatabaserangedialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 67c6156..2e0cf5e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -152,7 +152,6 @@
 
 #define HID_SC_DRAW_RENAME  
"SC_HID_SC_DRAW_RENAME"
 
-#define HID_SC_DPDATAFIELD  
"SC_HID_SC_DPDATAFIELD"
 #define HID_SC_DPSUBT_OPT   
"SC_HID_SC_DPSUBT_OPT"
 #define HID_SC_DPSUBT_HIDE  
"SC_HID_SC_DPSUBT_HIDE"
 #define HID_SC_DPNUMGROUP   
"SC_HID_SC_DPNUMGROUP"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e6a61f4..97630f8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1080,7 +1080,6 @@
 #define RID_SCDLG_DAPIDATA  (SC_DIALOGS_START + 131)
 
 
-#define RID_SCDLG_DPDATAFIELD   (SC_DIALOGS_START + 133)
 #define RID_SCDLG_DPSUBTOTAL_OPT(SC_DIALOGS_START + 134)
 #define RID_SCDLG_DPNUMGROUP(SC_DIALOGS_START + 135)
 #define RID_SCDLG_DPDATEGROUP   (SC_DIALOGS_START + 136)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 52d52bc..9b63ee0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -416,7 +416,7 @@ public:
 virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* 
pParent,
 const 
SfxItemSet&   rArgSet, sal_uInt16 nSourceTab , int nId ) = 0;
 
-virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, 
int nId,
+virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent,
 const 
ScDPLabelDataVector& rLabelVec,
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index cf1208e..01a2c54 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -881,24 +881,12 @@ AbstractScPivotFilterDlg * 
ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg
 }
 
 AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg 
( Window* pParent,
-int nId,
 const 
ScDPLabelDataVector& rLabelVec,
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData )
 {
-ScDPFunctionDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_DPDATAFIELD :
-pDlg = new ScDPFunctionDlg( pParent, rLabelVec, rLabelData, 
rFuncData );
- 

[Bug 38829] Add fractional inches to units

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=38829

--- Comment #8 from Tor Lillqvist  ---
Actually I think I might have been the original author, the idea sounds
familiar to me;) But, I have changed my mind...

-- 
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 38829] Add fractional inches to units

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=38829

--- Comment #7 from Björn Michaelsen  ---
(Note: This was an easy hack moved from the original messy wikipage, I dont
have anything to do with its contents, nor do the opinions in the description
have to match my own. If this task needs mentoring, it would be very nice if
the original author would show up ;) )

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Björn Michaelsen  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #186 from Björn Michaelsen  ---
Readding developer list.

-- 
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 67274] Gallery: Do not link inserted images

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=67274

Björn Michaelsen  changed:

   What|Removed |Added

   Priority|medium  |highest

--- Comment #10 from Björn Michaelsen  ---
(This is an automated message.)

Setting priority to highest as this is a 4.0 MAB. This is part of an effort to
make the importance of MAB reflected in priority too.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Björn Michaelsen  changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

--- Comment #185 from Björn Michaelsen  ---
Remove developer list for bulk change.

-- 
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 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Björn Michaelsen  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #132 from Björn Michaelsen  ---
readding after bulk change.

-- 
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 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Björn Michaelsen  changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

--- Comment #131 from Björn Michaelsen  ---
Removing developer list for bulk change.

-- 
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Björn Michaelsen  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #55 from Björn Michaelsen  ---
Readding developer list after bulk change.

-- 
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Björn Michaelsen  changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

--- Comment #54 from Björn Michaelsen  ---
Temporary removing dev-list for bulk change.

-- 
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: solenv/bin

[Matúš Kukan]

 solenv/bin/native-code.py |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0c95fedd5a1e8f192e06c8bb73396e3829f5b5bb
Author: Matúš Kukan 
Date:   Fri Jan 17 10:30:06 2014 +0100

native code generator: Add sfx implementations.

Change-Id: I9bfc757bbb5edbcb3e47e585592cafc3732b7f6e

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6727920..1368f47 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -51,6 +51,10 @@ core_constructor_list = [
 # sax/source/expatwrap/expwrap.component
 "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
+# sfx2/util/sfx.component
+"com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
+"com_sun_star_comp_office_FrameLoader_get_implementation",
+"SfxDocumentMetaData_get_implementation",
 # svtools/util/svt.component
 "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage & GC ...

[Stephan Bergmann]

On 01/16/2014 06:52 PM, Stephan Bergmann wrote:

So the way out is to distinguish singleton implementations (whose XML
description lists at least one ) from normal ones (whose
XML description does not list any s), and let the service
manager keep track to only create a single instance of those.

And for those "false singletons" that are normal implementations by the
preceding definition but use a single-instance factory, turn them into
singleton implementations (typically by deprecating an existing UNOIDL
service and introducing a superseding UNOIDL singleton), and, voila, you
can convert them to use constructor functions without further ado.


"Support for singleton constructor functions" implements the necessary
machinery in the service manager, and

"Introduce com.sun.star.frame.theGlobalEventBroadcaster singleton" and

"Revert 'Revert 'sfx: Use constructor feature for
SfxGlobalEvents_Impl''" demonstrate how to apply it to
SfxGlobaleEvent_Impl.


Bummer.  Where was my brains?  This of course also requires 
 
"Constructor functions for singletons still need to pass out single 
instances":



...as they are not only called from the service manager (which takes care of
singleton constructor functions since 997d21183322a0a94b96868073808841d2773902
"Support for singleton constructor functions") but potentially also directly
from cppumaker-generated code (which is the raison d'être for constructor
functions, after all).

However, this change:
* postpones the instance's destruction to atexit, with all dreaded consequences;
  lets see how that pans out.
* makes it questionable whether the service manager holding references of these
  singletons (introduced in 997d21183322a0a94b96868073808841d2773902) is
  necessary after all; lets revisit that in another commit.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice