[PATCH] handle missing dep files in concat-deps

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot, Björn Michaelsen,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/4302

to look at the new patch set (#5).

Change subject: handle missing dep files in concat-deps
..

handle missing dep files in concat-deps

* this and Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 reduces a default
  build on my machine from 2min25sec to 2min12sec
* without unitchecks, its down to 1min50sec now
* it reduces the build time on a i7-4770 Windows tinderbox from 99min to
  89min

Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
---
M solenv/bin/concat-deps.c
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/SdiTarget.mk
M solenv/gbuild/UnoApiTarget.mk
5 files changed, 93 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/4302/5
-- 
To view, visit https://gerrit.libreoffice.org/4302
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Jan Holesovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Norbert Thiebaud 

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

Re: Just a suggestion for Tinderbox

[Jan Holesovsky]

Hi Julien,

julien2412 píše v Po 17. 06. 2013 v 11:34 -0700:

> I read this https://bugs.freedesktop.org/show_bug.cgi?id=65653#c31, I'll
> quote:
> "It seems a little strange that ordinary users, such as myself, who raise a
> bug report and are keen to help reasonably early testing, can't find out for
> themselves whether a daily release has a fix or not."
> I thought perhaps it could be interesting to have a file in addition to
> build info (or perhaps inside it?)  which gives the list of commits
> retrieved since the previous build.
> I read too  https://bugs.freedesktop.org/show_bug.cgi?id=65653#c30 which
> indicates "git branch --contains " but you must have git +  git repo
> up-to-date in local.
> 
> Any idea?

The build has the git commit id in the About box, you can just do git
log that_commit_id in your tree, or go to

http://cgit.freedesktop.org/libreoffice/core/commit/?id=that_commit_id

Does that help?

Regards,
Kendy

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

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

[Cédric Bosdonnat]

 sw/qa/extras/ooxmlimport/data/n820504.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   12 
 writerfilter/source/dmapper/StyleSheetTable.cxx |3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit f9610ed634318c27382d79089d022fb8175eb90a
Author: Cédric Bosdonnat 
Date:   Tue Jun 18 09:50:41 2013 +0200

added unit test for n#820504

Change-Id: I804e081a564d24d3896160f817051b19da884c34

diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx 
b/sw/qa/extras/ooxmlimport/data/n820504.docx
new file mode 100644
index 000..36279a9
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n820504.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c0987d1..676fbbb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -118,6 +118,7 @@ public:
 void testN816593();
 void testN820509();
 void testN820788();
+void testN820504();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -203,6 +204,7 @@ void Test::run()
 {"n816593.docx", &Test::testN816593},
 {"n820509.docx", &Test::testN820509},
 {"n820788.docx", &Test::testN820788},
+{"n820504.docx", &Test::testN820504},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1437,6 +1439,16 @@ void Test::testN820788()
 CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty(xFrame, 
"SizeType"));
 }
 
+void Test::testN820504()
+{
+uno::Reference 
xFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xFamiliesAccess(xFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xStylesAccess(xFamiliesAccess->getByName("ParagraphStyles"), uno::UNO_QUERY);
+uno::Reference 
xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
+// The problem was that the CharColor was set to AUTO (-1) even if we have 
some default char color set
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty(xStyle, 
"CharColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 122db845e057cfd83bb2b5fde442200bc742eb8d
Author: Cédric Bosdonnat 
Date:   Mon Jun 17 13:42:34 2013 +0200

n#820504: default color hidden by Default style in writerfilter

Setting the font color of the default paragraph style to Auto makes the
color set in the Writer defaults (from rPrDefault) ignored.

Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c
(cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 74adb0b..8352b1b 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -786,8 +786,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 pEntry->pProperties->Insert(PROP_PARA_ORPHANS, true, 
aTwo, false);
 //  Left-to-right direction if not already set
 pEntry->pProperties->Insert(PROP_WRITING_MODE, true, 
uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false);
-//  font color COL_AUTO if not already set
-pEntry->pProperties->Insert(PROP_CHAR_COLOR, true, 
uno::makeAny( sal_Int32(0x) ), false);
+// Don't set font color to Auto if not already set: 
this could hide the default font color setting
 }
 
 uno::Sequence< beans::PropertyValue > aPropValues = 
pEntry->pProperties->GetPropertyValues();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 solenv/bin/concat-deps.c  |  115 ++
 solenv/gbuild/AllLangResTarget.mk |3 
 solenv/gbuild/LinkTarget.mk   |   51 +++-
 solenv/gbuild/SdiTarget.mk|   14 +++-
 solenv/gbuild/UnoApiTarget.mk |   15 
 5 files changed, 163 insertions(+), 35 deletions(-)

New commits:
commit 66a0713dc9c676182fcd7aa1e21f8dc25c05be5e
Author: Bjoern Michaelsen 
Date:   Sun Jun 16 05:01:45 2013 +0200

handle missing dep files in concat-deps

* this and Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 reduces a default
  build on my machine from 2min25sec to 2min12sec
* without unitchecks, its down to 1min50sec now
* it reduces the build time on a i7-4770 Windows tinderbox from 99min to
  89min
* by now it also takes care of avoiding most string copying, although
  this can certainly be considered overeager given that the file
  creation on Windows took ~250ms per file before and still will take a
  lot longer than any string operation with this change

Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 3613946..c60beeb 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -118,6 +118,7 @@
 int internal_boost = 0;
 static char* base_dir;
 static char* work_dir;
+int work_dir_len;
 
 #ifdef __GNUC__
 #define clz __builtin_clz
@@ -864,6 +865,44 @@ static inline char * eat_space_at_end(char * end)
 return real_end;
 }
 
+static char* phony_content_buffer;
+static inline char* generate_phony_line(char* phony_target, char* extension)
+{
+char* src;
+char* dest;
+char* last_dot;
+//fprintf(stderr, "generate_phony_line called with phony_target %s and 
extension %s\n", phony_target, extension);
+for(dest = phony_content_buffer+work_dir_len, src = phony_target; *src != 
0; ++src, ++dest)
+{
+*dest = *src;
+if(*dest == '.')
+{
+last_dot = dest;
+}
+}
+//fprintf(stderr, "generate_phony_line after phony_target copy: %s\n", 
phony_content_buffer);
+for(dest = last_dot+1, src = extension; *src != 0; ++src, ++dest)
+{
+*dest = *src;
+}
+//fprintf(stderr, "generate_phony_line after extension add: %s\n", 
phony_content_buffer);
+strcpy(dest, ": $(gb_Helper_PHONY)\n");
+//fprintf(stderr, "generate_phony_line after phony add: %s\n", 
phony_content_buffer);
+return phony_content_buffer;
+}
+
+static inline int generate_phony_file(char* fn, char* content)
+{
+FILE* depfile;
+depfile = fopen(fn, "w");
+if(depfile)
+{
+fputs(content, depfile);
+fclose(depfile);
+}
+return !depfile;
+}
+
 static int _process(struct hash* dep_hash, char* fn)
 {
 int rc;
@@ -872,6 +911,8 @@ char* end;
 char* cursor;
 char* cursor_out;
 char* base;
+char* created_line;
+char* src_relative;
 int continuation = 0;
 char last_ns = 0;
 off_t size;
@@ -985,6 +1026,75 @@ off_t size;
 }
 }
 }
+else
+{
+if(strncmp(fn, work_dir, work_dir_len) == 0)
+{
+if(strncmp(fn+work_dir_len, "/Dep/", 5) == 0)
+{
+src_relative = fn+work_dir_len+5;
+// cases ordered by frequency
+if(strncmp(src_relative, "CxxObject/", 10) == 0)
+{
+created_line = generate_phony_line(src_relative+10, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(fn+work_dir_len+5, "UnoApiPartTarget/", 17) == 
0)
+{
+created_line = generate_phony_line(src_relative+17, "urd");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
+{
+created_line = generate_phony_line(src_relative+14, "");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenCxxObject/", 13) == 0)
+{
+created_line = generate_phony_line(src_relative+13, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "CObject/", 8) == 0)
+{
+created_line = generate_phony_line(src_relative+8, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenCObject/", 11) == 0)
+{
+created_line = generate_phony_line(src_relative+11, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "SdiObject/", 10) == 0)
+{
+created_line = generate_phony_line(src_relative+10, "

[PATCH] handle missing dep files in concat-deps

[via Code Review]

Hello LibreOffice gerrit bot, Norbert Thiebaud,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/4302

to look at the new patch set (#6).

Change subject: handle missing dep files in concat-deps
..

handle missing dep files in concat-deps

* this and Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 reduces a default
  build on my machine from 2min25sec to 2min12sec
* without unitchecks, its down to 1min50sec now
* it reduces the build time on a i7-4770 Windows tinderbox from 99min to
  89min
* by now it also takes care of avoiding most string copying, although
  this can certainly be considered overeager given that the file
  creation on Windows took ~250ms per file before and still will take a
  lot longer than any string operation with this change

Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
---
M solenv/bin/concat-deps.c
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/SdiTarget.mk
M solenv/gbuild/UnoApiTarget.mk
5 files changed, 132 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/4302/6
-- 
To view, visit https://gerrit.libreoffice.org/4302
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Jan Holesovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Norbert Thiebaud 

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

[PUSHED] handle missing dep files in concat-deps

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4302


-- 
To view, visit https://gerrit.libreoffice.org/4302
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Jan Holesovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Norbert Thiebaud 

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

[PATCH] Reduce the amount of calls of mkdir -p.

[via Code Review]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/4297

to look at the new patch set (#5).

Change subject: Reduce the amount of calls of mkdir -p.
..

Reduce the amount of calls of mkdir -p.

Change-Id: Ib4762f5a260035f00b5e68cf45b687fdf02e9c02
---
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/SdiTarget.mk
M solenv/gbuild/UnoApiTarget.mk
3 files changed, 31 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/4297/5
-- 
To view, visit https://gerrit.libreoffice.org/4297
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib4762f5a260035f00b5e68cf45b687fdf02e9c02
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jan Holesovsky 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

[PUSHED] Reduce the amount of calls of mkdir -p.

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4297


-- 
To view, visit https://gerrit.libreoffice.org/4297
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4762f5a260035f00b5e68cf45b687fdf02e9c02
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jan Holesovsky 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

[PUSHED] String to OUString (SfxStringItem and related)

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4280

Approvals:
  Noel Power: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4280
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I390413e9ff3efee720a6423fb8695b4c655d7efa
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin 
Gerrit-Reviewer: Matteo Casalin 
Gerrit-Reviewer: Noel Power 

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

[PATCH libreoffice-4-1] n#820504: default color hidden by Default style in writerfil...

[Bosdonnat Cedric (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4329

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/4329/1

n#820504: default color hidden by Default style in writerfilter

Setting the font color of the default paragraph style to Auto makes the
color set in the Writer defaults (from rPrDefault) ignored.

Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c
(cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
(cherry picked from commit 122db845e057cfd83bb2b5fde442200bc742eb8d)
---
M writerfilter/source/dmapper/StyleSheetTable.cxx
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 74adb0b..8352b1b 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -786,8 +786,7 @@
 pEntry->pProperties->Insert(PROP_PARA_ORPHANS, true, 
aTwo, false);
 //  Left-to-right direction if not already set
 pEntry->pProperties->Insert(PROP_WRITING_MODE, true, 
uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false);
-//  font color COL_AUTO if not already set
-pEntry->pProperties->Insert(PROP_CHAR_COLOR, true, 
uno::makeAny( sal_Int32(0x) ), false);
+// Don't set font color to Auto if not already set: 
this could hide the default font color setting
 }
 
 uno::Sequence< beans::PropertyValue > aPropValues = 
pEntry->pProperties->GetPropertyValues();

-- 
To view, visit https://gerrit.libreoffice.org/4329
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Bosdonnat Cedric 

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

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

[Armin Le Grand]

 svx/source/xoutdev/xtabdash.cxx |   27 ++-
 1 file changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 445ebce3e08973dd1701791974477d7fa64835fa
Author: Armin Le Grand 
Date:   Wed Apr 10 15:51:45 2013 +

Resolves: #i121791# Enhanced look of the LineStyle previews

(cherry picked from commit 35f96c967abb1a8b4723c7261c253661d409732c)

Conflicts:
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtable.cxx

Change-Id: Idcff1f8ca317bc17757a88c88ff2bd89a82f6f9d

diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index bf5deff..a6d9d29 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -72,6 +72,10 @@ public:
 SdrObject* getLineObject() const { return mpLineObject; }
 };
 
+// to avoid rendering trouble (e.g. vcl renderer) and to get better AAed 
quality,
+// use double prerender size
+static bool bUseDoubleSize = true;
+
 void XDashList::impCreate()
 {
 if(!mpData)
@@ -83,7 +87,9 @@ void XDashList::impCreate()
 OSL_ENSURE(0 != pVirDev, "XDashList: no VirtualDevice created!" );
 pVirDev->SetMapMode(MAP_100TH_MM);
 const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
-const Size aSize(pVirDev->PixelToLogic(Size(rSize.Width() * 2, 
rSize.Height(;
+const Size aSize(pVirDev->PixelToLogic(Size(
+bUseDoubleSize ? rSize.Width() * 5 : rSize.Width() * 5 / 2,
+bUseDoubleSize ? rSize.Height() * 2 : rSize.Height(;
 pVirDev->SetOutputSize(aSize);
 pVirDev->SetDrawMode(rStyleSettings.GetHighContrastMode()
 ? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | 
DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
@@ -102,8 +108,10 @@ void XDashList::impCreate()
 pBackgroundObject->SetMergedItem(XLineStyleItem(XLINE_NONE));
 pBackgroundObject->SetMergedItem(XFillColorItem(String(), 
rStyleSettings.GetFieldColor()));
 
-const basegfx::B2DPoint aStart(0, aSize.Height() / 2);
-const basegfx::B2DPoint aEnd(aSize.Width(), aSize.Height() / 2);
+
+const sal_uInt32 nHalfHeight(aSize.Height() / 2);
+const basegfx::B2DPoint aStart(0, nHalfHeight);
+const basegfx::B2DPoint aEnd(aSize.Width(), nHalfHeight);
 basegfx::B2DPolygon aPolygon;
 aPolygon.append(aStart);
 aPolygon.append(aEnd);
@@ -113,7 +121,7 @@ void XDashList::impCreate()
 pLineObject->SetMergedItem(XLineStyleItem(XLINE_DASH));
 pLineObject->SetMergedItem(XLineColorItem(String(), 
rStyleSettings.GetFieldTextColor()));
 const Size 
aLineWidth(pVirDev->PixelToLogic(Size(rStyleSettings.GetListBoxPreviewDefaultLineWidth(),
 0)));
-pLineObject->SetMergedItem(XLineWidthItem(aLineWidth.getWidth()));
+pLineObject->SetMergedItem(XLineWidthItem(bUseDoubleSize ? 
aLineWidth.getWidth() * 2 : aLineWidth.getWidth()));
 mpData = new impXDashList(pVirDev, pSdrModel, pBackgroundObject, 
pLineObject);
 OSL_ENSURE(0 != mpData, "XDashList: data creation went wrong!" );
 }
@@ -202,7 +210,16 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* 
pDash)
 aPainter.ProcessDisplay(aDisplayInfo);
 
 const Point aZero(0, 0);
-return pVD->GetBitmap(aZero, pVD->GetOutputSize());
+Bitmap aResult(pVD->GetBitmap(aZero, pVD->GetOutputSize()));
+
+if(bUseDoubleSize)
+{
+const Size aCurrentSize(aResult.GetSizePixel());
+
+aResult.Scale(Size(aCurrentSize.Width() / 2, aCurrentSize.Height() / 
2), BMP_SCALE_DEFAULT);
+}
+
+return aResult;
 }
 
 Bitmap XDashList::CreateBitmapForUI( long nIndex )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-1] added unit test for n#820504

[Bosdonnat Cedric (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4330

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/4330/1

added unit test for n#820504

Change-Id: I804e081a564d24d3896160f817051b19da884c34
(cherry picked from commit f9610ed634318c27382d79089d022fb8175eb90a)
---
A sw/qa/extras/ooxmlimport/data/n820504.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2 files changed, 12 insertions(+), 0 deletions(-)



diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx 
b/sw/qa/extras/ooxmlimport/data/n820504.docx
new file mode 100644
index 000..36279a9
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/n820504.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ce66980..c895db2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -119,6 +119,7 @@
 void testPageBorderShadow();
 void testN820509();
 void testN820788();
+void testN820504();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -205,6 +206,7 @@
 {"page-border-shadow.docx", &Test::testPageBorderShadow},
 {"n820509.docx", &Test::testN820509},
 {"n820788.docx", &Test::testN820788},
+{"n820504.docx", &Test::testN820504},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1457,6 +1459,16 @@
 CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty(xFrame, 
"SizeType"));
 }
 
+void Test::testN820504()
+{
+uno::Reference 
xFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xFamiliesAccess(xFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xStylesAccess(xFamiliesAccess->getByName("ParagraphStyles"), uno::UNO_QUERY);
+uno::Reference 
xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
+// The problem was that the CharColor was set to AUTO (-1) even if we have 
some default char color set
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty(xStyle, 
"CharColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();

-- 
To view, visit https://gerrit.libreoffice.org/4330
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I804e081a564d24d3896160f817051b19da884c34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Bosdonnat Cedric 

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 35/f96c967abb1a8b4723c7261c253661d409732c

[Caolán McNamara]

 35/f96c967abb1a8b4723c7261c253661d409732c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 976d3aa417bd243f342e8571c14e6c81928f26d8
Author: Caolán McNamara 
Date:   Tue Jun 18 09:18:32 2013 +0100

Notes added by 'git notes add'

diff --git a/35/f96c967abb1a8b4723c7261c253661d409732c 
b/35/f96c967abb1a8b4723c7261c253661d409732c
new file mode 100644
index 000..ac1ed2c
--- /dev/null
+++ b/35/f96c967abb1a8b4723c7261c253661d409732c
@@ -0,0 +1 @@
+merged as: 445ebce3e08973dd1701791974477d7fa64835fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit 9e1c2d3b1da6f8ca23d2fd2fd5255f6bb8d9afda
Author: Andras Timar 
Date:   Tue Jun 18 10:20:15 2013 +0200

Updated core
Project: translations  5177014ee256887eb36b358747038816bad3371d

diff --git a/translations b/translations
index 6a22431..5177014 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6a224315f0e1cb8c3650773dc5482cc9e41e31ac
+Subproject commit 5177014ee256887eb36b358747038816bad3371d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sw/source/filter/xml/XMLRedlineImportHelper.cxx |   39 ++--
 1 file changed, 23 insertions(+), 16 deletions(-)

New commits:
commit b9155a663b767695c5d636e855765c209944cfd5
Author: Michael Meeks 
Date:   Tue Jun 18 10:00:12 2013 +0100

fdo#65882 - fix intermittent writer unit test failure on exit.

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index e1118e0..e7583aa 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -368,25 +368,32 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 }
 
 // set redline mode & key
-Any aAny;
+try
+{
+Any aAny;
 
-aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
-if ( bHandleShowChanges )
-xModelPropertySet->setPropertyValue( sShowChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
+aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
+if ( bHandleShowChanges )
+xModelPropertySet->setPropertyValue( sShowChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
 
-aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
-if ( bHandleRecordChanges )
-xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
+aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
+if ( bHandleRecordChanges )
+xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
 
-aAny <<= aProtectionKey;
-if ( bHandleProtectionKey )
-xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+aAny <<= aProtectionKey;
+if ( bHandleProtectionKey )
+xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, 
aAny);
+}
+catch (const uno::RuntimeException &) // fdo#65882
+{
+SAL_WARN( "sw", "potentially benign ordering issue during shutdown" );
+}
 }
 
 void XMLRedlineImportHelper::Add(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sw/source/filter/xml/XMLRedlineImportHelper.cxx |   39 ++--
 1 file changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 23ff4ca909f960a7fb36ac87791d448a2ed5eb6d
Author: Michael Meeks 
Date:   Tue Jun 18 10:00:12 2013 +0100

fdo#65882 - fix intermittent writer unit test failure on exit.

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index b4f85a5..e922d3c 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -368,25 +368,32 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 }
 
 // set redline mode & key
-Any aAny;
+try
+{
+Any aAny;
 
-aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
-if ( bHandleShowChanges )
-xModelPropertySet->setPropertyValue( sShowChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
+aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
+if ( bHandleShowChanges )
+xModelPropertySet->setPropertyValue( sShowChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
 
-aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
-if ( bHandleRecordChanges )
-xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
+aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
+if ( bHandleRecordChanges )
+xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
 
-aAny <<= aProtectionKey;
-if ( bHandleProtectionKey )
-xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+aAny <<= aProtectionKey;
+if ( bHandleProtectionKey )
+xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, 
aAny);
+}
+catch (const uno::RuntimeException &) // fdo#65882
+{
+SAL_WARN( "sw", "potentially benign ordering issue during shutdown" );
+}
 }
 
 void XMLRedlineImportHelper::Add(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/PropertyMap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab653ae64d782e5bd54bd169ab11755dab310553
Author: Cédric Bosdonnat 
Date:   Tue Jun 18 11:01:20 2013 +0200

n#820836: dmapper, fixed typos in first page style creation

Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 2b927a2..5fe50f2 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1021,9 +1021,9 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 
 sal_Int32 nPaperBin = m_nFirstPaperBin >= 0 ? m_nFirstPaperBin : 
m_nPaperBin >= 0 ? m_nPaperBin : 0;
 if( nPaperBin )
-xFollowPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( 
nPaperBin ) );
+xFirstPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( 
nPaperBin ) );
 if( xColumns.is() )
-xFollowPageStyle->setPropertyValue(
+xFirstPageStyle->setPropertyValue(
 rPropNameSupplier.GetName( PROP_TEXT_COLUMNS ), 
uno::makeAny( xColumns ));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - helpcontent2

[Andras Timar]

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

New commits:
commit 6a39e23e476ec50dc5f63c6a13ff4ca412d65a2a
Author: Andras Timar 
Date:   Tue Jun 18 11:15:46 2013 +0200

Updated core
Project: help  69b18e13ee03ea9e6c4626801a1a8e871fd65cff

diff --git a/helpcontent2 b/helpcontent2
index eaee7e5..69b18e1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eaee7e51ffbaddde5c50c9b5b281e3a46d97146a
+Subproject commit 69b18e13ee03ea9e6c4626801a1a8e871fd65cff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text

[Andras Timar]

 source/text/shared/02/querypropdlg.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69b18e13ee03ea9e6c4626801a1a8e871fd65cff
Author: Andras Timar 
Date:   Tue Jun 18 11:15:46 2013 +0200

fix confusing text

Change-Id: Ib6ba4896f2b35d12e09c99c0af78dccac9044cea

diff --git a/source/text/shared/02/querypropdlg.xhp 
b/source/text/shared/02/querypropdlg.xhp
index 08745db..8c17141 100644
--- a/source/text/shared/02/querypropdlg.xhp
+++ b/source/text/shared/02/querypropdlg.xhp
@@ -21,7 +21,7 @@
 
 
 Query 
Properties Dialog
-  In the 
Query Properties dialog, set properties belong to SQL Query, that 
you need your current task.
+  In the 
Query Properties dialog you can set two properties of the SQL 
Query, i.e. whether to return distinct values, and whether to limit the result 
set.
   
   In 
the Query Design View, choose Edit - Query Properties.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild sw/PythonTest_sw_python.mk sw/qa unotest/source

[David Ostrovsky]

 solenv/gbuild/PythonTest.mk  |7 +++
 sw/PythonTest_sw_python.mk   |5 ++
 sw/qa/python/check_fields.py |   46 +++
 unotest/source/python/org/libreoffice/unotest.py |   17 
 4 files changed, 75 insertions(+)

New commits:
commit 6e8eb540c8cfe1bf663c8e4cc15e484f0d8ea0b2
Author: David Ostrovsky 
Date:   Sat Jun 15 17:11:51 2013 +0200

Migrate CheckFields unit test to python

Change-Id: Ia765b37888b4095a735015e792f06fc89201d1a3
Reviewed-on: https://gerrit.libreoffice.org/4294
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 931af98..e6f4412 100755
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -40,6 +40,7 @@ $(call gb_PythonTest_get_target,%) :
($(gb_PythonTest_PRECOMMAND) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
+   $(DEFS) \
URE_BOOTSTRAP=vnd.sun.star.pathname:$(call 
gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/program/fundamental) \
PYTHONPATH="$(PYPATH)" \
UserInstallation=$(call gb_Helper_make_url,$(dir $(call 
gb_PythonTest_get_target,$*))user) \
@@ -63,6 +64,11 @@ $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest)
 
 endef
 
+define gb_PythonTest_set_defs
+$(call gb_PythonTest_get_target,$(1)) : DEFS := $(2)
+
+endef
+
 # put the directory on the PYTHONPATH because the "unittest" loader
 # mysteriously fails to load modules given as absolute path unless the $PWD is
 # a prefix of the absolute path, which it is not when we go into a certain
@@ -94,6 +100,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest)
 
 endef
 
+gb_PythonTest_set_defs :=
 gb_PythonTest_add_modules :=
 gb_PythonTest_use_customtarget :=
 
diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index 0b582a2..9421249 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -9,8 +9,13 @@
 
 $(eval $(call gb_PythonTest_PythonTest,sw_python))
 
+$(eval $(call gb_PythonTest_set_defs,sw_python,\
+TDOC="$(SRCDIR)/sw/qa/complex/writer/testdocuments" \
+))
+
 $(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
check_index \
+   check_fields \
get_expression \
set_expression \
var_fields \
diff --git a/sw/qa/python/check_fields.py b/sw/qa/python/check_fields.py
new file mode 100644
index 000..5a3c2b7
--- /dev/null
+++ b/sw/qa/python/check_fields.py
@@ -0,0 +1,46 @@
+import unittest
+from org.libreoffice.unotest import UnoInProcess
+
+class CheckFields(unittest.TestCase):
+_uno = None
+_xDoc = None
+
+@classmethod
+def setUpClass(cls):
+cls._uno = UnoInProcess()
+cls._uno.setUp()
+cls._xDoc = cls._uno.openWriterTemplateDoc("fdo39694.ott")
+cls._xEmptyDoc = cls._uno.openEmptyWriterDoc()
+
+@classmethod
+def tearDownClass(cls):
+cls._uno.tearDown()
+
+def test_fdo39694_load(self):
+placeholders = ["", "", "", "", 
"", "", ""]
+xDoc = self.__class__._xDoc
+xEnumerationAccess = xDoc.getTextFields()
+xFieldEnum = xEnumerationAccess.createEnumeration()
+while xFieldEnum.hasMoreElements():
+xField = xFieldEnum.nextElement()
+if xField.supportsService("com.sun.star.text.TextField.JumpEdit"):
+xAnchor = xField.getAnchor()
+readContent = xAnchor.getString()
+self.assertTrue(readContent in placeholders,
+"field %s is not contained: " % readContent)
+
+def test_fdo42073(self):
+xDoc = self.__class__._xEmptyDoc
+xBodyText = xDoc.getText()
+xCursor = xBodyText.createTextCursor()
+xTextField = xDoc.createInstance("com.sun.star.text.TextField.Input")
+xBodyText.insertTextContent(xCursor, xTextField, True)
+readContent = xTextField.getPropertyValue("Content")
+self.assertEqual("", readContent)
+content = "this is not surprising"
+xTextField.setPropertyValue("Content", content)
+readContent = xTextField.getPropertyValue("Content")
+self.assertEqual(content, readContent)
+
+if __name__ == '__main__':
+unittest.main()
diff --git a/unotest/source/python/org/libreoffice/unotest.py 
b/unotest/source/python/org/libreoffice/unotest.py
index 3ec016a..883d3a4 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -31,6 +31,11 @@ except ImportError:
 print("  URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
 raise
 
+try:
+from urllib.parse import quote
+except ImportError:
+from urllib import quote
+
 ### utilities ###
 
 def mkPropertyValue(name, value):
@@ -181,6 +186,

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - helpcontent2

[Andras Timar]

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

New commits:
commit 1c104c449733767e4ce1b4071acea20d400400c8
Author: Andras Timar 
Date:   Tue Jun 18 11:24:21 2013 +0200

Updated core
Project: help  81f2a2b6bffadded71b81ac7ccae3ff1574a341b

diff --git a/helpcontent2 b/helpcontent2
index 69b18e1..81f2a2b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 69b18e13ee03ea9e6c4626801a1a8e871fd65cff
+Subproject commit 81f2a2b6bffadded71b81ac7ccae3ff1574a341b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Migrate CheckFields unit test to python

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4294

Approvals:
  Noel Power: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4294
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia765b37888b4095a735015e792f06fc89201d1a3
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: David Ostrovsky 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text

[Andras Timar]

 source/text/shared/optionen/01010200.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81f2a2b6bffadded71b81ac7ccae3ff1574a341b
Author: Andras Timar 
Date:   Tue Jun 18 11:24:21 2013 +0200

fix confusing text

Change-Id: I7be47a0602b8a2fb598e28849a1db291516ca5f6

diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index df4869b..b491a33 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -155,7 +155,7 @@
   When you save a document, you can select whether to save the 
document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 
1.0/1.1.
   Currently, the ODF 1.2 (Extended) format enables files of Draw and 
Impress to contain comments. Those comments can be inserted by Insert - Comment in the latest software version. The 
comments get lost when loading files into prior software versions that were 
saved by the latest software version.
   Some companies or organizations may require ODF 
documents in the ODF 1.0/1.1 format. You can select that format to save in the 
listbox. This older format cannot store all new features, so the new format ODF 
1.2 (Extended) is recommended where possible.
-  With 
several legacy pre-ODF1.2 and ODF1.2-only consumers out there, users wanted a 
more backward-compatible ODF 1.2 extended mode, that uses stuff deprecated in 
1.2, and/or is 'bug-compatible' to older OpenOffice.org versions. Therefore the 
ODF 1.2 Extended (compat) mode was introduced.
+  The ODF 
1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. 
It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to 
older OpenOffice.org versions. It may be useful, if you need to interchange ODF 
documents with users, who use pre-ODF1.2 or ODF1.2-only legacy 
applications.
 
 Size optimization for ODF format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[Andras Timar]

 source/text/shared/02/querypropdlg.xhp   |2 +-
 source/text/shared/optionen/01010200.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 383ad41f4c56b858362e44cdc3f795f4e11fdeae
Author: Andras Timar 
Date:   Tue Jun 18 11:15:46 2013 +0200

fix confusing text

Change-Id: Ib6ba4896f2b35d12e09c99c0af78dccac9044cea

diff --git a/source/text/shared/02/querypropdlg.xhp 
b/source/text/shared/02/querypropdlg.xhp
index 08745db..8c17141 100644
--- a/source/text/shared/02/querypropdlg.xhp
+++ b/source/text/shared/02/querypropdlg.xhp
@@ -21,7 +21,7 @@
 
 
 Query 
Properties Dialog
-  In the 
Query Properties dialog, set properties belong to SQL Query, that 
you need your current task.
+  In the 
Query Properties dialog you can set two properties of the SQL 
Query, i.e. whether to return distinct values, and whether to limit the result 
set.
   
   In 
the Query Design View, choose Edit - Query Properties.
   
commit e1cba99a0b20ff52878ab1d2d9e944faadf401b1
Author: Andras Timar 
Date:   Tue Jun 18 11:24:21 2013 +0200

fix confusing text

Change-Id: I7be47a0602b8a2fb598e28849a1db291516ca5f6

diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index df4869b..b491a33 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -155,7 +155,7 @@
   When you save a document, you can select whether to save the 
document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 
1.0/1.1.
   Currently, the ODF 1.2 (Extended) format enables files of Draw and 
Impress to contain comments. Those comments can be inserted by Insert - Comment in the latest software version. The 
comments get lost when loading files into prior software versions that were 
saved by the latest software version.
   Some companies or organizations may require ODF 
documents in the ODF 1.0/1.1 format. You can select that format to save in the 
listbox. This older format cannot store all new features, so the new format ODF 
1.2 (Extended) is recommended where possible.
-  With 
several legacy pre-ODF1.2 and ODF1.2-only consumers out there, users wanted a 
more backward-compatible ODF 1.2 extended mode, that uses stuff deprecated in 
1.2, and/or is 'bug-compatible' to older OpenOffice.org versions. Therefore the 
ODF 1.2 Extended (compat) mode was introduced.
+  The ODF 
1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. 
It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to 
older OpenOffice.org versions. It may be useful, if you need to interchange ODF 
documents with users, who use pre-ODF1.2 or ODF1.2-only legacy 
applications.
 
 Size optimization for ODF format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit 5182731a55678d8e0f9328a9574aa2bb21f54c6e
Author: Andras Timar 
Date:   Tue Jun 18 11:15:46 2013 +0200

Updated core
Project: help  383ad41f4c56b858362e44cdc3f795f4e11fdeae

diff --git a/helpcontent2 b/helpcontent2
index da1f6d1..383ad41 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit da1f6d1195f1bd42bd4abbea49416bede5f6b069
+Subproject commit 383ad41f4c56b858362e44cdc3f795f4e11fdeae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Translate German comments, correct some WS

[Philipp Weissenbacher (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4331

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/4331/1

Translate German comments, correct some WS

Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
---
M svl/source/numbers/numfmuno.cxx
M svl/source/numbers/zforscan.cxx
2 files changed, 214 insertions(+), 235 deletions(-)



diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 40f34e9..826d53d 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -34,14 +34,10 @@
 
 using namespace com::sun::star;
 
-//
-
 #define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter"
 #define SERVICENAME_NUMBERSETTINGS  "com.sun.star.util.NumberFormatSettings"
 #define SERVICENAME_NUMBERFORMATS   "com.sun.star.util.NumberFormats"
 #define SERVICENAME_NUMBERFORMAT"com.sun.star.util.NumberFormatProperties"
-
-//
 
 #define PROPERTYNAME_FMTSTR "FormatString"
 #define PROPERTYNAME_LOCALE "Locale"
@@ -62,9 +58,7 @@
 #define PROPERTYNAME_STDDEC "StandardDecimals"
 #define PROPERTYNAME_TWODIGIT   "TwoDigitDateStart"
 
-//
-
-//  alles ohne Which-ID, Map nur fuer PropertySetInfo
+// All without a Which-ID, Map only for PropertySetInfo
 
 static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
 {
@@ -101,8 +95,6 @@
 return aNumberSettingsPropertyMap_Impl;
 }
 
-//
-
 static LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
 {
 //  empty language -> LANGUAGE_SYSTEM
@@ -111,12 +103,10 @@
 
 LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false );
 if ( eRet == LANGUAGE_NONE )
-eRet = LANGUAGE_SYSTEM; //! or throw an exception?
+eRet = LANGUAGE_SYSTEM; //! or throw an exception?
 
 return eRet;
 }
-
-//
 
 SvNumberFormatterServiceObj::SvNumberFormatterServiceObj()
 :m_aMutex()
@@ -145,7 +135,7 @@
 
 SvNumberFormatsSupplierObj* pNew = 
SvNumberFormatsSupplierObj::getImplementation( _xSupplier );
 if (!pNew)
-throw uno::RuntimeException();  // wrong object
+throw uno::RuntimeException(); // wrong object
 
 xAutoReleaseOld = xSupplier;
 
@@ -231,7 +221,7 @@
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier->GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -240,7 +230,7 @@
 pFormatter->GetOutputString(fValue, nKey, aStr, &pColor);
 if (pColor)
 nRet = pColor->GetColor();
-// sonst Default behalten
+// Else keep Default
 }
 else
 throw uno::RuntimeException();
@@ -276,7 +266,7 @@
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier->GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -288,7 +278,7 @@
 {
 nRet = pColor->GetColor();
 }
-// sonst Default behalten
+// Else keep Default
 }
 else
 {
@@ -354,7 +344,7 @@
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier->GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -372,7 +362,7 @@
 {
 if (pColor)
 nRet = pColor->GetColor();
-// sonst Default behalten
+// Else keep Default
 }
 else
 throw util::MalformedNumberFormatException();
@@ -405,8 +395,6 @@
 pArray[0] = SERVICENAME_NUMBERFORMATTER;
 return aRet;
 }
-
-//
 
 SvNumberFormatsObj::SvNumberFormatsObj( SvNumberFormatsSupplierObj& _rParent, 
::comphelper::SharedMutex& _rMutex )
 :rSupplier( _rParent )
@@ -477,7 +465,7 @@
 LanguageType eLang = lcl_GetLanguage( nLocale );
 if (bScan)
 {
-//! irgendwas muss hier noch passieren...
+//! FIXME: Something still needs to happen here ...
 }
 nRet = pFormatter->GetEntryKey( aFormat, eLang );
 }
@@ -507,10 +495,10 @@
 nRet = nKey;
 else if (nCheckPos)
 {
-

[PATCH] Remove commented out code

[Philipp Weissenbacher (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4332

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/4332/1

Remove commented out code

Change-Id: Iace3628d9c48f07e03c1dda8ca3ff02a2e32ad1f
---
M svl/source/numbers/zforscan.cxx
1 file changed, 0 insertions(+), 8 deletions(-)



diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 2c05559..b7c8b34 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1079,14 +1079,6 @@
 {
 nAnzStrings = 0;
 nAnzResStrings = 0;
-#if 0
-// ER 20.06.97 14:05   nicht noetig, wenn nAnzStrings beachtet wird
-for (size_t i = 0; i < NF_MAX_FORMAT_SYMBOLS; i++)
-{
-sStrArray[i].Erase();
-nTypeArray[i] = 0;
-}
-#endif
 eScannedType = NUMBERFORMAT_UNDEFINED;
 nRepPos = 0;
 bExp = false;

-- 
To view, visit https://gerrit.libreoffice.org/4332
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iace3628d9c48f07e03c1dda8ca3ff02a2e32ad1f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher 

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

[PATCH] fdo#43460 tools: use isEmpty()

[Jelle van der Waa (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4333

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/4333/1

fdo#43460 tools: use isEmpty()

Change-Id: I832473cab555d8ac5c6b2a47d51124ac63e996e9
---
M tools/source/fsys/urlobj.cxx
M tools/source/memtools/multisel.cxx
M tools/source/stream/stream.cxx
3 files changed, 21 insertions(+), 21 deletions(-)



diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 071ca7a..77128d7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -899,7 +899,7 @@
eCharset,
false);
 }
-if (aSynAuthority.getLength() == 0)
+if (aSynAuthority.isEmpty())
 {
 setInvalid();
 return false;
@@ -965,7 +965,7 @@
false);
 }
 }
-if (aSynAuthority.getLength() == 0)
+if (aSynAuthority.isEmpty())
 {
 setInvalid();
 return false;
@@ -1987,7 +1987,7 @@
 // new relative URL would neither be empty nor start with <"/"> nor start
 // with <1*rseg> (i.e., it could be mistaken for an absolute URL starting
 // with a scheme part), then the new relative URL is prefixed with "./":
-if (aSynRelURIRef.getLength() == 0)
+if (aSynRelURIRef.isEmpty())
 {
 if (pSubjectPathEnd - pSubjectPathBegin >= nMatch + 2
 && pSubjectPathBegin[nMatch] == '/'
@@ -2886,12 +2886,12 @@
 }
 break;
 case INET_PROT_LDAP:
-if (aSynHost.getLength() == 0 && m_aPort.isPresent())
+if (aSynHost.isEmpty() && m_aPort.isPresent())
 return false;
 break;
 
 default:
-if (aSynHost.getLength() == 0)
+if (aSynHost.isEmpty())
 return false;
 break;
 }
@@ -2944,7 +2944,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_HTTP_PATH, '%', eCharset, true);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 aTheSynPath.append(sal_Unicode('/'));
 break;
 
@@ -2965,7 +2965,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_HTTP_PATH, '%', eCharset, true);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 aTheSynPath.append(sal_Unicode('/'));
 break;
 
@@ -3008,7 +3008,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_PCHAR, '%', eCharset, true);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 aTheSynPath.append(sal_Unicode('/'));
 break;
 }
@@ -3076,7 +3076,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_NEWS_ARTICLE_LOCALPART, '%', eCharset, true);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 return false;
 ++pPos;
 aTheSynPath.append(sal_Unicode('@'));
@@ -3197,7 +3197,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_PCHAR, '%', eCharset, false);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 aTheSynPath.append(sal_Unicode('/'));
 break;
 
@@ -3362,7 +3362,7 @@
 appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
PART_URIC, '%', eCharset, true);
 }
-if (aTheSynPath.getLength() == 0)
+if (aTheSynPath.isEmpty())
 return false;
 break;
 default:
@@ -3732,7 +3732,7 @@
 }
 else
 {
-if (m_aAbsURIRef.getLength() != 0)
+if (!m_aAbsURIRef.isEmpty())
 {
 sal_Unicode const * pSchemeBegin
 = m_aAbsURIRef.getStr();
@@ -3874,7 +3874,7 @@
 aBuffer.
 append(decode(m_aFragment, cEscapePrefix, eMechanism, eCharset));
 }
-if (aBuffer.getLength() != 0)
+if (!aBuffer.isEmpty())
 {
 OUStringBuffer aResult(aBuffer);
 if (rStringWidth->queryStringWidth(aResult.makeStringAndClear())
@@ -3884,7 +3884,7 @@
 if (i == 0)
 {
 aBuffer.setLength(aBuffer.getLength() - 1);
-if (aBuffer.getLength() == 0)
+if (aBuffer.isEmpty())
 break;
 

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

[Cédric Bosdonnat]

 writerfilter/source/dmapper/PropertyMap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 33231f418f5ec0041a6d6377bf4028ca6028bdd4
Author: Cédric Bosdonnat 
Date:   Tue Jun 18 11:01:20 2013 +0200

n#820836: dmapper, fixed typos in first page style creation

Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb
(cherry picked from commit ab653ae64d782e5bd54bd169ab11755dab310553)

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 05fcfe2..2fb8180 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1021,9 +1021,9 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 
 sal_Int32 nPaperBin = m_nFirstPaperBin >= 0 ? m_nFirstPaperBin : 
m_nPaperBin >= 0 ? m_nPaperBin : 0;
 if( nPaperBin )
-xFollowPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( 
nPaperBin ) );
+xFirstPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( 
nPaperBin ) );
 if( xColumns.is() )
-xFollowPageStyle->setPropertyValue(
+xFirstPageStyle->setPropertyValue(
 rPropNameSupplier.GetName( PROP_TEXT_COLUMNS ), 
uno::makeAny( xColumns ));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 vcl/unx/generic/gdi/salgdi2.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1b3a39bfa10177aed40a4a9a69d0fe1970229422
Author: David Tardon 
Date:   Tue Jun 18 11:55:59 2013 +0200

fdo#65844 use right colors from palette

It is not correct to expect that the palette will always be the same as
default-constructed from VCL. For example, 1bit PICT images use reversed
white and black.

Change-Id: I6b5e7cd19af98202e80f4cff17fddaa3a3f0e3af

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 6ec6829..5c53635 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -471,8 +471,10 @@ void X11SalGraphics::drawBitmap( const SalTwoRect& 
rPosAry, const SalBitmap& rSa
 const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
 if (rPalette.GetEntryCount() == 2)
 {
-aNewVal.foreground = 
rColMap.GetPixel(ImplColorToSal(rPalette[0]));
-aNewVal.background = 
rColMap.GetPixel(ImplColorToSal(rPalette[1]));
+const BitmapColor aBlack( rPalette[rPalette.GetBestIndex( 
Color( COL_BLACK ) )] );
+const BitmapColor aWhite( rPalette[rPalette.GetBestIndex( 
Color( COL_WHITE ) )] );
+aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
+aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx

[David Tardon]

 vcl/unx/generic/gdi/salgdi2.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5ef3c40ff0e70704cbc7d846722db9618d01ca53
Author: David Tardon 
Date:   Tue Jun 18 11:55:59 2013 +0200

fdo#65844 use right colors from palette

It is not correct to expect that the palette will always be the same as
default-constructed from VCL. For example, 1bit PICT images use reversed
white and black.

Change-Id: I6b5e7cd19af98202e80f4cff17fddaa3a3f0e3af
(cherry picked from commit 1b3a39bfa10177aed40a4a9a69d0fe1970229422)

Signed-off-by: David Tardon 

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 0288e05..3a54d53 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -471,8 +471,10 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* 
pPosAry, const SalBitmap& rSa
 const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
 if (rPalette.GetEntryCount() == 2)
 {
-aNewVal.foreground = 
rColMap.GetPixel(ImplColorToSal(rPalette[0]));
-aNewVal.background = 
rColMap.GetPixel(ImplColorToSal(rPalette[1]));
+const BitmapColor aBlack( rPalette[rPalette.GetBestIndex( 
Color( COL_BLACK ) )] );
+const BitmapColor aWhite( rPalette[rPalette.GetBestIndex( 
Color( COL_WHITE ) )] );
+aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
+aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 vcl/win/source/gdi/salgdi_gdiplus.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 77df50a8c4cf4d4cfc7385ae162c0d4faf8dd821
Author: Fridrich Å trba 
Date:   Tue Jun 18 12:00:16 2013 +0200

The original code was doing exactly this, so let me mimic it

Change-Id: I04f4a783b0edb6a1f8701cd5da323e6a9ab5441d

diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx 
b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 1509f48..2020ddc 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -205,13 +205,7 @@ bool WinSalGraphics::drawPolyPolygon( const 
::basegfx::B2DPolyPolygon& rPolyPoly
 Gdiplus::REAL aDpiY;
 Gdiplus::DllExports::GdipGetDpiY(pGraphics, &aDpiY);
 
-// test code to check the current transformation at the graphics 
device
-//Gdiplus::GpMatrix *pMatrix = NULL;
-//Gdiplus::DllExports::GdipGetWorldTransform(pGraphics, pMatrix);
-//Gdiplus::REAL elements[6];
-//Gdiplus::DllExports::GdipGetMatrixElements(pMatrix, elements);
-//Gdiplus::DllExports::GdipDeleteMatrix(pMatrix);
-
+Gdiplus::DllExports::GdipResetWorldTransform(pGraphics);
 Gdiplus::DllExports::GdipScaleWorldTransform(pGraphics, 
Gdiplus::REAL(100.0) / aDpiX, Gdiplus::REAL(100.0) / aDpiY, 
Gdiplus::MatrixOrderAppend);
 }
 
___
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/concat-deps.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2152a4127de89b58e5dd4513e3130e580e8bffad
Author: Tor Lillqvist 
Date:   Tue Jun 18 13:07:35 2013 +0300

WaE: variable may be used uninitialized

Change-Id: Icfdf8dddc4da20785e0881a95f50ee498e8405cd

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index c60beeb..b305d1a 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -870,7 +870,7 @@ static inline char* generate_phony_line(char* phony_target, 
char* extension)
 {
 char* src;
 char* dest;
-char* last_dot;
+char* last_dot = NULL;
 //fprintf(stderr, "generate_phony_line called with phony_target %s and 
extension %s\n", phony_target, extension);
 for(dest = phony_content_buffer+work_dir_len, src = phony_target; *src != 
0; ++src, ++dest)
 {
@@ -911,7 +911,7 @@ char* end;
 char* cursor;
 char* cursor_out;
 char* base;
-char* created_line;
+char* created_line = NULL;
 char* src_relative;
 int continuation = 0;
 char last_ns = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr2.cxx |   59 ++-
 1 file changed, 46 insertions(+), 13 deletions(-)

New commits:
commit fa270848936d2ca9ddd312fc551ab189896b9417
Author: Eike Rathke 
Date:   Mon Jun 17 21:17:40 2013 +0200

resolved fdo#65082 RATE function should not find roots <= -1

Limit RATE to roots > -1.0, which is what also Excel and now Gnumeric
do. If the Newton goal seek fails for the default guess value 0.1 try
other values.

This now also calculates the few remaining error cases of i#15090
attachment https://issues.apache.org/ooo/attachment.cgi?id=6528
correctly.

Change-Id: Ic62cc807626b4715035c3076f58f303b9020db5a
(cherry picked from commit 9ee7be4efb494351c4be096ffa04cdbd85cdc3d4)
Reviewed-on: https://gerrit.libreoffice.org/4327
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a25826c..713966f 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1419,16 +1419,19 @@ bool ScInterpreter::RateIteration( double fNper, double 
fPayment, double fPv,
 fXnew = fX + 1.1 * SCdEpsilon;  // move away from zero 
slope
 else
 fXnew = fX - fTerm / fTermDerivation;
-nCount++;
-// more accuracy not possible in oscillating cases
-bFound = (fabs(fXnew - fX) < SCdEpsilon);
-fX = fXnew;
+nCount++;
+// more accuracy not possible in oscillating cases
+bFound = (fabs(fXnew - fX) < SCdEpsilon);
+fX = fXnew;
 }
 }
 // Gnumeric returns roots < -1, Excel gives an error in that cases,
 // ODFF says nothing about it. Enable the statement, if you want 
Excel's
-// behavior
+// behavior.
 //bValid =(fX >=-1.0);
+// Update 2013-06-17: Gnumeric (v1.12.2) doesn't return roots <= -1
+// anymore.
+bValid = (fX > -1.0);
 }
 else
 { // Nper is not an integer value.
@@ -1455,11 +1458,11 @@ bool ScInterpreter::RateIteration( double fNper, double 
fPayment, double fPv,
 fXnew = fX + 1.1 * SCdEpsilon;  // move away from zero 
slope
 else
 fXnew = fX - fTerm / fTermDerivation;
-nCount++;
- // more accuracy not possible in oscillating cases
-bFound = (fabs(fXnew - fX) < SCdEpsilon);
-fX = fXnew;
-bValid = (fX >= -1.0);  // otherwise pow(1.0+fX,fNper) will fail
+nCount++;
+// more accuracy not possible in oscillating cases
+bFound = (fabs(fXnew - fX) < SCdEpsilon);
+fX = fXnew;
+bValid = (fX >= -1.0);  // otherwise pow(1.0+fX,fNper) will 
fail
 }
 }
 }
@@ -1473,14 +1476,18 @@ void ScInterpreter::ScZins()
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZins" );
 double fPv, fPayment, fNper;
 // defaults for missing arguments, see ODFF spec
-double fFv = 0, fPayType = 0, fGuess = 0.1;
+double fFv = 0, fPayType = 0, fGuess = 0.1, fOrigGuess = 0.1;
 bool bValid = true;
+bool bDefaultGuess = true;
 nFuncFmtType = NUMBERFORMAT_PERCENT;
 sal_uInt8 nParamCount = GetByte();
 if ( !MustHaveParamCount( nParamCount, 3, 6 ) )
 return;
 if (nParamCount == 6)
-fGuess = GetDouble();
+{
+fOrigGuess = fGuess = GetDouble();
+bDefaultGuess = false;
+}
 if (nParamCount >= 5)
 fPayType = GetDouble();
 if (nParamCount >= 4)
@@ -1498,7 +1505,33 @@ void ScInterpreter::ScZins()
 //if (fPayType != 0.0) fPayType = 1.0;
 bValid = RateIteration(fNper, fPayment, fPv, fFv, fPayType, fGuess);
 if (!bValid)
-SetError(errNoConvergence);
+{
+/* TODO: try also for specified guess values, not only default? As is,
+ * a specified 0.1 guess may be error result but a default 0.1 guess
+ * may succeed. On the other hand, using a different guess value than
+ * the specified one may not be desired, even if that didn't match. */
+if (bDefaultGuess)
+{
+/* TODO: this is rather ugly, instead of looping over different
+ * guess values and doing a Newton goal seek for each we could
+ * first insert the values into the RATE equation to obtain a set
+ * of y values and then do a bisecting goal seek, possibly using
+ * different algorithms. */
+double fX = fOrigGuess;
+for (int nStep = 2; nStep <= 10 && !bValid; ++nStep)
+{
+fGuess = fX * nStep;
+bValid = RateIteration( fNper, fPayment, fPv, fFv, fPayType, 
fGuess);
+if (!bValid)
+{
+fGues

[PATCH] fdo#43460 sw: use isEmpty()

[Jelle van der Waa (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4334

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/4334/1

fdo#43460 sw: use isEmpty()

Change-Id: Ia23f01ee28f1dfd8079abedda50bbef0a5a1beec
---
M sw/source/core/crsr/crstrvl.cxx
M sw/source/filter/html/css1atr.cxx
M sw/source/filter/html/htmlatr.cxx
M sw/source/filter/html/htmldraw.cxx
M sw/source/filter/html/htmlfly.cxx
M sw/source/filter/html/htmlforw.cxx
M sw/source/filter/html/htmlnum.cxx
M sw/source/filter/ww8/rtfattributeoutput.cxx
M sw/source/filter/ww8/rtfsdrexport.cxx
M sw/source/filter/xml/xmltexte.cxx
10 files changed, 21 insertions(+), 21 deletions(-)



diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a206d0c..0869c46 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1793,7 +1793,7 @@
 comphelper::string::padToLength(sInsert, 
aFPos.nTabCnt, '\t');
 if (aFPos.nSpaceCnt)
 comphelper::string::padToLength(sInsert, 
sInsert.getLength() + aFPos.nSpaceCnt, ' ');
-if (sInsert.getLength())
+if (!sInsert.isEmpty())
 GetDoc()->InsertString( *m_pCurCrsr, 
sInsert.makeStringAndClear());
 }
 // no break - still need to set orientation
diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 5a348e4..db343f0 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -281,7 +281,7 @@
 sOut.append(OUStringToOString(*pSVal, eDestEnc));
 }
 
-if (sOut.getLength())
+if (!sOut.isEmpty())
 Strm() << sOut.makeStringAndClear().getStr();
 }
 
@@ -524,7 +524,7 @@
 sOut.append(sCSS1_rule_end);
 break;
 }
-if (sOut.getLength())
+if (!sOut.isEmpty())
 Strm() << sOut.makeStringAndClear().getStr();
 }
 }
@@ -2503,26 +2503,26 @@
 
 if( pOStr )
 {
-if (sOut.getLength())
+if (!sOut.isEmpty())
 sOut.append(' ');
 sOut.append(pOStr);
 }
 
 if( pCOStr )
 {
-if (sOut.getLength())
+if (!sOut.isEmpty())
 sOut.append(' ');
 sOut.append(pCOStr);
 }
 
 if( pBStr )
 {
-if (sOut.getLength())
+if (!sOut.isEmpty())
 sOut.append(' ');
 sOut.append(pBStr);
 }
 
-if (sOut.getLength())
+if (!sOut.isEmpty())
 rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_decoration, 
sOut.makeStringAndClear() );
 else if( bNone )
 rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_decoration, sCSS1_PV_none 
);
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 34514eb..2ce7beb 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -914,7 +914,7 @@
 
 if( nDir != rHWrt.nDirection )
 {
-if( sOut.getLength() )
+if( !sOut.isEmpty() )
 rWrt.Strm() << sOut.makeStringAndClear().getStr();
 rHWrt.OutDirection( nDir );
 }
@@ -3022,7 +3022,7 @@
 if( sRel.Len() )
 sOut.append(OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US));
 
-if( sOut.getLength() )
+if( !sOut.isEmpty() )
 rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
 if( bEvents )
diff --git a/sw/source/filter/html/htmldraw.cxx 
b/sw/source/filter/html/htmldraw.cxx
index d098988..7b950c5 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -816,7 +816,7 @@
 HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.eDestEnc );
 }
 
-if (sOut.getLength())
+if (!sOut.isEmpty())
 rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
 // und nun noch ALIGN, HSPACE und VSPACE
diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index b7fdd6f..f17643b 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -742,7 +742,7 @@
 }
 }
 
-if (sOut.getLength())
+if (!sOut.isEmpty())
 Strm() << sOut.makeStringAndClear().getStr();
 
 // Umlauf fuer absatzgeb. Grafiken als  in den String
@@ -1039,7 +1039,7 @@
 sOut.append('\"');
 }
 
-if (sOut.getLength())
+if (!sOut.isEmpty())
 rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
 if( pMacItem )
diff --git a/sw/source/filter/html/htmlforw.cxx 
b/sw/source/filter/html/htmlforw.cxx
index c9b1695..79afa49 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1063,7 +1063,7 @@
 }
 }
 
-if( sOut.getLength() )
+if( !sOut.isEmpty() )
 rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
 OSL_ENSURE( !bInCntnr, "Con

[PATCH] fdo#43460 include, registry, svtools, svx, unodevtools: use isEm...

[Jelle van der Waa (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4335

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/4335/1

fdo#43460 include,registry,svtools,svx,unodevtools: use isEmpty()

Change-Id: I6e35b91092239275694eec3666b076f7ff7e54f6
---
M include/rtl/ustrbuf.hxx
M registry/source/keyimpl.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/svrtf/parrtf.cxx
M svx/source/form/formcontroller.cxx
M svx/source/svdraw/svdmodel.cxx
M svx/source/svdraw/svdtrans.cxx
M unodevtools/source/skeletonmaker/cppcompskeleton.cxx
M unodevtools/source/skeletonmaker/javacompskeleton.cxx
9 files changed, 19 insertions(+), 19 deletions(-)



diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index b648714..ec40448 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -421,7 +421,7 @@
  */
 OUStringBuffer & append(const OUStringBuffer &str)
 {
-if(str.getLength() > 0)
+if(!str.isEmpty())
 {
 append( str.getStr(), str.getLength() );
 }
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 05993dd..36d6cae 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -1043,7 +1043,7 @@
 OUString ORegKey::getFullPath(OUString const & path) const {
 OSL_ASSERT(!m_name.isEmpty() && !path.isEmpty());
 OUStringBuffer b(m_name);
-if (b.getLength() > 0 && b[b.getLength() - 1] == '/') {
+if (!b.isEmpty() && b[b.getLength() - 1] == '/') {
 if (path[0] == '/') {
 b.append(path.getStr() + 1, path.getLength() - 1);
 } else {
diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index a95ec79..2430d72 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -648,7 +648,7 @@
 {
 // Restart with '&', the remainder is returned as
 // text token.
-if( aToken.Len() || sTmpBuffer.getLength() )
+if( aToken.Len() || !sTmpBuffer.isEmpty() )
 {
 // _GetNextChar() returns the previous text and
 // during the next execution a new character is read.
@@ -808,7 +808,7 @@
   rInput.IsEof() ) ||
 !IsParserWorking() )
 {
-if( sTmpBuffer.getLength() )
+if( !sTmpBuffer.isEmpty() )
 aToken += String(sTmpBuffer.makeStringAndClear());
 return HTML_TEXTTOKEN;
 }
@@ -824,7 +824,7 @@
 nNextCh = GetNextChar();
 }
 
-if( sTmpBuffer.getLength() )
+if( !sTmpBuffer.isEmpty() )
 aToken += String(sTmpBuffer.makeStringAndClear());
 
 return HTML_TEXTTOKEN;
@@ -1016,7 +1016,7 @@
 if( rInput.IsEof() )
 {
 bContinue = false;
-if( aToken.Len() || sTmpBuffer.getLength() )
+if( aToken.Len() || !sTmpBuffer.isEmpty() )
 {
 bEndTokenFound = true;
 }
@@ -1036,7 +1036,7 @@
 break;
 }
 
-if( (!bContinue && sTmpBuffer.getLength() > 0L) ||
+if( (!bContinue && !sTmpBuffer.isEmpty()) ||
 MAX_LEN == sTmpBuffer.getLength() )
 aToken += String(sTmpBuffer.makeStringAndClear());
 
@@ -1119,7 +1119,7 @@
 } while( '>' != nNextCh && '/' != nNextCh && 
!HTML_ISSPACE( nNextCh ) &&
  IsParserWorking() && !rInput.IsEof() );
 
-if( sTmpBuffer.getLength() )
+if( !sTmpBuffer.isEmpty() )
 aToken += String(sTmpBuffer.makeStringAndClear());
 
 // Skip blanks
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index f064a56..0ca1c79 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -338,7 +338,7 @@
 wchar_t __next=GetNextChar();
 if (__next>0xFF) // fix for #i43933# and 
#i35653#
 {
-if (aByteString.getLength())
+if (!aByteString.isEmpty())
 
aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), 
GetSrcEncoding(;
 aStrBuffer.Append((sal_Unicode)__next);
 
@@ -373,7 +373,7 @@
 
 bNextCh = false;
 
-if (aByteString.getLength())
+if (!aByteString.isEmpty())
 
aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), 
GetSrcEncoding(;
 }
   

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

[Fridrich Štrba]

 vcl/win/source/gdi/salgdi_gdiplus.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06e209682c2da513126ca19568386774287b86b6
Author: Fridrich Å trba 
Date:   Tue Jun 18 12:11:08 2013 +0200

Adapt the comment not to speak about things that are not

Change-Id: Id287e9fd82baed87be4b5f280e397287f4e1006d

diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx 
b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 2020ddc..608228e 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -197,9 +197,9 @@ bool WinSalGraphics::drawPolyPolygon( const 
::basegfx::B2DPolyPolygon& rPolyPoly
 // by the user and thus happens. This call can only come 
(currently) from
 // OutputDevice::DrawTransparent, see comments there with the same 
TaskID.
 // If it is used, the mapping for the printer is wrong and needs 
to be corrected. I
-// checked that there is *no* transformation set (testcode 
commented out below) and
-// estimated that a stable factor dependent of the printer's DPI 
is used. Create
-// and set a transformation here to correct this
+// checked that there is *no* transformation set and estimated 
that a stable factor
+// dependent of the printer's DPI is used. Create and set a 
transformation here to
+// correct this.
 Gdiplus::REAL aDpiX;
 Gdiplus::DllExports::GdipGetDpiX(pGraphics, &aDpiX);
 Gdiplus::REAL aDpiY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Patch] French dictionary update - v4.11

[Olivier R.]

Hi,

Here is a patch to update the French dictionary:
0001-French-dictionary-update-v4.11.zip

  

For master and 4.1 only.

Thanks.

Olivier





--
View this message in context: 
http://nabble.documentfoundation.org/Patch-French-dictionary-update-v4-11-tp4062026.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

[PUSHED libreoffice-4-0] resolved fdo#65082 RATE function should not find roots <= -1

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4327

Approvals:
  Noel Power: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4327
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic62cc807626b4715035c3076f58f303b9020db5a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Noel Power 

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

[PATCH libreoffice-4-0] fdo#65882 - fix intermittent writer unit test failure on exi...

[Michael Meeks (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4336

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/4336/1

fdo#65882 - fix intermittent writer unit test failure on exit.

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
---
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
1 file changed, 23 insertions(+), 16 deletions(-)



diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index fb942bb..3fe4709 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -369,25 +369,32 @@
 }
 
 // set redline mode & key
-Any aAny;
+try
+{
+Any aAny;
 
-aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
-if ( bHandleShowChanges )
-xModelPropertySet->setPropertyValue( sShowChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
+aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
+if ( bHandleShowChanges )
+xModelPropertySet->setPropertyValue( sShowChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
 
-aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
-if ( bHandleRecordChanges )
-xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
+aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
+if ( bHandleRecordChanges )
+xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
 
-aAny <<= aProtectionKey;
-if ( bHandleProtectionKey )
-xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+aAny <<= aProtectionKey;
+if ( bHandleProtectionKey )
+xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, 
aAny);
+}
+catch (const uno::RuntimeException &) // fdo#65882
+{
+SAL_WARN( "sw", "potentially benign ordering issue during shutdown" );
+}
 }
 
 void XMLRedlineImportHelper::Add(

-- 
To view, visit https://gerrit.libreoffice.org/4336
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr2.cxx |   59 ++-
 1 file changed, 46 insertions(+), 13 deletions(-)

New commits:
commit 2b81b9967f8269e4fe7cef8e6ede490ae3b66d94
Author: Eike Rathke 
Date:   Mon Jun 17 21:17:40 2013 +0200

resolved fdo#65082 RATE function should not find roots <= -1

Limit RATE to roots > -1.0, which is what also Excel and now Gnumeric
do. If the Newton goal seek fails for the default guess value 0.1 try
other values.

This now also calculates the few remaining error cases of i#15090
attachment https://issues.apache.org/ooo/attachment.cgi?id=6528
correctly.

Change-Id: Ic62cc807626b4715035c3076f58f303b9020db5a
(cherry picked from commit 9ee7be4efb494351c4be096ffa04cdbd85cdc3d4)
Reviewed-on: https://gerrit.libreoffice.org/4328
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index dc84359..29845cd 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1430,16 +1430,19 @@ bool ScInterpreter::RateIteration( double fNper, double 
fPayment, double fPv,
 fXnew = fX + 1.1 * SCdEpsilon;  // move away from zero 
slope
 else
 fXnew = fX - fTerm / fTermDerivation;
-nCount++;
-// more accuracy not possible in oscillating cases
-bFound = (fabs(fXnew - fX) < SCdEpsilon);
-fX = fXnew;
+nCount++;
+// more accuracy not possible in oscillating cases
+bFound = (fabs(fXnew - fX) < SCdEpsilon);
+fX = fXnew;
 }
 }
 // Gnumeric returns roots < -1, Excel gives an error in that cases,
 // ODFF says nothing about it. Enable the statement, if you want 
Excel's
-// behavior
+// behavior.
 //bValid =(fX >=-1.0);
+// Update 2013-06-17: Gnumeric (v1.12.2) doesn't return roots <= -1
+// anymore.
+bValid = (fX > -1.0);
 }
 else
 { // Nper is not an integer value.
@@ -1466,11 +1469,11 @@ bool ScInterpreter::RateIteration( double fNper, double 
fPayment, double fPv,
 fXnew = fX + 1.1 * SCdEpsilon;  // move away from zero 
slope
 else
 fXnew = fX - fTerm / fTermDerivation;
-nCount++;
- // more accuracy not possible in oscillating cases
-bFound = (fabs(fXnew - fX) < SCdEpsilon);
-fX = fXnew;
-bValid = (fX >= -1.0);  // otherwise pow(1.0+fX,fNper) will fail
+nCount++;
+// more accuracy not possible in oscillating cases
+bFound = (fabs(fXnew - fX) < SCdEpsilon);
+fX = fXnew;
+bValid = (fX >= -1.0);  // otherwise pow(1.0+fX,fNper) will 
fail
 }
 }
 }
@@ -1484,14 +1487,18 @@ void ScInterpreter::ScZins()
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZins" );
 double fPv, fPayment, fNper;
 // defaults for missing arguments, see ODFF spec
-double fFv = 0, fPayType = 0, fGuess = 0.1;
+double fFv = 0, fPayType = 0, fGuess = 0.1, fOrigGuess = 0.1;
 bool bValid = true;
+bool bDefaultGuess = true;
 nFuncFmtType = NUMBERFORMAT_PERCENT;
 sal_uInt8 nParamCount = GetByte();
 if ( !MustHaveParamCount( nParamCount, 3, 6 ) )
 return;
 if (nParamCount == 6)
-fGuess = GetDouble();
+{
+fOrigGuess = fGuess = GetDouble();
+bDefaultGuess = false;
+}
 if (nParamCount >= 5)
 fPayType = GetDouble();
 if (nParamCount >= 4)
@@ -1509,7 +1516,33 @@ void ScInterpreter::ScZins()
 //if (fPayType != 0.0) fPayType = 1.0;
 bValid = RateIteration(fNper, fPayment, fPv, fFv, fPayType, fGuess);
 if (!bValid)
-SetError(errNoConvergence);
+{
+/* TODO: try also for specified guess values, not only default? As is,
+ * a specified 0.1 guess may be error result but a default 0.1 guess
+ * may succeed. On the other hand, using a different guess value than
+ * the specified one may not be desired, even if that didn't match. */
+if (bDefaultGuess)
+{
+/* TODO: this is rather ugly, instead of looping over different
+ * guess values and doing a Newton goal seek for each we could
+ * first insert the values into the RATE equation to obtain a set
+ * of y values and then do a bisecting goal seek, possibly using
+ * different algorithms. */
+double fX = fOrigGuess;
+for (int nStep = 2; nStep <= 10 && !bValid; ++nStep)
+{
+fGuess = fX * nStep;
+bValid = RateIteration( fNper, fPayment, fPv, fFv, fPayType, 
fGuess);
+if (!bValid)
+{
+fGues

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries

[Olivier R]

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

New commits:
commit aa90fded06fae54cd6d1215e2fee9b93af5d04c2
Author: Olivier R 
Date:   Mon Jun 17 16:45:20 2013 +0200

Updated core
Project: dictionaries  dbfffe3512457095ea99f7362ff64b1431b820b1

diff --git a/dictionaries b/dictionaries
index 0a1af77..dbfffe3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0a1af7797066e5329160b456604f6b3091c660a4
+Subproject commit dbfffe3512457095ea99f7362ff64b1431b820b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Olivier R]

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

New commits:
commit b60c4d86cc33a67a07f5d7a058d30b98065b62d0
Author: Olivier R 
Date:   Mon Jun 17 16:45:20 2013 +0200

Updated core
Project: dictionaries  aab14d898ac002d5292e0610c433e667f99610fa

diff --git a/dictionaries b/dictionaries
index 98b40ee..aab14d8 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 98b40eee9d84dd95120c0b9ddf1a0d517c2122af
+Subproject commit aab14d898ac002d5292e0610c433e667f99610fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] French dictionary update - v4.11

[Andras Timar]

On Tue, Jun 18, 2013 at 12:13 PM, Olivier R.  wrote:
> Hi,
>
> Here is a patch to update the French dictionary:
> 0001-French-dictionary-update-v4.11.zip
> 
>
> For master and 4.1 only.

Pushed, thanks.
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-3-6] resolved fdo#65082 RATE function should not find roots <= -1

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4328

Approvals:
  Noel Power: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4328
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic62cc807626b4715035c3076f58f303b9020db5a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Noel Power 

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

Re: Just a suggestion for Tinderbox

[julien2412]

Jan Holesovsky wrote
> ...
>> I thought perhaps it could be interesting to have a file in addition to
>> build info (or perhaps inside it?)  which gives the list of commits
>> retrieved since the previous build.
>> I read too  https://bugs.freedesktop.org/show_bug.cgi?id=65653#c30 which
>> indicates "git branch --contains 
> 
> " but you must have git +  git repo
>> up-to-date in local.
>> 
>> Any idea?
> 
> The build has the git commit id in the About box, you can just do git
> log that_commit_id in your tree, or go to
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=that_commit_id
> ...

Hi Jan,

I meant for someone who doesn't have git so for the tree I don't think it
would help.

About cgit, you can include the commit id of the build then of the patch and
afterwards compare the results retrieved  (that's what I would do if I need)
but it's not very practical.

If the list isn't possible (or quite difficult to implement), at least it
could be useful to have the syntax to give a range to cgit (or perhaps
possible with gerrit?). Indeed, almost each time i put a "-", I've got an
"Internal Server error" and in the other cases, I've got no result found.
There must be a trick I don't know :-)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Just-a-suggestion-for-Tinderbox-tp4061929p4062034.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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 65082, which changed state.

Bug 65082 Summary: RATE() function produces different results as some versions 
of MS Office
https://bugs.freedesktop.org/show_bug.cgi?id=65082

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: Branch 'feature/cmis' - sfx2/source

[Cao Cuong Ngo]

 sfx2/source/dialog/dinfdlg.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fcb72e2e0dfb9e2f19c5d2ca5c2b8e2d1c655b98
Author: Cao Cuong Ngo 
Date:   Tue Jun 18 12:39:52 2013 +0200

CMIS properties dialog

Set ReadOnly depends on CMIS properties

Change-Id: I8aa29ab01d8a7f3ba2f71f17623a970dd9df8af4

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0f4..07f5cfb 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2417,7 +2417,7 @@ void CmisPropertiesWindow::updateLineWidth()
 }
 
 void CmisPropertiesWindow::AddLine( const OUString& /*sId*/, const OUString& 
sName,
-const bool /*bUpdatable*/, const bool 
/*bRequired*/,
+const bool bUpdatable, const bool 
/*bRequired*/,
 Any& rAny )
 {
 CmisPropertyLine* pNewLine = new CmisPropertyLine( this );
@@ -2426,6 +2426,9 @@ void CmisPropertiesWindow::AddLine( const OUString& 
/*sId*/, const OUString& sNa
 pNewLine->m_aName.SetAccessibleName(m_aName.GetAccessibleName());
 pNewLine->m_aType.SetAccessibleName(m_aType.GetAccessibleName());
 pNewLine->m_aValueEdit.SetAccessibleName(m_aValueEdit.GetAccessibleName());
+pNewLine->m_aValueEdit.SetReadOnly( !bUpdatable );
+pNewLine->m_aDateField.SetReadOnly( !bUpdatable );
+pNewLine->m_aTimeField.SetReadOnly( !bUpdatable );
 
 m_nLineHeight = m_aValueEdit.GetSizePixel().Height() ;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 4b/45fdde6ca810ee34d817beda6880c41978756c e5/5eae98ea7c337c07dacc5d5c5602c6ecb57fa3

[Caolán McNamara]

 4b/45fdde6ca810ee34d817beda6880c41978756c |1 +
 e5/5eae98ea7c337c07dacc5d5c5602c6ecb57fa3 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6cbe70d961ed8d7855aa4088153843b710f17374
Author: Caolán McNamara 
Date:   Tue Jun 18 11:58:18 2013 +0100

Notes added by 'git notes add'

diff --git a/e5/5eae98ea7c337c07dacc5d5c5602c6ecb57fa3 
b/e5/5eae98ea7c337c07dacc5d5c5602c6ecb57fa3
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/e5/5eae98ea7c337c07dacc5d5c5602c6ecb57fa3
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
commit 328e8bf62c1ae6cdc9e7b48ac00b548102279cc4
Author: Caolán McNamara 
Date:   Tue Jun 18 11:58:09 2013 +0100

Notes added by 'git notes add'

diff --git a/4b/45fdde6ca810ee34d817beda6880c41978756c 
b/4b/45fdde6ca810ee34d817beda6880c41978756c
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/4b/45fdde6ca810ee34d817beda6880c41978756c
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
___
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' - 5e/5dca13097c4d23f4efce9296163ff47e26872e

[Caolán McNamara]

 5e/5dca13097c4d23f4efce9296163ff47e26872e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit edd6ef27651768c121d13a007c9a65604955
Author: Caolán McNamara 
Date:   Tue Jun 18 11:57:54 2013 +0100

Notes added by 'git notes add'

diff --git a/5e/5dca13097c4d23f4efce9296163ff47e26872e 
b/5e/5dca13097c4d23f4efce9296163ff47e26872e
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/5e/5dca13097c4d23f4efce9296163ff47e26872e
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 6c/6903a997df3c4b556511269f5eb8936f8ef19c c6/9e071e2eff09e164471d2ebad4522eabdc62f8

[Caolán McNamara]

 6c/6903a997df3c4b556511269f5eb8936f8ef19c |1 +
 c6/9e071e2eff09e164471d2ebad4522eabdc62f8 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 4c33ffb53cb50daba61df7cf0e2443d9dd912a68
Author: Caolán McNamara 
Date:   Tue Jun 18 11:59:06 2013 +0100

Notes added by 'git notes add'

diff --git a/6c/6903a997df3c4b556511269f5eb8936f8ef19c 
b/6c/6903a997df3c4b556511269f5eb8936f8ef19c
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/6c/6903a997df3c4b556511269f5eb8936f8ef19c
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
commit cb2dd94e1cd50951ee31c276b9d0b5be743318df
Author: Caolán McNamara 
Date:   Tue Jun 18 11:58:54 2013 +0100

Notes added by 'git notes add'

diff --git a/c6/9e071e2eff09e164471d2ebad4522eabdc62f8 
b/c6/9e071e2eff09e164471d2ebad4522eabdc62f8
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/c6/9e071e2eff09e164471d2ebad4522eabdc62f8
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlnode.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 20499497b0c513f181d0a482c5b9e38c346a8aa1
Author: Lionel Elie Mamane 
Date:   Tue Jun 18 12:26:55 2013 +0200

fdo#65653 make columnMatchP safer

Change-Id: Id994ab5aed6172d8a93fd331a366fca10a663a48

diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index 6f55d9b..bcc72fc 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -134,6 +134,9 @@ namespace
 using namespace connectivity;
 assert(SQL_ISRULE(pSubTree,column_ref));
 
+if(!rParam.xField.is())
+return false;
+
 // retrieve the field's name & table range
 OUString aFieldName;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlnode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed9f8387201b1b70ea14af47d25e9133c7bfcd3c
Author: Lionel Elie Mamane 
Date:   Tue Jun 18 13:06:45 2013 +0200

Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"

This reverts commit 10777b37536be16c6d2e167b59e9e31e37ba3517.

The problem has been fixed in a more safe way by making columnMatchP
treat the case where rParam.xField is not set instead of requiring
it from all callers.

Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b

diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index bcc72fc..07c2daf 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -755,7 +755,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( 
OUStringBuffer& rString, c
 SQLParseNodeParameter aNewParam(rParam);
 //aNewParam.bQuote = sal_True; // why setting this to true? @see 
http://www.openoffice.org/issues/show_bug.cgi?id=75557
 
-if (bSimple && (!rParam.xField.is() || !columnMatchP(m_aChildren[0], 
rParam)))
+if (bSimple && !columnMatchP(m_aChildren[0], rParam))
 m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam, 
bSimple );
 
 const OSQLParseNode* pPart2 = m_aChildren[1];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-1] Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4337

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4337/1

Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"

This reverts commit 10777b37536be16c6d2e167b59e9e31e37ba3517.

The problem has been fixed in a more safe way by making columnMatchP
treat the case where rParam.xField is not set instead of requiring
it from all callers.

Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b
---
M connectivity/source/parse/sqlnode.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index bcc72fc..07c2daf 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -755,7 +755,7 @@
 SQLParseNodeParameter aNewParam(rParam);
 //aNewParam.bQuote = sal_True; // why setting this to true? @see 
http://www.openoffice.org/issues/show_bug.cgi?id=75557
 
-if (bSimple && (!rParam.xField.is() || !columnMatchP(m_aChildren[0], 
rParam)))
+if (bSimple && !columnMatchP(m_aChildren[0], rParam))
 m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam, 
bSimple );
 
 const OSQLParseNode* pPart2 = m_aChildren[1];

-- 
To view, visit https://gerrit.libreoffice.org/4337
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Lionel Elie Mamane 

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

[PUSHED libreoffice-4-1] Revert "fdo#65653, fdo#65619, fdo#65216: Missing check"

[Lionel Elie Mamane (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4337


-- 
To view, visit https://gerrit.libreoffice.org/4337
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic68a764e08446a7b669c6030c2bcd55c7d31772b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Lionel Elie Mamane 

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

[PATCH libreoffice-4-1] fdo#65653 make columnMatchP safer

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4338

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/4338/1

fdo#65653 make columnMatchP safer

Change-Id: Id994ab5aed6172d8a93fd331a366fca10a663a48
---
M connectivity/source/parse/sqlnode.cxx
1 file changed, 3 insertions(+), 0 deletions(-)



diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index f0590c1..272deb1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -135,6 +135,9 @@
 using namespace connectivity;
 assert(SQL_ISRULE(pSubTree,column_ref));
 
+if(!rParam.xField.is())
+return false;
+
 // retrieve the field's name & table range
 OUString aFieldName;
 try

-- 
To view, visit https://gerrit.libreoffice.org/4338
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id994ab5aed6172d8a93fd331a366fca10a663a48
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Lionel Elie Mamane 

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

[Libreoffice-commits] core.git: instsetoo_native/util

[David Tardon]

 instsetoo_native/util/openoffice.lst.in |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d72e170d6a956cf2cc7da1c0b5917bca3e79f5ce
Author: David Tardon 
Date:   Tue Jun 18 13:39:29 2013 +0200

prefer filelist from GeneratedPackage over Package

This broke incremental builds on MacOS X in the past, where
Package/python3.filelist was created for some reason, so the installer
did not install the Python framework.

Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index ad8019b..f3cdc7a 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
 downloadnameLibreOffice_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage,{filelistpath}
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
 }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
 downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage,{filelistpath}
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
 }
 }
 
@@ -177,7 +177,7 @@ LibreOffice_SDK
 active 1
 compression 5
 script sdkoo
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage,{filelistpath}
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
 }
 }
 
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
 active 1
 compression 5
 script sdkoo
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage,{filelistpath}
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
 }
 }
 
___
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' - 3c/e5c003239b2850576765e5de9f06e6ae300571

[Caolán McNamara]

 3c/e5c003239b2850576765e5de9f06e6ae300571 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6a5c4a581e64171069920c9ba26b8b6ffb91a26f
Author: Caolán McNamara 
Date:   Tue Jun 18 12:42:22 2013 +0100

Notes added by 'git notes add'

diff --git a/3c/e5c003239b2850576765e5de9f06e6ae300571 
b/3c/e5c003239b2850576765e5de9f06e6ae300571
new file mode 100644
index 000..a210a06
--- /dev/null
+++ b/3c/e5c003239b2850576765e5de9f06e6ae300571
@@ -0,0 +1 @@
+prefer: 83a0796604dedc039a3e65c02453b7de1429316d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stefan Knorr]

 framework/source/services/backingwindow.hxx  |8 
 icon-themes/galaxy/brand/shell/about.svg |  281 +++
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 7 files changed, 109 insertions(+), 180 deletions(-)

New commits:
commit 4a0247603e94412c1a77af8e8c7bd17f729b9eba
Author: Stefan Knorr 
Date:   Sat Jun 15 22:20:11 2013 +0200

Small (hopefully non-controversial) changes to the existing branding

* Make sure about window background covers entire window
* Make sure start center images are centred

Change-Id: I402448ef4ea77633fe4e1ad5d5f93952efb495af
Reviewed-on: https://gerrit.libreoffice.org/4308
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/framework/source/services/backingwindow.hxx 
b/framework/source/services/backingwindow.hxx
index b098c46..ab45314 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -117,10 +117,10 @@ namespace framework
 static const int nItemId_Extensions = 1;
 static const int nItemId_Info = 3;
 static const int nItemId_TplRep = 4;
-static const int nShadowTop = 31;
-static const int nShadowLeft = 35;
-static const int nShadowRight = 45;
-static const int nShadowBottom = 40;
+static const int nShadowTop = 30;
+static const int nShadowLeft = 30;
+static const int nShadowRight = 30;
+static const int nShadowBottom = 30;
 
 void loadImage( const ResId& i_rId, PushButton& i_rButton );
 
diff --git a/icon-themes/galaxy/brand/shell/about.svg 
b/icon-themes/galaxy/brand/shell/about.svg
index afdae2b..64ea4c4 100644
--- a/icon-themes/galaxy/brand/shell/about.svg
+++ b/icon-themes/galaxy/brand/shell/about.svg
@@ -1,28 +1,17 @@
 
-
 
-http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://creativecommons.org/ns#";
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-   xmlns:svg="http://www.w3.org/2000/svg";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:xlink="http://www.w3.org/1999/xlink";
-   version="1.1"
-   width="486"
-   height="322"
-   id="svg1604">
-  
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";
+version="1.1" width="486" height="500">
+  
 
   
   
 
 
+ fill="#530260" fill-opacity="1" stroke="none" />
 
 
+   gradientTransform="matrix(1,0,0,0.,-183.019,-50.249)" />
   
-  
-
-  
-image/svg+xml
-http://purl.org/dc/dcmitype/StillImage"; />
-
-  
-
-  
   
+ y="-1.5258789e-05"
+ fill="#ff" fill-opacity="1" stroke="none" />
   
+ opacity="0.6" fill="#43c330">
 
+   d="m 387.37,390.36 58.25,0.43 c 0,0 5.6,0.02 5.59,5.99 l -0.43,57.53 c 
0,0 -0.39,5.22 -3.76,1.79 -3.37,-3.42692 -60.98,-61.90002 -60.98898,-61.90002 
0,0 -3.09373,-3.88589 1.3391,-3.85299"
+   opacity="0.22" fill="#43c330" stroke="none" />
 
+   d="m 363.46,419.0742 57.03479,-43.60924 c 0,0 5.50008,-4.24516 
9.97687,1.60986 l 43.06983,56.3293 c 0,0 3.57184,5.37903 -2.30574,4.59498 
-5.87919,-0.78281 -106.16694,-14.16154 -106.16694,-14.16154 0,0 
-5.9493,-1.44458 -1.60881,-4.76336"
+   opacity="0.21" fill="#43c330" stroke="none" />
 
+   d="m 556.11,335.77719 23.45351,18.1423 c 0,0 2.27757,1.74532 
0.41514,4.15298 l -17.9179,23.16342 c 0,0 -1.76838,1.99598 -2.07855,-0.4332 
-0.31084,-2.4297 -5.60295,-43.87834 -5.60295,-43.87834 0,0 -0.0541,-2.52784 
1.73075,-1.14716"
+   opacity="0.37" fill="#43c330" stroke="none" />
 
+   d="m 494.48,411.9226 25.41052,37.36802 c 0,0 2.47541,3.60493 
-1.36068,6.2135 l -36.9058,25.09621 c 0,0 -3.50531,2.0565 -2.80699,-1.60974 
0.69759,-3.66731 12.61322,-66.22358 12.61322,-66.22358 0,0 1.11593,-3.68821 
3.04973,-0.84441"
+   opacity="0.37" fill="#43c330" stroke="none" />
 
+   d="m 461.51,323.2971 54.72499,30.27545 c 0,0 5.30905,2.90569 
2.20107,8.52359 l -29.90096,54.04807 c 0,0 -3.04434,4.72947 -4.47218,-0.23452 
-1.4294,-4.96485 -25.7918,-89.66463 -25.7918,-89.66463 0,0 -0.92583,-5.252 
3.23888,-2.94796"
+   opacity="0.30" fill="#43c330" stroke="none" />
 
+   d="m 476.74,325.18647 27.15045,-48.36586 c 0,0 2.60608,-4.69231 
7.57117,-1.90513 l 47.76761,26.81462 c 0,0 4.17755,2.72585 -0.23258,3.96482 
-4.41089,1.24034 -79.66009,22.38014 -79.66009,22.38014 0,0 -4.66278,0.79218 
-2.59656,-2.88859"
+   opacity="0.34" fill="#43c330" stroke="none" />
 
+   d="m 384.18,467.5217 -50.78858,-11.12355 c 0,0 -4.91971,-1.05409 
-3.7778,-6.26789 l 10.98596,-50.16036 c 0,0 1.30219,-4.4909 3.61861,-0.87525 
2.31787,3.61596 41.84208,65.30926 41.84208,65.30926 0,0 1.98487,3.964

[PUSHED] Small (hopefully non-controversial) changes to the existing ...

[Thorsten Behrens (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4308

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4308
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I402448ef4ea77633fe4e1ad5d5f93952efb495af
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Stefan Knorr 
Gerrit-Reviewer: Thorsten Behrens 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - instsetoo_native/util

[David Tardon]

 instsetoo_native/util/openoffice.lst.in |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a9de59240243542033d798e7b55b849d9daaccc6
Author: David Tardon 
Date:   Tue Jun 18 13:39:29 2013 +0200

prefer filelist from GeneratedPackage over Package

This broke incremental builds on MacOS X in the past, where
Package/python3.filelist was created for some reason, so the installer
did not install the Python framework.

(cherry picked from commit d72e170d6a956cf2cc7da1c0b5917bca3e79f5ce)

Signed-off-by: David Tardon 

Conflicts:
instsetoo_native/util/openoffice.lst.in

Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 2c8e8fd..589781e 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
 downloadnameLibreOffice_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
 }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
 downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
 }
 }
 
@@ -177,7 +177,7 @@ LibreOffice_SDK
 active 1
 compression 5
 script sdkoo
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
 }
 }
 
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
 active 1
 compression 5
 script sdkoo
-include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+include 
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[SOLVED] Re: Just a suggestion for Tinderbox

[julien2412]

Just for the record, Lionel wrote a very useful quick tutorial, see
https://wiki.documentfoundation.org/QA/FAQ#How_do_I_check_whether_a_given_.28e.g._daily.29_build_contains_a_specific_commit.3F
It may be a good replacement to a file giving the list, so put this thread
to SOLVED.
Thank you again Lionel!

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Just-a-suggestion-for-Tinderbox-tp4061929p4062045.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: config_host.mk.in configure.ac solenv/bin

[Stephan Bergmann]

 config_host.mk.in |1 +
 configure.ac  |   12 
 solenv/bin/modules/installer/windows/msiglobal.pm |6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 08337321e655a3b4991c895de98d96858e60d863
Author: Stephan Bergmann 
Date:   Tue Jun 18 13:58:49 2013 +0200

Let WINDOWS_SDK_WILANGID override the location of WiLangId.vbs

...see new TODO comment in configure.ac

Change-Id: Id3ffd45357a3f539f3d3f068528019334d929654

diff --git a/config_host.mk.in b/config_host.mk.in
index 3a10c3b..9363263 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -542,6 +542,7 @@ export WGET=@WGET@
 export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
 export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
 export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
+export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
 export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
diff --git a/configure.ac b/configure.ac
index 4efc4f9..0596eb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9066,9 +9066,21 @@ the  Windows SDK are installed.])
 SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um 
-I$WINDOWS_SDK_HOME/include/shared"
 fi
 fi
+
+dnl TODO: solenv/bin/modules/installer/windows/msiglobal.pm wants to use a
+dnl WiLangId.vbs that is included only in some SDKs (e.g., included in v7.1
+dnl but not in v8.0), so allow this to be overriden with a
+dnl WINDOWS_SDK_WILANGID for now; a full-blown --with-windows-sdk-wilangid
+dnl and configuration error if no WiLangId.vbs is found would arguably be
+dnl better, but I do not know under which conditions exactly it is needed 
by
+dnl msiglobal.pm:
+if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
+
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
+fi
 fi
 AC_SUBST(WINDOWS_SDK_HOME)
 AC_SUBST(WINDOWS_SDK_VERSION)
+AC_SUBST(WINDOWS_SDK_WILANGID)
 
 dnl =
 dnl Check for uuidgen
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 15c084c..7a7a121 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -675,7 +675,7 @@ sub create_transforms
 $infoline = "ERROR: We cannot create transformations yet (we cannot 
use cscript.exe when cross-compiling)\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
-my $wilangid = $ENV{WINDOWS_SDK_HOME} . 
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
+my $wilangid = $ENV{WINDOWS_SDK_WILANGID};
 
 my $from = cwd();
 
@@ -827,7 +827,7 @@ sub create_transforms
 }
 }
 
-$systemcall = "TEMP=$ENV{'TMPDIR'} $cscript $wilangid $basedbname Package 
$templatevalue";
+$systemcall = "TEMP=$ENV{'TMPDIR'} $cscript \"$wilangid\" $basedbname 
Package $templatevalue";
 
 $returnvalue = system($systemcall);
 
@@ -836,7 +836,7 @@ sub create_transforms
 
 if ($returnvalue)
 {
-$infoline = "ERROR: Could not execute WiLangId.vbs!\n";
+$infoline = "ERROR: $returnvalue from $systemcall\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlnode.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b9fe182902c9aedcc1fde16fcab8e8cbbb20b5ea
Author: Lionel Elie Mamane 
Date:   Tue Jun 18 12:26:55 2013 +0200

fdo#65653 make columnMatchP safer

Change-Id: Id994ab5aed6172d8a93fd331a366fca10a663a48
Reviewed-on: https://gerrit.libreoffice.org/4338
Reviewed-by: Zolnai Tamás 
Tested-by: Zolnai Tamás 

diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index f0590c1..272deb1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -135,6 +135,9 @@ namespace
 using namespace connectivity;
 assert(SQL_ISRULE(pSubTree,column_ref));
 
+if(!rParam.xField.is())
+return false;
+
 // retrieve the field's name & table range
 OUString aFieldName;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-1] fdo#65653 make columnMatchP safer

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4338

Approvals:
  Zolnai Tamás: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4338
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id994ab5aed6172d8a93fd331a366fca10a663a48
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Zolnai Tamás 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - framework/source icon-themes/galaxy

[Stefan Knorr]

 framework/source/services/backingwindow.hxx  |8 
 icon-themes/galaxy/brand/shell/about.svg |  281 +++
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 7 files changed, 109 insertions(+), 180 deletions(-)

New commits:
commit 23315b07d3753a5c7ccaf3da06e6fcc74abff942
Author: Stefan Knorr 
Date:   Sat Jun 15 22:20:11 2013 +0200

Small (hopefully non-controversial) changes to the existing branding

* Make sure about window background covers entire window
* Make sure start center images are centred

Change-Id: I402448ef4ea77633fe4e1ad5d5f93952efb495af
Reviewed-on: https://gerrit.libreoffice.org/4308
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 4a0247603e94412c1a77af8e8c7bd17f729b9eba)

Signed-off-by: Thorsten Behrens 

diff --git a/framework/source/services/backingwindow.hxx 
b/framework/source/services/backingwindow.hxx
index fdf245f..1778e31 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -119,10 +119,10 @@ namespace framework
 static const int nItemId_Extensions = 1;
 static const int nItemId_Info = 3;
 static const int nItemId_TplRep = 4;
-static const int nShadowTop = 31;
-static const int nShadowLeft = 35;
-static const int nShadowRight = 45;
-static const int nShadowBottom = 40;
+static const int nShadowTop = 30;
+static const int nShadowLeft = 30;
+static const int nShadowRight = 30;
+static const int nShadowBottom = 30;
 
 void loadImage( const ResId& i_rId, PushButton& i_rButton );
 
diff --git a/icon-themes/galaxy/brand/shell/about.svg 
b/icon-themes/galaxy/brand/shell/about.svg
index afdae2b..64ea4c4 100644
--- a/icon-themes/galaxy/brand/shell/about.svg
+++ b/icon-themes/galaxy/brand/shell/about.svg
@@ -1,28 +1,17 @@
 
-
 
-http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://creativecommons.org/ns#";
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-   xmlns:svg="http://www.w3.org/2000/svg";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:xlink="http://www.w3.org/1999/xlink";
-   version="1.1"
-   width="486"
-   height="322"
-   id="svg1604">
-  
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";
+version="1.1" width="486" height="500">
+  
 
   
   
 
 
+ fill="#530260" fill-opacity="1" stroke="none" />
 
 
+   gradientTransform="matrix(1,0,0,0.,-183.019,-50.249)" />
   
-  
-
-  
-image/svg+xml
-http://purl.org/dc/dcmitype/StillImage"; />
-
-  
-
-  
   
+ y="-1.5258789e-05"
+ fill="#ff" fill-opacity="1" stroke="none" />
   
+ opacity="0.6" fill="#43c330">
 
+   d="m 387.37,390.36 58.25,0.43 c 0,0 5.6,0.02 5.59,5.99 l -0.43,57.53 c 
0,0 -0.39,5.22 -3.76,1.79 -3.37,-3.42692 -60.98,-61.90002 -60.98898,-61.90002 
0,0 -3.09373,-3.88589 1.3391,-3.85299"
+   opacity="0.22" fill="#43c330" stroke="none" />
 
+   d="m 363.46,419.0742 57.03479,-43.60924 c 0,0 5.50008,-4.24516 
9.97687,1.60986 l 43.06983,56.3293 c 0,0 3.57184,5.37903 -2.30574,4.59498 
-5.87919,-0.78281 -106.16694,-14.16154 -106.16694,-14.16154 0,0 
-5.9493,-1.44458 -1.60881,-4.76336"
+   opacity="0.21" fill="#43c330" stroke="none" />
 
+   d="m 556.11,335.77719 23.45351,18.1423 c 0,0 2.27757,1.74532 
0.41514,4.15298 l -17.9179,23.16342 c 0,0 -1.76838,1.99598 -2.07855,-0.4332 
-0.31084,-2.4297 -5.60295,-43.87834 -5.60295,-43.87834 0,0 -0.0541,-2.52784 
1.73075,-1.14716"
+   opacity="0.37" fill="#43c330" stroke="none" />
 
+   d="m 494.48,411.9226 25.41052,37.36802 c 0,0 2.47541,3.60493 
-1.36068,6.2135 l -36.9058,25.09621 c 0,0 -3.50531,2.0565 -2.80699,-1.60974 
0.69759,-3.66731 12.61322,-66.22358 12.61322,-66.22358 0,0 1.11593,-3.68821 
3.04973,-0.84441"
+   opacity="0.37" fill="#43c330" stroke="none" />
 
+   d="m 461.51,323.2971 54.72499,30.27545 c 0,0 5.30905,2.90569 
2.20107,8.52359 l -29.90096,54.04807 c 0,0 -3.04434,4.72947 -4.47218,-0.23452 
-1.4294,-4.96485 -25.7918,-89.66463 -25.7918,-89.66463 0,0 -0.92583,-5.252 
3.23888,-2.94796"
+   opacity="0.30" fill="#43c330" stroke="none" />
 
+   d="m 476.74,325.18647 27.15045,-48.36586 c 0,0 2.60608,-4.69231 
7.57117,-1.90513 l 47.76761,26.81462 c 0,0 4.17755,2.72585 -0.23258,3.96482 
-4.41089,1.24034 -79.66009,22.38014 -79.66009,22.38014 0,0 -4.66278,0.79218 
-2.59656,-2.88859"
+   opacity="0.34" fill="#43c330" stroke="none" />
 
+   d="m 384.18,467.5217 -50.78858,-11.12355 c 0,0 -4.91971,-1.05409 
-3.7778,-6.26789 l 10.98596,-50.

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0c/353433ad94786a937fa9da01d6e7382e3da942

[Caolán McNamara]

 0c/353433ad94786a937fa9da01d6e7382e3da942 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2e5ee7b79fae444104abb57fbf0719a9ecb9a1ab
Author: Caolán McNamara 
Date:   Tue Jun 18 13:08:48 2013 +0100

Notes added by 'git notes add'

diff --git a/0c/353433ad94786a937fa9da01d6e7382e3da942 
b/0c/353433ad94786a937fa9da01d6e7382e3da942
new file mode 100644
index 000..753a109
--- /dev/null
+++ b/0c/353433ad94786a937fa9da01d6e7382e3da942
@@ -0,0 +1 @@
+merged as: 7377557f277b19c4953198c17b591fd964ac7c40
___
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' - 8a/10735b8ee3926a592d6919f4dbb823771bed9f

[Caolán McNamara]

 8a/10735b8ee3926a592d6919f4dbb823771bed9f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 90d4d8d8a9910ec62818a605ff8f3d5e4efc60fe
Author: Caolán McNamara 
Date:   Tue Jun 18 13:08:55 2013 +0100

Notes added by 'git notes add'

diff --git a/8a/10735b8ee3926a592d6919f4dbb823771bed9f 
b/8a/10735b8ee3926a592d6919f4dbb823771bed9f
new file mode 100644
index 000..753a109
--- /dev/null
+++ b/8a/10735b8ee3926a592d6919f4dbb823771bed9f
@@ -0,0 +1 @@
+merged as: 7377557f277b19c4953198c17b591fd964ac7c40
___
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' - ce/829e862e8e0b7c35a62afc2a169a30612e962d

[Caolán McNamara]

 ce/829e862e8e0b7c35a62afc2a169a30612e962d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 127718ff984164a1992d4232320d5b8c0311b97e
Author: Caolán McNamara 
Date:   Tue Jun 18 13:10:20 2013 +0100

Notes added by 'git notes add'

diff --git a/ce/829e862e8e0b7c35a62afc2a169a30612e962d 
b/ce/829e862e8e0b7c35a62afc2a169a30612e962d
new file mode 100644
index 000..be1ed62
--- /dev/null
+++ b/ce/829e862e8e0b7c35a62afc2a169a30612e962d
@@ -0,0 +1 @@
+reject: first start wizard is unpopular
___
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' - 8f/9af2d0a761436caaf6c313c69c35f8dc1f61c7

[Caolán McNamara]

 8f/9af2d0a761436caaf6c313c69c35f8dc1f61c7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4eb6aafacb93466ea924f434e63bacfcc98ccd84
Author: Caolán McNamara 
Date:   Tue Jun 18 13:11:14 2013 +0100

Notes added by 'git notes add'

diff --git a/8f/9af2d0a761436caaf6c313c69c35f8dc1f61c7 
b/8f/9af2d0a761436caaf6c313c69c35f8dc1f61c7
new file mode 100644
index 000..be1ed62
--- /dev/null
+++ b/8f/9af2d0a761436caaf6c313c69c35f8dc1f61c7
@@ -0,0 +1 @@
+reject: first start wizard is unpopular
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philipp Weissenbacher]

 svl/source/numbers/zforscan.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit ab28fdeba0c37dacd7bb949ef85a3477ad8ea032
Author: Philipp Weissenbacher 
Date:   Tue Jun 18 11:36:29 2013 +0200

Remove commented out code

Change-Id: Iace3628d9c48f07e03c1dda8ca3ff02a2e32ad1f
Reviewed-on: https://gerrit.libreoffice.org/4332
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 87d518b..1c846de 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1079,14 +1079,6 @@ void ImpSvNumberformatScan::Reset()
 {
 nAnzStrings = 0;
 nAnzResStrings = 0;
-#if 0
-// ER 20.06.97 14:05   nicht noetig, wenn nAnzStrings beachtet wird
-for (size_t i = 0; i < NF_MAX_FORMAT_SYMBOLS; i++)
-{
-sStrArray[i].Erase();
-nTypeArray[i] = 0;
-}
-#endif
 eScannedType = NUMBERFORMAT_UNDEFINED;
 nRepPos = 0;
 bExp = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Remove commented out code

[Eike Rathke (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4332

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4332
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iace3628d9c48f07e03c1dda8ca3ff02a2e32ad1f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher 
Gerrit-Reviewer: Eike Rathke 

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

[Libreoffice-commits] core.git: sw/Module_sw.mk

[David Tardon]

 sw/Module_sw.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3b3a0ae27906e534ad7b80b6eeb76cdda71a33ac
Author: David Tardon 
Date:   Tue Jun 18 14:17:00 2013 +0200

disable test that ends throwing std::bad_alloc

... after eating >11 GiB of memory.

Change-Id: I6202fa7e410c9b397c465cb1c185305aeee509e1

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 202c67c..d8ca65e 100755
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Module_add_check_targets,sw,\
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_htmlexport \
 CppunitTest_sw_macros_test \
-CppunitTest_sw_ooxmlexport \
 CppunitTest_sw_ooxmlimport \
 CppunitTest_sw_ww8export \
 CppunitTest_sw_ww8import \
___
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' - de/f95cfb69619071811fb8e564eb4187f59f4b99

[Caolán McNamara]

 de/f95cfb69619071811fb8e564eb4187f59f4b99 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4bd7d9fcb12efbb70fe9ab560a077fdf9b78a070
Author: Caolán McNamara 
Date:   Tue Jun 18 13:21:42 2013 +0100

Notes added by 'git notes add'

diff --git a/de/f95cfb69619071811fb8e564eb4187f59f4b99 
b/de/f95cfb69619071811fb8e564eb4187f59f4b99
new file mode 100644
index 000..3aeffdc
--- /dev/null
+++ b/de/f95cfb69619071811fb8e564eb4187f59f4b99
@@ -0,0 +1 @@
+merged as: b4219ea230a9635ca2422421324af5c407216e03
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |   18 +
 svgio/inc/svgio/svgreader/svgtoken.hxx   |1 
 svgio/source/svgreader/svgcharacternode.cxx  |   32 +
 svgio/source/svgreader/svgdocumenthandler.cxx|   22 ++
 svgio/source/svgreader/svgnode.cxx   |2 
 svgio/source/svgreader/svgstyleattributes.cxx|   77 +++
 svgio/source/svgreader/svgtoken.cxx  |2 
 7 files changed, 152 insertions(+), 2 deletions(-)

New commits:
commit b4219ea230a9635ca2422421324af5c407216e03
Author: Armin Le Grand 
Date:   Tue Jun 18 09:44:12 2013 +

Resolves: #i122524# fixed some text import aspects for super/sub-baseline

(cherry picked from commit def95cfb69619071811fb8e564eb4187f59f4b99)

Conflicts:
svgio/source/svgreader/svgtoken.cxx

Change-Id: I1208229a86807ce271a823415e9b8f0baf955e01

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx 
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index a84fd46..13e3705 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -143,6 +143,15 @@ namespace svgio
 FillRule_evenodd
 };
 
+enum BaselineShift
+{
+BaselineShift_Baseline,
+BaselineShift_Sub,
+BaselineShift_Super,
+BaselineShift_Percentage,
+BaselineShift_Length
+};
+
 class SvgStyleAttributes
 {
 private:
@@ -196,6 +205,10 @@ namespace svgio
 // ClipRule setting (only valid wne mbIsClipPathContent == true, 
default is FillRule_nonzero)
 FillRulemaClipRule;
 
+// BaselineShift: Type and number (in case of 
BaselineShift_Percentage or BaselineShift_Length)
+BaselineShift   maBaselineShift;
+SvgNumber   maBaselineShiftNumber;
+
 /// bitfield
 
 // defines if this attributes are part of a ClipPath. If yes,
@@ -422,6 +435,11 @@ namespace svgio
 const SvgMarkerNode* accessMarkerEndXLink() const;
 void setMarkerEndXLink(const OUString& rNew) { maMarkerEndXLink = 
rNew; }
 
+// BaselineShift
+void setBaselineShift(const BaselineShift aBaselineShift = 
BaselineShift_Baseline) { maBaselineShift = aBaselineShift; }
+BaselineShift getBaselineShift() const { return maBaselineShift; }
+void setBaselineShiftNumber(const SvgNumber& rBaselineShift = 
SvgNumber()) { maBaselineShiftNumber = rBaselineShift; }
+SvgNumber getBaselineShiftNumber() const;
 };
 } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx 
b/svgio/inc/svgio/svgreader/svgtoken.hxx
index 2e1f8c4..8594ca7 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -178,6 +178,7 @@ namespace svgio
 
 // text tokens
 SVGTokenText,
+SVGTokenBaselineShift,
 
 SVGTokenLast
 };
diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index b154645..0d2d575 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -403,6 +403,38 @@ namespace svgio
 }
 }
 
+// get BaselineShift
+const BaselineShift 
aBaselineShift(rSvgStyleAttributes.getBaselineShift());
+
+// apply BaselineShift
+switch(aBaselineShift)
+{
+case BaselineShift_Sub:
+{
+aPosition.setY(aPosition.getY() + 
aTextLayouterDevice.getUnderlineOffset());
+break;
+}
+case BaselineShift_Super:
+{
+aPosition.setY(aPosition.getY() + 
aTextLayouterDevice.getOverlineOffset());
+break;
+}
+case BaselineShift_Percentage:
+case BaselineShift_Length:
+{
+const SvgNumber 
aNumber(rSvgStyleAttributes.getBaselineShiftNumber());
+const double mfBaselineShift(aNumber.solve(*this, 
length));
+
+aPosition.setY(aPosition.getY() + mfBaselineShift);
+break;
+}
+default: // BaselineShift_Baseline
+{
+// nothing to do
+break;
+}
+}
+
 // get fill color
 const basegfx::BColor aFill(rSvgStyleAttributes.getFill()
 ? *rSvgStyleAttributes.getFill()
diff --git a/svgio/source/svgreader/sv

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.1.0.1' created by Christian Lohmaier 
 at 2013-06-18 13:41 -0700

Tag libreoffice-4.1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwFV9AAoJEPQ0oe+v7q6jMcEP/35G8UvbBwTXoBm+xLC+khUO
rReXgHmS6ZU0nxW4NozufYCHjhTg+ud+701Uskx43C74s1DIpi4mN6WSuWN9nABW
bmJiWrVZOOlJf7sRfm2QbZu9WOIGgvOn1YPzHSOnVa8O5b1CoO873JFKvwbdXHiH
Vr072PYPrynypBQK2R1Uf5spf2UVO9yHxtRnL5BACcUyWouV1hmlKda66kVLwcYU
kGQ2PZPp1W7MPvYKP0By+Up0O9rGSfq6owDiuOrAlvJ0xPVUiQdxvj6QgfgT1Qsx
d0Ug8dZKJfKN4r7hQ5vCdXBJGV2sPWBddoSltZWRGHwggS19X4NcIwTjxXF6nTd3
KiDZH/R1mffc6akC2g2O1ghMUlMLdmXHXjgvg4hZD4gY0Kf64JAEInKAfHaKG7Yd
YFFf2kNjumA8CRrCkMjGpVnv6SkvhXVI1hB/iviwpQkEYpy7pjQZlpK4X9shGezR
qdy0fB64AlJSyBI11YufF1k4ylFIZtyWm9dhMzG17NJojktLDU3MOHx6RtXHWFaD
1Hz0sQEuVp2FLCsD1jzyrU1Kl5orS02HSNuPUQMpDVttMhaNN92HVjrG/1v+9P3K
TfMbRu9wq/86vBBUyww3HoIwPhG0Ie/kCwSydg/UyRAdBpQP8qLm8+kH5sWLtZEu
rpq/Q3SqST1FyArdJ3aG
=wxnU
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-12:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.1.0.1' created by Christian Lohmaier 
 at 2013-06-18 13:41 -0700

Tag libreoffice-4.1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwFWKAAoJEPQ0oe+v7q6jcTwP/jZhxS3epPcoYIsXc9Di/G5I
zveRbbJPSDkB+DfUg7h5SoIngGqVr6s20/XU0iUC7gEArJwtcHirgC88ABaqGYVu
i/Hs/e9mlmJJvv1c6vVPXJzzRRa9gqe4U0Z8M2U2KofRxQ28mTVzMZPjr9trgypC
NSuF0nQ7ZCMFaIC9VhqnJSROH0xqm6eSAg1wEw3JFNjlP/t5QyWTq4+J1KoKjjku
IGVysixsuysngcRDkx16pFKscIR4hrFS/zORamHzwbufxSivSM5L3RcRAXj0q5QU
OJ6xNS8v7azcUkjV9OnYqS89dOdtVNtMOk8L1+vcKdaS5lCbbp/96g8Krst2YuNy
wOIO3jpeEEowacn5gvAfal5sdF/u5aViCpqtfROOcqf6tfLVarh4ExpH5bS1/zpy
o8NiSDsOhUuUnDrKfSlQmZsPYCOqUBg4RwFfHEHL60oIGEMKiK7Y3nZQZ8UiNIax
BmCS50gzaAol4DCtM8cvadeX8d3ZdPaL7gQlF2pwvuNQNmidwJvVR1k5FoAxWFSV
5TQut4aSzpMMP7xvPegdlX8f5Kh0vfU9LuYciq0RDK706E5+F8G8lOjDTQjRrgTl
5n7x8c4wpBBMTKWJe8BvRmuwyo0+GbDp7p6u/uQNXcAH1OW0tmn+Qvrjw502bJsb
+peRxePb6M3oe1n8Ql9/
=0Itq
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-421:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.1.0.1' created by Christian Lohmaier 
 at 2013-06-18 13:41 -0700

Tag libreoffice-4.1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwFWHAAoJEPQ0oe+v7q6jXf0QAMrVPMFent/MU5qzH9g56hGy
xMgNfcZtE45gnXUceDcP2WYhEfbkXwSivQX7INC0Ks8rQoSE9do34tTSMJUJPLZi
IiWtO8T1PYorqt5FK66kaLYkpQqgaBVWTBwnivMNcC79r0pMeVQWxsCiXNw7ZsPP
RLUwyG9xH0JqyO9Piajez9fcDqstY4VfsOor6RSDVThd5oq/CntHrF/6aHir4j0F
M6i7+YbiDShaQebnzl1uRpCNedyyRkLZQraqXt9SCOuntURKqryB5DyEMfeF5Npd
25NrLlK1G44FzBPnJlTJDCVO7LncYPDdbd264xusVab/OzdQ+gOkk8CiokKHOZzR
QZwAaGRV5mKgzQWD1+pouTAeJl1xqFFLTwy6tO6qjUigaHM6zXSWWRAIqm3/oJw/
fWg2IDcAXguYCMK7Uod5PAN6kjMm0xJ/HPaAXCYyaURCtog2zf13S7ncyQTONHat
rIGtTexY3YY7SkqFwCfebcj51xfsLnJJEq+dUQNfWCAo9Q7gCcxP8lvbLWqT/dpe
yE6Iqgew0GDlBG4tsqNBK5Giq5Ih+crWL+KFWy58FmMP7EFvqarsC0tvveXevHeO
N4HN4sS839dlHDzsSm2g2mT8OJr92mAPqXzPP3yrANtgyX9VVx59okI6wCajdexQ
SfgvykpyxEY0PuspqZPB
=KUkx
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-18:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.1.0.1' created by Christian Lohmaier 
 at 2013-06-18 13:41 -0700

Tag libreoffice-4.1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwFWEAAoJEPQ0oe+v7q6jToQP/Ah1atpQFKrZqml4OyRVuBRg
ZdbBD5cVTktPtDXykfTngC00shuwxxp5U0maglSiKDyMZ7sveZCTJn23DR5H3Fpm
Rc57Tl7IvJ0ZahttqjYLI+Zk3BwCh6jlVPFdhsWGR5wy3xPi73/3D3xf5A+vyByj
+IarJ+nPi6/innac+WtuW0UW5nLoiFM5sWgFf+4QKkrHOVlTfDGG/GMsJHwapZ93
+eDEjXXiQdl8Do3tgTxZtuOr67j+z8vlbRjxkuBhWX5mCzeZqAlk0eHT2grEaAWK
A/u9fXQpwGrovyY8850Y4yxkn+yHd5NYA4/C/2PfImh5U3HzWuK6Il4CwdtsjiAU
/O6uZfKklS7UG+PXMhc6HrgGAcxlgfE75TeNTM5dD4lS51OHXEDKaIkSvl8LChkQ
TdHDa+a2zHNxvhNBJIJg2AvrIwZ1DFnx4PmbUX7WBXv9ws9wXKAbVZPkoeWETeNv
eOUSCwLuYZ50ISJW4P6sAsHHwv0HU/AvdOgyfLtTeF8oN+xskaIMnKywGVWqx4L8
f92FqoFPJSbefd1F+9Y2Ch+JAnESmG/AadRiITHCMW2VgPQfX1jleh9O/w3AJjze
CwCb4fY2Q9s+MqwqfGdzbpsHgDvj1yNYu36EUQKY2yllDt/ayuQoMTd9B7sm+VkL
Sza3s6A4RJtisBaCLmC8
=I8Vl
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-13:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

[Faisal M . Al-Otaibi]

 starmath/UIConfig_smath.mk  |1 
 starmath/inc/dialog.hxx |   21 --
 starmath/inc/starmath.hrc   |1 
 starmath/source/dialog.cxx  |   72 +++---
 starmath/source/dialog.hrc  |   16 -
 starmath/source/smres.src   |  105 --
 starmath/uiconfig/smath/ui/smathsettings.ui |  290 
 7 files changed, 334 insertions(+), 172 deletions(-)

New commits:
commit 4f99d56f929c1eac07217e0f80a501b4e3dbdc6c
Author: Faisal M. Al-Otaibi 
Date:   Tue Jun 18 14:26:00 2013 +0200

convert starmath settings option page to .ui format

Change-Id: I908a29713ca1e01ec3e742193bd4b49e1fa97bc9

diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index d64abe8..2f26333 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
+   starmath/uiconfig/smath/ui/smathsettings \
starmath/uiconfig/smath/ui/spacingdialog \
 ))
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ca902b5..6c3586e 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -51,18 +51,15 @@ void SetFontStyle(const OUString &rStyleName, Font &rFont);
 
 class SmPrintOptionsTabPage : public SfxTabPage
 {
-FixedLine   aFixedLine1;
-CheckBoxaTitle;
-CheckBoxaText;
-CheckBoxaFrame;
-FixedLine   aFixedLine2;
-RadioButton aSizeNormal;
-RadioButton aSizeScaled;
-RadioButton aSizeZoomed;
-MetricField aZoom;
-FixedLine   aFixedLine3;
-CheckBoxaNoRightSpaces;
-CheckBoxaSaveOnlyUsedSymbols;
+CheckBox*   m_pTitle;
+CheckBox*   m_pText;
+CheckBox*   m_pFrame;
+RadioButton*m_pSizeNormal;
+RadioButton*m_pSizeScaled;
+RadioButton*m_pSizeZoomed;
+MetricField*m_pZoom;
+CheckBox*   m_pNoRightSpaces;
+CheckBox*   m_pSaveOnlyUsedSymbols;
 
 DECL_LINK(SizeButtonClickHdl, Button *);
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f03cd6d..dedc3f3 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -79,7 +79,6 @@
 #define RID_FONTDIALOG  (RID_APP_START + 2)
 #define RID_FONTSIZEDIALOG  (RID_APP_START + 3)
 #define RID_FONTTYPEDIALOG  (RID_APP_START + 4)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS  (RID_APP_START + 11)
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 86e2340..67c4a1d 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -152,32 +152,28 @@ void SetFontStyle(const OUString &rStyleName, Font &rFont)
 
 IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, 
EMPTYARG/*pButton*/ )
 {
-aZoom.Enable(aSizeZoomed.IsChecked());
+m_pZoom->Enable(m_pSizeZoomed->IsChecked());
 return 0;
 }
 IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, 
pButton )
 
 
 SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet 
&rOptions)
-: SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions),
-aFixedLine1 (this, SmResId( FL_PRINTOPTIONS )),
-aTitle  (this, SmResId( CB_TITLEROW )),
-aText   (this, SmResId( CB_EQUATION_TEXT )),
-aFrame  (this, SmResId( CB_FRAME )),
-aFixedLine2 (this, SmResId( FL_PRINT_FORMAT )),
-aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )),
-aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
-aSizeZoomed (this, SmResId( RB_ZOOM )),
-aZoom   (this, SmResId( MF_ZOOM )),
-aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
-aNoRightSpaces  (this, SmResId( CB_IGNORE_SPACING )),
-aSaveOnlyUsedSymbols  (this, SmResId( CB_SAVE_ONLY_USED_SYMBOLS ))
-{
-FreeResource();
-
-aSizeNormal.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
-aSizeScaled.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
-aSizeZoomed.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
+: SfxTabPage(pParent, "SmathSettings", 
"modules/smath/ui/smathsettings.ui", rOptions)
+{
+get( m_pTitle,   "title");
+get( m_pText,"text");
+get( m_pFrame,   "frame");
+get( m_pSizeNormal,  "sizenormal");
+get( m_pSizeScaled,  "sizescaled");
+get( m_pSizeZoomed,  "sizezoomed");
+get( m_pZoom,"zoom");
+get( m_pNoRightSpaces,   "norightspaces");
+get( m_pSaveOnlyUsedSymbols, "saveonlyusedsymbols");

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - configure.ac dictionaries helpcontent2 translations

[Christian Lohmaier]

 configure.ac |2 +-
 dictionaries |2 +-
 helpcontent2 |2 +-
 translations |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9baff35a485df83e08c986b7be26457a97fb2249
Author: Christian Lohmaier 
Date:   Tue Jun 18 15:11:43 2013 +0200

bump product version to 4.1.0.1+

Change-Id: I544b65cf520823e286a921ba75a9b8b4df5c46b4

diff --git a/configure.ac b/configure.ac
index 8b77e71..081899e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
commit 1b3956717a60d6ac35b133d7b0a0f5eb55e91550
Author: Christian Lohmaier 
Date:   Tue Jun 18 14:15:53 2013 +0200

Version 4.1.0.1, tag libreoffice-4.1.0.1

Change-Id: I75aaf91b99af7e0a14ec1eb3d4ee2af756b55fa7

diff --git a/configure.ac b/configure.ac
index add9ba2..8b77e71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
diff --git a/dictionaries b/dictionaries
index dbfffe3..acaca7f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit dbfffe3512457095ea99f7362ff64b1431b820b1
+Subproject commit acaca7f442d69ae360ee013bed7c180ceb158479
diff --git a/helpcontent2 b/helpcontent2
index 81f2a2b..2b4d8e8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 81f2a2b6bffadded71b81ac7ccae3ff1574a341b
+Subproject commit 2b4d8e83bd2e59ae70e0bf80eb00a20be452a39a
diff --git a/translations b/translations
index 5177014..98cefbb 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5177014ee256887eb36b358747038816bad3371d
+Subproject commit 98cefbba76f6c096929422336a0a336eab6ec7a3
___
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

[Faisal M . Al-Otaibi]

 helpers/help_hid.lst |9 -
 source/text/shared/optionen/01090100.xhp |   30 +++---
 2 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 69604ab9ca7ce8f03c5eced18c39308e1ca0
Author: Faisal M. Al-Otaibi 
Date:   Tue Jun 18 15:19:44 2013 +0200

update help ids for starmath settings option page .ui conversion

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 45b64de..8923027 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6997,10 +6997,6 @@ sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
 starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
 starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
-starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT,86436,
-starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_FRAME,86437,
-starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING,86455,
-starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_TITLEROW,86435,
 starmath_ComboBox_RID_FONTDIALOG_1,1401458689,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
@@ -7023,7 +7019,6 @@ starmath_MetricField_RID_FONTSIZEDIALOG_5,1401477637,
 starmath_MetricField_RID_FONTSIZEDIALOG_6,1401477638,
 starmath_MetricField_RID_FONTSIZEDIALOG_7,1401477639,
 starmath_MetricField_RID_FONTSIZEDIALOG_8,1401477640,
-starmath_MetricField_RID_PRINTOPTIONPAGE_MF_ZOOM,864672280,
 starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
 starmath_PushButton_RID_FONTSIZEDIALOG_1,1401475585,
@@ -7031,10 +7026,6 @@ starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
 starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
 starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891,
-starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE,864666134,
-starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE,864666133,
-starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ZOOM,864666135,
-starmath_TabPage_RID_PRINTOPTIONPAGE,864665600,
 svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD,1336427552,
 svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE,1338786859,
 svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT,1338786829,
diff --git a/source/text/shared/optionen/01090100.xhp 
b/source/text/shared/optionen/01090100.xhp
index 93ddcc6..8239dff 100644
--- a/source/text/shared/optionen/01090100.xhp
+++ b/source/text/shared/optionen/01090100.xhp
@@ -41,7 +41,7 @@
 scaling; printing in $[officename] Math
 fitting to pages;print settings in Math
 mw inserted "fitting..."
-
+
 Settings
 Defines formula 
settings that will be valid for all documents.
 
@@ -49,23 +49,23 @@
   
 
 Print options
-Title
-Specifies whether you 
want the name of the document to be included in the 
printout.
-Formula text
-Specifies whether 
to include the contents of the Commands window at the bottom of 
the printout.
-Border
+Title
+Specifies whether 
you want the name of the document to be included in the 
printout.
+Formula text
+Specifies whether 
to include the contents of the Commands window at the bottom of 
the printout.
+Border
 Applies a thin border to the formula area in the 
printout. Title and Formula text are only set 
down by a frame if the corresponding check box is active.
 Print format
-Original size
-Prints the 
formula without adjusting the current font size. It is possible that 
with large formulas a part of the command text is cut off.
-Fit to size
-Adjusts the 
formula to the page format used in the printout. The real size will be 
determined by the used paper format.
-
-Scaling
-Reduces or enlarges the 
size of the printed formula by a specified enlargement factor. Type the 
desired enlargement factor directly in the Scaling control, or set 
the value using the arrow buttons.
+Original size
+Prints the 
formula without adjusting the current font size. It is possible that 
with large formulas a part of the command text is cut off.
+Fit to size
+Adjusts the 
formula to the page format used in the printout. The real size will be 
determined by the used paper format.
+
+Scaling
+Reduces or 
enlarges the size of the printed formula by a specified enlargement 
factor. Type the desired enlargement factor directly in the 
Scaling control, or set the value using the arrow 
buttons.
 Other options
-Ignore ~ and ' at the end of 
the line
-Specifies that 
these space wildcards will be removed if they are at the end of a line. 
In earlier versions of $[officename], adding such characters at the end of a 
line prevented the right edge of the formula from being cut off during 
printing.
+Ignore ~ and ' at the end of the 
line
+Specifies 
that these space wildcards will be removed if they are at the end of a 
line. In earlier versions of $[officename], adding such characters at 
the end of a line prevented the right edge of the formula from being cut off 
during printing.
 
 Em

[Libreoffice-commits] core.git: helpcontent2

[Faisal M . Al-Otaibi]

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

New commits:
commit d1556eefd9fd587a0bf2f7a42304654b00a376d9
Author: Faisal M. Al-Otaibi 
Date:   Tue Jun 18 15:19:44 2013 +0200

Updated core
Project: help  69604ab9ca7ce8f03c5eced18c39308e1ca0

diff --git a/helpcontent2 b/helpcontent2
index 383ad41..69604ab 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 383ad41f4c56b858362e44cdc3f795f4e11fdeae
+Subproject commit 69604ab9ca7ce8f03c5eced18c39308e1ca0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 42899, which changed state.

Bug 42899 Summary: Autosave causes Macro change not to be stored on save.
https://bugs.freedesktop.org/show_bug.cgi?id=42899

   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

bug 65456

[Ciorba Edmond]

Hi Thorsten,

    I'm working on bug 65456, I have started
with the hint in the description. The getMainSequence() function
returns a pointer,when that is null it's sure that the slide doesn't
have animation on, but if that is not null it doesn't mean the slide
has animation. 
 Than I thought it would work, if I'd
iterate all over the objects of the page and after that I could use
the hasEffect() function to determinate whether the object has
animation on, or not. This solution was working, but it took to a
problem, when I added a new object and set an animation on it, it
wasn't working (see Patch 6).___
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

Bug 60270 depends on bug 58317, which changed state.

Bug 58317 Summary: UI Pivot Table - Choosing Results to  in 
More does not set the cell address field enabled
https://bugs.freedesktop.org/show_bug.cgi?id=58317

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |NOTABUG

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

[License statement] Gabor Kelemen

[Gabor Kelemen]

License statement:

   All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

Regards
Gabor Kelemen



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/cmis' - 2 commits - include/sfx2 offapi/com offapi/UnoApi_offapi.mk sfx2/source ucb/source

[Cao Cuong Ngo]

 include/sfx2/dinfdlg.hxx   |   14 +++-
 include/sfx2/sfxbasemodel.hxx  |   10 +--
 offapi/UnoApi_offapi.mk|2 
 offapi/com/sun/star/document/CmisProperty.idl  |   68 +
 offapi/com/sun/star/document/CmisPropertyValue.idl |   57 -
 offapi/com/sun/star/document/XCmisDocument.idl |4 -
 sfx2/source/dialog/dinfdlg.cxx |   63 ++-
 sfx2/source/doc/objserv.cxx|6 -
 sfx2/source/doc/sfxbasemodel.cxx   |   24 +++
 sfx2/source/view/sfxbasecontroller.cxx |2 
 ucb/source/ucp/cmis/cmis_content.cxx   |   28 
 11 files changed, 165 insertions(+), 113 deletions(-)

New commits:
commit 613ce6cadfb915b58a4611bf6d68660724fc95e8
Author: Cao Cuong Ngo 
Date:   Tue Jun 18 15:10:26 2013 +0200

Cmis Property

Add MultiValued, OpenChoice and Choices to CMIS Property

Change-Id: Iade033c86878368b39a0264ad0a56d0286e6bffb

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 949cbd2..dc7d78d 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -165,6 +165,8 @@ public:
 voidClearCmisProperties();
 voidAddCmisProperty(  const OUString& sId, const OUString& sName,
   const bool bUpdatable, const bool bRequired,
+  const bool bMultiValued, const bool 
bOpenChoice,
+  const com::sun::star::uno::Any& Choices,
   const com::sun::star::uno::Any& rValue );
 
 virtual SfxPoolItem*Clone( SfxItemPool* pPool = NULL ) const;
@@ -629,6 +631,8 @@ public:
 inline sal_Int32GetLineHeight() const { return m_nLineHeight; }
 voidAddLine( const OUString& sId, const OUString& sName,
  const bool bUpdatable, const bool bRequired,
+ const bool bMultiValued, const bool 
bOpenChoice,
+ com::sun::star::uno::Any& aChoices,
  com::sun::star::uno::Any& rAny );
 boolAreAllLinesValid() const;
 voidClearAllLines();
@@ -658,6 +662,8 @@ public:
 
 voidAddLine( const OUString& sId, const OUString& sName,
  const bool bUpdatable, const bool bRequired,
+ const bool bMultiValude, const bool bOpenChoice,
+ com::sun::star::uno::Any& aChoices,
  com::sun::star::uno::Any& rAny, bool bInteractive 
);
 
 inline bool AreAllLinesValid() const { return 
m_pPropertiesWin->AreAllLinesValid(); }
diff --git a/offapi/com/sun/star/document/CmisProperty.idl 
b/offapi/com/sun/star/document/CmisProperty.idl
index f6009a0..65caab1 100644
--- a/offapi/com/sun/star/document/CmisProperty.idl
+++ b/offapi/com/sun/star/document/CmisProperty.idl
@@ -21,7 +21,7 @@
 
 module com {  module sun {  module star {  module document {
 
-/** specifies a CMIS property value.
+/** specifies a CMIS property.
  */
 struct CmisProperty
 {
@@ -42,6 +42,19 @@ struct CmisProperty
 */
 boolean Required;
 
+/** specifies if the property has multiple value
+*/
+boolean MultiValued;
+
+/** specifies if the property value can be freely set
+or is restricted from a list of choices.
+*/
+boolean OpenChoice;
+
+/** specifies the possible choices of the values.
+*/
+any Choices;
+
 /** specifies value of the property
 */
 any Value;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1e85aad..8d1e79e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -97,26 +97,38 @@ struct CmisProperty
 OUStringm_sName;
 boolm_bUpdatable;
 boolm_bRequired;
+boolm_bMultiValued;
+boolm_bOpenChoice;
+com::sun::star::uno::Anym_aChoices;
 com::sun::star::uno::Anym_aValue;
 
 CmisProperty( const OUString& sId,
   const OUString& sName,
   const bool bUpdatable,
   const bool bRequired,
+  const bool bMultiValued,
+  const bool bOpenChoice,
+  const com::sun::star::uno::Any& aChoices,
   const com::sun::star::uno::Any& rValue ) :
 m_sId( sId ),
 m_sName( sName ),
 m_bUpdatable( bUpdatable ),
 m_bRequired( bRequired ),
+m_bMultiValued( bMultiValued ),
+m_bOpenChoice( bOpenChoice ),
+m_aChoices( aChoices),
 m_aValue( rValue )
 {}
 
 inline bool ope

[ANNOUNCE] libreoffice-4.1.0.1 tag created

[Christian Lohmaier]

Hi *.

The tag libreoffice-4.1.0.1 (AKA RC1) has been created. The
corresponding official builds will be available within next few days.

This release marks hard English sting and UI freeze. Note that there
are two more release candidates scheduled (deadlines are July 1, and
15, 2013).

IMPORTANT: we are reaching the final phase, so all changes in the 4-1
branch will now need at least one review.

See the attached list of changes against 4.1.0.0beta2

To switch your tree to it, use:

./g fetch --tags
./g checkout -b tag-libreoffice-4.1.0.1 libreoffice-4.1.0.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.

See also
https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.0_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches

Best Regards,
Christian


commits-libreoffice-4-1-release-4.1.0.1.log
Description: Binary data


bugs-libreoffice-4-1-release-4.1.0.1.wiki
Description: Binary data


bugs-libreoffice-4-1-release-4.1.0.1.log
Description: Binary data


bugs-changelog-libreoffice-4-1-release-4.1.0.1.log
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - sw/qa writerfilter/source

[Cédric Bosdonnat]

 sw/qa/extras/ooxmlimport/data/n820504.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   12 
 writerfilter/source/dmapper/StyleSheetTable.cxx |3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 60443905cdc004397322b5beef0e2bd8594a8ebf
Author: Cédric Bosdonnat 
Date:   Tue Jun 18 09:50:41 2013 +0200

added unit test for n#820504

Change-Id: I804e081a564d24d3896160f817051b19da884c34
(cherry picked from commit f9610ed634318c27382d79089d022fb8175eb90a)
Reviewed-on: https://gerrit.libreoffice.org/4330
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx 
b/sw/qa/extras/ooxmlimport/data/n820504.docx
new file mode 100644
index 000..36279a9
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n820504.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ce66980..c895db2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -119,6 +119,7 @@ public:
 void testPageBorderShadow();
 void testN820509();
 void testN820788();
+void testN820504();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -205,6 +206,7 @@ void Test::run()
 {"page-border-shadow.docx", &Test::testPageBorderShadow},
 {"n820509.docx", &Test::testN820509},
 {"n820788.docx", &Test::testN820788},
+{"n820504.docx", &Test::testN820504},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1457,6 +1459,16 @@ void Test::testN820788()
 CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty(xFrame, 
"SizeType"));
 }
 
+void Test::testN820504()
+{
+uno::Reference 
xFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xFamiliesAccess(xFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xStylesAccess(xFamiliesAccess->getByName("ParagraphStyles"), uno::UNO_QUERY);
+uno::Reference 
xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
+// The problem was that the CharColor was set to AUTO (-1) even if we have 
some default char color set
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty(xStyle, 
"CharColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 97a46454b39fa54c4110b2e24cfec1f18b32e596
Author: Cédric Bosdonnat 
Date:   Mon Jun 17 13:42:34 2013 +0200

n#820504: default color hidden by Default style in writerfilter

Setting the font color of the default paragraph style to Auto makes the
color set in the Writer defaults (from rPrDefault) ignored.

Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c
(cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
(cherry picked from commit 122db845e057cfd83bb2b5fde442200bc742eb8d)
Reviewed-on: https://gerrit.libreoffice.org/4329
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 74adb0b..8352b1b 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -786,8 +786,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 pEntry->pProperties->Insert(PROP_PARA_ORPHANS, true, 
aTwo, false);
 //  Left-to-right direction if not already set
 pEntry->pProperties->Insert(PROP_WRITING_MODE, true, 
uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false);
-//  font color COL_AUTO if not already set
-pEntry->pProperties->Insert(PROP_CHAR_COLOR, true, 
uno::makeAny( sal_Int32(0x) ), false);
+// Don't set font color to Auto if not already set: 
this could hide the default font color setting
 }
 
 uno::Sequence< beans::PropertyValue > aPropValues = 
pEntry->pProperties->GetPropertyValues();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerfilter/source/dmapper/DomainMapper.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0e1c9b0a47fb45e4439e55cb48a6dd7024218dc9
Author: Stephan Bergmann 
Date:   Tue Jun 18 16:09:40 2013 +0200

-Werror=maybe-uninitialized

Change-Id: Ic2011b6c3db44d12c0dc883019d2d532bbda467b

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0d14f8d..c371c9a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1513,8 +1513,7 @@ static bool ExchangeLeftRight( const PropertyMapPtr 
rContext )
 if( aPropParaIte != rContext->end())
 {
 sal_Int32 aAdjust ;
-aPropParaIte->second >>= aAdjust;
-if( aAdjust == text::WritingMode2::RL_TB )
+if( (aPropParaIte->second >>= aAdjust) && aAdjust == 
text::WritingMode2::RL_TB )
 bExchangeLeftRight = true;
 }
 return bExchangeLeftRight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 oox/source/ole/olehelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ba49392543bae1f6477c65f1887881b48a3143e
Author: David Tardon 
Date:   Tue Jun 18 10:06:35 2013 -0400

fix ppc build

char is a type distinct from both unsigned char and signed char.

Change-Id: Ia9de35ef42101ce818880b810c44547f1c1a417a

diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 58aa67e..8dc8f7c 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -298,7 +298,7 @@ void OleHelper::exportGuid( BinaryOutputStream& rOStr, 
const SvGlobalName& rId )
 memcpy(&b, pBytes+6, sizeof(sal_uInt16));
 rOStr << b;
 
-rOStr.writeArray( (sal_Char *)&pBytes[ 8 ], 8 );
+rOStr.writeArray( (sal_uInt8 *)&pBytes[ 8 ], 8 );
 }
 OUString OleHelper::importGuid( BinaryInputStream& rInStrm )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Michael Meeks]

 sw/source/filter/xml/XMLRedlineImportHelper.cxx |   39 ++--
 1 file changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 49c783437f37b52f1feeb415d1fc9274b185a488
Author: Michael Meeks 
Date:   Tue Jun 18 10:00:12 2013 +0100

fdo#65882 - fix intermittent writer unit test failure on exit.

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
Reviewed-on: https://gerrit.libreoffice.org/4336
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index fb942bb..3fe4709 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -369,25 +369,32 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 }
 
 // set redline mode & key
-Any aAny;
+try
+{
+Any aAny;
 
-aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
-if ( bHandleShowChanges )
-xModelPropertySet->setPropertyValue( sShowChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
+aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
+if ( bHandleShowChanges )
+xModelPropertySet->setPropertyValue( sShowChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
 
-aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
-if ( bHandleRecordChanges )
-xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
+aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
+if ( bHandleRecordChanges )
+xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
 
-aAny <<= aProtectionKey;
-if ( bHandleProtectionKey )
-xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
-else
-xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+aAny <<= aProtectionKey;
+if ( bHandleProtectionKey )
+xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
+else
+xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, 
aAny);
+}
+catch (const uno::RuntimeException &) // fdo#65882
+{
+SAL_WARN( "sw", "potentially benign ordering issue during shutdown" );
+}
 }
 
 void XMLRedlineImportHelper::Add(
___
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' - 36/a8574012525fa837df6dfd1839fa65b5a2bc70

[Caolán McNamara]

 36/a8574012525fa837df6dfd1839fa65b5a2bc70 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 305be0df50502eae0a3dc4b0088fd8bb991d91b8
Author: Caolán McNamara 
Date:   Tue Jun 18 15:35:31 2013 +0100

Notes added by 'git notes add'

diff --git a/36/a8574012525fa837df6dfd1839fa65b5a2bc70 
b/36/a8574012525fa837df6dfd1839fa65b5a2bc70
new file mode 100644
index 000..0287577
--- /dev/null
+++ b/36/a8574012525fa837df6dfd1839fa65b5a2bc70
@@ -0,0 +1 @@
+merged as: 6ed60d6a9314341bda0afbea7ed6b106f562393d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   57 ++--
 sw/source/core/draw/dcontact.cxx|   22 ++-
 2 files changed, 50 insertions(+), 29 deletions(-)

New commits:
commit 2c9c9923fdf042c41cebaf9a15def7caac86032d
Author: Armin Le Grand 
Date:   Tue Jun 18 13:10:42 2013 +

i121917 Corrected access to text object

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index d093d0b..de12d70 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -156,6 +156,34 @@ void PosSizePropertyPanel::ShowMenu (void)
 
 
 
+namespace
+{
+bool hasText(const SdrView& rSdrView)
+{
+const SdrMarkList& rMarkList = rSdrView.GetMarkedObjectList();
+
+if(1 == rMarkList.GetMarkCount())
+{
+const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
+
+if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind 
|| OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind))
+{
+const SdrTextObj* pSdrTextObj = dynamic_cast< const 
SdrTextObj* >(pObj);
+
+if(pSdrTextObj && pSdrTextObj->HasText())
+{
+return true;
+}
+}
+}
+
+return false;
+}
+} // end of anonymous namespace
+
+
+
 void PosSizePropertyPanel::Initialize()
 {
 mpFtPosX->SetBackground(Wallpaper());
@@ -228,18 +256,7 @@ void PosSizePropertyPanel::Initialize()
 if ( mpView != NULL )
 {
 maUIScale = mpView->GetModel()->GetUIScale();
-
-const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-if(1 == rMarkList.GetMarkCount())
-{
-const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
-
-if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind 
|| OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && 
((SdrTextObj*)pObj)->HasText())
-{
-mbAdjustEnabled = true;
-}
-}
+mbAdjustEnabled = hasText(*mpView);
 }
 
 mePoolUnit = maTransfWidthControl.GetCoreMetric();
@@ -705,20 +722,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 if ( mpView == NULL )
 return;
 
-const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-
-if(1 == rMarkList.GetMarkCount())
-{
-const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
-
-if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || 
OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && 
((SdrTextObj*)pObj)->HasText())
-mbAdjustEnabled = true;
-else
-mbAdjustEnabled = false;
-}
-else
-mbAdjustEnabled = false;
+mbAdjustEnabled = hasText(*mpView);
 
 // Pool unit and dialog unit may have changed, make sure that we
 // have the current values.
@@ -942,6 +946,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 }
 
 const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
+const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
 
 switch (rMarkList.GetMarkCount())
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index f55d031..32784e0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2582,8 +2582,16 @@ basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() 
const
 SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const
 {
 SdrHdl* pHdl = rRefObj.GetHdl(nHdlNum);
-Point aP(pHdl->GetPos() + GetOffset());
-pHdl->SetPos(aP);
+
+if(pHdl)
+{
+Point aP(pHdl->GetPos() + GetOffset());
+pHdl->SetPos(aP);
+}
+else
+{
+OSL_ENSURE(false, "Got no SdrHdl(!)");
+}
 
 return pHdl;
 }
@@ -2591,7 +2599,15 @@ SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const
 SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const
 {
 SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum);
-pHdl->SetPos(pHdl->GetPos() + GetOffset());
+
+if(pHdl)
+{
+pHdl->SetPos(pHdl->GetPos() + GetOffset());
+}
+else
+{
+OSL_ENSURE(false, "Got no SdrHdl(!)");
+}
 
 return pHdl;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/kk

[Andras Timar]

 source/kk/dbaccess/source/ui/misc.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46c683c740acf324164f188a97abea28fe3c1bf9
Author: Andras Timar 
Date:   Tue Jun 18 16:54:58 2013 +0200

buildfix

Change-Id: I3816b95baba54568d00f7afca8eff0a1882f8886

diff --git a/source/kk/dbaccess/source/ui/misc.po 
b/source/kk/dbaccess/source/ui/misc.po
index c5d8118..a42baf0 100644
--- a/source/kk/dbaccess/source/ui/misc.po
+++ b/source/kk/dbaccess/source/ui/misc.po
@@ -417,4 +417,4 @@ msgctxt ""
 "RID_STR_EXTENSION_NOT_PRESENT\n"
 "string.text"
 msgid "The report, \"$file$\", requires the Oracle Report Builder feature."
-msgstr "\\\"$file$\\\" есептемесі Oracle Report Builder 
мүмкіндігін талап етеді."
+msgstr "\"$file$\" есептемесі Oracle Report Builder 
мүмкіндігін талап етеді."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit 5456dd3d611a0e1c2f170003b7abcc49ddacbc7c
Author: Andras Timar 
Date:   Tue Jun 18 16:54:58 2013 +0200

Updated core
Project: translations  46c683c740acf324164f188a97abea28fe3c1bf9

diff --git a/translations b/translations
index 98cefbb..46c683c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 98cefbba76f6c096929422336a0a336eab6ec7a3
+Subproject commit 46c683c740acf324164f188a97abea28fe3c1bf9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c04d0a7b4e94dd88ab5af04160a037cfa014e292
Author: Christian Lohmaier 
Date:   Tue Jun 18 16:43:10 2013 +0200

bump version to 4.1.0.1.0+ instead of 4.1.0.1+

as otherwise LIBO_VERSION_PATCH gets assigned "1+", but the code
doesn't cope with that/expects only numeric values.

Change-Id: I32ffa952e4d377e7998d7a54d877a5f57a9d6046

diff --git a/configure.ac b/configure.ac
index 081899e..f5a72d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2c/9c9923fdf042c41cebaf9a15def7caac86032d

[Caolán McNamara]

 2c/9c9923fdf042c41cebaf9a15def7caac86032d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0da3663f76e7b7a30797a2b0aa35f7cb521f55a6
Author: Caolán McNamara 
Date:   Tue Jun 18 16:04:15 2013 +0100

Notes added by 'git notes add'

diff --git a/2c/9c9923fdf042c41cebaf9a15def7caac86032d 
b/2c/9c9923fdf042c41cebaf9a15def7caac86032d
new file mode 100644
index 000..6aa245a
--- /dev/null
+++ b/2c/9c9923fdf042c41cebaf9a15def7caac86032d
@@ -0,0 +1 @@
+merged as: 6c5c5584eb1adb64fee3aaf76196115ba3812e2c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sc/uiconfig starmath/uiconfig svx/source sw/source

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optsortlists.ui|   23 +---
 starmath/uiconfig/smath/ui/smathsettings.ui |5 +
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   57 ++--
 sw/source/core/draw/dcontact.cxx|   20 +--
 4 files changed, 56 insertions(+), 49 deletions(-)

New commits:
commit 3ed731fc136f958a8a38c9117fbd1e4a068d838b
Author: Caolán McNamara 
Date:   Tue Jun 18 16:03:02 2013 +0100

put some borders around these widgets

Change-Id: I252f637d87a33253e2a90b77db013c2f712f1d39

diff --git a/sc/uiconfig/scalc/ui/optsortlists.ui 
b/sc/uiconfig/scalc/ui/optsortlists.ui
index 45fc9be..34dec77 100644
--- a/sc/uiconfig/scalc/ui/optsortlists.ui
+++ b/sc/uiconfig/scalc/ui/optsortlists.ui
@@ -141,7 +141,7 @@
 0
 _Lists
 True
-lists
+lists:border
   
   
 0
@@ -157,7 +157,7 @@
 0
 _Entries
 True
-entries
+entries:border
   
   
 1
@@ -167,7 +167,7 @@
   
 
 
-  
+  
 True
 True
 True
@@ -181,7 +181,7 @@
   
 
 
-  
+  
 True
 True
 True
commit 9f8c4f50e441e640d52712f1866b4037dab4da36
Author: Caolán McNamara 
Date:   Tue Jun 18 15:43:25 2013 +0100

a few HIG tweaks

Change-Id: I063c5fac1727ea7ba2bf5c8054d425af4598395c

diff --git a/sc/uiconfig/scalc/ui/optsortlists.ui 
b/sc/uiconfig/scalc/ui/optsortlists.ui
index ce603c9..45fc9be 100644
--- a/sc/uiconfig/scalc/ui/optsortlists.ui
+++ b/sc/uiconfig/scalc/ui/optsortlists.ui
@@ -1,13 +1,6 @@
 
 
   
-  
-1
-32000
-1
-1
-10
-  
   
 True
 False
@@ -30,11 +23,9 @@
 
   
 _New
-False
 True
 True
 True
-False
 True
   
   
@@ -46,11 +37,9 @@
 
   
 _Add
-False
 True
 True
 True
-False
 True
   
   
@@ -62,11 +51,9 @@
 
   
 _Delete
-False
 True
 True
 True
-False
 True
   
   
@@ -86,11 +73,9 @@
 
   
 _Copy
-False
 True
 True
 True
-False
 True
   
   
diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui 
b/starmath/uiconfig/smath/ui/smathsettings.ui
index c7d6c77..550dc8d 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -12,7 +12,9 @@
 False
 True
 True
+6
 vertical
+12
 
   
 True
@@ -157,7 +159,7 @@
   
 True
 False
-6
+12
 
   
 _Scaling
@@ -256,6 +258,7 @@
 True
 True
 False
+True
 0
 True
   
commit 6c5c5584eb1adb64fee3aaf76196115ba3812e2c
Author: Armin Le Grand 
Date:   Tue Jun 18 13:10:42 2013 +

Resolves: #i121917# Corrected access to text object

(cherry picked from commit 2c9c9923fdf042c41cebaf9a15def7caac86032d)

Conflicts:
sw/source/core/draw/dcontact.cxx

Change-Id: Ia214127ca540c4f4036a0006e7c227649fb39134

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5854e36..20879f1 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -150,6 +150,34 @@ void PosSizePropertyPanel::ShowMenu (void)
 
 
 
+namespace
+{
+bool hasText(const SdrView& rSdrView)
+{
+const SdrMarkList& rMarkList = rSdrView.GetMarkedObjectList();
+
+if(1 == rMarkList.GetMarkCount())
+{
+const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
+
+if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind 
|| OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind))
+{
+const SdrTextObj* pSdrTextObj = dynamic_cast< const 
SdrTextObj* >(pObj);
+
+if(pSdrTextObj && pSdrTextObj->HasText())
+