[Bug 70414] create VSProject files for code editing in MSVS from gbuild

[bugzilla-daemon]

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

--- Comment #18 from vv...@yandex.ru ---
(In reply to comment #17)
> I had some problems with that (IIRC the same message you got), try to 
> * go to your directory with sources
> (/cygdrive/e/_Projects/libreoffice-core/) 
> * run the autogen.sh with reasonable parameters (e.g. the ones from
> https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies)
> * run command "/opt/lo/bin/make vs2012-ide-integration" there.
Here is the results:

Vort@Vort-PC /cygdrive/e/_Projects/libreoffice-core
$ /opt/lo/bin/make vs2012-ide-integration  
cd E:/_Projects/libreoffice-core && (LC_MESSAGES=C /opt/lo/bin/make
cmd="/opt/lo/bin/make -npf Makefile.gbuild all" cmd || true) |
E:/_Projects/libreoffice-core/bin/gbuild-to-ide --ide vs2012
cl : Command line warning D9025 : overriding '/Od' with '/O2'
/bin/sh:
E:/_Projects/libreoffice-core/workdir/Package/ure_install.filelist.tmp: No such
file or directory
/bin/sh:
E:/_Projects/libreoffice-core/workdir/Package/ure_install.filelist.tmp: No such
file or directory
/cygdrive/e/_Projects/libreoffice-core/external/libxml2/ExternalPackage_xml2.mk:22:
*** file
E:/_Projects/libreoffice-core/workdir/UnpackedTarball/xml2/win32/bin.msvc/libxml2.dll
does not exist in the tarball.  Stop.
make[1]: *** [cmd] Error 2
Traceback (most recent call last):
  File "E:/_Projects/libreoffice-core/bin/gbuild-to-ide", line 833, in 
VisualStudioIntegrationGenerator(gbuildparser).emit()
  File "E:/_Projects/libreoffice-core/bin/gbuild-to-ide", line 613, in emit
project_guid = self.write_project(project_path, target)
  File "E:/_Projects/libreoffice-core/bin/gbuild-to-ide", line 675, in
write_project
os.makedirs(os.path.dirname(project_path), exist_ok = True)
  File "/usr/lib/python3.2/os.py", line 152, in makedirs
mkdir(name, mode)
OSError: [Errno 17] File exists: './oox'
make: *** [vs2012-ide-integration] Error 1

> If that fails, try to build the LO and then "/opt/lo/bin/make
> vs2012-ide-integration" (building shouldn't be necessary, but just to be
> sure).
It usually takes 10 hours for me. It's too long.
If it's possible, please send to me project files for sdext module - I will try
to test it separately.

> I will try to investigate the issue more thoroughly.
Thanks.

-- 
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 Gerrit News for core on 2014-03-06

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#42164 Esc doesn't clear copy source overlay in panes of split/frozen 
  in https://gerrit.libreoffice.org/8472 from Trent MacAlpine
  about module sc
+ fdo#35324: Text and picture water are not imported  and not preserved in 
  in https://gerrit.libreoffice.org/8457 from Ravindra Vidhate
  about module include, oox, svx, sw
 End of freshness 

+ use WeakImplHelper for ActivaDataSink
  in https://gerrit.libreoffice.org/8471 from Norbert Thiebaud
  about module include, ucbhelper
+ Reduce image resolution by default in PDF Export
  in https://gerrit.libreoffice.org/8422 from Samuel Mehrbrodt
  about module filter, officecfg
+ Build webdav based on serf if neon is disabled.
  in https://gerrit.libreoffice.org/8465 from Matúš Kukan
  about module build, postprocess, ucb
+ Add apr and serf externals for alternative webdav implementation.
  in https://gerrit.libreoffice.org/8353 from Matúš Kukan
  about module build, external, solenv


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

+ Do not needlessly truncate MinMax argument before comparison with bounds
  in https://gerrit.libreoffice.org/8461 from Stephan Bergmann
+ de-macroize XINTERFACE_COMMON_IMPL
  in https://gerrit.libreoffice.org/8455 from Norbert Thiebaud
+ de-macroize XINTERFACE_DECL
  in https://gerrit.libreoffice.org/8454 from Norbert Thiebaud
+ Currently used file pickers API doesn't work for OS X < 10.6
  in https://gerrit.libreoffice.org/8430 from Douglas Mencken
+ Switch to -magnification instead of -deltaZ for mac osx pinch-to-zoom
  in https://gerrit.libreoffice.org/8345 from Joren De Cuyper
+ Simplify resolution calculation
  in https://gerrit.libreoffice.org/8166 from Keith Curtis
+ Simplify DrawWave
  in https://gerrit.libreoffice.org/8168 from Keith Curtis
+ Remove visual noise from winaccessibility
  in https://gerrit.libreoffice.org/8340 from Alexander Wilms
+ Converted group by [number|date] pivot table dlg to .ui
  in https://gerrit.libreoffice.org/8382 from Katarina Behrens
+ made ListBox handle more than 64k elements, fdo#61520 related
  in https://gerrit.libreoffice.org/8460 from Eike Rathke
+ fdo#67104 Use correct command for show grid
  in https://gerrit.libreoffice.org/8459 from Maxim Monastirsky
+ fdo#70798 add missing parclass.cxx entries for new Excel2010 functions
  in https://gerrit.libreoffice.org/8355 from Winfried Donkers
+ fdo#72197 Add Excel 2010 functions
  in https://gerrit.libreoffice.org/7776 from Winfried Donkers
+ fdo#39440 the sSymName parameter is now passed by reference
  in https://gerrit.libreoffice.org/8450 from Mihai Varga
+ Add window title and frame into placeedit.ui
  in https://gerrit.libreoffice.org/8453 from Olivier Hallot
+ fdo#75557 : OLE Objects of type .zip not being preserved in RT
  in https://gerrit.libreoffice.org/8458 from Tushar Bende
+ fdo#73596 [DOCX] Index:distance between columns
  in https://gerrit.libreoffice.org/8444 from Vinaya Mandke
+ fdo#73219 File corruption: Table in header
  in https://gerrit.libreoffice.org/8378 from Priyanka Gaikwad
+ fdo#74792 [DOCX] Grab-bag rels and images for SmartArt
  in https://gerrit.libreoffice.org/8362 from Vinaya Mandke
+ fdo#73596 Added support to import and export \r,\h Index flags.
  in https://gerrit.libreoffice.org/8099 from Nikhil Walvekar


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

None

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

+ fd0#74150:Numbered list getting display after RT -table-within-table-1.do
  in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji
+ fdo#74111 3D Rotation is wrong after Round trip for pie chart
  in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
  in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ fdo#69407: On transparent frames, shadows are painted in foreground.
  in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ 

License statement

[Trent MacAlpine]

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

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

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

[Kohei Yoshida]

 sc/inc/formulacell.hxx   |4 +++-
 sc/inc/types.hxx |   11 ---
 sc/source/core/data/formulacell.cxx  |7 ---
 sc/source/core/opencl/formulagroupcl.cxx |6 +++---
 sc/source/core/tool/clkernelthread.cxx   |4 ++--
 5 files changed, 20 insertions(+), 12 deletions(-)

New commits:
commit b981c089a9194f33b46272e3f4efa117241ea533
Author: Kohei Yoshida 
Date:   Wed Mar 5 21:39:10 2014 -0500

Separate the OpenCL kernel state flag to get it to function correctly.

It's better this way.

Change-Id: I293a51f0d180e21c35b0d310b9a6bda496ad7f45

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index f75895b..67b0fb6 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -64,7 +64,9 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable
 short mnFormatType;
 bool mbInvariant:1;
 bool mbSubTotal:1;
-sc::GroupCalcState meCalcState;
+
+sal_uInt8 meCalcState;
+sal_uInt8 meKernelState;
 
 ScFormulaCellGroup();
 ~ScFormulaCellGroup();
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index fc0e0e8..b6c4fa6 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -58,11 +58,16 @@ const sal_uInt16 MatrixEdgeOpen= 32;
 
 enum GroupCalcState
 {
+GroupCalcDisabled = 0,
 GroupCalcEnabled,
-GroupCalcOpenCLKernelCompilationScheduled,
-GroupCalcOpenCLKernelBinaryCreated,
 GroupCalcRunning,
-GroupCalcDisabled
+};
+
+enum OpenCLKernelState
+{
+OpenCLKernelNone = 0,
+OpenCLKernelCompilationScheduled,
+OpenCLKernelBinaryCreated
 };
 
 struct RangeMatrix
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 3b20408..9a328ed 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -413,7 +413,8 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
 mnFormatType(NUMBERFORMAT_NUMBER),
 mbInvariant(false),
 mbSubTotal(false),
-meCalcState(sc::GroupCalcEnabled)
+meCalcState(sc::GroupCalcEnabled),
+meKernelState(sc::OpenCLKernelNone)
 {
 if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
 {
@@ -446,7 +447,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup()
 
 void ScFormulaCellGroup::scheduleCompilation()
 {
-meCalcState = sc::GroupCalcOpenCLKernelCompilationScheduled;
+meKernelState = sc::OpenCLKernelCompilationScheduled;
 sc::CLBuildKernelWorkItem aWorkItem;
 aWorkItem.meWhatToDo = sc::CLBuildKernelWorkItem::COMPILE;
 aWorkItem.mxGroup = this;
@@ -2071,7 +2072,7 @@ bool ScFormulaCell::IsMultilineResult()
 
 void ScFormulaCell::MaybeInterpret()
 {
-if (mxGroup && mxGroup->meCalcState == 
sc::GroupCalcOpenCLKernelCompilationScheduled)
+if (mxGroup && mxGroup->meKernelState == 
sc::OpenCLKernelCompilationScheduled)
 return;
 
 if (!IsDirtyOrInTableOpDirty())
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 1ecee21..de4b6e6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3456,10 +3456,10 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument& rDoc,
 {
 DynamicKernel *pKernel;
 
-if (xGroup->meCalcState == sc::GroupCalcOpenCLKernelCompilationScheduled ||
-xGroup->meCalcState == sc::GroupCalcOpenCLKernelBinaryCreated)
+if (xGroup->meKernelState == sc::OpenCLKernelCompilationScheduled ||
+xGroup->meKernelState == sc::OpenCLKernelBinaryCreated)
 {
-if (xGroup->meCalcState == 
sc::GroupCalcOpenCLKernelCompilationScheduled)
+if (xGroup->meKernelState == sc::OpenCLKernelCompilationScheduled)
 {
 
ScFormulaCellGroup::sxCompilationThread->maCompilationDoneCondition.wait();
 
ScFormulaCellGroup::sxCompilationThread->maCompilationDoneCondition.reset();
diff --git a/sc/source/core/tool/clkernelthread.cxx 
b/sc/source/core/tool/clkernelthread.cxx
index 2a619c5..2715af6 100644
--- a/sc/source/core/tool/clkernelthread.cxx
+++ b/sc/source/core/tool/clkernelthread.cxx
@@ -51,13 +51,13 @@ void CLBuildKernelThread::execute()
 SAL_INFO("sc.opencl.thread", "told to compile group " << 
aWorkItem.mxGroup << " (state " << aWorkItem.mxGroup->meCalcState << ") to 
binary");
 if (aWorkItem.mxGroup->meCalcState == sc::GroupCalcDisabled)
 break;
-assert(aWorkItem.mxGroup->meCalcState == 
sc::GroupCalcOpenCLKernelCompilationScheduled);
+assert(aWorkItem.mxGroup->meKernelState == 
sc::OpenCLKernelCompilationScheduled);
 aWorkItem.mxGroup->mpCompiledFormula =
 
sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(*aWorkItem.mxGroup->mpTopCell->GetDocument(),

 aWorkItem.mxGroup->mpTopCell->aPos,
  

HELP: Impress language dictionary

[Alexandre Vicenzi]

Hi folks,

I was using Impress yesterday, and I can't find where I choose the current 
dictionary for spelling.
On Writer is on page bottom. 

Where is this option? It would be good to put at the same spot that Writer, I 
think.

Best regards,

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

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

[Eike Rathke]

 sc/source/core/data/validat.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 7122ef19847b26529ed1d5bad40df869e91a8495
Author: Eike Rathke 
Date:   Thu Mar 6 01:23:37 2014 +0100

resolved fdo#61520 do not add multiple empty strings to the validation list

Change-Id: I4f6180b2f8c914a965965ca362e1670e8b434d37

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 7889302..abfe67d 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -717,6 +717,8 @@ bool ScValidationData::GetSelectionFromFormula(
 }
 }
 
+bool bHaveEmpty = false;
+
 /* XL artificially limits things to a single col or row in the UI but does
  * not list the constraint in MOOXml. If a defined name or INDIRECT
  * resulting in 1D is entered in the UI and the definition later modified
@@ -737,6 +739,16 @@ bool ScValidationData::GetSelectionFromFormula(
 {
 aValStr = nMatVal.GetString().getString();
 
+// Do not add multiple empty strings to the validation list,
+// especially not if they'd bloat the tail with a million empty
+// entries for a column range, fdo#61520
+if (aValStr.isEmpty())
+{
+if (bHaveEmpty)
+continue;
+bHaveEmpty = true;
+}
+
 if( NULL != pStrings )
 pEntry = new ScTypedStrData( aValStr, 0.0, 
ScTypedStrData::Standard);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/formulagroup.hxx  |3 ++
 sc/source/core/data/formulacell.cxx  |   44 ---
 sc/source/core/tool/formulagroup.cxx |4 +++
 3 files changed, 23 insertions(+), 28 deletions(-)

New commits:
commit 95637452609260c97d8e5aaa7500531bb458a8bc
Author: Kohei Yoshida 
Date:   Wed Mar 5 18:47:07 2014 -0500

Fix incorrect group calc state check.

And the code in the else block is pretty dangerous as it passes an empty
token array to the group interpreter whose effect is entirely unpredictable.

Also, declare the destructor of CompiledFormula class to be virtual as it
serves as a base class for DynamicKernel.

Change-Id: I4e191550a4437ad6ebac55fcdeee4f3654722ff1

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 602c4a4..a3f1891 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -81,6 +81,9 @@ struct FormulaGroupContext : boost::noncopyable
  */
 class SC_DLLPUBLIC CompiledFormula
 {
+public:
+CompiledFormula();
+virtual ~CompiledFormula();
 };
 
 /**
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 8528828..3b20408 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3660,38 +3660,26 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (mxGroup->mbInvariant && false)
 return InterpretInvariantFormulaGroup();
 
-if (mxGroup->meCalcState == sc::GroupCalcEnabled)
-{
-ScTokenArray aCode;
-ScAddress aTopPos = aPos;
-aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
-ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
-if (!aConverter.convert(*pCode))
-{
-SAL_INFO("sc.opencl", "conversion of group " << this << " failed, 
disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
-mxGroup->meCalcState = sc::GroupCalcRunning;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
-{
-SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state 
" << mxGroup->meCalcState << ") failed, disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
-mxGroup->meCalcState = sc::GroupCalcEnabled;
+ScTokenArray aCode;
+ScAddress aTopPos = aPos;
+aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
+ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
+if (!aConverter.convert(*pCode))
+{
+SAL_INFO("sc.opencl", "conversion of group " << this << " failed, 
disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
 }
-else
+
+mxGroup->meCalcState = sc::GroupCalcRunning;
+if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
 {
-ScTokenArray aDummy;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
-{
-SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state 
" << mxGroup->meCalcState << ") failed, disabling");
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
-}
+SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " 
<< mxGroup->meCalcState << ") failed, disabling");
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
 }
 
+mxGroup->meCalcState = sc::GroupCalcEnabled;
 return true;
 }
 
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 8ddafd2..806d2d1 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -279,6 +279,10 @@ void fillMatrix( ScMatrix& rMat, size_t nCol, const 
double* pNums, rtl_uString**
 
 }
 
+CompiledFormula::CompiledFormula() {}
+
+CompiledFormula::~CompiledFormula() {}
+
 FormulaGroupInterpreterSoftware::FormulaGroupInterpreterSoftware() : 
FormulaGroupInterpreter()
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/qa/extras/ooxmlimport/data/rhbz988516.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   12 
 sw/source/core/unocore/unotext.cxx|2 ++
 writerfilter/source/ooxml/model.xml   |4 +++-
 4 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2
Author: Michael Stahl 
Date:   Wed Mar 5 23:29:06 2014 +0100

rhbz#988516: DOCX import: fix context stack when importing header/footer

When a header/footer substream is parsed, a ParagraphGroup is started,
but not ended; so the properties of the last paragraph in the
header/footer are applied to a paragraph in the body.

The obvious fix to add a call to endParagraphGroup() at the end of w:p
element breaks table cells.  So add a call to endParagraphGroup() at
the end of the "hdr"/"ftr" element.

(The problem in the bugdoc became much more visible with commit
ca555c596043c88894b964ac5e21f5a7271d5f3b, but was there before)

Change-Id: Ib054f1882793049b39424c1076ba5d4b319cd027

diff --git a/sw/qa/extras/ooxmlimport/data/rhbz988516.docx 
b/sw/qa/extras/ooxmlimport/data/rhbz988516.docx
new file mode 100644
index 000..38e2dcf
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/rhbz988516.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2392899..4f384d8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -198,6 +198,18 @@ DECLARE_OOXMLIMPORT_TEST(testN757890, "n757890.docx")
 CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER, nValue);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testRhbz988516, "rhbz988516.docx")
+{
+// The problem was that the list properties of the footer leaked into body
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getProperty(getParagraph(1), "NumberingStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Enclosure 3"), 
getParagraph(2)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getProperty(getParagraph(2), "NumberingStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getProperty(getParagraph(3), "NumberingStyleName"));
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo49940, "fdo49940.docx")
 {
 uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 8739717..70289f5 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24210,7 +24210,9 @@
   
   
 
-
+
+  
+
 
   
   
commit d3fcaef7dce044b7e053278a7ea972dc957ca7e2
Author: Michael Stahl 
Date:   Wed Mar 5 15:01:36 2014 +0100

SwXText::convertToTable(): assert that SwTable is client of table format

... which is wild guessing related to crash in rhbz#1010982.

Change-Id: Ifbd9309a5cff1fff3a8c6022d3a20b2b8c175dce

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 88e596b..721dda0 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2319,6 +2319,8 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException, std::exception)
 {
 }
 
+assert(SwTable::FindTable(pTable->GetFrmFmt()) == pTable);
+assert(pTable->GetFrmFmt() == pTextTable->GetFrmFmt());
 return xRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Do not convert SVGs to JPEGs when editing with external tool

[Alex Henrie]

This patch adds support for opening SVGs in the user's default SVG
viewer/editor. If the image cannot be exported to SVG directly, it is
exported as PNG instead. In no case will an SVG or an unrecognized
format be lossy-converted to JPEG.

Change-Id: I46dc8548c3cfb4d24a4a0078d4e3d7eee8367b1c
---
 svx/source/core/extedit.cxx   | 2 +-
 svx/source/core/graphichelper.cxx | 3 +++
 svx/source/xoutdev/_xoutbmp.cxx   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 9dd2e7e..853ae77 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -100,7 +100,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject )
 
 //Write Graphic to the Temp File
 GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
-sal_uInt16 nFilter(rGraphicFilter.GetExportFormatNumber(fExtension));
+sal_uInt16 
nFilter(rGraphicFilter.GetExportFormatNumberForShortName(fExtension));
 
 OUString aFilter(rGraphicFilter.GetExportFormatShortName(nFilter));
 
diff --git a/svx/source/core/graphichelper.cxx 
b/svx/source/core/graphichelper.cxx
index d914121..4878872 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -84,6 +84,9 @@ void GraphicHelper::GetPreferredExtension( OUString& 
rExtension, const Graphic&
 case GFX_LINK_TYPE_NATIVE_BMP:
 aExtension = "bmp";
 break;
+case GFX_LINK_TYPE_NATIVE_SVG:
+aExtension = "svg";
+break;
 default:
 break;
 }
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 1521c7a..bdf732a 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -231,7 +231,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& 
rGraphic, OUString& rFileNam
 
 if( GRFILTER_FORMAT_NOTFOUND == nFilter )
 {
-nFilter = rFilter.GetExportFormatNumberForShortName( 
FORMAT_JPG );
+nFilter = rFilter.GetExportFormatNumberForShortName( 
FORMAT_PNG );
 
 if( GRFILTER_FORMAT_NOTFOUND == nFilter )
 nFilter = rFilter.GetExportFormatNumberForShortName( 
FORMAT_BMP );
-- 
1.8.3.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 75240] improve coding style in bitmap3.cxx

[bugzilla-daemon]

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

Milan Zelenka  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |milanzele...@atlas.cz
   |desktop.org |

--- Comment #4 from Milan Zelenka  ---
Hi. I would like to start working on this issue as a part of my assignment at
school. The subject is called Open-Source programming. However, I am not fully
familiar with the open-source development yet therefore it might take a while
before I am finished with my work. The deadline should be at most in 10 weeks,
however, I believe I will be done with the work sooner. I hope this delay will
not be much of an issue and you will allow me to take my time. Thank you :-)

-- 
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] help.git: source/text

[Zolnai Tamás]

 source/text/swriter/01/05060900.xhp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8942a6afa77f5f9304e566041a0ccf28613c15ec
Author: Zolnai Tamás 
Date:   Wed Mar 5 22:32:49 2014 +0100

New feature: vertical alignment for text frames: help part

Change-Id: I6d1f7785160ce9152cf0919978533bf61e85e51e

diff --git a/source/text/swriter/01/05060900.xhp 
b/source/text/swriter/01/05060900.xhp
index 28ccba4..1c9eae5 100644
--- a/source/text/swriter/01/05060900.xhp
+++ b/source/text/swriter/01/05060900.xhp
@@ -77,6 +77,9 @@
 
 Text flow
 Specifies the 
preferred text flow direction in a frame. To use the default text flow settings 
for the page, select Use superordinate object settings from the 
list.
+
+Content vertical alignment
+Specifies the 
vertical alignment of the frame's content. Mainly it means text content, but it 
also affects tables and other objects anchored to the text area (anchored as 
character, to character or to paragraph), for example frames, graphics or 
drawings.
 
 Text 
direction.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Zolnai Tamás]

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

New commits:
commit 20c03592d9c436a6566f926154f46cbba0919675
Author: Zolnai Tamás 
Date:   Wed Mar 5 22:32:49 2014 +0100

Updated core
Project: help  8942a6afa77f5f9304e566041a0ccf28613c15ec

diff --git a/helpcontent2 b/helpcontent2
index 89290ae..8942a6a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 89290aeb021a3ab91a0a091537eaa7c8194c8449
+Subproject commit 8942a6afa77f5f9304e566041a0ccf28613c15ec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sw/source/core/inc/flyfrm.hxx|   13 +
 sw/source/core/inc/frame.hxx |2 
 sw/source/core/layout/calcmove.cxx   |   15 ++
 sw/source/core/layout/fly.cxx|  181 ++-
 sw/source/core/layout/flylay.cxx |8 +
 sw/source/ui/frmdlg/frmpage.cxx  |   36 +
 sw/source/ui/inc/frmpage.hxx |3 
 sw/uiconfig/swriter/ui/frmaddpage.ui |  233 +--
 8 files changed, 367 insertions(+), 124 deletions(-)

New commits:
commit cb19042f4395c97d123a27c6960d5e30d666c010
Author: Zolnai Tamás 
Date:   Wed Mar 5 22:15:09 2014 +0100

New feature: vertical alignment for text frames: Layout part

- Introduce a new attribute (content position) for fly frames. Content
position specify the top-left corner of the content area (where
frame content can be placed). Add methods and members for invalidation.
- Extract content's height calculation from SwFlyFrm::Format()
to a funtction so we can use this inside SwFlyFrm::MakeContentPos.

Change-Id: I64abb70afb652ad5c11aa69b5ba12a85210e215b

diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 234e94d..a666a9d 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -118,8 +118,12 @@ protected:
 
 friend class SwNoTxtFrm; // is allowed to call NotifyBackground
 
+Point m_aContentPos;// content area's position relatively to Frm
+bool m_bValidContentPos;
+
 virtual void Format( const SwBorderAttrs *pAttrs = 0 );
 void MakePrtArea( const SwBorderAttrs &rAttrs );
+void MakeContentPos( const SwBorderAttrs &rAttrs );
 
 void Lock() { bLocked = sal_True; }
 void Unlock()   { bLocked = sal_False; }
@@ -147,6 +151,8 @@ protected:
 
 virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
 
+SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips 
nMinHeight, const SwTwips nUL);
+
 public:
 // #i26791#
 TYPEINFO();
@@ -279,6 +285,13 @@ public:
 virtual   SwFlyFrmFmt *GetFmt();
 
 virtual void dumpAsXml( xmlTextWriterPtr writer ) { 
SwLayoutFrm::dumpAsXml( writer ); };
+
+virtual void Calc() const;
+
+const Point& ContentPos() const { return m_aContentPos; }
+Point& ContentPos() { return m_aContentPos; }
+
+void InvalidateContentPos();
 };
 #endif
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index c78614a..73b32f8 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -682,7 +682,7 @@ public:
 inline SwLayoutFrm *GetPrevLayoutLeaf();
 inline SwLayoutFrm *GetNextLayoutLeaf();
 
-inline void Calc() const;   // here might be "formatted"
+virtual void Calc() const;  // here might be "formatted"
 inline void OptCalc() const;// here we assume (for optimization) that
 // the predecessors are already formatted
 
diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index b8e9b12..88be7b6 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -25,6 +25,7 @@
 #include "fmtftn.hxx"
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -581,7 +582,11 @@ void SwFrm::MakePos()
 else
 {
 maFrm.Pos( GetUpper()->Frm().Pos() );
-maFrm.Pos() += GetUpper()->Prt().Pos();
+if( GetUpper()->IsFlyFrm() )
+maFrm.Pos() += 
static_cast(GetUpper())->ContentPos();
+else
+maFrm.Pos() += GetUpper()->Prt().Pos();
+
 if( FRM_NEIGHBOUR & nMyType && IsRightToLeft() )
 {
 if( bVert )
@@ -1335,6 +1340,14 @@ void SwCntntFrm::MakeAll()
 if ( nConsequetiveFormatsWithoutChange <= cnStopFormat )
 {
 Format();
+
+// When a lower of a vertically aligned fly frame changes it's 
size we need to recalculate content pos.
+if( GetUpper() && GetUpper()->IsFlyFrm() &&
+GetUpper()->GetFmt()->GetTextVertAdjust().GetValue() != 
SDRTEXTVERTADJUST_TOP )
+{
+static_cast(GetUpper())->InvalidateContentPos();
+GetUpper()->SetCompletePaint();
+}
 }
 #if OSL_DEBUG_LEVEL > 0
 else
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index df97a35..5d0aede 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -72,7 +72,8 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm 
*pAnch ) :
 bLayout( sal_False ),
 bAutoPosition( sal_False ),
 bNoShrink( sal_False ),
-bLockDeleteContent( sal_False )
+bLockDeleteContent( sal_False ),
+m_bValidContentPos( false )
 {
 mnType = FRMC_FLY;
 
@@ -931,6 +932,13 @@ void SwFlyFrm::_Upd

Re: Current Build from Git: Writer-Wizards don't run

[Jean-Baptiste Faure]

Hi,
Le 03/03/2014 20:36, Andreas Mantke a écrit :
> Hi Stephan,
> 
> Am 03.03.2014 12:02, schrieb Stephan Bergmann:
>> On 03/02/2014 05:45 PM, Andreas Mantke wrote:
>>> I build LibreOffice from the current master on my openSuSE 12.3-x64 and
>>> the Writer wizzards don't run anymore.

It almost works for me this morning with Version: 4.3.0.0.alpha0+
Build ID: 0b2637dda47690da69f748119081151f41fe4133

Only the "documents converter" wizard does not start, all others start
as expected. It starts as expected in LO 4.2.3.0.0+.

Best regards
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 83/510855eff12832682adfb0c1093ccb5cfc7b13

[Caolán McNamara]

 83/510855eff12832682adfb0c1093ccb5cfc7b13 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4e8ed518869feed2b2ece1abc10ff4a402768027
Author: Caolán McNamara 
Date:   Wed Mar 5 20:42:04 2014 +

Notes added by 'git notes add'

diff --git a/83/510855eff12832682adfb0c1093ccb5cfc7b13 
b/83/510855eff12832682adfb0c1093ccb5cfc7b13
new file mode 100644
index 000..24ebf9b
--- /dev/null
+++ b/83/510855eff12832682adfb0c1093ccb5cfc7b13
@@ -0,0 +1 @@
+merged as: 3b6a4c3bee4696332dd547096d5501e28a195770
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 17 commits - sc/source sd/source sfx2/source svtools/source sw/source

[Caolán McNamara]

 sc/source/core/data/funcdesc.cxx |2 -
 sd/source/ui/func/fuchar.cxx |   13 ++-
 sd/source/ui/func/fucopy.cxx |   32 ++---
 sd/source/ui/func/fudraw.cxx |2 -
 sd/source/ui/func/fuparagr.cxx   |   34 +++
 sd/source/ui/func/fupoor.cxx |2 -
 sd/source/ui/func/futext.cxx |   23 +---
 sd/source/ui/slideshow/showwin.cxx   |3 +-
 sd/source/ui/slideshow/slideshowimpl.cxx |8 ---
 sfx2/source/doc/docfilt.cxx  |   13 ---
 svtools/source/control/scriptedtext.cxx  |2 -
 sw/source/core/crsr/swcrsr.cxx   |   25 +-
 sw/source/filter/ww8/docxexport.cxx  |7 --
 sw/source/filter/ww8/wrtw8sty.cxx|2 -
 sw/source/filter/ww8/wrtww8.cxx  |2 -
 15 files changed, 93 insertions(+), 77 deletions(-)

New commits:
commit 4516e300534fe982bb42d5b58b872406fa7991c5
Author: Caolán McNamara 
Date:   Wed Mar 5 20:39:27 2014 +

crash indexing -1

Change-Id: Ia339bed9bad3b43ec1e4ea813646cab81cf3a619

diff --git a/svtools/source/control/scriptedtext.cxx 
b/svtools/source/control/scriptedtext.cxx
index 23e5d56..acc1ab7 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -233,7 +233,7 @@ void SvtScriptedTextHelper_Impl::CalculateBreaks( const 
uno::Reference< i18n::XB
 maScriptVec.push_back( nScript );
 nCharIx = nNextCharIx;
 }
-while( nCharIx < nNextPos );
+while( nCharIx < nNextPos && nCharIx != -1 );
 }
 // nothing to do for following portions
 }
commit adb265b23118a8fe172e6ce978c77e4b1e0b0d67
Author: Caolán McNamara 
Date:   Wed Mar 5 20:25:48 2014 +

coverity#982309 Logically dead code

Change-Id: Id05614cf8c90d1c845876e8a6592df8420d57d47

diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 60b53bc..f62ae7d 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -190,7 +190,6 @@ OUString SfxFilter::GetTypeFromStorage(
 throw ( beans::UnknownPropertyException, lang::WrappedTargetException, 
uno::RuntimeException )
 {
 SfxFilterMatcher aMatcher;
-const char* pType=0;
 OUString aName;
 if ( pFilterName )
 {
@@ -243,17 +242,7 @@ OUString SfxFilter::GetTypeFromStorage(
 }
 }
 
-//TODO: do it without SfxFilter
-//TODO/LATER: don't yield FilterName, should be done in FWK!
-OUString aRet;
-if ( pType )
-{
-aRet = OUString::createFromAscii(pType);
-if ( pFilterName )
-*pFilterName = aMatcher.GetFilter4EA( aRet )->GetName();
-}
-
-return aRet;
+return OUString();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e7da9d42350a7d51798e0c60c7655f99d03aa3f5
Author: Caolán McNamara 
Date:   Wed Mar 5 17:01:45 2014 +

coverity#735941 Dereference after null check

Change-Id: Ic4b27068cb3dc359ec24d4af12c64585a3a3f09a

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index b68368c..493a57d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -796,8 +796,11 @@ void DocxExport::WriteSettings()
 FSEND );
 
 // Zoom
-OString aZoom(OString::number(pViewShell->GetViewOptions()->GetZoom()));
-pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
+if (pViewShell)
+{
+OString 
aZoom(OString::number(pViewShell->GetViewOptions()->GetZoom()));
+pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
+}
 
 // Display Background Shape
 if (boost::optional oBrush = getBackground())
commit 8e3593107b6eca1935b3b6134f662542a9013096
Author: Caolán McNamara 
Date:   Wed Mar 5 17:00:11 2014 +

coverity#735944 Dereference after null check

Change-Id: I2123943de85d80127042a5b3e8f5b0c1b2b4f288

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index a506801..57266c7 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1048,7 +1048,7 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport 
)
 pSet = &pTblNd->GetTable().GetFrmFmt()->GetAttrSet();
 pNd = pTblNd;
 }
-else if ( 0 != ( pSectNd = pNd->FindSectionNode() ) )
+else if (pNd && 0 != ( pSectNd = pNd->FindSectionNode() ))
 {
 if ( TOX_HEADER_SECTION == pSectNd->GetSection().GetType() &&
  pSectNd->StartOfSectionNode()->IsSectionNode() )
commit c64aac2f18c25f6c8c3c6261c80fd923bed0f9b2
Author: Caolán McNamara 
Date:   Wed Mar 5 16:57:00 2014 +

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc

[Kohei Yoshida]

 sc/inc/stlalgorithm.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6a2d5f7f42406487ca2c77ed1c17856c5a4b47b8
Author: Kohei Yoshida 
Date:   Wed Mar 5 15:35:33 2014 -0500

Build fix for OSX.

Change-Id: I63613c40a5a947625c449fcd52ca129af116c900

diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index 5cc22f2..fb2b35b 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -14,7 +14,9 @@
 #include 
 
 #include 
+#if defined(WNT) || defined (__ANDROID__)
 #include 
+#endif
 
 /**
  * Function object to allow deleting instances stored in STL containers as
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60739] cut/paste coding redux

[bugzilla-daemon]

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

--- Comment #8 from Michael Meeks  ---
Lenka - it'd be great to have you working on that =) what I'd suggest you do is
to whack it in one of the source/ui pieces - and then some purist will come
along and sort that out; the key piece is doing the careful de-duplication -
analysing the problem & hacking out the bloat: then trying to work out if the
special cases / differences are deliberate or accidental ;-)

Beyond that the naming of the new headers / classes is up to your creativity -
it's easy to search/replace them in the patch usually as long as they are
reasonably unique.

Thanks so much for looking at this !

-- 
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 60739] cut/paste coding redux

[bugzilla-daemon]

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

--- Comment #7 from Lenka  ---
Hi people, I would like to solve this bug. Any advice for the common place for
that code?

-- 
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: 2 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx   |   41 ---
 writerfilter/source/doctok/resources.xmi   |   93 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   84 +++---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   16 +++-
 4 files changed, 69 insertions(+), 165 deletions(-)

New commits:
commit 1484eee9437346fce788fb4afc8488900a5c4fd1
Author: Miklos Vajna 
Date:   Wed Mar 5 21:00:51 2014 +0100

writerfilter: remove handling of never-generated sprm:CRgFtc{0,1,2} tokens

Change-Id: Idbdd4d9b8e0498f09c9a66391a8e8d0bd31606ea

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6e0f4e3..e30f83a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1506,47 +1506,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 case NS_ooxml::LN_EG_RPrBase_kern: // auto kerning is bound to a minimum 
font size in Word - but not in Writer :-(
 rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::makeAny( 
sal_Bool(nIntValue) ) );
 break;
-case NS_sprm::LN_CRgFtc0:  // sprmCRgFtc0 //ascii font index
-case NS_sprm::LN_CRgFtc1:  // sprmCRgFtc1 //Asian font index
-case NS_sprm::LN_CRgFtc2:  // sprmCRgFtc2 //CTL font index
-{
-FontTablePtr pFontTable = m_pImpl->GetFontTable();
-if(nIntValue >= 0 && pFontTable->size() > sal_uInt32(nIntValue))
-{
-PropertyIds eFontName= PROP_CHAR_FONT_NAME;
-PropertyIds eFontStyle   = PROP_CHAR_FONT_STYLE;
-PropertyIds eFontFamily  = PROP_CHAR_FONT_FAMILY;
-PropertyIds eFontCharSet = PROP_CHAR_FONT_CHAR_SET;
-PropertyIds eFontPitch   = PROP_CHAR_FONT_PITCH;
-switch(nSprmId)
-{
-case NS_sprm::LN_CRgFtc0:
-//already initialized
-break;
-case NS_sprm::LN_CRgFtc1:
-eFontName = PROP_CHAR_FONT_NAME_ASIAN;
-eFontStyle =PROP_CHAR_FONT_STYLE_ASIAN;
-eFontFamily =   PROP_CHAR_FONT_FAMILY_ASIAN;
-eFontCharSet =  PROP_CHAR_FONT_CHAR_SET_ASIAN;
-eFontPitch =PROP_CHAR_FONT_PITCH_ASIAN;
-break;
-case NS_sprm::LN_CRgFtc2:
-eFontName = PROP_CHAR_FONT_NAME_COMPLEX;
-eFontStyle =PROP_CHAR_FONT_STYLE_COMPLEX;
-eFontFamily =   PROP_CHAR_FONT_FAMILY_COMPLEX;
-eFontCharSet =  PROP_CHAR_FONT_CHAR_SET_COMPLEX;
-eFontPitch =PROP_CHAR_FONT_PITCH_COMPLEX;
-break;
-}
-(void)eFontFamily;
-(void)eFontStyle;
-const FontEntry::Pointer_t 
pFontEntry(pFontTable->getFontEntry(sal_uInt32(nIntValue)));
-rContext->Insert(eFontName, uno::makeAny( 
pFontEntry->sFontName  ));
-rContext->Insert(eFontCharSet, uno::makeAny( 
(sal_Int16)pFontEntry->nTextEncoding  ));
-rContext->Insert(eFontPitch, uno::makeAny( 
pFontEntry->nPitchRequest  ));
-}
-}
-break;
 case NS_ooxml::LN_EG_RPrBase_w:
 rContext->Insert(PROP_CHAR_SCALE_WIDTH,
  uno::makeAny( sal_Int16(nIntValue) ));
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 7c955d1..5f2b4d8 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -100,99 +100,6 @@
   
 
 
-
-
-  
-
-  
-  
-
-  0x4A4F
-  
-
-  
-
-  
-  
-
-  
rtf:sprmCRgFtc0
-  
-
-  
-
-  
-  
-
-  character
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x4A50
-  
-
-  
-
-  
-  
-
-  
rtf:sprmCRgFtc1
-  
-
-  
-
-  
-  
-
-  character
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x4A51
-  
-
-  
-
-  
-  
-
-  
rtf:sprmCRgFtc2
-  
-   

[Libreoffice-commits] core.git: 10 commits - include/sax oox/source sax/source sw/qa sw/source writerfilter/source

[Tomaž Vajngerl]

 include/sax/fastattribs.hxx   |1 
 oox/source/token/tokens.txt   |1 
 sax/source/tools/fastattribs.cxx  |6 +
 sw/qa/extras/ooxmlexport/data/AnchorId.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx   |   12 ++
 sw/source/filter/ww8/docxsdrexport.cxx|   76 +--
 writerfilter/source/dmapper/GraphicImport.cxx |  129 --
 writerfilter/source/dmapper/GraphicImport.hxx |   55 ++-
 writerfilter/source/ooxml/model.xml   |   20 +++-
 9 files changed, 219 insertions(+), 81 deletions(-)

New commits:
commit 477684669a03e7c6048b804ca3f3ebec43a4d071
Author: Tomaž Vajngerl 
Date:   Wed Mar 5 20:21:58 2014 +0100

ooxml: round-trip test for w14:anchorId & wp14:anchorId

Change-Id: Iada0ba2b6d1450167977915fe95a38b5bab2559c

diff --git a/sw/qa/extras/ooxmlexport/data/AnchorId.docx 
b/sw/qa/extras/ooxmlexport/data/AnchorId.docx
new file mode 100644
index 000..b1b6668
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/AnchorId.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index d3e6f6b..ed9f630 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -890,6 +890,18 @@ DECLARE_OOXMLEXPORT_TEST(testGroupshapeThemeFont, 
"groupshape-theme-font.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Cambria"), getProperty(xRun, 
"CharFontName"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testAnchorIdForWP14AndW14, "AnchorId.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:r[3]/mc:AlternateContent/mc:Choice/w:drawing/wp:inline",
 "anchorId", "78735EFD");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:r[3]/mc:AlternateContent/mc:Fallback/w:pict/v:rect",
 "anchorId", "78735EFD");
+
+
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit ce5cca0cdad0a414d7f5a8e007a38755e1ae1b51
Author: Tomaž Vajngerl 
Date:   Wed Mar 5 20:21:04 2014 +0100

ooxml export: writer anchorId for "inline" element

Change-Id: I366c329cbdcafdda87feef73802b4d1be991bb4f

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index eeca450..835892c 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -405,12 +405,19 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* 
pFrmFmt, const Size& rS
 }
 else
 {
-m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_inline,
-   XML_distT, 
OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr(),
-   XML_distB, 
OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr(),
-   XML_distL, 
OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr(),
-   XML_distR, 
OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr(),
-   FSEND);
+sax_fastparser::FastAttributeList* aAttrList = 
m_pImpl->m_pSerializer->createAttrList();
+aAttrList->add(XML_distT, 
OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr());
+aAttrList->add(XML_distB, 
OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
+aAttrList->add(XML_distL, 
OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
+aAttrList->add(XML_distR, 
OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr());
+const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
+if (pObj != NULL)
+{
+OUString sAnchorId = lclGetAnchorIdFromGrabBag(pObj);
+if (!sAnchorId.isEmpty())
+aAttrList->addNS(XML_wp14, XML_anchorId, 
OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
+}
+m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_inline, aAttrList);
 }
 
 // now the common parts
commit 25acc2efb9df1090f9bb8f696fa1d43508b7a9b8
Author: Tomaž Vajngerl 
Date:   Wed Mar 5 20:20:03 2014 +0100

writerfilter: also push anchorId for inline to a FrameGrabBag

Change-Id: I187affa518f0df8717c75855d3ea78a5bea7e69b

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index cd014c8..5f6d50d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -587,6 +587,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 //enable overlapping - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_wp14_anchorId:
+case NS_ooxml::LN_CT_Inline_wp14_anchorId:
 {
 OUStringBuffer aBuffer = OUString::number(nIntValue, 16);
 OUStringBuffer aString;
commit e9c6b925957b

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc

[Kohei Yoshida]

 sc/inc/stlalgorithm.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e83598ae9e55e5f3fd21faa296f0e81df1ddca4b
Author: Kohei Yoshida 
Date:   Wed Mar 5 13:58:56 2014 -0500

Build fix on Windows.

Change-Id: Icbd46d5bc72bdc07490dd45b3d29a4400a66119f

diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index d2beaa6..5cc22f2 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -80,9 +80,9 @@ public:
 
 size_type size = n*sizeof(value_type);
 #ifdef WNT
-return _aligned_malloc(size, _Alignment);
+return (pointer)_aligned_malloc(size, _Alignment);
 #elif defined __ANDROID__
-return memalign(_Alignment, size);
+return (pointer)memalign(_Alignment, size);
 #else
 void* ptr;
 int err = posix_memalign(&ptr, _Alignment, size);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/dbgui/pvfundlg.cxx |   28 ++--
 sc/source/ui/inc/pvfundlg.hxx   |4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 425c0b91026ea4e319ee195e686befcc98de9e60
Author: Eike Rathke 
Date:   Wed Mar 5 19:05:24 2014 +0100

more list type correctness

Change-Id: I97cc37c05782b6ab2cd7b8b63a4315ba2386f1ef

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 2f2910b..9bc0b1c 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -176,14 +176,14 @@ void ScDPFunctionListBox::SetSelection( sal_uInt16 
nFuncMask )
 if( (nFuncMask == PIVOT_FUNC_NONE) || (nFuncMask == PIVOT_FUNC_AUTO) )
 SetNoSelection();
 else
-for( sal_uInt16 nEntry = 0, nCount = GetEntryCount(); nEntry < nCount; 
++nEntry )
+for( sal_Int32 nEntry = 0, nCount = GetEntryCount(); nEntry < nCount; 
++nEntry )
 SelectEntryPos( nEntry, (nFuncMask & spnFunctions[ nEntry ]) != 0 
);
 }
 
 sal_uInt16 ScDPFunctionListBox::GetSelection() const
 {
 sal_uInt16 nFuncMask = PIVOT_FUNC_NONE;
-for( sal_uInt16 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; 
++nSel )
+for( sal_Int32 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; 
++nSel )
 nFuncMask |= spnFunctions[ GetSelectEntryPos( nSel ) ];
 return nFuncMask;
 }
@@ -233,7 +233,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
 aRef.ReferenceType = mxLbTypeWrp->GetControlValue();
 aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectEntry());
 
-sal_uInt16 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
+sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
 switch( nBaseItemPos )
 {
 case SC_BASEITEM_PREV_POS:
@@ -309,8 +309,8 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& 
rLabelData, const ScPivotFuncDa
 }
 else
 {
-sal_uInt16 nStartPos = mbEmptyItem ? (SC_BASEITEM_USER_POS + 
1) : SC_BASEITEM_USER_POS;
-sal_uInt16 nPos = FindBaseItemPos( 
rFuncData.maFieldRef.ReferenceItemName, nStartPos );
+sal_Int32 nStartPos = mbEmptyItem ? (SC_BASEITEM_USER_POS + 1) 
: SC_BASEITEM_USER_POS;
+sal_Int32 nPos = FindBaseItemPos( 
rFuncData.maFieldRef.ReferenceItemName, nStartPos );
 if( nPos >= mpLbBaseItem->GetEntryCount() )
 nPos = (mpLbBaseItem->GetEntryCount() > 
SC_BASEITEM_USER_POS) ? SC_BASEITEM_USER_POS : SC_BASEITEM_PREV_POS;
 mpLbBaseItem->SelectEntryPos( nPos );
@@ -331,9 +331,9 @@ const OUString& ScDPFunctionDlg::GetBaseItemName(const 
OUString& rLayoutName) co
 return itr == maBaseItemNameMap.end() ? rLayoutName : itr->second;
 }
 
-sal_uInt16 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, 
sal_uInt16 nStartPos ) const
+sal_Int32 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_Int32 
nStartPos ) const
 {
-sal_uInt16 nPos = nStartPos;
+sal_Int32 nPos = nStartPos;
 bool bFound = false;
 while (nPos < mpLbBaseItem->GetEntryCount())
 {
@@ -625,7 +625,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& 
rDataFields, bool bEnableLayou
 if( m_pLbSortBy->GetEntryCount() > SC_SORTDATA_POS )
 m_pLbSortBy->SetSeparatorPos( SC_SORTDATA_POS - 1 );
 
-sal_uInt16 nSortPos = SC_SORTNAME_POS;
+sal_Int32 nSortPos = SC_SORTNAME_POS;
 if( nSortMode == DataPilotFieldSortMode::DATA )
 {
 nSortPos = FindListBoxEntry( *m_pLbSortBy, 
maLabelData.maSortInfo.Field, SC_SORTDATA_POS );
@@ -691,7 +691,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& 
rDataFields, bool bEnableLayou
 lclFillListBox( *m_pLbHierarchy, maLabelData.maHiers );
 sal_Int32 nHier = maLabelData.mnUsedHier;
 if( (nHier < 0) || (nHier >= maLabelData.maHiers.getLength()) ) nHier 
= 0;
-m_pLbHierarchy->SelectEntryPos( static_cast< sal_uInt16 >( nHier ) );
+m_pLbHierarchy->SelectEntryPos( static_cast< sal_Int32 >( nHier ) );
 m_pLbHierarchy->SetSelectHdl( LINK( this, ScDPSubtotalOptDlg, 
SelectHdl ) );
 }
 else
@@ -706,8 +706,8 @@ void ScDPSubtotalOptDlg::InitHideListBox()
 m_pLbHide->Clear();
 lclFillListBox( *m_pLbHide, maLabelData.maMembers );
 size_t n = maLabelData.maMembers.size();
-for (size_t i = 0; i < n; ++i)
-m_pLbHide->CheckEntryPos(static_cast(i), 
!maLabelData.maMembers[i].mbVisible);
+for (sal_uLong i = 0; i < n; ++i)
+m_pLbHide->CheckEntryPos(i, !maLabelData.maMembers[i].mbVisible);
 bool bEnable = m_pLbHide->GetEntryCount() > 0;
 m_pHideFrame->Enable(bEnable);
 }
@@ -718,10 +718,10 @@ ScDPName ScDPSubtotalOptDlg::GetFieldName(const OUString& 
rLayoutName) const
 return itr == maDataFieldNameMap.end() ? ScDPName() : itr->second;
 }
 
-sal_uInt16 ScDPSubtotalOptDlg::FindListBoxEntry(
-const ListBox& rLBox, const OUStr

[Bug 70414] create VSProject files for code editing in MSVS from gbuild

[bugzilla-daemon]

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

--- Comment #17 from Honza Havlíček  ---
(In reply to comment #16)
> Hello all!
> 
> When I try to execute /opt/lo/bin/make vs2012-ide-integration
> , I am getting strange error:
> 
> Vort@Vort-PC /cygdrive/e/_Projects/libreoffice-build
> $ /opt/lo/bin/make vs2012-ide-integration
> cd E:/_Projects/libreoffice-core && (LC_MESSAGES=C /opt/lo/bin/make
> cmd="/opt/lo/bin/make -npf Makefile.gbuild all" cmd || true) |
> E:/_Projects/libreoffice-core/bin/gbuild-to-ide --ide vs2012
> make[1]: *** No rule to make target `cmd'.  Stop.
> Solution LibreOffice:
> 
> What I need to do to fix this?

Hi, 

thank you for trying out the generator. 

You are trying to generate solution in directory
(/cygdrive/e/_Projects/libreoffice-build) other than the one with sources
(E:/_Projects/libreoffice-core/).

I had some problems with that (IIRC the same message you got), try to 
* go to your directory with sources (/cygdrive/e/_Projects/libreoffice-core/) 
* run the autogen.sh with reasonable parameters (e.g. the ones from
https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies)
* run command "/opt/lo/bin/make vs2012-ide-integration" there.

If that fails, try to build the LO and then "/opt/lo/bin/make
vs2012-ide-integration" (building shouldn't be necessary, but just to be sure).

I will try to investigate the issue more thoroughly.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc

[Kohei Yoshida]

 sc/inc/stlalgorithm.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3bc4e283fc941c6f8c334de31fd34031afa0fef
Author: Kohei Yoshida 
Date:   Wed Mar 5 12:28:21 2014 -0500

Oopsy.

Change-Id: Ie961fca03b99ec14f401462da56dd4110ea5518c
Reviewed-on: https://gerrit.libreoffice.org/8467
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index f788667..d2beaa6 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -82,7 +82,7 @@ public:
 #ifdef WNT
 return _aligned_malloc(size, _Alignment);
 #elif defined __ANDROID__
-return memalign(align, size);
+return memalign(_Alignment, size);
 #else
 void* ptr;
 int err = posix_memalign(&ptr, _Alignment, size);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sc/source/ui/dbgui/dpgroupdlg.cxx |6 +++---
 sc/source/ui/inc/dpgroupdlg.hxx   |2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 85901343fd9f5075aba96101f7dc759cc61a25d2
Author: Tor Lillqvist 
Date:   Wed Mar 5 19:14:22 2014 +0200

WaE: sal_Bool vs. bool

Change-Id: I8d5a959fdca8f7deefffb0c3a0529d2e32595df4

diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx 
b/sc/source/ui/dbgui/dpgroupdlg.cxx
index b733340..03a9c63 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -230,8 +230,8 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent,
 for( size_t nIdx = 0 ; nIdx < nCount; ++nIdx )
 mpLbUnits->InsertEntry( ScGlobal::GetRscString( nDatePartResIds[nIdx] 
) );
 
-mpEdStart->SetShowDateCentury( sal_True );
-mpEdEnd->SetShowDateCentury( sal_True );
+mpEdStart->SetShowDateCentury( true );
+mpEdEnd->SetShowDateCentury( true );
 
 maStartHelper.SetValue( rInfo.mbAutoStart, rInfo.mfStart );
 maEndHelper.SetValue( rInfo.mbAutoEnd, rInfo.mfEnd );
@@ -278,7 +278,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent,
 ScDPNumGroupInfo ScDPDateGroupDlg::GetGroupInfo() const
 {
 ScDPNumGroupInfo aInfo;
-aInfo.mbEnable = sal_True;
+aInfo.mbEnable = true;
 aInfo.mbDateValues = mpRbNumDays->IsChecked();
 aInfo.mbAutoStart = maStartHelper.IsAuto();
 aInfo.mbAutoEnd = maEndHelper.IsAuto();
commit eadce168120506771aa01b83bef25fc325abcbe0
Author: Tor Lillqvist 
Date:   Wed Mar 5 19:12:58 2014 +0200

WaE: unused private fields

Change-Id: I56d280b896b9e676994750cb684fab23bdc7060f

diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 9ed7c7d..e4f2fcf 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -115,8 +115,6 @@ private:
 ScDoubleField*   mpEdEnd;
 ScDoubleField*   mpEdBy;
 OKButton*mpBtnOk;
-CancelButton*mpBtnCancel;
-HelpButton*  mpBtnHelp;
 ScDPNumGroupEditHelper maStartHelper;
 ScDPNumGroupEditHelper maEndHelper;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc

[Kohei Yoshida]

 sc/inc/formulagroup.hxx |4 +-
 sc/inc/stlalgorithm.hxx |   79 
 2 files changed, 82 insertions(+), 1 deletion(-)

New commits:
commit 5e34a3236258f47374c34e5c7ab92fde9b981bb7
Author: Kohei Yoshida 
Date:   Wed Feb 26 16:29:27 2014 -0500

Ensure that numeric array storage is aligned to 256-byte boundary.

OpenCL devices require this else we would get a performance hit.

(cherry picked from commit 03f7a342011a4f69cfcbec7af3e4f1a2e835618b)
(cherry picked from commit 757856e9275d19e2c7a3673d10fa8963fb9fbeb3)

Change-Id: Ie69e07dc5d9b62abad5cc39d1f30e1d770c56758
Reviewed-on: https://gerrit.libreoffice.org/8466
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 3834e49..602c4a4 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -13,6 +13,7 @@
 #include "address.hxx"
 #include "types.hxx"
 #include "platforminfo.hxx"
+#include 
 
 #include "svl/sharedstringpool.hxx"
 
@@ -28,7 +29,8 @@ namespace sc {
 
 struct FormulaGroupContext : boost::noncopyable
 {
-typedef std::vector NumArrayType;
+typedef AlignedAllocator DoubleAllocType;
+typedef std::vector NumArrayType;
 typedef std::vector StrArrayType;
 typedef boost::ptr_vector NumArrayStoreType;
 typedef boost::ptr_vector StrArrayStoreType;
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index fb5509f..f788667 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -11,6 +11,10 @@
 #define __SC_STLALGORITHM_HXX__
 
 #include 
+#include 
+
+#include 
+#include 
 
 /**
  * Function object to allow deleting instances stored in STL containers as
@@ -25,6 +29,81 @@ struct ScDeleteObjectByPtr : public 
::std::unary_function
 }
 };
 
+namespace sc {
+
+/**
+ * Custom allocator for STL container to ensure that the base address of
+ * allocated storage is aligned to a specified boundary.
+ */
+template
+class AlignedAllocator
+{
+public:
+typedef T value_type;
+typedef size_t size_type;
+typedef std::ptrdiff_t difference_type;
+
+typedef T* pointer;
+typedef const T* const_pointer;
+typedef T* void_pointer;
+
+typedef T& reference;
+typedef const T& const_reference;
+
+template
+struct rebind
+{
+typedef AlignedAllocator<_Type2,_Alignment> other;
+};
+
+AlignedAllocator() {}
+~AlignedAllocator() {}
+
+template
+AlignedAllocator(const AlignedAllocator<_Type2,_Alignment>&) {}
+
+void construct(T* p, const value_type& val) { new(p) value_type(val); }
+void destroy(T* p) { p->~value_type(); }
+
+size_type max_size() const
+{
+return std::numeric_limits::max() / sizeof(value_type);
+}
+
+bool operator== (const AlignedAllocator&) const { return true; }
+bool operator!= (const AlignedAllocator&) const { return false; }
+
+pointer allocate(size_type n)
+{
+if (!n)
+return NULL;
+
+size_type size = n*sizeof(value_type);
+#ifdef WNT
+return _aligned_malloc(size, _Alignment);
+#elif defined __ANDROID__
+return memalign(align, size);
+#else
+void* ptr;
+int err = posix_memalign(&ptr, _Alignment, size);
+if (err)
+ptr = NULL;
+return (pointer)ptr;
+#endif
+}
+
+void deallocate(pointer p, size_type)
+{
+#ifdef WNT
+_aligned_free(p);
+#else
+free(p);
+#endif
+}
+};
+
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 forms/source/component/FormattedField.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 191a50828c8b5aa0f694ea7e1c8e6fce69cd1982
Author: Stephan Bergmann 
Date:   Wed Mar 5 17:57:11 2014 +0100

simplify

Change-Id: Icd2dff124ca331935412e2653c57943b92deeea4

diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index ec4c7cd..533c6fa 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -957,7 +957,7 @@ Any OFormattedModel::translateControlValueToExternalValue( 
) const
 // if this asserts ... well, the somebody set the TreatAsNumeric 
property to false,
 // and the control value is a string. This implies some weird 
misconfiguration
 // of the FormattedModel, so we won't care for it for the moment.
-aExternalValue <<= (sal_Bool)( fValue ? sal_True : sal_False );
+aExternalValue <<= fValue != 0.0;
 }
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools

[Stephan Bergmann]

 include/tools/helpers.hxx |   34 --
 1 file changed, 32 insertions(+), 2 deletions(-)

New commits:
commit f51f03a46102333bac6a7fe06bc8538492f413a5
Author: Stephan Bergmann 
Date:   Wed Mar 5 12:24:14 2014 +0100

Do not needlessly truncate MinMax argument before comparison with bounds

Change-Id: I218e70d6a19901107fd037af255ad29692c850d4
Reviewed-on: https://gerrit.libreoffice.org/8461
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index c3cb88f..8b04050 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
@@ -9,9 +9,39 @@
 #ifndef INCLUDED_TOOLS_HELPERS_HXX
 #define INCLUDED_TOOLS_HELPERS_HXX
 
-inline long MinMax( long nVal, long nMin, long nMax )
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+template
+inline
+typename boost::enable_if<
+boost::mpl::or_< boost::is_signed, boost::is_floating_point >, long>
+::type
+MinMax(T nVal, long nMin, long nMax)
+{
+assert(nMin <= nMax);
+return nVal >= nMin
+? (nVal <= nMax ? static_cast(nVal) : nMax) : nMin;
+}
+
+template
+inline typename boost::enable_if, long>::type MinMax(
+T nVal, long nMin, long nMax)
 {
-return nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin;
+assert(nMin <= nMax);
+return nMax < 0
+? nMax
+: ((nMin < 0 || nVal >= static_cast(nMin))
+   ? (nVal <= static_cast(nMax)
+  ? static_cast(nVal) : nMax)
+   : nMin);
 }
 
 inline long AlignedWidth4Bytes( long nWidthBits )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svl/source/numbers/zforfind.cxx   |2 +-
 svl/source/numbers/zforfind.hxx   |2 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx |4 ++--
 vcl/source/edit/texteng.cxx   |3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0e78ce148371f8ae27f4660403dd057a1f632ecf
Author: Stephan Bergmann 
Date:   Wed Mar 5 13:27:17 2014 +0100

Operators for Point are only overloaded for long, not double

...so no use giving double arguments that are implicitly cast to long 
anyway.

Change-Id: I26b9059fc5ab0d55c3f320e2b2f55502423541a9

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index b1bd8d8..3ed2605 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1737,8 +1737,8 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& 
rSrcPt, sal_uInt16& rSegm
 const Point aPreviousEndPoint(GetPoint( 
seqCoordinates[ rSrcPt - 1 ], true, true));
 const Point aControlQ(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
 const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
-const Point aControlA((aPreviousEndPoint + 
(aControlQ * 2.0)) / 3.0);
-const Point aControlB(((aControlQ * 2.0) + aEnd) / 
3.0);
+const Point aControlA((aPreviousEndPoint + 
(aControlQ * 2)) / 3);
+const Point aControlB(((aControlQ * 2) + aEnd) / 
3);
 
 DBG_ASSERT(aNewB2DPolygon.count(), 
"EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!)");
 aNewB2DPolygon.appendBezierSegment(
commit a7859d08ab3f4c214e83d311a5db7aeed2f707b5
Author: Stephan Bergmann 
Date:   Wed Mar 5 13:07:31 2014 +0100

Work around unfortunate libstdc++ interpretation of C++ cmath requirements

...that causes a call to std::abs with a short argument to effectively 
select
the double overload (via a template added with 
"include/c_std/cmath (abs(_Tp)): Add"), see
 "Validity 
and
return type of std::abs(0u) is unclear" for details.

The workaround is to use int instead of short arguments (and make sure the
integral overloads of std::abs from cstdlib are available).

Change-Id: If95363f9a54abb9cb1a57fd4828c4b91c12bc4be

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6119ca2..4bb4c18 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -19,7 +19,7 @@
 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 6e24040..5738ce6 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -104,7 +104,7 @@ private:
 static const sal_uInt8 nMatchedUsedAsReturn; // 0x10
 
 intnSign;   // Sign of number
-short  nMonth;  // Month (1..x) if date
+intnMonth;  // Month (1..x) if date
 // negative => short format
 short  nMonthPos;   // 1 = front, 2 = middle
 // 3 = end
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 0fdaa68..5567c90 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -53,6 +53,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -2183,7 +2184,7 @@ bool TextEngine::CreateLines( sal_uLong nPara )
 pTEParaPortion->GetLines().push_back( pL );
 }
 
-const short nInvalidDiff = pTEParaPortion->GetInvalidDiff();
+const int nInvalidDiff = pTEParaPortion->GetInvalidDiff();
 const sal_uInt16 nInvalidStart = pTEParaPortion->GetInvalidPosStart();
 const sal_uInt16 nInvalidEnd =  nInvalidStart + std::abs( nInvalidDiff );
 bool bQuickFormat = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 padmin/source/pamain.cxx |   54 ++-
 1 file changed, 30 insertions(+), 24 deletions(-)

New commits:
commit 42df210d4b2132bea2850e5320abf8d5984c2017
Author: Stephan Bergmann 
Date:   Thu Feb 27 13:18:36 2014 +0100

fdo#75540 setProcessServiceFactory must be called before InitVCL

...because InitVCL now calls:

> comphelper::getProcessServiceFactory
> comphelper::getProcessComponentContext
> utl::DefaultFontConfiguration::DefaultFontConfiguration
> rtl::Static::get
> utl::DefaultFontConfiguration::get
> ImplStyleData::SetStandardStyles
> ImplStyleData::ImplStyleData
> boost::make_shared
> StyleSettings::StyleSettings
> ImplAllSettingsData::ImplAllSettingsData
> boost::make_shared
> AllSettings::AllSettings
> Application::InitSettings
> Application::GetSettings
> GtkInstance::AfterAppInit
> InitVCL
> ImplSVMain
> SVMain
> sal_main
> main

and Application::Main is only called after InitVCL.

(cherry picked from commit c828e3cc409077a1916911b8abf1d7b8dbb2078a)
Conflicts:
padmin/source/pamain.cxx

Change-Id: I1126e33f454a4ea35ef295cbd3f48429c473efb4
Reviewed-on: https://gerrit.libreoffice.org/8381
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: David Tardon 

diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index bbccadf..b510f99 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -51,6 +51,11 @@ public:
 virtual sal_uInt16  Exception( sal_uInt16 nError );
 
 static OUString ReadStringHook( const OUString& );
+
+private:
+virtual void Init() SAL_OVERRIDE;
+
+Reference< XComponentContext > xCtx_;
 };
 
 void vclmain::createApplication()
@@ -84,35 +89,13 @@ int MyApp::Main()
 
 EnableAutoHelpId();
 
-//-
-// create the global service-manager
-//-
-Reference< XComponentContext > xCtx;
-Reference< XMultiServiceFactory > xFactory;
-try
-{
-xCtx = defaultBootstrap_InitialComponentContext();
-xFactory = Reference< XMultiServiceFactory >(  
xCtx->getServiceManager(), UNO_QUERY );
-if( xFactory.is() )
-setProcessServiceFactory( xFactory );
-}
-catch( const com::sun::star::uno::Exception& )
-{
-}
-
-if( ! xFactory.is() )
-{
-fprintf( stderr, "Could not bootstrap UNO, installation must be in 
disorder. Exiting.\n" );
-exit( 1 );
-}
-
 // Detect desktop environment - need to do this as early as possible
 com::sun::star::uno::setCurrentContext(
 new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
 
 // Create UCB (for backwards compatibility, in case some code still uses
 // plain createInstance w/o args directly to obtain an instance):
-com::sun::star::ucb::UniversalContentBroker::create(xCtx);
+com::sun::star::ucb::UniversalContentBroker::create(xCtx_);
 
 /*
  * Initialize the Java UNO AccessBridge if accessibility is turned on
@@ -139,7 +122,7 @@ int MyApp::Main()
  */
 try
 {
-Reference xComp(xCtx, UNO_QUERY_THROW);
+Reference xComp(xCtx_, UNO_QUERY_THROW);
 xComp->dispose();
 }
 catch(...)
@@ -149,4 +132,27 @@ int MyApp::Main()
 return EXIT_SUCCESS;
 }
 
+void MyApp::Init()
+{
+// create the global service-manager
+
+Reference< XMultiServiceFactory > xFactory;
+try
+{
+xCtx_ = defaultBootstrap_InitialComponentContext();
+xFactory = Reference< XMultiServiceFactory >(  
xCtx_->getServiceManager(), UNO_QUERY );
+if( xFactory.is() )
+setProcessServiceFactory( xFactory );
+}
+catch( const com::sun::star::uno::Exception& )
+{
+}
+
+if( ! xFactory.is() )
+{
+fprintf( stderr, "Could not bootstrap UNO, installation must be in 
disorder. Exiting.\n" );
+exit( 1 );
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - cui/source drawinglayer/source editeng/source include/svtools include/xmloff offapi/com sc/source svtools/source sw/source xmloff/sou

[Kohei Yoshida]

 cui/source/inc/border.hxx |2 
 cui/source/tabpages/border.cxx|   72 +-
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |  120 ++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |4 
 editeng/source/items/borderline.cxx   |5 
 editeng/source/items/frmitems.cxx |2 
 include/svtools/ctrlbox.hxx   |9 
 include/xmloff/xmltoken.hxx   |1 
 offapi/com/sun/star/table/BorderLineStyle.idl |   10 
 sc/source/filter/excel/xistyle.cxx|2 
 sc/source/filter/html/htmlexp.cxx |1 
 sc/source/filter/lotus/lotattr.cxx|2 
 sc/source/filter/oox/stylesbuffer.cxx |4 
 svtools/source/control/ctrlbox.cxx|9 
 sw/source/core/layout/paintfrm.cxx|  369 --
 xmloff/source/core/xmltoken.cxx   |1 
 xmloff/source/style/bordrhdl.cxx  |   44 -
 17 files changed, 408 insertions(+), 249 deletions(-)

New commits:
commit c909ebf6ea9ce3251ddb69fd0c57d00c3f361f88
Author: Kohei Yoshida 
Date:   Mon Mar 3 17:58:11 2014 -0500

fdo#75260: Correctly draw double lines for both Writer and Calc.

Fix all sorts of incorrect double line handling in drawinglayer in order to
draw thick-thin double line types correctly.  Also change handling of border
lines in writer tables. There are still some outstanding issues but it's
much better than how it was before.

Also realized that Word and Excel handle simple thin double lines 
differently;
Word varies widths of all of the lines and the gap whereas Excel only has 
one
fixed size for its double line.  For this reason I decided to add a separate
double line type (DOUBLE_THIN) to handle Excel's double line.

(cherry picked from commit 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc)

Conflicts:
cui/source/tabpages/border.cxx
sc/qa/unit/subsequent_export-test.cxx
sc/source/ui/view/tabvwsha.cxx
sw/source/core/layout/paintfrm.cxx
xmloff/source/style/bordrhdl.cxx

Conflicts:
cui/source/tabpages/border.cxx
sw/source/core/layout/paintfrm.cxx
xmloff/source/style/bordrhdl.cxx

Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 445222a..645115f 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -130,6 +130,8 @@ private:
 voidResetFrameLine_Impl( svx::FrameBorderType eBorder,
  const editeng::SvxBorderLine* 
pCurLine,
  bool bValid );
+
+bool IsBorderLineStyleAllowed( sal_Int16 nStyle ) const;
 };
 
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 26f3a0c..a147975 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include "borderconn.hxx"
+#include 
 
 using namespace ::editeng;
 
@@ -332,6 +333,11 @@ void SvxBorderTabPage::ResetFrameLine_Impl( 
svx::FrameBorderType eBorder, const
 }
 }
 
+bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 /*nStyle*/ ) const
+{
+return true;
+}
+
 // ---
 
 void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
@@ -985,37 +991,49 @@ void SvxBorderTabPage::FillLineListBox_Impl()
 {
 using namespace ::com::sun::star::table::BorderLineStyle;
 
+struct {
+sal_Int16 mnStyle;
+long mnMinWidth;
+LineListBox::ColorFunc mpColor1Fn;
+LineListBox::ColorFunc mpColor2Fn;
+LineListBox::ColorDistFunc mpColorDistFn;
+} aLines[] = {
+// Simple lines
+{ SOLID,   0, &sameColor, &sameColor, &sameDistColor },
+{ DOTTED,  0, &sameColor, &sameColor, &sameDistColor },
+{ DASHED,  0, &sameColor, &sameColor, &sameDistColor },
+{ FINE_DASHED, 0, &sameColor, &sameColor, &sameDistColor },
+
+// Double lines
+{ DOUBLE,  10, &sameColor, &sameColor, &sameDistColor },
+{ DOUBLE_THIN, 10, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
+
+{ EMBOSSED, 15, &SvxB

Re: Widget Conversion: Getting hard to find the last 175 remaining

[Caolán McNamara]

On Wed, 2014-03-05 at 10:49 -0300, Joao S. O. Bueno wrote:
> Maybe L.O. could have in the future a submenu where all tabs and
> dialogs could be found? Or a "dialog browser" tool?

Well, we sort of have something like that in the sense that every dialog
associated with a command can be put into a mega menu by using the
customization dialog to create a menu of everything, but so many
commands are context sensitive so that the dialog won't launch unless
it's in the right context. e.g. today's conversion of the pivot table
date group dialog can only be tested if a date cell was selected before
launching the dialog.

And there's the extra edge case of e.g. warning/error dialogs that only
appear if certain errors take place, and a few times I've just thrown my
hat at it and temporarily hacked in a "yes there's an error" condition
in order to see the dialog rather than figure out how to recreate the
real condition, e.g. "this operation is taking a long time, do you want
to turn off viewing redlines to make it faster", *shudder*

C.

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

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

[Norbert Thiebaud]

 include/ucbhelper/macros.hxx |  234 ---
 ucb/source/cacher/cachedcontentresultset.cxx |   13 +
 ucb/source/cacher/cachedcontentresultsetstub.cxx |   11 -
 ucb/source/cacher/cacheddynamicresultset.cxx |   11 -
 ucb/source/cacher/cacheddynamicresultsetstub.cxx |   11 -
 ucb/source/cacher/contentresultsetwrapper.cxx|   12 +
 ucb/source/core/provprox.cxx |   15 -
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |   14 -
 8 files changed, 72 insertions(+), 249 deletions(-)

New commits:
commit 10fe4b9fd17e1da11ea7ebfa354f40c2e2da3f3f
Author: Norbert Thiebaud 
Date:   Tue Mar 4 12:55:44 2014 -0600

de-macroize XINTERFACE_COMMON_IMPL

Change-Id: I7cffc8a111dd939272c6dbef8827b6f5c04a4590
Reviewed-on: https://gerrit.libreoffice.org/8455
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index c6f31a6..4a494e9 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -72,13 +72,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( 
   \
 
 
 
-// 1 interface implemented
-#define XINTERFACE_IMPL_1( Class, Ifc1 )\
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class )  \
-(static_cast< Ifc1* >(this))  \
-QUERYINTERFACE_IMPL_END
-
 // 2 interfaces implemented
 #define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 )  \
 XINTERFACE_COMMON_IMPL( Class ) \
@@ -129,33 +122,6 @@ QUERYINTERFACE_IMPL_START( Class ) 
 \
 (static_cast< I6* >(this))\
 QUERYINTERFACE_IMPL_END
 
-// 7 interfaces implemented
-#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 ) \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class )  \
-(static_cast< I1* >(this)),   \
-(static_cast< I2* >(this)),   \
-(static_cast< I3* >(this)),   \
-(static_cast< I4* >(this)),   \
-(static_cast< I5* >(this)),   \
-(static_cast< I6* >(this)),   \
-(static_cast< I7* >(this))\
-QUERYINTERFACE_IMPL_END
-
-// 8 interfaces implemented
-#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 )  \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class )  \
-(static_cast< I1* >(this)),   \
-(static_cast< I2* >(this)),   \
-(static_cast< I3* >(this)),   \
-(static_cast< I4* >(this)),   \
-(static_cast< I5* >(this)),   \
-(static_cast< I6* >(this)),   \
-(static_cast< I7* >(this)),   \
-(static_cast< I8* >(this))\
-QUERYINTERFACE_IMPL_END
-
 // 9 interfaces implemented
 #define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 )   \
 XINTERFACE_COMMON_IMPL( Class ) \
@@ -171,119 +137,6 @@ QUERYINTERFACE_IMPL_START( Class )
  \
 (static_cast< I9* >(this))\
 QUERYINTERFACE_IMPL_END
 
-// 10 interfaces implemented
-#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 )  \
-XINTERFACE_COMMON_IMPL( Class ) \
-QUERYINTERFACE_IMPL_START( Class )  \
-(static_cast< I1* >(this)),   \
-(static_cast< I2* >(this)),   \
-(static_cast< I3* >(this)),   \
-(static_cast< I4* >(this)),   \
-(static_cast< I5* >(this)),   \
-(static_cast< I6* >(this)),   \
-(static_cast< I7* >(this)),   \
-(static_cast< I8* >(this)),   \
-(static_cast< I9* >(this)), 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source drawinglayer/source editeng/source include/svtools include/xmloff offapi/com sc/source svtools/source sw/source xmloff/source

[Kohei Yoshida]

 cui/source/inc/border.hxx |2 
 cui/source/tabpages/border.cxx|   73 +-
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |  120 ++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |4 
 editeng/source/items/borderline.cxx   |5 
 editeng/source/items/frmitems.cxx |2 
 include/svtools/ctrlbox.hxx   |9 
 include/xmloff/xmltoken.hxx   |1 
 offapi/com/sun/star/table/BorderLineStyle.idl |   10 
 sc/source/filter/excel/xistyle.cxx|2 
 sc/source/filter/html/htmlexp.cxx |1 
 sc/source/filter/lotus/lotattr.cxx|2 
 sc/source/filter/oox/stylesbuffer.cxx |4 
 svtools/source/control/ctrlbox.cxx|9 
 sw/source/core/layout/paintfrm.cxx|  369 --
 xmloff/source/core/xmltoken.cxx   |1 
 xmloff/source/style/bordrhdl.cxx  |   46 -
 17 files changed, 407 insertions(+), 253 deletions(-)

New commits:
commit 743d331357af5204108186f0428e949f68d966c7
Author: Kohei Yoshida 
Date:   Mon Mar 3 17:58:11 2014 -0500

fdo#75260: Correctly draw double lines for both Writer and Calc.

Fix all sorts of incorrect double line handling in drawinglayer in order to
draw thick-thin double line types correctly.  Also change handling of border
lines in writer tables. There are still some outstanding issues but it's
much better than how it was before.

Also realized that Word and Excel handle simple thin double lines 
differently;
Word varies widths of all of the lines and the gap whereas Excel only has 
one
fixed size for its double line.  For this reason I decided to add a separate
double line type (DOUBLE_THIN) to handle Excel's double line.

(cherry picked from commit 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc)

Conflicts:
cui/source/tabpages/border.cxx
sc/qa/unit/subsequent_export-test.cxx
sc/source/ui/view/tabvwsha.cxx
sw/source/core/layout/paintfrm.cxx
xmloff/source/style/bordrhdl.cxx

Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4
Reviewed-on: https://gerrit.libreoffice.org/8464
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 793d584..8f66e5d 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -130,6 +130,8 @@ private:
 voidResetFrameLine_Impl( svx::FrameBorderType eBorder,
  const editeng::SvxBorderLine* 
pCurLine,
  bool bValid );
+
+bool IsBorderLineStyleAllowed( sal_Int16 nStyle ) const;
 };
 
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 6713ee8..d2d12ac 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include "borderconn.hxx"
+#include 
 
 using namespace ::editeng;
 
@@ -332,6 +333,11 @@ void SvxBorderTabPage::ResetFrameLine_Impl( 
svx::FrameBorderType eBorder, const
 }
 }
 
+bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 /*nStyle*/ ) const
+{
+return true;
+}
+
 // ---
 
 void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
@@ -985,38 +991,49 @@ void SvxBorderTabPage::FillLineListBox_Impl()
 {
 using namespace ::com::sun::star::table::BorderLineStyle;
 
+struct {
+sal_Int16 mnStyle;
+long mnMinWidth;
+LineListBox::ColorFunc mpColor1Fn;
+LineListBox::ColorFunc mpColor2Fn;
+LineListBox::ColorDistFunc mpColorDistFn;
+} aLines[] = {
+// Simple lines
+{ SOLID,   0, &sameColor, &sameColor, &sameDistColor },
+{ DOTTED,  0, &sameColor, &sameColor, &sameDistColor },
+{ DASHED,  0, &sameColor, &sameColor, &sameDistColor },
+{ FINE_DASHED, 0, &sameColor, &sameColor, &sameDistColor },
+
+// Double lines
+{ DOUBLE,  10, &sameColor, &sameColor, &sameDistColor },
+{ DOUBLE_THIN, 10, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
+{ THINTHICK_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
+{ THICKTHIN_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
+
+{ EMBOSSED, 15, &SvxBorderLine::threeDLightColor, 

[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source xmlhelp/source

[Norbert Thiebaud]

 include/ucbhelper/activedatasink.hxx |9 +--
 include/ucbhelper/activedatastreamer.hxx |9 +--
 include/ucbhelper/commandenvironment.hxx |7 +
 include/ucbhelper/contenthelper.hxx  |7 +
 include/ucbhelper/contentinfo.hxx|   14 ++-
 include/ucbhelper/macros.hxx |   17 --
 include/ucbhelper/propertyvalueset.hxx   |7 +
 include/ucbhelper/providerhelper.hxx |   10 +---
 include/ucbhelper/resultset.hxx  |7 +
 include/ucbhelper/resultsethelper.hxx|7 +
 include/ucbhelper/resultsetmetadata.hxx  |7 +
 ucb/source/cacher/cachedcontentresultset.cxx |7 +
 ucb/source/cacher/cachedcontentresultset.hxx |   18 +++
 ucb/source/cacher/cachedcontentresultsetstub.hxx |   18 +++
 ucb/source/cacher/cacheddynamicresultset.hxx |   19 +++-
 ucb/source/cacher/cacheddynamicresultsetstub.hxx |   20 +++--
 ucb/source/cacher/contentresultsetwrapper.hxx|9 +--
 ucb/source/cacher/dynamicresultsetwrapper.hxx|9 +--
 ucb/source/core/identify.hxx |7 +
 ucb/source/core/provprox.hxx |   14 ++-
 ucb/source/core/ucb.hxx  |7 +
 ucb/source/core/ucbprops.hxx |7 +
 ucb/source/core/ucbstore.cxx |7 +
 ucb/source/core/ucbstore.hxx |   21 +++--
 ucb/source/sorter/sortdynres.hxx |   27 +++
 ucb/source/sorter/sortresult.cxx |7 +
 ucb/source/sorter/sortresult.hxx |7 +
 ucb/source/ucp/cmis/cmis_content.hxx |8 +-
 ucb/source/ucp/cmis/cmis_provider.hxx|7 +
 ucb/source/ucp/cmis/cmis_repo_content.hxx|8 +-
 ucb/source/ucp/ftp/ftpcontent.hxx|7 +
 ucb/source/ucp/ftp/ftpcontentprovider.hxx|7 +
 ucb/source/ucp/gio/gio_content.hxx   |8 +-
 ucb/source/ucp/gio/gio_provider.hxx  |7 +
 ucb/source/ucp/gvfs/gvfs_content.hxx |7 +
 ucb/source/ucp/gvfs/gvfs_provider.hxx|7 +
 ucb/source/ucp/hierarchy/hierarchycontent.hxx|7 +
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |7 +
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx |7 +
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx   |7 +
 ucb/source/ucp/package/pkgcontent.hxx|7 +
 ucb/source/ucp/package/pkgprovider.hxx   |7 +
 ucb/source/ucp/tdoc/tdoc_content.hxx |7 +
 ucb/source/ucp/tdoc/tdoc_provider.hxx|7 +
 ucb/source/ucp/webdav-neon/webdavcontent.hxx |7 +
 ucb/source/ucp/webdav-neon/webdavprovider.hxx|7 +
 ucb/source/ucp/webdav/webdavcontent.hxx  |7 +
 ucb/source/ucp/webdav/webdavprovider.hxx |7 +
 ucbhelper/source/client/content.cxx  |7 +
 ucbhelper/source/provider/resultset.cxx  |7 +
 xmlhelp/source/cxxhelp/provider/content.hxx  |7 +
 xmlhelp/source/cxxhelp/provider/provider.hxx |7 +
 52 files changed, 375 insertions(+), 108 deletions(-)

New commits:
commit 66f2c35fac22a235a1e491824126f105e6d3869c
Author: Norbert Thiebaud 
Date:   Tue Mar 4 12:55:07 2014 -0600

de-macroize XINTERFACE_DECL

Change-Id: Iaa1cf999189f6b62547c208eadc38150400ca0fe
Reviewed-on: https://gerrit.libreoffice.org/8454
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/include/ucbhelper/activedatasink.hxx 
b/include/ucbhelper/activedatasink.hxx
index deaf6ac..5adf7be 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -45,8 +45,13 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink : public 
cppu::OWeakObject,
 com::sun::star::io::XInputStream > m_xStream;
 
 public:
- // XInterface
-XINTERFACE_DECL()
+// XInterface
+virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType )
+throw( css::uno::RuntimeException, std::exception );
+virtual void SAL_CALL acquire()
+throw();
+virtual void SAL_CALL release()
+throw();
 
 // XTypeProvider
 XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/activedatastreamer.hxx 
b/include/ucbhelper/activedatastreamer.hxx
index 799f7ee..0c1af6a 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -44,8 +44,13 @@ class ActiveDataStreamer : public cppu::OWeakObject,
 com::sun::star::io::XStream > m_xStream;
 
 public:
- // XInterface
-XINTERFACE_DECL()
+// XInterface
+virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Typ

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

[Douglas Mencken]

 fpicker/source/aqua/FilterHelper.mm  |4 
 fpicker/source/aqua/SalAquaFilePicker.mm |4 
 fpicker/source/aqua/SalAquaPicker.mm |   29 +
 3 files changed, 37 insertions(+)

New commits:
commit 578bd15399a16b0a32e752e19ae42d989321d731
Author: Douglas Mencken 
Date:   Sun Mar 2 22:06:25 2014 -0500

Currently used file pickers API doesn't work for OS X < 10.6

Change-Id: I69592ada3a413cae2d0def2faa495db44894ed3f
Reviewed-on: https://gerrit.libreoffice.org/8430
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/fpicker/source/aqua/FilterHelper.mm 
b/fpicker/source/aqua/FilterHelper.mm
index 4132783..5ee7b44 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -385,7 +385,11 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* 
sFilename)
 }
 
 NSFileManager *manager = [NSFileManager defaultManager];
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+NSDictionary* pAttribs = [manager fileAttributesAtPath: sFilename 
traverseLink: NO];
+#else
 NSDictionary* pAttribs = [manager attributesOfItemAtPath: sFilename error: 
nil];
+#endif
 if( pAttribs )
 {
 NSObject* pType = [pAttribs objectForKey: NSFileType];
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm 
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 0d62482..6c2aa35 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -761,7 +761,11 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
 rtl::OUString suffix = (*(aStringList.begin())).copy(1);
 NSString *requiredFileType = [NSString stringWithOUString:suffix];
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+[m_pDialog setRequiredFileType:requiredFileType];
+#else
 [m_pDialog setAllowedFileTypes:[NSArray 
arrayWithObjects:requiredFileType, nil]];
+#endif
 
 OSL_TRACE("disallowing other file types");
 [m_pDialog setAllowsOtherFileTypes:NO];
diff --git a/fpicker/source/aqua/SalAquaPicker.mm 
b/fpicker/source/aqua/SalAquaPicker.mm
index 664088f..baff7c3 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -165,6 +165,19 @@ int SalAquaPicker::run()
 
 int retVal = 0;
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+NSString *startDirectory;
+if (m_sDisplayDirectory.getLength() > 0) {
+NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
+NSURL *url = [NSURL URLWithString:temp];
+startDirectory = [url path];
+
+OSL_TRACE("start dir: %s", [startDirectory UTF8String]);
+}
+else {
+startDirectory = NSHomeDirectory();
+}
+#else
 NSURL *startDirectory;
 if (m_sDisplayDirectory.getLength() > 0) {
 NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
@@ -175,17 +188,26 @@ int SalAquaPicker::run()
 else {
 startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() 
isDirectory:YES];
 }
+#endif
 
 switch(m_nDialogType) {
 case NAVIGATIONSERVICES_DIRECTORY:
 case NAVIGATIONSERVICES_OPEN:
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+retVal = [(NSOpenPanel*)m_pDialog 
runModalForDirectory:startDirectory file:nil types:nil];
+#else
 [m_pDialog setDirectoryURL:startDirectory];
 retVal = [(NSOpenPanel*)m_pDialog runModal];
+#endif
 break;
 case NAVIGATIONSERVICES_SAVE:
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+retVal = [m_pDialog runModalForDirectory:startDirectory 
file:[NSString 
stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]];
+#else
 [m_pDialog setDirectoryURL:startDirectory];
 [m_pDialog setNameFieldStringValue:[NSString 
stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]];
 retVal = [m_pDialog runModal];
+#endif
 break;
 // [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog 
saveFilename] modalForWindow:[NSApp keyWindow] 
modalDelegate:((SalAquaFilePicker*)this)->getDelegate() 
didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) 
contextInfo:nil];
 default:
@@ -193,10 +215,17 @@ int SalAquaPicker::run()
 }
 
 if (retVal == NSFileHandlingPanelOKButton) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+NSString* pDir = [m_pDialog directory];
+if (pDir) {
+implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] 
OUStringForInfo:FULLPATH]);
+}
+#else
 NSURL* pDir = [m_pDialog directoryURL];
 if (pDir) {
 implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]);
 }
+#endif
 }
 DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 vcl/osx/salframeview.mm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 644dbbc9d0098c02c8a1edd7d12daf13edca7eda
Author: Joren De Cuyper 
Date:   Tue Feb 25 23:10:44 2014 +0100

Switch to -magnification instead of -deltaZ for mac osx pinch-to-zoom

Using pinch-to-zoom in LibreOffice result in following warning in terminal:
soffice[2376:507] -deltaZ is deprecated for NSEventTypeMagnify.  Please use 
-magnification.

Following 
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/lMxCG03aZNs
-deltaZ is deprecated since OSX 10.6. Therefore use -magnification. The 
forum also
mentions the fact the steps are 500 times smaller. Lets use this factor 500 
to keep the
behavior as consistent as possible

Change-Id: Ie769c518492e5b149a5301b19cae8d841047cb22
Reviewed-on: https://gerrit.libreoffice.org/8345
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index e521957..e556bf3 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -765,11 +765,11 @@ private:
 
 if( bNewSeries )
 mfMagnifyDeltaSum = 0.0;
-mfMagnifyDeltaSum += [pEvent deltaZ];
+mfMagnifyDeltaSum += [pEvent magnification];
 
mfLastMagnifyTime = [pEvent timestamp];
// TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow 
finer zooming control
-   static const float fMagnifyFactor = 0.25;
+   static const float fMagnifyFactor = 0.25*500;
 static const float fMinMagnifyStep = 15.0 / fMagnifyFactor;
 if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svtools/source/control/ctrlbox.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 160d289564428c458f4923fe2eb5bfe28c3c61a7
Author: Eike Rathke 
Date:   Wed Mar 5 16:20:31 2014 +0100

cast to the higher capacity type instead

Change-Id: I515f315c93dd19016dfdabdf9524606214f84891

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 5461863..1065b34 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -827,7 +827,7 @@ sal_Int32 LineListBox::InsertEntry( const OUString& rStr, 
sal_Int32 nPos )
 {
 nPos = ListBox::InsertEntry( rStr, nPos );
 if ( nPos != LISTBOX_ERROR ) {
-if ( nPos < static_cast(pLineList->size()) ) {
+if ( static_cast(nPos) < pLineList->size() ) {
 ImpLineList::iterator it = pLineList->begin();
 ::std::advance( it, nPos );
 pLineList->insert( it, reinterpret_cast(NULL) );
@@ -855,7 +855,7 @@ void LineListBox::RemoveEntry( sal_Int32 nPos )
 {
 ListBox::RemoveEntry( nPos );
 
-if ( 0 <= nPos && nPos < static_cast(pLineList->size()) ) {
+if ( 0 <= nPos && static_cast(nPos) < pLineList->size() ) {
 ImpLineList::iterator it = pLineList->begin();
 ::std::advance( it, nPos );
 if ( *it ) delete *it;
@@ -901,7 +901,7 @@ sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) 
const
 
 sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const
 {
-ImpLineListData* pData = (0 <= nPos && nPos < 
static_cast(pLineList->size())) ? (*pLineList)[ nPos ] : NULL;
+ImpLineListData* pData = (0 <= nPos && static_cast(nPos) < 
pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
 return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Keith Curtis]

 vcl/inc/unx/saldisp.hxx |2 --
 vcl/unx/generic/app/saldisp.cxx |   23 ---
 vcl/unx/generic/gdi/salgdi.cxx  |8 ++--
 3 files changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 9f308fbc02439e25f8932314a9374c205ebdbc4c
Author: Keith Curtis 
Date:   Fri Feb 21 19:21:27 2014 -0500

Simplify resolution calculation

Removed unnecessary complexity with resolutions because X in 2014 isn't
telling the truth about the size of the screen. My brand-new 13" laptop
with the latest X and everything apparently has a 33" x 18" monitor. So
if the data isn't reliable, just use 96 dpi anyway which is a very
reasonable default.

Also got rid of exact resolution member variable. LibreOffice can just
always think it has exact resolution. If it doesn't, then it just means
the code needs to be smarter, not that we need a flag about whether the
data we have is "exact" or not.

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

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 1125608..9b98a76 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -252,7 +252,6 @@ protected:
 std::vector< ScreenData >m_aScreens;
 ScreenData  m_aInvalidScreenData;
 PairaResolution_;   // [dpi]
-boolmbExactResolution;
 sal_uLong   nMaxRequestSize_;   // [byte]
 
 srv_vendor_tmeServerVendor;
@@ -353,7 +352,6 @@ public:
 const SalVisual&  GetVisual( SalX11Screen nXScreen ) const { return 
getDataForScreen(nXScreen).m_aVisual; }
 RenderEntryMap&   GetRenderEntries( SalX11Screen nXScreen ) const { 
return getDataForScreen(nXScreen).m_aRenderData; }
 const Pair &GetResolution() const { return aResolution_; }
-boolGetExactResolution() const { return mbExactResolution; }
 sal_uLong   GetProperties() const { return PROPERTY_DEFAULT; }
 sal_uLong   GetMaxRequestSize() const { return nMaxRequestSize_; }
 XLIB_Time   GetLastUserEventTime( bool bAlwaysReget = false ) const;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c343552..99060cd 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -540,7 +540,7 @@ void SalDisplay::Init()
 int nDisplayScreens = ScreenCount( pDisp_ );
 m_aScreens = std::vector(nDisplayScreens);
 
-mbExactResolution = false;
+bool bExactResolution = false;
 /*  #i15507#
  *  Xft resolution should take precedence since
  *  it is what modern desktops use.
@@ -554,27 +554,12 @@ void SalDisplay::Init()
 if( (nDPI >= 50) && (nDPI <= 500) )
 {
 aResolution_ = Pair( nDPI, nDPI );
-mbExactResolution = true;
+bExactResolution = true;
 }
 }
-if( mbExactResolution == false )
+if( bExactResolution == false )
 {
-int nDisplayWidth = DisplayWidthMM ( pDisp_, 
m_nXDefaultScreen.getXScreen() );
-int nDisplayHeight = DisplayHeightMM( pDisp_, 
m_nXDefaultScreen.getXScreen() );
-
-if (nDisplayHeight == 0 || nDisplayWidth == 0)
-{
-aResolution_ = Pair( 96, 96 );
-SAL_WARN("vcl", "screen width/height reported as 0!, using 
fallback 96dpi");
-}
-else
-{
-aResolution_ =
-Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ),
-   nDisplayWidth ),
-  DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ),
-   nDisplayHeight ) );
-}
+aResolution_ = Pair( 96, 96 );
 }
 
 nMaxRequestSize_= XExtendedMaxRequestSize( pDisp_ ) * 4;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 018f833..c4b9cf9 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -484,12 +484,8 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, 
sal_Int32 &rDPIY ) // cons
 
 rDPIX = pDisplay->GetResolution().A();
 rDPIY = pDisplay->GetResolution().B();
-if( !pDisplay->GetExactResolution() && rDPIY < 96 )
-{
-rDPIX = Divide( rDPIX * 96, rDPIY );
-rDPIY = 96;
-}
-else if ( rDPIY > 200 )
+
+if ( rDPIY > 200 )
 {
 rDPIX = Divide( rDPIX * 200, rDPIY );
 rDPIY = 200;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

some comments about OOXML and 6536826f2f4c747582d60ed40b0418c6a67a9829

[Markus Mohrhard]

Hey,

I had a quick look at [1] and noticed that it introduces again
relationships with a URL starting with "
http://schemas.openxmlformats.org/officeDocument/2006/relationships";.
Please be careful when you add such relationships and try to use a way that
takes care of the OOXML strict relationships at the same time. An example
for this is
oox::core::Relations::getFragmentPathFromFirstTypeFromOfficeDoc

Basically all relations of that type have to be checked against the OOXML
transitional URL and the OOXML strict URL during import. Sadly it seems
that I did not get all places correct for writer yet so testing OOXML
strict with writer still only shows an empty document.

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

[Libreoffice-commits] core.git: drawinglayer/source editeng/source include/vcl sw/source vcl/source

[Keith Curtis]

 drawinglayer/source/processor2d/helperwrongspellrenderer.cxx |   14 
 editeng/source/editeng/impedit3.cxx  |   16 
 include/vcl/outdev.hxx   |7 --
 sw/source/core/inc/wrong.hxx |7 --
 sw/source/core/txtnode/fntcache.cxx  |   34 --
 vcl/source/gdi/outdev3.cxx   |   37 +++
 6 files changed, 22 insertions(+), 93 deletions(-)

New commits:
commit ff6f3164dfc454354bee79eac30d6cc279b8a0ec
Author: Keith Curtis 
Date:   Sat Feb 22 05:30:00 2014 -0500

Simplify DrawWave

This patch simplifies the DrawWave logic. Callers of that code would try to
figure out what size wave to draw and pass down a style integer to
DrawWaveLine, but DrawWaveLine already has logic which trims the height of 
the
wave so it doesn't need the hint.

This doesn't change the UNO API
(::com::sun::star::awt::FontUnderline::SMALLWAVE), but it does get rid of
internal usages and maps those small waves to normal.

Note that changing the zoom in Calc right now causes spelling underlines to
disappear. That bug is not related to these changes.

Conflicts:
editeng/source/editeng/impedit3.cxx

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

diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx 
b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
index 8d1e69f..13a015f 100644
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
@@ -42,8 +42,6 @@ namespace drawinglayer
 const sal_uInt32 
nFontPixelHeight(basegfx::fround(aFontVectorPixel.getLength()));
 
 static const sal_uInt32 nMinimumFontHeight(5); // #define 
WRONG_SHOW_MIN 5
-static const sal_uInt32 nSmallFontHeight(11);  // #define 
WRONG_SHOW_SMALL  11
-static const sal_uInt32 nMediumFontHeight(15); // #define 
WRONG_SHOW_MEDIUM 15
 
 if(nFontPixelHeight > nMinimumFontHeight)
 {
@@ -51,16 +49,6 @@ namespace drawinglayer
 const basegfx::B2DPoint aStop(aLocalTransform * 
basegfx::B2DPoint(rWrongSpellCandidate.getStop(), 0.0));
 const Point aVclStart(basegfx::fround(aStart.getX()), 
basegfx::fround(aStart.getY()));
 const Point aVclStop(basegfx::fround(aStop.getX()), 
basegfx::fround(aStop.getY()));
-sal_uInt16 nWaveStyle(WAVE_FLAT);
-
-if(nFontPixelHeight > nMediumFontHeight)
-{
-nWaveStyle = WAVE_NORMAL;
-}
-else if(nFontPixelHeight > nSmallFontHeight)
-{
-nWaveStyle = WAVE_SMALL;
-}
 
 // #i101075# draw it. Do not forget to use the evtl. offsetted 
origin of the target device,
 // e.g. when used with mask/transparence buffer device
@@ -72,7 +60,7 @@ namespace drawinglayer
 rOutputDevice.EnableMapMode(false);
 rOutputDevice.SetLineColor(Color(aProcessedColor));
 rOutputDevice.SetFillColor();
-rOutputDevice.DrawWaveLine(aOrigin + aVclStart, aOrigin + 
aVclStop, nWaveStyle);
+rOutputDevice.DrawWaveLine(aOrigin + aVclStart, aOrigin + 
aVclStop);
 rOutputDevice.EnableMapMode(bMapModeEnabledState);
 }
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 1ee1a1b..c095ba2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -83,8 +83,6 @@ using namespace ::com::sun::star::linguistic2;
 #define RESDIFF 10
 
 #define WRONG_SHOW_MIN   5
-#define WRONG_SHOW_SMALL11
-#define WRONG_SHOW_MEDIUM   15
 
 struct TabInfo
 {
@@ -169,14 +167,6 @@ static void lcl_DrawRedLines(
 long nHght = pOutDev->LogicToPixel( Size( 0, nFontHeight ) ).Height();
 if( WRONG_SHOW_MIN < nHght )
 {
-sal_uInt16 nStyle;
-if( WRONG_SHOW_MEDIUM < nHght )
-nStyle = WAVE_NORMAL;
-else if( WRONG_SHOW_SMALL < nHght )
-nStyle = WAVE_SMALL;
-else
-nStyle = WAVE_FLAT;
-
 size_t nEnd, nStart = nIndex;
 bool bWrong = pWrongs->NextWrong( nStart, nEnd );
 while ( bWrong )
@@ -189,12 +179,12 @@ static void lcl_DrawRedLines(
 if ( nEnd > nMaxEnd )
 nEnd = nMaxEnd;
 Point aPnt1( rPnt );
-if ( bVertical && ( nStyle != WAVE_FLAT ) )
+if ( bVertical )
 {
 // VCL doesn't know that the text is vertical, and is 
manipulating
 // the positions a little bit in y direction...
 long nOnePixel = pOutDev->PixelToLogic( Size( 0, 1 ) 
).Height();
-

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

[Ahmad H . Al Harthi]

 vcl/source/window/splitwin.cxx |   49 ++---
 1 file changed, 12 insertions(+), 37 deletions(-)

New commits:
commit 60b257f47750a3315edd3024ff7931a0c40ae33a
Author: Ahmad H. Al Harthi 
Date:   Tue Feb 11 11:19:16 2014 +0300

fdo#59329 fix docked panels borders

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index c411b51..628d598 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -137,9 +137,9 @@ static void ImplCalcBorder( WindowAlign eAlign, sal_Bool 
bNoAlign,
 rBottom = 0;
 break;
 case WINDOWALIGN_LEFT:
-rLeft   = 2;
+rLeft   = 0;
 rTop= 2;
-rRight  = 0;
+rRight  = 2;
 rBottom = 2;
 break;
 case WINDOWALIGN_BOTTOM:
@@ -179,48 +179,23 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
 case WINDOWALIGN_BOTTOM:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
-pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, 6 ), Point( nDX-1, 6 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 1, 1 ), Point( nDX-3, 1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-1 ) );
-pWin->DrawLine( Point( nDX-1, 1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, nDY-7 ), Point( nDX-1, nDY-7 ) );
 break;
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 1, 1 ), Point( nDX-1, 1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
-pWin->DrawLine( Point( 1, nDY-1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
+pWin->DrawLine( Point( nDX-8, 0 ), Point( nDX-8, nDY-1 ) );
 break;
 default:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-2, 0 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 0, 1 ), Point( nDX-3, 1 ) );
-pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-break;
+pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
+pWin->DrawLine( Point( 6, 0 ), Point( 6, nDY-1 ) );
 }
 }
 }
@@ -1650,7 +1625,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
 
 void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool 
bTest ) const
 {
-long nSplitSize = mpMainSet->mnSplitSize-2;
+long nSplitSize = mpMainSet->mnSplitSize-1;
 if ( mbAutoHide || mbFadeOut || mbFadeIn )
 nSplitSize += SPLITWIN_SPLITSIZEEX;
 
@@ -2000,7 +1975,7 @@ void SplitWindow::ImplDrawGrip( const Rectangle& rRect, 
sal_Bool bHorz, sal_Bool
 int height = (int) (0.5 * rRect.getHeight() + 0.5);
 int i = rRect.Top() + (rRect.getHeight() - height) / 2;
 height += i;
-const int x = rRect.Left() + 1;
+const int x = rRect.Left() + 2;
 ImplDrawFadeArrow( Point( x, i-8), bHorz, bLeft );
 while( i <= height )
 {
___
Libreoffice-commits mailing list
libreoffice-com

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

[Ahmad H . Al Harthi]

 vcl/source/window/splitwin.cxx |   52 +
 1 file changed, 38 insertions(+), 14 deletions(-)

New commits:
commit 24de7939b2f4416506bf4858711b91d48064a201
Author: Ahmad H. Al Harthi 
Date:   Sun Mar 2 12:53:14 2014 +0300

fdo#59329 Fix docked window border lines

This patch completes the missing border lines. This is intended
for versions 4.1 and 4.2 only.

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 628d598..617efa0 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -179,23 +179,43 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
 case WINDOWALIGN_BOTTOM:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 6 ), Point( nDX-1, 6 ) );
 pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
 pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-7 ), Point( nDX-1, nDY-7 ) );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) );
 break;
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
-pWin->DrawLine( Point( nDX-8, 0 ), Point( nDX-8, nDY-1 ) );
+pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-3, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-2, nDY-1 ) );
 break;
 default:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( 6, 0 ), Point( 6, nDY-1 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
+pWin->DrawLine( Point( 1, 1 ), Point( nDX-1, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
 }
 }
 }
@@ -214,27 +234,31 @@ void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin )
 {
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN-1, nDY-3 ) );
+pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN-1, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN-1, nDY-2 ) );
+
 pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN, nDY-4 ) );
+pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WINDOWALIGN_RIGHT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
SPLITWIN_SPLITSIZEEXLN-1, nDY-3 ) );
+pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
SPLITWIN_SPLITSIZEEXLN-1, nDY-2 ) );
+
 pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
SPLITWIN_SPLITSIZEEXLN, nDY-4 ) );
+pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, nDY-SPLITWIN_SPLITSIZEEXLN-1 ), Point( 
nDX-3, nDY-SPLITWIN_SPLITSIZEEXLN-1

Re: How to install Libreoffice SDK in Ubuntu

[Bjoern Michaelsen]

Hi,

On Wed, Mar 05, 2014 at 06:38:14PM +0530, Prabhat Kumar wrote:
> I have run this script /usr/lib/libreoffice/sdk/setsdkenv_unix
> ...

Its probably best to file a bug and include all the relevant data, at least:
- Which Ubuntu version
- Which LibreOffice version
- from were (Ubuntu?, PPA, TDF)

FWIW, I personally think it is _much_ easier to hack directly on your own
LibreOffice build than using a SDK when you are using C++ anyway. The SDK is
fine for some simple Python/Java stuff though.

Best,

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

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

[Ahmad H . Al Harthi]

 vcl/source/window/splitwin.cxx |   52 +
 1 file changed, 38 insertions(+), 14 deletions(-)

New commits:
commit 682f723d31e6c4a59254a08f5ec62abc700f3fd6
Author: Ahmad H. Al Harthi 
Date:   Sun Mar 2 12:53:14 2014 +0300

fdo#59329 Fix docked window border lines

This patch completes the missing border lines. This is intended
for versions 4.1 and 4.2 only.

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index b23a65d..fdadc8e 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -179,23 +179,43 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
 case WINDOWALIGN_BOTTOM:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 6 ), Point( nDX-1, 6 ) );
 pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
 pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-7 ), Point( nDX-1, nDY-7 ) );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) );
 break;
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
-pWin->DrawLine( Point( nDX-8, 0 ), Point( nDX-8, nDY-1 ) );
+pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, 1 ), Point( nDX-3, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-2, nDY-1 ) );
 break;
 default:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( 6, 0 ), Point( 6, nDY-1 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-2 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
+pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
+
+pWin->SetLineColor( rStyleSettings.GetLightColor() );
+pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
+pWin->DrawLine( Point( 1, 1 ), Point( nDX-1, 1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
 }
 }
 }
@@ -214,27 +234,31 @@ void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin )
 {
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN-1, nDY-3 ) );
+pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN-1, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN-1, nDY-2 ) );
+
 pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN, nDY-4 ) );
+pWin->DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
nDX-SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WINDOWALIGN_RIGHT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
SPLITWIN_SPLITSIZEEXLN-1, nDY-3 ) );
+pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
SPLITWIN_SPLITSIZEEXLN-1, nDY-2 ) );
+
 pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
SPLITWIN_SPLITSIZEEXLN, nDY-4 ) );
+pWin->DrawLine( Point( SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, nDY-SPLITWIN_SPLITSIZEEXLN-1 ), Point( 
nDX-3, nDY-SPLITWIN_SPLITSIZEEXLN-1

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

[Ahmad H . Al Harthi]

 vcl/source/window/splitwin.cxx |   49 ++---
 1 file changed, 12 insertions(+), 37 deletions(-)

New commits:
commit af172141738bf50c7edbc502acf8286191adae95
Author: Ahmad H. Al Harthi 
Date:   Tue Feb 11 11:19:16 2014 +0300

fdo#59329 fix docked panels borders

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 8937527..b23a65d 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -137,9 +137,9 @@ static void ImplCalcBorder( WindowAlign eAlign, sal_Bool 
bNoAlign,
 rBottom = 0;
 break;
 case WINDOWALIGN_LEFT:
-rLeft   = 2;
+rLeft   = 0;
 rTop= 2;
-rRight  = 0;
+rRight  = 2;
 rBottom = 2;
 break;
 case WINDOWALIGN_BOTTOM:
@@ -179,48 +179,23 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
 case WINDOWALIGN_BOTTOM:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
-pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, 6 ), Point( nDX-1, 6 ) );
+pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
 break;
 case WINDOWALIGN_TOP:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 1, 1 ), Point( nDX-3, 1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-1 ) );
-pWin->DrawLine( Point( nDX-1, 1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( 0, nDY-7 ), Point( nDX-1, nDY-7 ) );
 break;
 case WINDOWALIGN_LEFT:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
-pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 1, 1 ), Point( nDX-1, 1 ) );
-pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
-pWin->DrawLine( Point( 1, nDY-1 ), Point( nDX-1, nDY-1 ) );
+pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-1 ) );
+pWin->DrawLine( Point( nDX-8, 0 ), Point( nDX-8, nDY-1 ) );
 break;
 default:
 pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-pWin->DrawLine( Point( 0, 0 ), Point( nDX-2, 0 ) );
-pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) );
-pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) );
-
-pWin->SetLineColor( rStyleSettings.GetLightColor() );
-pWin->DrawLine( Point( 0, 1 ), Point( nDX-3, 1 ) );
-pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
-pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-break;
+pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
+pWin->DrawLine( Point( 6, 0 ), Point( 6, nDY-1 ) );
 }
 }
 }
@@ -1648,7 +1623,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
 
 void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool 
bTest ) const
 {
-long nSplitSize = mpMainSet->mnSplitSize-2;
+long nSplitSize = mpMainSet->mnSplitSize-1;
 if ( mbAutoHide || mbFadeOut || mbFadeIn )
 nSplitSize += SPLITWIN_SPLITSIZEEX;
 
@@ -1998,7 +1973,7 @@ void SplitWindow::ImplDrawGrip( const Rectangle& rRect, 
sal_Bool bHorz, sal_Bool
 int height = (int) (0.5 * rRect.getHeight() + 0.5);
 int i = rRect.Top() + (rRect.getHeight() - height) / 2;
 height += i;
-const int x = rRect.Left() + 1;
+const int x = rRect.Left() + 2;
 ImplDrawFadeArrow( Point( x, i-8), bHorz, bLeft );
 while( i <= height )
 {
___
Libreoffice-commits mailing list
libreoffice-com

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On 03/05/2014 02:43 PM, Caolán McNamara wrote:

On Tue, 2014-03-04 at 15:59 +0100, Stephan Bergmann wrote:

Right, /org.openoffice.Office.Paths/Template/InternalPaths is a set, and
the order in which its elements are reported by configmgr is
unspecified.  Still, at least the two elements given in
officecfg/registry/data/org/openoffice/Office/Paths.xcu,






would both result in the same effective path generated via


sLetterPath = self.sTemplatePath + "/../common/wizard/letter"


Not if the expanded vlang path doesn't exist, then relative path of
foo/template/NOTTHERE/../common/wizard/letter
won't work either.


Ah, right (and that's what made it behave differently for different people).

Stephan

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

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

[Tor Lillqvist]

 svtools/source/control/ctrlbox.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9d4c3a2a217e02444601bea9e0eae7ae342fe0e8
Author: Tor Lillqvist 
Date:   Wed Mar 5 16:19:31 2014 +0200

WaE: comparison of integers of different signs

Change-Id: I936e7bdaf3a4236775add4982005b465f229eb78

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 7508659..5461863 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -827,7 +827,7 @@ sal_Int32 LineListBox::InsertEntry( const OUString& rStr, 
sal_Int32 nPos )
 {
 nPos = ListBox::InsertEntry( rStr, nPos );
 if ( nPos != LISTBOX_ERROR ) {
-if ( nPos < pLineList->size() ) {
+if ( nPos < static_cast(pLineList->size()) ) {
 ImpLineList::iterator it = pLineList->begin();
 ::std::advance( it, nPos );
 pLineList->insert( it, reinterpret_cast(NULL) );
@@ -855,7 +855,7 @@ void LineListBox::RemoveEntry( sal_Int32 nPos )
 {
 ListBox::RemoveEntry( nPos );
 
-if ( 0 <= nPos && nPos < pLineList->size() ) {
+if ( 0 <= nPos && nPos < static_cast(pLineList->size()) ) {
 ImpLineList::iterator it = pLineList->begin();
 ::std::advance( it, nPos );
 if ( *it ) delete *it;
@@ -901,7 +901,7 @@ sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) 
const
 
 sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const
 {
-ImpLineListData* pData = (0 <= nPos && nPos < pLineList->size()) ? 
(*pLineList)[ nPos ] : NULL;
+ImpLineListData* pData = (0 <= nPos && nPos < 
static_cast(pLineList->size())) ? (*pLineList)[ nPos ] : NULL;
 return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDEData.cxx|   17 +
 vcl/unx/kde4/KDESalGraphics.cxx |   12 
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 6b6398b72401b35dc0d01de70ee2124a0a4072a8
Author: Jan-Marek Glogowski 
Date:   Thu Feb 27 08:54:57 2014 +

fdo#45935: try hard to paint a frame for menus

Current Oxygen theme doesn't draw frames for menus, but uses shaped
and "colored" background images. This workaround paints the window
and menu frame for menus. Any frame seems to be better then no frame
at all.

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

diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 196f186..ccbbd99 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -17,10 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#define Region QtXRegion
+
+#include 
+#include 
+
+#undef Region
+
 #include "KDEData.hxx"
 
 #include "KDEXLib.hxx"
 
+
 KDEData::~KDEData()
 {
 }
@@ -39,6 +47,15 @@ void KDEData::initNWF()
 pSVData->maNWFData.mbDockingAreaSeparateTB = true;
 // no borders for menu, theming does that
 pSVData->maNWFData.mbFlatMenu = true;
+
+// Styled menus need additional space
+QStyle *style = kapp->style();
+pSVData->maNWFData.mnMenuFormatBorderX =
+   style->pixelMetric( QStyle::PM_MenuPanelWidth ) +
+   style->pixelMetric( QStyle::PM_MenuHMargin );
+pSVData->maNWFData.mnMenuFormatBorderY =
+   style->pixelMetric( QStyle::PM_MenuPanelWidth ) +
+   style->pixelMetric( QStyle::PM_MenuVMargin );
 }
 
 void KDEData::deInitNWF()
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index cf72dcd..967864f 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -78,7 +78,7 @@ QRect region2QRect( const Rectangle& rControlRegion )
 }
 
 KDESalGraphics::KDESalGraphics() :
-m_image(0)
+m_image(NULL)
 {
 }
 
@@ -130,13 +130,7 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( 
ControlType type, ControlPart
 if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == 
PART_TRACK_VERT_AREA) )
 return true;
 
-if ( (type == CTRL_PROGRESS)&& (part == PART_ENTIRE_CONTROL) ) return 
true;
-
-return false;
-
-if ( (type == CTRL_TAB_ITEM) && (part == PART_ENTIRE_CONTROL) ) return 
true;
-if ( (type == CTRL_TAB_PANE) && (part == PART_ENTIRE_CONTROL) ) return 
true;
-// no CTRL_TAB_BODY for KDE
+if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return 
true;
 
 return false;
 }
@@ -378,8 +372,10 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 {
 QStyleOptionMenuItem option;
 draw( QStyle::PE_PanelMenu, &option, m_image, 
vclStateValue2StateFlag( nControlState, value ));
+// Try hard to get any frame!
 QStyleOptionFrame frame;
 draw( QStyle::PE_FrameMenu, &frame, m_image, 
vclStateValue2StateFlag( nControlState, value ));
+draw( QStyle::PE_FrameWindow, &frame, m_image, 
vclStateValue2StateFlag( nControlState, value ));
 lastPopupRect = widgetRect;
 }
 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-2' - vcl/unx

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDE4FilePicker.cxx |9 +++--
 vcl/unx/kde4/KDE4FilePicker.hxx |5 -
 vcl/unx/kde4/KDEXLib.cxx|   17 +++--
 vcl/unx/kde4/KDEXLib.hxx|2 ++
 4 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit e95d5d52c84c073e1878c290031cdde6061fcc7d
Author: Jan-Marek Glogowski 
Date:   Wed Feb 26 18:19:11 2014 +

fdo#74416: sleep in yield for native file picker

As it seems to be the only way to poll the clipboard, reintroduce

 m_pApplication->clipboard()->setProperty(
"useEventLoopWhenWaiting", true );

To prevent crashes, disable event processing in the Qt thread while
the dialog is open.

Instead this applies the same workaround as the Windows backend to
sleep a ms, which keeps the FP dialogs more usable, but feels like
a horrible workaround.

This is still slower then running processEvent in Yield but still
much better then the current situation.

(cherry picked from commit 380f3b4b6cbbe8e82b58ddf55e95c5005307b51f)

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

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index b3fde26..405eafe 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -38,6 +38,7 @@
 
 #include "KDE4FilePicker.hxx"
 #include "FPServiceInfo.hxx"
+#include "KDEXLib.hxx"
 
 /* * Hack, but needed because of conflicting types... */
 #define Region QtXRegion
@@ -113,10 +114,11 @@ QString toQString(const OUString& s)
 // KDE4FilePicker
 //
 
-KDE4FilePicker::KDE4FilePicker( const uno::Reference& )
+KDE4FilePicker::KDE4FilePicker( const uno::Reference&, 
KDEXLib *xlib )
 : KDE4FilePicker_Base(_helperMutex)
 , _resMgr( ResMgr::CreateResMgr("fps_office") )
 , allowRemoteUrls( false )
+, _mXLib( xlib )
 {
 _extraControls = new QWidget();
 _layout = new QGridLayout(_extraControls);
@@ -261,8 +263,11 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
 _dialog->filterWidget()->setEditable(false);
 
 // We're entering a nested loop.
-// Release the yield mutex to prevent deadlocks.
+// Prevent yield calls, which would crash LO.
+
+_mXLib->freezeYield( true );
 int result = _dialog->exec();
+_mXLib->freezeYield( false );
 
 // HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings
 // (such as the auto-extension flag), but that doesn't update 
KGlobal::config()
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 6dc97df..81acf0c 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -40,6 +40,7 @@
 class KFileDialog;
 class QWidget;
 class QLayout;
+class KDEXLib;
 
 class ResMgr;
 
@@ -82,8 +83,10 @@ protected:
 
 bool allowRemoteUrls;
 
+KDEXLib* _mXLib;
+
 public:
-KDE4FilePicker( const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >& );
+KDE4FilePicker( const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >&, KDEXLib* );
 virtual ~KDE4FilePicker();
 
 // XFilePickerNotifier
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 7c67e35..b4be6d6 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -64,7 +64,8 @@
 KDEXLib::KDEXLib() :
 SalXLib(),  m_bStartupDone(false), m_pApplication(0),
 m_pFreeCmdLineArgs(0), m_pAppCmdLineArgs(0), m_nFakeCmdLineArgs( 0 ),
-eventLoopType( LibreOfficeEventLoop )
+eventLoopType( LibreOfficeEventLoop ),
+m_bYieldFrozen( false )
 {
 // the timers created here means they belong to the main thread
 connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( 
timeoutActivated()));
@@ -225,6 +226,7 @@ void KDEXLib::setupEventLoop()
 eventLoopType = GlibEventLoop;
 old_gpoll = g_main_context_get_poll_func( NULL );
 g_main_context_set_poll_func( NULL, gpoll_wrapper );
+m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", 
true );
 return;
 }
 #endif
@@ -308,6 +310,17 @@ void KDEXLib::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
 return SalXLib::Yield( bWait, bHandleAllCurrentEvents );
 }
 
+if( m_bYieldFrozen ) {
+if( qApp->thread() != QThread::currentThread() ) {
+QAbstractEventDispatcher* dispatcher = 
QAbstractEventDispatcher::instance( qApp->thread() );
+if( dispatcher->hasPendingEvents() ) {
+struct timespec delay = {0, ( 100 )};
+nanosleep(&delay, NULL);
+}
+}
+return;
+}
+
 // if we are the main thread (which is where the event processing is done),
 // good, just do it
 if( qApp->thread() == 

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

[Alexander Wilms]

 winaccessibility/inc/AccResource.hxx|4 -
 winaccessibility/source/UAccCOM/AccActionBase.cxx   |8 +-
 winaccessibility/source/UAccCOM/AccActionBase.h |4 -
 winaccessibility/source/UAccCOM/AccComponentBase.cxx|4 -
 winaccessibility/source/UAccCOM/AccComponentBase.h  |4 -
 winaccessibility/source/UAccCOM/AccEditableText.cxx |4 -
 winaccessibility/source/UAccCOM/AccHypertext.cxx|4 -
 winaccessibility/source/UAccCOM/AccTextBase.cxx |   32 
+-
 winaccessibility/source/UAccCOM/AccTextBase.h   |4 -
 winaccessibility/source/UAccCOM/EnumVariant.cxx |2 
 winaccessibility/source/UAccCOM/EnumVariant.h   |   14 ++--
 winaccessibility/source/UAccCOM/Resource.h  |4 -
 winaccessibility/source/UAccCOM/UAccCOM.cxx |6 -
 winaccessibility/source/UAccCOM/UAccCOM.rc  |   32 
+-
 winaccessibility/source/UAccCOM/UNOXWrapper.cxx |2 
 winaccessibility/source/UAccCOMIDL/AccessibleKeyBinding.idl |   28 
+++-
 winaccessibility/source/service/AccObjectContainerEventListener.cxx |4 -
 winaccessibility/source/service/AccResource.cxx |6 -
 18 files changed, 80 insertions(+), 86 deletions(-)

New commits:
commit b25c29389e81c52395521ce8efdf99699abc500a
Author: Alexander Wilms 
Date:   Tue Feb 25 22:57:15 2014 +0100

Remove visual noise from winaccessibility

Change-Id: If8ac2543e3dca393e14380a85547cafbb68ab8c6
Reviewed-on: https://gerrit.libreoffice.org/8340
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/winaccessibility/inc/AccResource.hxx 
b/winaccessibility/inc/AccResource.hxx
index 793ab86..87b429b 100644
--- a/winaccessibility/inc/AccResource.hxx
+++ b/winaccessibility/inc/AccResource.hxx
@@ -26,10 +26,10 @@ class SimpleResMgr;
 
 #define ACC_RES_STRING(id) ResourceManager::loadString(id)
 
-//==
+
 //= ResourceManager
 //= handling ressources within the FormLayer library
-//==
+
 class ResourceManager
 {
 static SimpleResMgr*m_pImpl;
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx 
b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index c965225..a12d8a9 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//
+
 // AccActionBase.cpp: implementation of the CAccActionBase class.
-//
+
 #include "stdafx.h"
 
 #include "AccActionBase.h"
@@ -41,9 +41,9 @@ using namespace com::sun::star::accessibility;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::awt;
 
-//
+
 // Construction/Destruction
-//
+
 
 CAccActionBase::CAccActionBase()
 {}
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h 
b/winaccessibility/source/UAccCOM/AccActionBase.h
index 0ed9914..876 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//
+
 // AccActionBase.h: interface for the CAccActionBase class.
-//
+
 
 #if 
!defined(AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_)
 #define AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.cxx 
b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
index cc6cf46..670783c 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
@@ -27,9 +27,9 @@
 using namespace com::sun::star::accessibility;
 using namespace com::sun::star::uno;
 
-//
+
 // Construction/Destruction
-//
+
 
 CAccComponentBase::CAccComponentBase()
 {}
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h 
b/winaccessibility/source/UAccCOM/AccComponentBase.h
index 9081157..6d72b39e 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/sourc

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c7/39861cc38b09a1f99c3d91f879bfd8ee1ea43a

[Caolán McNamara]

 c7/39861cc38b09a1f99c3d91f879bfd8ee1ea43a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ccdd8c6f520d65a73f289c806ca18f1c41c9a178
Author: Caolán McNamara 
Date:   Wed Mar 5 14:19:07 2014 +

Notes added by 'git notes add'

diff --git a/c7/39861cc38b09a1f99c3d91f879bfd8ee1ea43a 
b/c7/39861cc38b09a1f99c3d91f879bfd8ee1ea43a
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/c7/39861cc38b09a1f99c3d91f879bfd8ee1ea43a
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - android/experimental configure.ac sal/osl

[Tor Lillqvist]

 android/experimental/DocumentLoader/AndroidManifest.xml |4 ++--
 android/experimental/DocumentLoader/project.properties  |2 +-
 android/experimental/desktop/AndroidManifest.xml|4 ++--
 android/experimental/desktop/project.properties |2 +-
 configure.ac|6 +++---
 sal/osl/unx/nlsupport.c |3 ---
 6 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit ad2d1082b1e6eb446798e363ccc1e71461bf1748
Author: Tor Lillqvist 
Date:   Wed Mar 5 15:04:25 2014 +0200

Bin unused global variable

Change-Id: I9bd4ea90638df91122b96f1fb86043c2d770417d

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index f504b9e..ac5ef18 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -838,9 +838,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale 
* pLocale )
 #if defined(MACOSX) || defined(IOS)
 #include "system.h"
 
-/* OS X locale discovery function */
-int (*pGetOSXLocale)( char *, sal_uInt32 );
-
 /*
  return the current process locale
  */
commit c2756737e0dafe9c802346a2cf4d459bf59acd9d
Author: Tor Lillqvist 
Date:   Wed Mar 5 13:49:04 2014 +0200

Require Android API level 15, which is from December 2011

Note that this doesn't really mean a lot for the NDK.

Change-Id: I4061cb856055ae126aadf56afc462182a875e65f

diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml 
b/android/experimental/DocumentLoader/AndroidManifest.xml
index 65f223b..9781534 100644
--- a/android/experimental/DocumentLoader/AndroidManifest.xml
+++ b/android/experimental/DocumentLoader/AndroidManifest.xml
@@ -4,8 +4,8 @@
   android:installLocation="preferExternal"
   android:versionCode="1"
   android:versionName="1.0">
-  
+  
 
-
+
 http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/experimental sal/osl

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
  70 ++
 sal/osl/unx/osxlocale.cxx| 
   4 
 2 files changed, 72 insertions(+), 2 deletions(-)

New commits:
commit 0b5558a68de6b9d887fd76a5ad8463116e7be4bd
Author: Tor Lillqvist 
Date:   Wed Mar 5 16:05:27 2014 +0200

Add sal source files

Change-Id: Id44a5bb0dca7bc6b8d97a6d5ae26ea642043e374

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 4ec246a..bf29e9a 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -184,6 +184,37 @@
BE82BDAB182190E400A447B5 /* TiledView.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= TiledView.m; sourceTree = ""; };
BE82BDAD1821A1D000A447B5 /* View.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
View.h; sourceTree = ""; };
BE82BDAE1821A1D000A447B5 /* View.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= View.m; sourceTree = ""; };
+   BE82C38918C752E20050EB79 /* backtrace.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = backtrace.c; path 
= ../../../sal/osl/unx/backtrace.c; sourceTree = ""; };
+   BE82C38A18C752E20050EB79 /* conditn.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = conditn.cxx; 
path = ../../../sal/osl/unx/conditn.cxx; sourceTree = ""; };
+   BE82C38B18C752E20050EB79 /* diagnose.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = diagnose.cxx; 
path = ../../../sal/osl/unx/diagnose.cxx; sourceTree = ""; };
+   BE82C38C18C752E20050EB79 /* file_error_transl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
file_error_transl.cxx; path = ../../../sal/osl/unx/file_error_transl.cxx; 
sourceTree = ""; };
+   BE82C38D18C752E20050EB79 /* file_misc.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_misc.cxx; 
path = ../../../sal/osl/unx/file_misc.cxx; sourceTree = ""; };
+   BE82C38E18C752E20050EB79 /* file_path_helper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
file_path_helper.cxx; path = ../../../sal/osl/unx/file_path_helper.cxx; 
sourceTree = ""; };
+   BE82C38F18C752E20050EB79 /* file_stat.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_stat.cxx; 
path = ../../../sal/osl/unx/file_stat.cxx; sourceTree = ""; };
+   BE82C39018C752E20050EB79 /* file_url.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_url.cxx; 
path = ../../../sal/osl/unx/file_url.cxx; sourceTree = ""; };
+   BE82C39118C752E20050EB79 /* file_volume.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
file_volume.cxx; path = ../../../sal/osl/unx/file_volume.cxx; sourceTree = 
""; };
+   BE82C39218C752E20050EB79 /* file.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cxx; path 
= ../../../sal/osl/unx/file.cxx; sourceTree = ""; };
+   BE82C39318C752E20050EB79 /* interlck.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = interlck.c; path = 
../../../sal/osl/unx/interlck.c; sourceTree = ""; };
+   BE82C39418C752E20050EB79 /* memory.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = memory.c; path = 
../../../sal/osl/unx/memory.c; sourceTree = ""; };
+   BE82C39518C752E20050EB79 /* module.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cxx; 
path = ../../../sal/osl/unx/module.cxx; sourceTree = ""; };
+   BE82C39618C752E20050EB79 /* mutex.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mutex.c; path = 
../../../sal/osl/unx/mutex.c; sourceTree = ""; };
+   BE82C39718C752E20050EB79 /* nlsupport.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nlsupport.c; path 
= ../../../sal/osl/unx/nlsupport.c; sourceTree = ""; };
+   BE82C39818C752E20050EB79 /* osxlocale.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = osxlocale.cxx; 
path = ../../../sal/osl/unx/osxlocale.cxx; sourceTree = ""; };
+   BE82C39918C752E20050EB79 /* pipe.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pipe.c; path = 
../../../sal/osl/unx/pipe.c; sourceTree = ""; };
+   BE82C39A18C752E20050EB79 /* process_impl

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

[Andre Fischer]

 stlport/systemstl/list |   17 +
 sw/source/core/crsr/swcrsr.cxx |   40 ++--
 2 files changed, 35 insertions(+), 22 deletions(-)

New commits:
commit c739861cc38b09a1f99c3d91f879bfd8ee1ea43a
Author: Andre Fischer 
Date:   Wed Mar 5 13:52:22 2014 +

124361: Avoid MSVC warning 4555 while including list.

diff --git a/stlport/systemstl/list b/stlport/systemstl/list
index 283880b..1fa1dc5 100644
--- a/stlport/systemstl/list
+++ b/stlport/systemstl/list
@@ -23,16 +23,17 @@
 #define SYSTEM_STL_LIST
 
 #ifdef HAVE_STL_INCLUDE_PATH
-   // TODO: use computed include file name
-   #include_next 
+// TODO: use computed include file name
+#include_next 
 #elif defined(_MSC_VER)
-   #include <../../VC/include/list>
-   // MSVC's list would cause a lot of expression-result-unused warnings
-   // unless it is compiled in iterator-debugging mode. Silence this noise
-   #pragma warning(disable:4555)
+// MSVC's list would cause a lot of expression-result-unused warnings
+// unless it is compiled in iterator-debugging mode. Silence this noise 
temporarily.
+#pragma warning(push)
+#pragma warning(disable:4555)
+#include <../../VC/include/list>
+#pragma warning(pop)
 #else // fall back to boost/tr1
-   #include 
+#include 
 #endif
 
 #endif
-
commit 83510855eff12832682adfb0c1093ccb5cfc7b13
Author: Oliver-Rainer Wittmann 
Date:   Wed Mar 5 13:24:23 2014 +

123979: method  - treat application of new position 
due to content frame without height to next/previous content frame as restore 
to saved position, if new position equals the saved one.

This avoid cursor traveling loops due to hidden content at the 
beginning/end of the text document.

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6922b16..b81ea04 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -343,7 +343,8 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
 if( pNd->IsCntntNode() && !dynamic_cast(this) )
 {
 const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->getLayoutFrm( 
pDoc->GetCurrentLayout() );
-if( pFrm && pFrm->IsValid()
+if( pFrm != NULL
+&& pFrm->IsValid()
 && 0 == pFrm->Frm().Height()
 && 0 != ( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags ) )
 {
@@ -356,40 +357,51 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
 
 // --> LIJIAN/FME 2007-11-27 #i72394# skip to prev /next valid 
paragraph
 // with a layout in case the first search did not succeed:
-if( !pFrm )
+if ( pFrm == NULL )
 {
 bGoNxt = !bGoNxt;
 pFrm = ((SwCntntNode*)pNd)->getLayoutFrm( 
pDoc->GetCurrentLayout() );
-while ( pFrm && 0 == pFrm->Frm().Height() )
+while ( pFrm != NULL
+&& 0 == pFrm->Frm().Height() )
 {
-pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
-:   pFrm->GetPrevCntntFrm();
+pFrm = bGoNxt ? pFrm->GetNextCntntFrm() : 
pFrm->GetPrevCntntFrm();
 }
 }
 // <--
 
-SwCntntNode* pCNd;
-if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) )
+SwCntntNode* pCNd = (pFrm != NULL) ? (SwCntntNode*)pFrm->GetNode() 
: NULL;
+if ( pCNd != NULL )
 {
 // set this cntntNode as new position
 rPtIdx = *pCNd;
 pNd = pCNd;
 
-// ContentIndex noch anmelden:
-xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len();
+// assign corresponding ContentIndex
+const xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len();
 GetPoint()->nContent.Assign( pCNd, nTmpPos );
 
-// sollten wir in einer Tabelle gelandet sein?
-if( IsInProtectTable( sal_True ) )
-pFrm = 0;
+if ( rPtIdx.GetIndex() == pSavePos->nNode
+ && nTmpPos == pSavePos->nCntnt )
+{
+// new position equals saved one
+// --> trigger restore of saved pos by setting  to 
NULL - see below
+pFrm = NULL;
+}
+
+if ( IsInProtectTable( sal_True ) )
+{
+// new position in protected table
+// --> trigger restore of saved pos by setting  to 
NULL - see below
+pFrm = NULL;
+}
 }
 }
 
-if( !pFrm )
+if( pFrm == NULL )
 {
 DeleteMark();
 RestoreSavePos();
-return sal_True;// ohne Frames geht gar nichts!
+return sal_True;
 }
 }
 
__

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 3184f539b0bb4e7df6189248fb33804916259d9d
Author: Caolán McNamara 
Date:   Wed Mar 5 14:00:39 2014 +

Updated core
Project: help  89290aeb021a3ab91a0a091537eaa7c8194c8449

diff --git a/helpcontent2 b/helpcontent2
index b7b2120..89290ae 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b7b2120b6b279ed678c9fc8dbd5ee02e184064bc
+Subproject commit 89290aeb021a3ab91a0a091537eaa7c8194c8449
___
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

[Caolán McNamara]

 helpers/help_hid.lst |   19 ---
 1 file changed, 19 deletions(-)

New commits:
commit 89290aeb021a3ab91a0a091537eaa7c8194c8449
Author: Caolán McNamara 
Date:   Wed Mar 5 14:00:39 2014 +

remove unused helpids that go nowhere

Change-Id: I8d3296053c8f744894888fcf9e217495de9de8b8

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a0e43a2..f557f87 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2984,9 +2984,6 @@ HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
 HID_SC_CHANGES_COMMENT,58990,
-HID_SC_DPDATEGROUP,59012,
-HID_SC_DPDATEGROUP_LB,59013,
-HID_SC_DPNUMGROUP,59011,
 HID_SC_DPSHOWDETAIL,59014,
 HID_SC_DRAW_RENAME,59007,
 HID_SC_DROPMODE_COPY,58924,
@@ -5748,16 +5745,11 @@ 
sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
-sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898,
-sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975,
-sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883,
-sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882,
-sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233,
 sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231,
@@ -5790,7 +5782,6 @@ sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
-sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
@@ -5804,16 +5795,6 @@ 
sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOEND,1495433731,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOSTART,1495433729,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_MANEND,1495433732,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_MANSTART,1495433730,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_NUMDAYS,1495433733,
-sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_UNITS,1495433734,
-sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_AUTOEND,1495417347,
-sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_AUTOSTART,1495417345,
-sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_MANEND,1495417348,
-sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_MANSTART,1495417346,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Widget Conversion: Getting hard to find the last 175 remaining

[Joao S. O. Bueno]

Hi there -
I think  that issue maybe could spin of as a UI discussion -
only yesterday I was thinking just about this issue, though regarding
2 other softwares I use a lot: GIMP and Inkscape.

Inkscape has this same design as L.O., where the dialogs can be
launched from the U.I. form different places - and, even thoguh there
might be an order of magnitude less dialogs in inkscape than in L.O.
they are already difficult to find.

In GIMP, regardless of the type of dialog, ALL of the "primary" types
of dialog are
under Window->Dockable dialogs menu.  Some of them, due to logic
organization of the UI are _also_ present in other places - but one
does not need to think "where can I possibly find a way to get to the
textures dialog" - they are all listed in one place.

Maybe L.O. could have in the future a submenu where all tabs and
dialogs could be found? Or a "dialog browser" tool?

I am sorry if this list is not the appropriate place for UI discussion
suggestions  - I I've been reading it for some months and saw some
e-mails talking about UI, but very few. Where could that conversation
take place?

  js
 -><-


On 5 March 2014 10:38, Caolán McNamara  wrote:
> Its getting harder for me to *find* in the UI the way to launch most of
> the remaining dialogs and tabpages that need converting and it's slowing
> me down to have to spend a few minutes muddling through the help content
> and the text of the .src to figure that out, so if you want to help then
> you can fill in a few entries of this tracking wiki page with
> instructions as to how to launch a given dialog/tabpage
>
> https://wiki.documentfoundation.org/Development/WidgetLayout/FindDialogs
>
> There are some hints on the page as how to do it.
>
> C.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Current Build from Git: Writer-Wizards don't run

[Caolán McNamara]

On Tue, 2014-03-04 at 15:59 +0100, Stephan Bergmann wrote:
> Right, /org.openoffice.Office.Paths/Template/InternalPaths is a set, and 
> the order in which its elements are reported by configmgr is 
> unspecified.  Still, at least the two elements given in 
> officecfg/registry/data/org/openoffice/Office/Paths.xcu,
> 
> >  > oor:op="fuse"/>
> >  > oor:op="fuse"/>
> 
> would both result in the same effective path generated via
> 
> > sLetterPath = self.sTemplatePath + "/../common/wizard/letter"

Not if the expanded vlang path doesn't exist, then relative path of
foo/template/NOTTHERE/../common/wizard/letter
won't work either.

C.

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

Widget Conversion: Getting hard to find the last 175 remaining

[Caolán McNamara]

Its getting harder for me to *find* in the UI the way to launch most of
the remaining dialogs and tabpages that need converting and it's slowing
me down to have to spend a few minutes muddling through the help content
and the text of the .src to figure that out, so if you want to help then
you can fill in a few entries of this tracking wiki page with
instructions as to how to launch a given dialog/tabpage

https://wiki.documentfoundation.org/Development/WidgetLayout/FindDialogs

There are some hints on the page as how to do it.

C.

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fd/dfd6e97750acacf667fc195456d33af8828a46

[Caolán McNamara]

 fd/dfd6e97750acacf667fc195456d33af8828a46 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 624178fd90827db2264451859e102c39f6270a33
Author: Caolán McNamara 
Date:   Wed Mar 5 13:14:49 2014 +

Notes added by 'git notes add'

diff --git a/fd/dfd6e97750acacf667fc195456d33af8828a46 
b/fd/dfd6e97750acacf667fc195456d33af8828a46
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/fd/dfd6e97750acacf667fc195456d33af8828a46
@@ -0,0 +1 @@
+ignore: aoo
___
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' - 6f/bf6653bebf3dfb6998233dff386d2ae977b152

[Caolán McNamara]

 6f/bf6653bebf3dfb6998233dff386d2ae977b152 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2deb97d28179ef857eeae8e4e1283476ed752c9b
Author: Caolán McNamara 
Date:   Wed Mar 5 13:14:06 2014 +

Notes added by 'git notes add'

diff --git a/6f/bf6653bebf3dfb6998233dff386d2ae977b152 
b/6f/bf6653bebf3dfb6998233dff386d2ae977b152
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/6f/bf6653bebf3dfb6998233dff386d2ae977b152
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 67104, which changed state.

Bug 67104 Summary: UI - Default value of "Show cell grid lines" checkbox on 
sidebar
https://bugs.freedesktop.org/show_bug.cgi?id=67104

   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

How to install Libreoffice SDK in Ubuntu

[Prabhat Kumar]

Hi,
I'm new to Libreoffice development and I'm having problem to start with
Libreoffice SDK.

I have run this script /usr/lib/libreoffice/sdk/setsdkenv_unix

and got following message :-

 *
 * SDK environment is prepared for Linux
 *
 * SDK = /usr/lib/libreoffice/sdk
 * Office = /usr/lib/libreoffice
 * URE = /usr/lib/libreoffice/ure-link
 * Make = /usr/bin
 * Zip = /usr/bin
 * C++ Compiler = /usr/bin
 * Java = /usr
 * SDK Output directory = Desktop/GSoC/libreoffice4.1_sdk
 * Auto deployment = YES
 *
 
but still I'm not able to run cpp program and getting several errors
Please help me to start with it

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

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

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 -
 sc/inc/sc.hrc |3 
 sc/sdi/formatsh.sdi   |1 
 sc/sdi/scalc.sdi  |   25 -
 sc/source/core/data/docpool.cxx   |3 
 sc/source/ui/app/scmod.cxx|1 
 sc/source/ui/inc/formatsh.hxx |3 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx  |8 -
 sc/source/ui/view/formatsh.cxx|   48 
--
 sc/source/ui/view/tabview3.cxx|1 
 10 files changed, 6 insertions(+), 92 deletions(-)

New commits:
commit c3403ac888c2e62edaf8befe7982f5f8cc95c16f
Author: Maxim Monastirsky 
Date:   Wed Mar 5 09:42:30 2014 +0200

fdo#67104 Use correct command for show grid

Not sure why .uno:ViewGridLines & SID_SCGRIDSHOW were
introduced (in "merge sidebar feature" and related commits).

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5c75e98..cdfd826 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -835,11 +835,6 @@
   ~Formula Bar
 
   
-  
-
-  View Grid lines
-
-  
   
 
   C~olumn & Row Headers
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3ed851a..ae92cf8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -677,8 +677,7 @@
 // Sidebar -
 
 #define SID_PROPERTY_PANEL_CELLTEXT_DLG (SC_SIDEBAR_PROPERTY_BEGIN+0)
-#define SID_SCGRIDSHOW  (SC_SIDEBAR_PROPERTY_BEGIN+1)
-#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+2)
+#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+1)
 
 // resources
 
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 72e1e14..903c5e5 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -101,7 +101,6 @@ interface FormatForSelection
 SID_ALIGNCENTERVER  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
 SID_ALIGNBLOCK  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
 SID_ALIGNCENTERHOR  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
-SID_SCGRIDSHOW  [ ExecMethod = ExecViewOptions; StateMethod = 
GetViewOptions; ]
 
 SID_V_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = 
GetAlignState; ]
 SID_H_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = 
GetAlignState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 1313bdb..ca7b225 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8801,31 +8801,6 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC
 ]
 
 
-SfxBoolItem ViewGridLines SID_SCGRIDSHOW
-[
-AutoUpdate = TRUE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = FALSE, //TRUE
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-Readonly = FALSE,
-
-/* config */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = GID_VIEW;
-]
-
-
 SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT
 [
 /* flags: */
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index db06224..3c7e52d 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -182,8 +182,7 @@ static SfxItemInfo const  aItemInfos[] =
 { SID_ATTR_PAGE_FOOTERSET,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FOOTERSET
 { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FORMULAS
 { SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_NULLVALS
-{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_SCALETO
-{ SID_SCGRIDSHOW,   SFX_ITEM_POOLABLE }
+{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE } // 
ATTR_PAGE_SCALETO
 };
 
 
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 496062b..ba7aec8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1121,7 +1121,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 if (pBindings)
 {
 pBindings->Invalidate(SID_HELPLINES_MOVE);
-pBindings->Invalidate(SID_SCGRIDSHOW);
 }
 }
 
diff --git a/sc/source/ui/i

Re: [Libreoffice-qa] [ANN] LIbreOffice 4.2.2 RC1 available

[Bjoern Michaelsen]

On Wed, Mar 05, 2014 at 11:43:59AM +0100, Christian Lohmaier wrote:
> The release is available for Windows, Linux and Mac OS X from our QA
> builds download page at
> 
>   http://www.libreoffice.org/download/pre-releases/
> 
> LibreOffice 4.2.2 RC1 is also available in a 64bit version for Mac OS
> X 10.8 (or newer)

Ubuntu trusty (14.04) users will also find a build in all these PPAs:

 https://launchpad.net/~libreoffice/+archive/ppa
 https://launchpad.net/~libreoffice/+archive/libreoffice-prereleases
 https://launchpad.net/~libreoffice/+archive/libreoffice-4-2

Backports to Ubuntu 13.10 and 12.04 will likely follow soon.

Best,

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/inc stlport/systemstl

[Andre Fischer]

 sc/inc/refdata.hxx |2 +-
 stlport/systemstl/hash_map |   17 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit fddfd6e97750acacf667fc195456d33af8828a46
Author: Andre Fischer 
Date:   Wed Mar 5 11:51:34 2014 +

124361: Avoid warning by not assigning from sal_Int32 to sal_Int16.

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 9550b82..b3352faa 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -78,7 +78,7 @@ struct SC_DLLPUBLIC ScSingleRefData// Single 
reference (one address) int
 inline  void InitFlags() { bFlags = 0; }// all FALSE
 
 // #123870# Make it possible to init members to some defined values
-inline void InitMembers() { nCol = nRow = nTab = nRelCol = nRelRow = 
nRelTab = 0; }
+inline void InitMembers() { nRow = nRelRow = 0; nCol = nRelCol = 0; nTab = 
nRelTab = 0; }
 
 // InitAddress: InitFlags and set address
 inline  void InitAddress( const ScAddress& rAdr );
commit 6fbf6653bebf3dfb6998233dff386d2ae977b152
Author: Andre Fischer 
Date:   Wed Mar 5 10:51:54 2014 +

124361: Avoid MSVC warning 4555 while including unordered_map.

diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 198b055..9ebcb44 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -23,16 +23,19 @@
 #define SYSTEM_STL_HASHMAP
 
 #ifdef HAVE_STL_INCLUDE_PATH
-   // TODO: use computed include file name
-   #include_next 
+// TODO: use computed include file name
+#include_next 
 #elif defined(__cplusplus) && (__cplusplus >= 201103L)
-   #include 
+#include 
 #elif defined(_MSC_VER)
-   #include <../../VC/include/unordered_map>
-   #define STLP4_EMUBASE_NS ::std::tr1
+#pragma warning(push)
+#pragma warning(disable:4555)
+#include <../../VC/include/unordered_map>
+#pragma warning(pop)
+#define STLP4_EMUBASE_NS ::std::tr1
 #else // fall back to boost/tr1
-   #include 
-   #define STLP4_EMUBASE_NS ::boost
+#include 
+#define STLP4_EMUBASE_NS ::boost
 #endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/source/core/tool/parclass.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 9b808856ca26a1879303bd562f6b02233cb87ac3
Author: Winfried Donkers 
Date:   Wed Feb 26 11:08:12 2014 +0100

fdo#70798 add missing parclass.cxx entries for new Excel2010 functions

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

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index ae10b6c..2b74084 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -152,13 +152,21 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocOr,  {{ Reference  
  }, 1 }},
 { ocPearson, {{ ForceArray, ForceArray 
  }, 0 }},
 { ocPercentile,  {{ Reference, Value   
  }, 0 }},
+{ ocPercentile_Exc,  {{ Reference, Value   
  }, 0 }},
+{ ocPercentile_Inc,  {{ Reference, Value   
  }, 0 }},
 { ocPercentrank, {{ Reference, Value, Value
  }, 0 }},
+{ ocPercentrank_Exc, {{ Reference, Value, Value
  }, 0 }},
+{ ocPercentrank_Inc, {{ Reference, Value, Value
  }, 0 }},
 { ocPow, {{ Array, Array   
  }, 0 }},
 { ocPower,   {{ Array, Array   
  }, 0 }},
 { ocProb,{{ ForceArray, ForceArray, Value, Value   
  }, 0 }},
 { ocProduct, {{ Reference  
  }, 1 }},
 { ocQuartile,{{ Reference, Value   
  }, 0 }},
+{ ocQuartile_Exc,{{ Reference, Value   
  }, 0 }},
+{ ocQuartile_Inc,{{ Reference, Value   
  }, 0 }},
 { ocRank,{{ Value, Reference, Value
  }, 0 }},
+{ ocRank_Avg,{{ Value, Reference, Value
  }, 0 }},
+{ ocRank_Eq, {{ Value, Reference, Value
  }, 0 }},
 { ocRGP, {{ Reference, Reference, Value, Value 
  }, 0 }},
 { ocRKP, {{ Reference, Reference, Value, Value 
  }, 0 }},
 { ocRow, {{ Reference  
  }, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/appl/newhelp.cxx |7 ---
 sfx2/source/appl/newhelp.hxx |1 -
 2 files changed, 8 deletions(-)

New commits:
commit e203cf28c7ab5b256e02769392fff487c5ecc87a
Author: Caolán McNamara 
Date:   Wed Mar 5 11:55:00 2014 +

HelpTabPage_Impl ResId variant is now unused

Change-Id: I084aaae3f090b36e7f16c4cd2541613fc91d6490

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b7909d8..f7199a4 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -420,13 +420,6 @@ OUString ContentListBox_Impl::GetSelectEntry() const
 // class HelpTabPage_Impl 
 
 HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* 
_pIdxWin,
-const ResId& rResId )
-: TabPage( pParent, rResId )
-, m_pIdxWin( _pIdxWin )
-{
-}
-
-HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* 
_pIdxWin,
 const OString& rID, const OUString& rUIXMLDescription)
 : TabPage( pParent, rID, rUIXMLDescription)
 , m_pIdxWin( _pIdxWin )
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index fa63cff..a8ef107 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -78,7 +78,6 @@ protected:
 SfxHelpIndexWindow_Impl*m_pIdxWin;
 
 public:
-HelpTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, 
const ResId& rResId );
 HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
 const OString& rID, const OUString& rUIXMLDescription);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 formula/source/core/api/FormulaCompiler.cxx|1 
 formula/source/core/resource/core_resource.src |   28 +
 include/formula/compiler.hrc   |6 -
 include/formula/opcode.hxx |4 
 sc/inc/helpids.h   |4 
 sc/qa/unit/subsequent_filters-test.cxx |   10 -
 sc/qa/unit/ucalc.cxx   |4 
 sc/source/core/inc/interpre.hxx|2 
 sc/source/core/tool/interpr3.cxx   |   27 
 sc/source/core/tool/interpr4.cxx   |6 -
 sc/source/core/tool/interpr5.cxx   |   63 +++
 sc/source/core/tool/parclass.cxx   |3 
 sc/source/filter/excel/xlformula.cxx   |6 -
 sc/source/filter/oox/formulabase.cxx   |6 -
 sc/source/ui/src/scfuncs.src   |  136 +
 15 files changed, 297 insertions(+), 9 deletions(-)

New commits:
commit e4def6edaa4686e50bbfd4490a4b9ddb928397a4
Author: Winfried Donkers 
Date:   Sun Feb 2 12:37:39 2014 +0100

fdo#72197 Add Excel 2010 functions

MODE.SNGL, MODE.MULT, NEGBINOM.DIST, Z.TEST

Change-Id: I55eb05e1ebdb9dbc3ce9ae84e3cdacfdfa112091
Reviewed-on: https://gerrit.libreoffice.org/7776
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 0302855..d37f8cf 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -842,6 +842,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
 case ocMatMult :
 case ocMatInv :
 case ocMatrixUnit :
+case ocModalValue_Multi :
 return true;
 default:
 {
diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index d3b3ea3..a6de271 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -301,6 +301,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; };
 String SC_OPCODE_WEIBULL_MS { Text = "COM.MICROSOFT.WEIBULL.DIST" ; };
 String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
+String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "COM.MICROSOFT.NEGBINOM.DIST" 
; };
 String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
 String SC_OPCODE_BINOM_INV { Text = "COM.MICROSOFT.BINOM.INV" ; };
 String SC_OPCODE_KURT { Text = "KURT" ; };
@@ -313,7 +314,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; };
 String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; };
 String SC_OPCODE_MODAL_VALUE { Text = "MODE" ; };
+String SC_OPCODE_MODAL_VALUE_MS { Text = "COM.MICROSOFT.MODE.SNGL" ; };
+String SC_OPCODE_MODAL_VALUE_MULTI { Text = "COM.MICROSOFT.MODE.MULT" ; };
 String SC_OPCODE_Z_TEST { Text = "ZTEST" ; };
+String SC_OPCODE_Z_TEST_MS { Text = "COM.MICROSOFT.Z.TEST" ; };
 String SC_OPCODE_T_TEST { Text = "TTEST" ; };
 String SC_OPCODE_T_TEST_MS { Text = "COM.MICROSOFT.T.TEST" ; };
 String SC_OPCODE_RANK { Text = "RANK" ; };
@@ -695,6 +699,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
 String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; };
 String SC_OPCODE_WEIBULL_MS { Text = "_xlfn.WEIBULL.DIST" ; };
 String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
+String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "_xlfn.NEGBINOM.DIST" ; };
 String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
 String SC_OPCODE_BINOM_INV { Text = "_xlfn.BINOM.INV" ; };
 String SC_OPCODE_KURT { Text = "KURT" ; };
@@ -707,7 +712,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
 String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; };
 String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; };
 String SC_OPCODE_MODAL_VALUE { Text = "MODE" ; };
+String SC_OPCODE_MODAL_VALUE_MS { Text = "_xlfn.MODE.SNGL" ; };
+String SC_OPCODE_MODAL_VALUE_MULTI { Text = "_xlfn.MODE.MULT" ; };
 String SC_OPCODE_Z_TEST { Text = "ZTEST" ; };
+String SC_OPCODE_Z_TEST_MS { Text = "_xlfn.Z.TEST" ; };
 String SC_OPCODE_T_TEST { Text = "TTEST" ; };
 String SC_OPCODE_T_TEST_MS { Text = "_xlfn.T.TEST" ; };
 String SC_OPCODE_RANK { Text = "RANK" ; };
@@ -1091,6 +1099,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; };
 String SC_OPCODE_WEIBULL_MS { Text = "WEIBULL.DIST" ; };
 String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
+String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "NEGBINOM.DIST" ; };
 String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
 String SC_OPCODE_BINOM_INV { Text = "BINOM.INV" ; };
 String SC_OPCODE_KURT { Text = "KURT" ; };
@@ -1103,7 +1112,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLIS

[Libreoffice-commits] core.git: extras/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |3 +
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/app.hrc   |1 
 sfx2/source/appl/newhelp.cxx   |   56 +
 sfx2/source/appl/newhelp.hrc   |3 -
 sfx2/source/appl/newhelp.hxx   |   13 ++---
 sfx2/source/appl/newhelp.src   |   16 ---
 sfx2/source/inc/helpid.hrc |2 
 sfx2/uiconfig/ui/helpcontentpage.ui|   45 
 9 files changed, 77 insertions(+), 63 deletions(-)

New commits:
commit c1d9f1ff1868ecd8fa21028c53c5dd357701affe
Author: Caolán McNamara 
Date:   Wed Mar 5 11:45:51 2014 +

convert help contents page to .ui

Change-Id: I9ffd2881bfbf51749d69d7fc1af2d74335d8e3f4

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 24c8c3e..645ec55 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -472,6 +472,9 @@
 
+
 
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 46f3160..a39c171 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/helpbookmarkpage \
+   sfx2/uiconfig/ui/helpcontentpage \
sfx2/uiconfig/ui/helpindexpage \
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 138aa53..e0c1d13 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -42,7 +42,6 @@
 #define CONFIG_PATH_START   (RID_SFX_APP_START+98)
 
 #define WIN_HELPINDEX   (RID_SFX_APP_START+99)
-#define TP_HELP_CONTENT (RID_SFX_APP_START+100)
 
 #define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
 #define RID_INFO_NOSEARCHRESULTS(RID_SFX_APP_START+106)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f7080b1..b7909d8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -270,13 +270,11 @@ struct ContentEntry_Impl
 
 // ContentListBox_Impl ---
 
-ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId 
) :
-
-SvTreeListBox( pParent, rResId ),
-
-aOpenBookImage  ( SfxResId( IMG_HELP_CONTENT_BOOK_OPEN ) ),
-aClosedBookImage( SfxResId( IMG_HELP_CONTENT_BOOK_CLOSED ) ),
-aDocumentImage  ( SfxResId( IMG_HELP_CONTENT_DOC ) )
+ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle)
+: SvTreeListBox(pParent, nStyle)
+, aOpenBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_OPEN))
+, aClosedBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_CLOSED))
+, aDocumentImage(SfxResId(IMG_HELP_CONTENT_DOC))
 
 {
 SetStyle( GetStyle() | WB_HIDESELECTION | WB_HSCROLL );
@@ -292,7 +290,15 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, 
const ResId& rResId )
 InitRoot();
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeContentListBox(Window 
*pParent,
+VclBuilder::stringmap &rMap)
+{
+WinBits nWinStyle = WB_TABSTOP;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
+return new ContentListBox_Impl(pParent, nWinStyle);
+}
 
 ContentListBox_Impl::~ContentListBox_Impl()
 {
@@ -306,8 +312,6 @@ ContentListBox_Impl::~ContentListBox_Impl()
 }
 }
 
-
-
 void ContentListBox_Impl::InitRoot()
 {
 OUString aHelpTreeviewURL( 
"vnd.sun.star.hier://com.sun.star.help.TreeView/" );
@@ -431,41 +435,25 @@ HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, 
SfxHelpIndexWindow_Impl* _pI
 
 // class ContentTabPage_Impl -
 
-ContentTabPage_Impl::ContentTabPage_Impl( Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin ) :
-
-HelpTabPage_Impl( pParent, _pIdxWin, SfxResId( TP_HELP_CONTENT ) ),
-
-aContentBox( this, SfxResId( LB_CONTENTS ) )
-
+ContentTabPage_Impl::ContentTabPage_Impl(Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin)
+: HelpTabPage_Impl(pParent, _pIdxWin, "HelpContentPage",
+"sfx/ui/helpcontentpage.ui")
 {
-FreeResource();
-
-aContentBox.Show();
-}
-
-
-
-void ContentTabPage_Impl::Resize()
-{
-Size aSize = GetOutputSizePixel();
-aSize.Width() -= 8;
-aSize.Height() -= 8;
-aContentBox.SetPosSizePixel( Point( 4, 4 ), aSize );
+get(m_pContentBox, "content");
+Size aSize(LogicToPixel(Size(108 , 188), MAP_APPFONT));
+m_pContentBox->set_width_request(aSize.Width());
+m_pContentBox->set_height_request(aSize.Height());
 }
 
-
-
 void ContentTabPage_Impl::ActivatePage()
 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 3991641ad68b08ad6be332c9a3f8ffa7ff98a4d1
Author: Caolán McNamara 
Date:   Wed Mar 5 11:48:05 2014 +

Updated core
Project: help  b7b2120b6b279ed678c9fc8dbd5ee02e184064bc

diff --git a/helpcontent2 b/helpcontent2
index a1500f2..b7b2120 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a1500f2d2d62db355abf42dbd136b26baecf8abc
+Subproject commit b7b2120b6b279ed678c9fc8dbd5ee02e184064bc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/05/0160.xhp |4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b7b2120b6b279ed678c9fc8dbd5ee02e184064bc
Author: Caolán McNamara 
Date:   Wed Mar 5 11:48:05 2014 +

update help ids for help contents page .ui conversion

Change-Id: I11701c2b795fde45d671762951046ea3e459e5b0

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 53cd13c..a0e43a2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2106,7 +2106,6 @@ HID_HELP_LISTBOX,33347,
 HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
-HID_HELP_TABPAGE_CONTENTS,33356,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
 HID_HELP_TOOLBOXITEM_BACKWARD,33352,
@@ -2116,7 +2115,6 @@ HID_HELP_TOOLBOXITEM_INDEX,33350,
 HID_HELP_TOOLBOXITEM_PRINT,33354,
 HID_HELP_TOOLBOXITEM_SEARCHDIALOG,33363,
 HID_HELP_TOOLBOXITEM_START,33351,
-HID_HELP_TREELISTBOX_CONTENTS,33369,
 HID_HELP_WINDOW,33346,
 HID_HYPERDLG_DOC_PATH,34092,
 HID_HYPERDLG_INET_PATH,34090,
diff --git a/source/text/shared/05/0160.xhp 
b/source/text/shared/05/0160.xhp
index e18ba5a..0b3fa89 100644
--- a/source/text/shared/05/0160.xhp
+++ b/source/text/shared/05/0160.xhp
@@ -35,10 +35,10 @@
 tree view of Help
 
 
-
+
 Contents - The Main Help Topics
 
-Displays the main help 
themes, arranged in a similar way to folders in a file 
manager.
+Displays the 
main help themes, arranged in a similar way to folders in a file 
manager.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/shared/05/0140.xhp |   24 
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit a1500f2d2d62db355abf42dbd136b26baecf8abc
Author: Caolán McNamara 
Date:   Wed Mar 5 11:31:01 2014 +

update help ids for help search page .ui conversion

Change-Id: I34d65b1d4f4929ae69bea4e2a47bef21f5e9a958

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f1da63d..53cd13c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2107,7 +2107,6 @@ HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
 HID_HELP_TABPAGE_CONTENTS,33356,
-HID_HELP_TABPAGE_SEARCH,33358,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
 HID_HELP_TOOLBOXITEM_BACKWARD,33352,
@@ -5946,9 +5945,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236,
 sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235,
 sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
-sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
-sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
-sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
@@ -5964,7 +5960,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
@@ -5973,8 +5968,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
-sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379,
diff --git a/source/text/shared/05/0140.xhp 
b/source/text/shared/05/0140.xhp
index 3d79bec..ffb02dc 100644
--- a/source/text/shared/05/0140.xhp
+++ b/source/text/shared/05/0140.xhp
@@ -38,18 +38,18 @@
 
 Find - 
The Full-Text Search
 
-
-Enter the search term here. The search is not 
case-sensitive.
-
-Click to start a full-text search for the term you 
entered.
-
-Lists the headings of the pages found in your full-text 
search. To display a page, double-click its entry.
-
-Specifies whether to carry out an exact search for the word 
you entered. Incomplete words will not be found.
-
-Specifies whether to only search in document headings for 
the search term.
-
-Displays the entry selected in the list.
+
+Enter 
the search term here. The search is not case-sensitive.
+
+Click to 
start a full-text search for the term you entered.
+
+Lists 
the headings of the pages found in your full-text search. To display a page, 
double-click its entry.
+
+Specifies whether to carry out an exact search for the word 
you entered. Incomplete words will not be found.
+
+Specifies whether to only search in document headings for 
the search term.
+
+Displays the entry selected in the list.
 The full text search function in $[officename] Help allows you to 
find Help documents that contain any combination of search terms. To do this, 
type one or more words into the Search term text field.
 The Search term text field stores the words you entered 
last. To repeat a previous search, click the arrow icon and select the term 
from the list.
 After the search has been carried out, the document headings of the 
results appear in a list. Either double-click an entry, or select it and click 
Display to load the corresponding Help document.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |6 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/app.hrc   |1 
 sfx2/source/appl/newhelp.cxx   |  173 ++---
 sfx2/source/appl/newhelp.hrc   |   10 -
 sfx2/source/appl/newhelp.hxx   |   37 ++---
 sfx2/source/appl/newhelp.src   |   57 
 sfx2/source/inc/helpid.hrc |1 
 sfx2/uiconfig/ui/helpsearchpage.ui |  156 ++
 9 files changed, 253 insertions(+), 189 deletions(-)

New commits:
commit 8ce132ee0e2ddcd7f47e46fb943b32326cfa429e
Author: Caolán McNamara 
Date:   Wed Mar 5 11:25:15 2014 +

convert help search page to .ui

Change-Id: Ib40ab75ce04c60df29895b0b14450d507d67db23

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 1e5ff88..24c8c3e 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -21,6 +21,12 @@
 
+
+
 
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 7fcf9b0..46f3160 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/helpbookmarkpage \
sfx2/uiconfig/ui/helpindexpage \
+   sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 79d94c1..138aa53 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -43,7 +43,6 @@
 
 #define WIN_HELPINDEX   (RID_SFX_APP_START+99)
 #define TP_HELP_CONTENT (RID_SFX_APP_START+100)
-#define TP_HELP_SEARCH  (RID_SFX_APP_START+102)
 
 #define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
 #define RID_INFO_NOSEARCHRESULTS(RID_SFX_APP_START+106)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 509014d..f7080b1 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -873,6 +873,15 @@ void IndexTabPage_Impl::OpenKeyword()
 
 // class SearchBox_Impl --
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent,
+VclBuilder::stringmap &)
+{
+WinBits nWinBits = 
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN;
+SearchBox_Impl* pComboBox = new SearchBox_Impl(pParent, nWinBits);
+pComboBox->EnableAutoSize(true);
+return pComboBox;
+}
+
 bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
 sal_Bool bHandled = sal_False;
@@ -897,6 +906,18 @@ void SearchBox_Impl::Select()
 
 // class SearchResultsBox_Impl ---
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchResultsBox(Window 
*pParent,
+VclBuilder::stringmap &rMap)
+{
+WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+   nWinBits |= WB_BORDER;
+SearchResultsBox_Impl* pListBox = new SearchResultsBox_Impl(pParent, 
nWinBits);
+pListBox->EnableAutoSize(true);
+return pListBox;
+}
+
 bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
 {
 bool bHandled = false;
@@ -912,29 +933,30 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
 
 // class SearchTabPage_Impl --
 
-SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin ) :
+SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin)
+: HelpTabPage_Impl(pParent, _pIdxWin, "HelpSearchPage",
+"sfx/ui/helpsearchpage.ui")
 
-HelpTabPage_Impl( pParent, _pIdxWin, SfxResId( TP_HELP_SEARCH ) ),
+,
 
-aSearchFT   ( this, SfxResId( FT_SEARCH ) ),
-aSearchED   ( this, SfxResId( ED_SEARCH ) ),
-aSearchBtn  ( this, SfxResId( PB_SEARCH ) ),
-aFullWordsCB( this, SfxResId( CB_FULLWORDS ) ),
-aScopeCB( this, SfxResId( CB_SCOPE ) ),
-aResultsLB  ( this, SfxResId( LB_RESULT ) ),
-aOpenBtn( this, SfxResId( PB_OPEN_SEARCH ) ),
 xBreakIterator  ( vcl::unohelper::CreateBreakIterator() )
 
 {
-FreeResource();
+get(m_pSearchED, "search");
+get(m_pSearchBtn, "find");
+get(m_pFullWordsCB, "completewords");
+get(m_pScopeCB, "headings");
+get(m_pResultsLB, "results");
+Size aSize(LogicToPixel(Size(128 , 30), MAP_APPFONT));
+m_pResultsLB->set_width_request(aSize.Width());
+m_pResultsLB->set_height_request(aSize.Height());
+get(m_pOpenBtn, "displa

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit a099961a13752dedbdf5ec7445865e0d6cb45455
Author: Caolán McNamara 
Date:   Wed Mar 5 11:31:01 2014 +

Updated core
Project: help  a1500f2d2d62db355abf42dbd136b26baecf8abc

diff --git a/helpcontent2 b/helpcontent2
index d17b89d..a1500f2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d17b89d10487e87000998056c30f9ecfa8b1a86a
+Subproject commit a1500f2d2d62db355abf42dbd136b26baecf8abc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal

[Stephan Bergmann]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5cab7c7b24fab6e77cb54a134ada2ee33cf51acc
Author: Stephan Bergmann 
Date:   Wed Mar 5 12:11:46 2014 +0100

loplugin:sallogareas

Change-Id: Iba543bf0642071ab4a9164af8a4bcb35ac1ecfd0

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 11b7613..931a989 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -457,6 +457,7 @@ certain functionality.
 @li @c shell
 @li @c stoc
 @li @c svg
+@li @c test
 @li @c ucbhelper
 @li @c unoidl
 @li @c unoxml
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39440] cppcheck cleanliness

[bugzilla-daemon]

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

--- Comment #19 from Commit Notification 
 ---
Mihai Varga committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39440 the sSymName parameter is now passed by reference



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

[Libreoffice-commits] core.git: extras/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/app.hrc   |1 
 sfx2/source/appl/newhelp.cxx   |  130 -
 sfx2/source/appl/newhelp.hrc   |   10 -
 sfx2/source/appl/newhelp.hxx   |   17 +--
 sfx2/source/appl/newhelp.src   |   28 -
 sfx2/source/inc/helpid.hrc |1 
 sfx2/uiconfig/ui/helpindexpage.ui  |   74 ++
 9 files changed, 130 insertions(+), 135 deletions(-)

New commits:
commit e5107024bd2703122c4d8a27e29abd2c73e6af38
Author: Caolán McNamara 
Date:   Wed Mar 5 10:49:43 2014 +

convert help index page to .ui

Change-Id: I2d3b5311b8f40350f6d9524f802cb074c175ffaa

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 3aaadca..1e5ff88 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -18,6 +18,9 @@
 
+
 
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 614071b..7fcf9b0 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/helpbookmarkpage \
+   sfx2/uiconfig/ui/helpindexpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index e6c1adc..79d94c1 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -43,7 +43,6 @@
 
 #define WIN_HELPINDEX   (RID_SFX_APP_START+99)
 #define TP_HELP_CONTENT (RID_SFX_APP_START+100)
-#define TP_HELP_INDEX   (RID_SFX_APP_START+101)
 #define TP_HELP_SEARCH  (RID_SFX_APP_START+102)
 
 #define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 0b1f653..509014d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -470,16 +470,24 @@ Control* ContentTabPage_Impl::GetLastFocusControl()
 
 // class IndexBox_Impl ---
 
-IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) :
-
-ComboBox( pParent, rResId )
-
+IndexBox_Impl::IndexBox_Impl(Window* pParent, WinBits nStyle)
+: ComboBox(pParent, nStyle)
 {
-EnableAutocomplete( true );
-EnableUserDraw( true );
+EnableAutocomplete(true);
+EnableUserDraw(true);
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeIndexBox(Window *pParent,
+VclBuilder::stringmap &rMap)
+{
+WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+   nWinBits |= WB_BORDER;
+IndexBox_Impl* pListBox = new IndexBox_Impl(pParent, nWinBits);
+pListBox->EnableAutoSize(true);
+return pListBox;
+}
 
 void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
 {
@@ -537,31 +545,25 @@ void IndexBox_Impl::SelectExecutableEntry()
 
 // class IndexTabPage_Impl ---
 
-IndexTabPage_Impl::IndexTabPage_Impl( Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin ) :
-
-HelpTabPage_Impl( pParent, _pIdxWin, SfxResId( TP_HELP_INDEX ) ),
-
-aExpressionFT   ( this, SfxResId( FT_EXPRESSION ) ),
-aIndexCB( this, SfxResId( CB_INDEX ) ),
-aOpenBtn( this, SfxResId( PB_OPEN_INDEX ) ),
-
-bIsActivated( sal_False )
-
+IndexTabPage_Impl::IndexTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* 
_pIdxWin)
+: HelpTabPage_Impl(pParent, _pIdxWin, "HelpIndexPage",
+"sfx/ui/helpindexpage.ui")
+, bIsActivated(false)
 {
-FreeResource();
+get(m_pIndexCB, "terms");
+Size aSize(LogicToPixel(Size(108, 97), MAP_APPFONT));
+m_pIndexCB->set_width_request(aSize.Width());
+m_pIndexCB->set_height_request(aSize.Height());
+get(m_pOpenBtn, "display");
 
-aOpenBtn.SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
+m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
 Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
 aFactoryTimer.SetTimeoutHdl( aTimeoutLink );
 aFactoryTimer.SetTimeout( 300 );
 aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
 aFactoryTimer.SetTimeout( 300 );
-
-nMinWidth = aOpenBtn.GetSizePixel().Width();
 }
 
-
-
 IndexTabPage_Impl::~IndexTabPage_Impl()
 {
 ClearIndex();
@@ -597,18 +599,18 @@ namespace sfx2 {
 #define UNIFY_AND_INSERT_TOKEN( aToken )   
 \
 it = aInfo.ins

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

[Jan Holesovsky]

 sw/qa/extras/inc/swmodeltestbase.hxx |   13 +--
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |  123 +++
 2 files changed, 52 insertions(+), 84 deletions(-)

New commits:
commit 27e57531b48afa7bf0c95418a89811c375a96c32
Author: Jan Holesovsky 
Date:   Wed Mar 5 12:01:21 2014 +0100

sw tests: Fix description of the new assertXPathContent() and use it 
broadly.

Change-Id: I3c8d5e491fcf9f871d72fb2d138bb7094ff69746

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index cb15d69..77c32c2 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -580,21 +580,20 @@ protected:
  nNumberOfNodes, 
xmlXPathNodeSetGetLength(pXmlNodes));
 }
 
-
 /**
- * Assert that rXPath exists, and returns exactly nNumberOfNodes nodes.
- * Useful for checking that we do _not_ export some node (nNumberOfNodes 
== 0).
+ * Assert that rXPath exists, and its content equals rContent.
  */
 void assertXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath, const 
OUString& rContent)
 {
 xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
 
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("XPath '" + rXPath + "' not 
found").getStr(),
- 1, xmlXPathNodeSetGetLength(pXmlNodes));
+CPPUNIT_ASSERT_MESSAGE(OString("XPath '" + rXPath + "' not 
found").getStr(),
+xmlXPathNodeSetGetLength(pXmlNodes) > 0);
 
 xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
-CPPUNIT_ASSERT_EQUAL_MESSAGE("XPath contents do not 
match",rContent,contents);
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("XPath contents of child does not match", 
rContent,
+OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content)));
 }
 
 /**
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 383566c..c51b58a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2108,10 +2108,8 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
 if (!pXmlDoc)
 return;
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t");
-xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
-CPPUNIT_ASSERT(contents.match("15"));
+
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t", "15");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, "textbox_picturefill.docx")
@@ -2143,12 +2141,10 @@ 
DECLARE_OOXMLEXPORT_TEST(testFieldFlagO,"TOC_field_f.docx")
 xmlDocPtr pXmlDoc = parseExport();
 if (!pXmlDoc)
 return;
+
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:r[2]/w:instrText");
-xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
-CPPUNIT_ASSERT(contents.match(" TOC \\z \\f \\o \"1-3\" \\u \\h"));
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\f \\o \"1-3\" \\u 
\\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTOCFlag_f, "toc_doc.docx")
@@ -2162,12 +2158,10 @@ DECLARE_OOXMLEXPORT_TEST(testTOCFlag_f, "toc_doc.docx")
 xmlDocPtr pXmlDoc = parseExport();
 if (!pXmlDoc)
 return;
+
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:r[2]/w:instrText");
-xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
-CPPUNIT_ASSERT(contents.endsWith("\\h"));
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\o \"1-3\" \\u \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPreserveZfield,"preserve_Z_field_TOC.docx")
@@ -2175,48 +2169,40 @@ 
DECLARE_OOXMLEXPORT_TEST(testPreserveZfield,"preserve_Z_field_TOC.docx")
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
 if (!pXmlDoc)
 return;
+
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:r[2]/w:instrText");
-xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString contents = OUString::createFromAscii((const 
char*)(

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit eb847b33f7ea5b5e103886da7eb5dd1cc3061422
Author: Caolán McNamara 
Date:   Wed Mar 5 10:56:47 2014 +

Updated core
Project: help  d17b89d10487e87000998056c30f9ecfa8b1a86a

diff --git a/helpcontent2 b/helpcontent2
index fd4b247..d17b89d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fd4b247481040463a7037ed0d96e78256ad2c32d
+Subproject commit d17b89d10487e87000998056c30f9ecfa8b1a86a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/05/0130.xhp |8 
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit d17b89d10487e87000998056c30f9ecfa8b1a86a
Author: Caolán McNamara 
Date:   Wed Mar 5 10:56:47 2014 +

update help ids for help index page .ui conversion

Change-Id: I13210a5173f28ecd111bfd9c2809c36b1fedfe6c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b2d5a85..f1da63d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2107,7 +2107,6 @@ HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
 HID_HELP_TABPAGE_CONTENTS,33356,
-HID_HELP_TABPAGE_INDEX,33357,
 HID_HELP_TABPAGE_SEARCH,33358,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
@@ -5949,7 +5948,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
-sfx2_ComboBox_TP_HELP_INDEX_CB_INDEX,546983947,
 sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
@@ -5975,7 +5973,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
diff --git a/source/text/shared/05/0130.xhp 
b/source/text/shared/05/0130.xhp
index 0af617d..dfdc578 100644
--- a/source/text/shared/05/0130.xhp
+++ b/source/text/shared/05/0130.xhp
@@ -39,10 +39,10 @@
 
 Index - Keyword Search in the Help
 
-
-Double-click an entry or type the word you want to find in 
the index.
-
-Click to display the selected topic.
+
+Double-click an entry or type the word you want to find in 
the index.
+
+Click 
to display the selected topic.
 You can search for a specific topic by typing a word into the 
Search term text box. The window contains an alphabetical list of 
index terms.
 If the cursor is in the index list when you type the search term, 
the display will jump directly to the next match. When you type a word in the 
Search term text box, the focus will jump to the best match in the 
index list.
 The index and full-text searches always apply to the currently 
selected %PRODUCTNAME application. Select the 
appropriate application using the list box on the help viewer's 
toolbar.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 extensions/source/propctrlr/browserlistbox.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 47bf525643fb0b609b248387b7192ce8b285f881
Author: Caolán McNamara 
Date:   Thu Feb 27 09:55:18 2014 +

coverity#704633 Dereference after null check

(cherry picked from commit ccf0f7ef03bf98831a3e21b4b1327673a590b918)

Change-Id: I4985249110da93ba67881dcd1c8cd1dc66ae08e2
Reviewed-on: https://gerrit.libreoffice.org/8379
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/extensions/source/propctrlr/browserlistbox.cxx 
b/extensions/source/propctrlr/browserlistbox.cxx
index fa6bfcc..9a8cf37 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1196,11 +1196,12 @@ namespace pcr
 // So, we manually switch this to read-only.
 if ( xControl.is() && ( xControl->getControlType() == 
PropertyControlType::Unknown ) )
 {
-Edit* pControlWindowAsEdit = dynamic_cast< Edit* >( 
rLine.pLine->getControlWindow() );
-if ( pControlWindowAsEdit )
-pControlWindowAsEdit->SetReadOnly( sal_True );
+Window *pWindow = rLine.pLine->getControlWindow();
+Edit* pControlWindowAsEdit = dynamic_cast(pWindow);
+if (pControlWindowAsEdit)
+pControlWindowAsEdit->SetReadOnly(sal_True);
 else
-pControlWindowAsEdit->Enable( sal_False );
+pWindow->Enable(sal_False);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 svtools/uiconfig/ui/placeedit.ui |  429 ---
 1 file changed, 228 insertions(+), 201 deletions(-)

New commits:
commit 935e91c55f5878ce999db30b777cec36b50c3b3a
Author: Olivier Hallot 
Date:   Tue Mar 4 15:06:40 2014 -0300

Add window title and frame into placeedit.ui

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

diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index c6bde76..681e95e 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -6,9 +6,38 @@
 1
 10
   
+  
+True
+False
+gtk-refresh
+  
+  
+
+  
+  
+
+
+  
+WebDAV
+  
+  
+FTP
+  
+  
+SSH
+  
+  
+Windows Share
+  
+  
+CMIS
+  
+
+  
   
 False
 6
+File Services
 dialog
 
   
@@ -16,78 +45,104 @@
 vertical
 12
 
-  
+  
 True
 False
-6
-12
-
-  
-True
-False
-start
-0
-Name
-True
-name
-  
-  
-0
-0
-1
-1
-  
-
+0
+none
 
-  
+  
 True
 False
-start
-0
-Type
-True
-type
-  
-  
-0
-1
-1
-1
-  
-
-
-  
-True
-True
-True
-●
+6
+12
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+start
+0
+Name
+True
+name
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+start
+0
+Type
+True
+type
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+True
+True
+●
+  
+  
+1
+0
+1
+1
+  
+
+
+  
+True
+False
+True
+liststore1
+
+  
+  
+0
+  
+
+  
+  
+1
+1
+1
+1
+  
+
+  
+
   
-  
-1
-0
-1
-1
-  
 
-
-  
+
+  
 True
 False
-True
-liststore1
-
-  
-  
-0
-  
-
+File 
Service
+
+  
+
   
-  
-1
-1
-1
-1
-  
 
   
   
@@ -263,131 +318,80 @@
   
 
 
-  
+  
 True
 False
 0
 none
 
-  
+  
 True
 False
 6
 12
 
-

[ANN] LIbreOffice 4.2.2 RC1 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 4.2.2. The upcoming 4.2.2 will be the second
in a sequence of frequent bugfix release for our feature-packed 4.2
line. Feel free to give it a try instead of
4.2.1. Conservative users should continue to use LibreOffice 4.1.5

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

LibreOffice 4.2.2 RC1 is also available in a 64bit version for Mac OS
X 10.8 (or newer)

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.2.2 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.2.2/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

[Libreoffice-commits] core.git: extras/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/app.hrc   |1 
 sfx2/source/appl/newhelp.cxx   |  108 +
 sfx2/source/appl/newhelp.hxx   |   14 +--
 sfx2/source/appl/newhelp.src   |   29 --
 sfx2/source/inc/helpid.hrc |1 
 sfx2/uiconfig/ui/helpbookmarkpage.ui   |   74 +
 8 files changed, 123 insertions(+), 108 deletions(-)

New commits:
commit 8c766085a045710a1fc761fe57026e60a6ccdba3
Author: Caolán McNamara 
Date:   Wed Mar 5 09:51:43 2014 +

convert help bookmarks tabpage to .ui

Change-Id: I2bfbb2aa53729be1c12ccc3ca3dd8644aa4d5410

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index ebb007f..3aaadca 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -15,6 +15,9 @@
 -->
 
   
+
 
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index d3e53de..614071b 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentpropertiesdialog \
sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
+   sfx2/uiconfig/ui/helpbookmarkpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 84050c0..e6c1adc 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -45,7 +45,6 @@
 #define TP_HELP_CONTENT (RID_SFX_APP_START+100)
 #define TP_HELP_INDEX   (RID_SFX_APP_START+101)
 #define TP_HELP_SEARCH  (RID_SFX_APP_START+102)
-#define TP_HELP_BOOKMARKS   (RID_SFX_APP_START+103)
 
 #define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
 #define RID_INFO_NOSEARCHRESULTS(RID_SFX_APP_START+106)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 664302c..0b1f653 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -92,6 +92,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -414,13 +415,17 @@ OUString ContentListBox_Impl::GetSelectEntry() const
 
 // class HelpTabPage_Impl 
 
-HelpTabPage_Impl::HelpTabPage_Impl(
-Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const ResId& rResId ) :
-
-TabPage( pParent, rResId ),
-
-m_pIdxWin( _pIdxWin )
+HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* 
_pIdxWin,
+const ResId& rResId )
+: TabPage( pParent, rResId )
+, m_pIdxWin( _pIdxWin )
+{
+}
 
+HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* 
_pIdxWin,
+const OString& rID, const OUString& rUIXMLDescription)
+: TabPage( pParent, rID, rUIXMLDescription)
+, m_pIdxWin( _pIdxWin )
 {
 }
 
@@ -1229,16 +1234,22 @@ void GetBookmarkEntry_Impl
 }
 }
 
-
-
-BookmarksBox_Impl::BookmarksBox_Impl( Window* pParent, const ResId& rResId ) :
-
-ListBox( pParent, rResId )
-
+BookmarksBox_Impl::BookmarksBox_Impl(Window* pParent, WinBits nStyle)
+: ListBox(pParent, nStyle)
 {
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarksBox(Window 
*pParent,
+VclBuilder::stringmap &rMap)
+{
+WinBits nWinBits = 
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+   nWinBits |= WB_BORDER;
+BookmarksBox_Impl* pListBox = new BookmarksBox_Impl(pParent, nWinBits);
+pListBox->EnableAutoSize(true);
+return pListBox;
+}
 
 BookmarksBox_Impl::~BookmarksBox_Impl()
 {
@@ -1345,20 +1356,17 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
 
 // class BookmarksTabPage_Impl ---
 
-BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin ) :
-
-HelpTabPage_Impl( pParent, _pIdxWin, SfxResId( TP_HELP_BOOKMARKS ) ),
-
-aBookmarksFT( this, SfxResId( FT_BOOKMARKS ) ),
-aBookmarksBox   ( this, SfxResId( LB_BOOKMARKS ) ),
-aBookmarksPB( this, SfxResId( PB_BOOKMARKS ) )
-
+BookmarksTabPage_Impl::BookmarksTabPage_Impl(Window* pParent, 
SfxHelpIndexWindow_Impl* _pIdxWin)
+: HelpTabPage_Impl(pParent, _pIdxWin, "HelpBookmarkPage",
+"sfx/ui/helpbookmarkpage.ui")
 {
-FreeResource();
-
-nMinWidth = aBookmarksPB.GetSizePixel().Width();
+get(m_pBookmarksPB, "display");
+get(m_pBookmarksBox, "bookmarks");
+Size aSize(LogicToPixel(Size(120 , 200), MAP_APPFONT));
+m_pBookmarksBox->set_w

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/05/0150.xhp |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit fd4b247481040463a7037ed0d96e78256ad2c32d
Author: Caolán McNamara 
Date:   Wed Mar 5 10:17:24 2014 +

update help ids for help bookmarks .ui conversion

Change-Id: I4d264d6e53bffa652d58ccd99fb0d2279a77218e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 71736aa..b2d5a85 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2106,7 +2106,6 @@ HID_HELP_LISTBOX,33347,
 HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
-HID_HELP_TABPAGE_BOOKMARKS,33359,
 HID_HELP_TABPAGE_CONTENTS,33356,
 HID_HELP_TABPAGE_INDEX,33357,
 HID_HELP_TABPAGE_SEARCH,33358,
@@ -5967,7 +5966,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203,
 sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
@@ -5977,7 +5975,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
diff --git a/source/text/shared/05/0150.xhp 
b/source/text/shared/05/0150.xhp
index e1b584d..9f659e5 100644
--- a/source/text/shared/05/0150.xhp
+++ b/source/text/shared/05/0150.xhp
@@ -51,7 +51,7 @@
   You can find the bookmarks on the Bookmarks tab 
page.
   

-Double-clicking a bookmark or pressing the Return key 
opens the assigned page in Help. A right-click opens the context 
menu.
+Double-clicking a bookmark or pressing the Return key 
opens the assigned page in Help. A right-click opens the context 
menu.


 Use the Del key to delete a selected bookmark.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 76ccdee026b7166904f3f9ec04340c70e6132ae0
Author: Caolán McNamara 
Date:   Wed Mar 5 10:17:24 2014 +

Updated core
Project: help  fd4b247481040463a7037ed0d96e78256ad2c32d

diff --git a/helpcontent2 b/helpcontent2
index bf4bd6b..fd4b247 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bf4bd6b7a918771621956a90f13213e8fc777507
+Subproject commit fd4b247481040463a7037ed0d96e78256ad2c32d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ww8import/data/bnc821208.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |9 +
 sw/source/filter/ww8/ww8par2.cxx  |5 +
 3 files changed, 14 insertions(+)

New commits:
commit 4b7d584b13a40a6e067afdacb77638b334606da2
Author: Miklos Vajna 
Date:   Tue Mar 4 14:47:13 2014 +0100

bnc#821208 DOC import: don't overwrite WW8Num* character styles

In general we're overwriting styles on import in case we're not pasting.
But these WW8Num* character styles are in general not from the document,
they are created because Writer needs a character style for each
numbering level to handle what's in the DOC file.

So, in case there is a character style with the same name as our
"character style for numbering" styles, prefer the later ones, as that's
intended most likely.

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

diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc 
b/sw/qa/extras/ww8import/data/bnc821208.doc
new file mode 100755
index 000..d89d711
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc821208.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 0c3e1fc..cc107e0 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -234,6 +234,15 @@ DECLARE_WW8IMPORT_TEST(testListNolevel, "list-nolevel.doc")
 CPPUNIT_ASSERT_EQUAL(OUString("1."), aText);
 }
 
+DECLARE_WW8IMPORT_TEST(testBnc821208, "bnc821208.doc")
+{
+// WW8Num1z0 earned a Symbol font, turning numbers into rectangles.
+uno::Reference 
xPropertyState(getStyles("CharacterStyles")->getByName("WW8Num1z0"), 
uno::UNO_QUERY);
+beans::PropertyState ePropertyState = 
xPropertyState->getPropertyState("CharFontName");
+// This was beans::PropertyState_DIRECT_VALUE.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4d454e1..f94e055 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3750,6 +3750,11 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti 
eSti, sal_uInt16 nThisSty
 }
 
 bool bImport = !bStyExist || pIo->mbNewDoc; // import content ?
+
+// Do not override character styles the list import code created earlier.
+if (bImport && bStyExist && rSI.GetOrgWWName().startsWith("WW8Num"))
+bImport = false;
+
 bool bOldNoImp = pIo->bNoAttrImport;
 rSI.bImportSkipped = !bImport;
 
___
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/qa sw/source

[Miklos Vajna]

 sw/qa/extras/ww8import/data/bnc821208.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |   11 +++
 sw/source/filter/ww8/ww8par2.cxx  |5 +
 3 files changed, 16 insertions(+)

New commits:
commit f57fa998035cb5f859b89451a563137fdaf1b465
Author: Miklos Vajna 
Date:   Tue Mar 4 14:47:13 2014 +0100

bnc#821208 DOC import: don't overwrite WW8Num* character styles

In general we're overwriting styles on import in case we're not pasting.
But these WW8Num* character styles are in general not from the document,
they are created because Writer needs a character style for each
numbering level to handle what's in the DOC file.

So, in case there is a character style with the same name as our
"character style for numbering" styles, prefer the later ones, as that's
intended most likely.

(cherry picked from commit e88ee8aa307ecec1cc22cda56b97dcfd8b838ce8)

Conflicts:
sw/qa/extras/ww8import/ww8import.cxx

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

diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc 
b/sw/qa/extras/ww8import/data/bnc821208.doc
new file mode 100755
index 000..d89d711
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc821208.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 3311563..4fd9d21 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -35,6 +35,7 @@ public:
 void testN816593();
 void testPageBorder();
 void testN823651();
+void testBnc821208();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -61,6 +62,7 @@ void Test::run()
 {"n816593.doc", &Test::testN816593},
 {"page-border.doc", &Test::testPageBorder},
 {"n823651.doc", &Test::testN823651},
+{"bnc821208.doc", &Test::testBnc821208},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -265,6 +267,15 @@ void Test::testN823651()
 CPPUNIT_ASSERT_EQUAL(7.5f, getProperty(getParagraphOfText(1, 
xText), "CharHeight"));
 }
 
+void Test::testBnc821208()
+{
+// WW8Num1z0 earned a Symbol font, turning numbers into rectangles.
+uno::Reference 
xPropertyState(getStyles("CharacterStyles")->getByName("WW8Num1z0"), 
uno::UNO_QUERY);
+beans::PropertyState ePropertyState = 
xPropertyState->getPropertyState("CharFontName");
+// This was beans::PropertyState_DIRECT_VALUE.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 81841d5..01baf33 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3763,6 +3763,11 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti 
eSti, sal_uInt16 nThisSty
 }
 
 bool bImport = !bStyExist || pIo->mbNewDoc; // import content ?
+
+// Do not override character styles the list import code created earlier.
+if (bImport && bStyExist && rSI.GetOrgWWName().SearchAscii("WW8Num") == 0)
+bImport = false;
+
 bool bOldNoImp = pIo->bNoAttrImport;
 rSI.bImportSkipped = !bImport;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tushar Bende]

 sw/qa/extras/ooxmlexport/data/test_ole_object.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |8 
 sw/source/filter/ww8/docxattributeoutput.cxx   |1 +
 3 files changed, 9 insertions(+)

New commits:
commit 7b7b64f26b9ef4ed717506f689d6d870305cb2bb
Author: Tushar Bende 
Date:   Wed Mar 5 11:25:35 2014 +0530

fdo#75557 : OLE Objects of type .zip not being preserved in RT

Problem was Document containing ole object if RoundTripped then after 
Roundtripping the OLE object was not working.
Which means if doc contains .zip file as ole object then after 
RoundTripping that .zip object was not getting opened .

Reason found that it was because of missing o:title attribute during 
RoundTrip for  inside .

XML file difference :
In document.xml,
Before - 
   
 
After -  
   
 

Verified that code changes working for other ole objects as well which are: 
Equations ,Excel Sheet and .zip.

Change-Id: I813de38bcd6e334ce38a661fdfcfa434ef246ed0
Reviewed-on: https://gerrit.libreoffice.org/8458
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/test_ole_object.docx 
b/sw/qa/extras/ooxmlexport/data/test_ole_object.docx
new file mode 100644
index 000..4391946
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test_ole_object.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 920f33a..383566c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2943,6 +2943,14 @@ DECLARE_OOXMLEXPORT_TEST(testCompatSettingsForW14, 
"TextEffects_StylisticSets_Cn
 assertXPath(pXmlDoc, "/w:settings/w:compat/w:compatSetting[5]", "uri", 
"http://schemas.microsoft.com/office/word";);
 assertXPath(pXmlDoc, "/w:settings/w:compat/w:compatSetting[5]", "val", 
"1");
 }
+DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+ assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:imagedata", "o:title", "");
+}
 
 DECLARE_OOXMLEXPORT_TEST(testFdo74792, "fdo74792.docx")
 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2fe102c..dad9d27 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3712,6 +3712,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, 
const Size& rSize, const S
 // shape filled with the preview image
 m_pSerializer->singleElementNS( XML_v, XML_imagedata,
 FSNS( XML_r, XML_id ), OUStringToOString( 
sImageId, RTL_TEXTENCODING_UTF8 ).getStr(),
+FSNS( XML_o, XML_title ), "",
 FSEND );
 
 m_pSerializer->endElementNS( XML_v, XML_shape );
___
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' - filter/CppunitTest_filter_xslt.mk filter/Module_filter.mk filter/qa filter/source

[Michael Stahl]

 filter/CppunitTest_filter_xslt.mk   |   46 +
 filter/Module_filter.mk |4 
 filter/qa/cppunit/data/xslt/copy.xslt   |9 +
 filter/qa/cppunit/xslt-test.cxx |  193 
 filter/source/xsltfilter/LibXSLTTransformer.cxx |5 
 5 files changed, 256 insertions(+), 1 deletion(-)

New commits:
commit f856667ee6ae786575aa8e82f71ff2dabf16a659
Author: Michael Stahl 
Date:   Tue Mar 4 17:59:45 2014 +0100

filter: make LibXSLTTransformer init backward compatible

As reported by Fernand Vanrie, initializing the XSLT service can fail
because the LibXSLTTransformer::initialize was changed to require
the parameters as a nested Sequence; accept previous parameter
convention as a fall-back.

(regression from ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0)

(cherry picked from commit 6967da019b69767a15116de101d33a16b95c8a44)

filter: and we learn that BootstrapFixture requires boost headers
(cherry picked from commit bfdd18eb35f5c8bf7f713910ec35b853c7456969)

filter: don't wait forever if the xslt test fails
(cherry picked from commit 8af7a8953248dd184cd620b934ee6abc147f4076)

I imagine this should have a SAL_CALL decoration
(cherry picked from commit 62d6252d2cde33f6ef0e627c3192a63d43ba2a87)

filter: sigh... fix the xslt test to run on WNT too
(cherry picked from commit 4fcd5534348adcb61ab85b93478c272b8d9e8f8c)

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

diff --git a/filter/CppunitTest_filter_xslt.mk 
b/filter/CppunitTest_filter_xslt.mk
new file mode 100644
index 000..90af9b0
--- /dev/null
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_api,filter_xslt,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_external,filter_xslt,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \
+   comphelper \
+   test \
+   unotest \
+   cppuhelper \
+   cppu \
+   sal \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,filter_xslt,\
+   configmgr/source/configmgr \
+   fileaccess/source/fileacc \
+   filter/source/xsltfilter/xsltfilter \
+   i18npool/util/i18npool \
+   ucb/source/core/ucb1 \
+   ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_xslt, \
+   filter/qa/cppunit/xslt-test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 559fb65..85480f7 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -75,6 +75,10 @@ $(eval $(call gb_Module_add_targets,filter,\
 ))
 endif
 
+$(eval $(call gb_Module_add_check_targets,filter,\
+CppunitTest_filter_xslt \
+))
+
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_pict_test \
diff --git a/filter/qa/cppunit/data/xslt/copy.xslt 
b/filter/qa/cppunit/data/xslt/copy.xslt
new file mode 100644
index 000..d46172a
--- /dev/null
+++ b/filter/qa/cppunit/data/xslt/copy.xslt
@@ -0,0 +1,9 @@
+
+http://www.w3.org/1999/XSL/Transform";>
+
+
+   
+
+
+
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
new file mode 100644
index 000..509d37c
--- /dev/null
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -0,0 +1,193 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+
+using namespace std;
+using namespace ::com::sun::star;
+
+
+namespace {
+
+class XsltFilterTest
+: public test::BootstrapFixture
+{
+public:
+void testXsltCopyOld();
+void testXsltCopyNew();
+
+CPPUNIT_TEST_SUITE(XsltFilterTest);
+CPPUNIT_TEST(testXsltCopyOld);
+CPPUNIT_TEST(testXsltCopyNew);
+CPPUNIT_TEST_SUITE_END();
+};
+
+struct Listener : public ::cppu:

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

[Markus Mohrhard]

 include/test/bootstrapfixture.hxx |8 
 sc/qa/unit/helper/qahelper.cxx|   68 --
 test/source/bootstrapfixture.cxx  |   74 ++
 3 files changed, 83 insertions(+), 67 deletions(-)

New commits:
commit 9a7ca779cdd3007df4e1425d296ba83091a4044d
Author: Markus Mohrhard 
Date:   Wed Mar 5 11:11:41 2014 +0100

move the export validation code to test

Change-Id: Iaafe30a1095bd5b6dac3637c394818ba8bd848ce

diff --git a/include/test/bootstrapfixture.hxx 
b/include/test/bootstrapfixture.hxx
index 3896010..f7e40e6 100644
--- a/include/test/bootstrapfixture.hxx
+++ b/include/test/bootstrapfixture.hxx
@@ -27,6 +27,12 @@
 
 namespace test {
 
+enum ValidationFormat
+{
+OOXML,
+ODF
+};
+
 // Class to do lots of heavy-lifting UNO & environment
 // bootstrapping for unit tests, such that we can use
 // almost an entire LibreOffice during compile - so
@@ -47,6 +53,8 @@ public:
 
   virtual void setUp();
   virtual void tearDown();
+
+  static void validate(const OUString& rURL, ValidationFormat);
 };
 
 }
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 7ab7a36..320ab5e 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -587,70 +587,6 @@ void ScBootstrapFixture::createCSVPath(const OUString& 
aFileBase, OUString& rCSV
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
-namespace validation {
-
-enum ScValidationFormat
-{
-OOXML
-};
-
-}
-
-#if HAVE_EXPORT_VALIDATION
-
-namespace {
-
-void validate(const utl::TempFile& rTempFile, validation::ScValidationFormat 
eFormat)
-{
-OUString aValidator;
-if( eFormat == validation::OOXML )
-{
-aValidator = "officeotron ";
-}
-else
-return;
-
-utl::TempFile aOutput;
-aOutput.EnableKillingFile();
-OUString aOutputFile = aOutput.GetFileName();
-OUString aInputFile = rTempFile.GetFileName();
-OUString aCommand = aValidator + aInputFile + " > " + aOutputFile;
-
-system(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8).getStr());
-
-std::string aContent;
-loadFile(aOutputFile, aContent);
-OString aContentString(aContent.c_str());
-OUString aContentOUString = OStringToOUString(aContentString, 
RTL_TEXTENCODING_UTF8);
-
-if( eFormat == validation::OOXML && !aContentOUString.isEmpty() )
-{
-// check for validation errors here
-sal_Int32 nIndex = aContentOUString.lastIndexOf("Grand total of errors 
in submitted package: ");
-if(nIndex == -1)
-{
-SAL_WARN("sc", "no summery line");
-}
-else
-{
-sal_Int32 nStartOfNumber = nIndex + std::strlen("Grand total of 
errors in submitted package: ");
-OUString aNumber = aContentOUString.copy(nStartOfNumber);
-sal_Int32 nErrors = aNumber.toInt32();
-OString aMsg("validation error in OOXML export: Errors: ");
-aMsg = aMsg + OString::number(nErrors);
-if(nErrors)
-{
-SAL_WARN("sc", aContent);
-}
-CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), sal_Int32(0), nErrors);
-}
-}
-}
-
-}
-
-#endif
-
 ScDocShellRef ScBootstrapFixture::saveAndReload(
 ScDocShell* pShell, const OUString &rFilter,
 const OUString &rUserData, const OUString& rTypeName, sal_uLong 
nFormatType)
@@ -678,10 +614,8 @@ ScDocShellRef ScBootstrapFixture::saveAndReload(
 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
 
 ScDocShellRef xDocSh = load(aTempFile.GetURL(), rFilter, rUserData, 
rTypeName, nFormatType, nFormat );
-#if HAVE_EXPORT_VALIDATION
 if(nFormatType == XLSX_FORMAT_TYPE)
-validate(aTempFile, validation::OOXML);
-#endif
+validate(aTempFile.GetFileName(), test::OOXML);
 return xDocSh;
 }
 
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 23ea391..137a284 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -23,6 +23,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
+#include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -113,6 +118,75 @@ test::BootstrapFixture::~BootstrapFixture()
 {
 }
 
+namespace {
+
+OString loadFile(const OUString& rURL)
+{
+osl::File aFile(rURL);
+osl::FileBase::RC eStatus = aFile.open(osl_File_OpenFlag_Read);
+CPPUNIT_ASSERT_EQUAL(eStatus, osl::FileBase::E_None);
+sal_uInt64 nSize;
+aFile.getSize(nSize);
+boost::scoped_array aBytes(new char[nSize]);
+sal_uInt64 nBytesRead;
+aFile.read(aBytes.get(), nSize, nBytesRead);
+CPPUNIT_ASSERT_EQUAL(nSize, nBytesRead);
+OString aContent(aBytes.get());
+
+return aContent;
+}
+
+}
+
+void test::BootstrapFixture::validate(const OUString& rPath, 
test::ValidationFormat eFormat )
+{
+(void)rPath;
+(void)eFormat;
+
+#if HAVE_EXPORT_VALIDATION
+OUString aValidator;
+if( eFormat == t

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||51550

-- 
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 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on|51550   |

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

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

[Vinaya Mandke]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |2 +
 writerfilter/source/dmapper/DomainMapper.cxx  |   23 --
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 
 4 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 7691532a89a94120c220f77e8cc6c42615e3d7c4
Author: Vinaya Mandke 
Date:   Mon Mar 3 16:31:00 2014 +0530

fdo#73596 [DOCX] Index:distance between columns

Import the "w:space" or the distance between multiple
columns of an Index
Modifies existing UT for the same

Reviewed on:
https://gerrit.libreoffice.org/8444

Change-Id: I6d38e106208524cb22d0b98b0071360865e64bc0

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4c1ba4f..920f33a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2755,6 +2755,8 @@ 
DECLARE_OOXMLEXPORT_TEST(testAlphabeticalIndex_MultipleColumns,"alphabeticalInde
 // check for section breaks after and before the Index Section
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:pPr/w:sectPr/w:type","val","continuous");
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[9]/w:pPr/w:sectPr/w:type","val","continuous");
+// check for "w:space" attribute for the columns in Section Properties
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[9]/w:pPr/w:sectPr/w:cols/w:col[1]","space","720");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index ccc6a85..6e0f4e3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1912,6 +1913,24 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 pSectionContext->SetSeparatorLine( pSectHdl->IsSeparator() 
);
 }
 }
+
+else if ( pSectionContext )
+{
+FieldContextPtr pContext = m_pImpl->GetTopFieldContext();
+uno::Reference< beans::XPropertySet > xTOC = 
pContext->GetTOC();
+if( xTOC.is() )
+{
+uno::Reference xTextColumns;
+xTOC->getPropertyValue(rPropNameSupplier.GetName( 
PROP_TEXT_COLUMNS )) >>= xTextColumns;
+if (xTextColumns.is())
+{
+uno::Reference< beans::XPropertySet > xColumnPropSet( 
xTextColumns, uno::UNO_QUERY_THROW );
+if ( xColumnPropSet.is() )
+xColumnPropSet->setPropertyValue( 
rPropNameSupplier.GetName( PROP_AUTOMATIC_DISTANCE ), uno::makeAny( 
pSectHdl->GetSpace() ));
+xTOC->setPropertyValue( rPropNameSupplier.GetName( 
PROP_TEXT_COLUMNS ), uno::makeAny( xTextColumns ) );
+}
+}
+}
 }
 }
 break;
@@ -2405,7 +2424,7 @@ void DomainMapper::data(const sal_uInt8* /*buf*/, size_t 
/*len*/,
 
 void DomainMapper::lcl_startSectionGroup()
 {
-if (!m_pImpl->isInIndexContext() || !m_pImpl->isInBibliographyContext())
+if (!m_pImpl->isInIndexContext() && !m_pImpl->isInBibliographyContext())
 {
 m_pImpl->PushProperties(CONTEXT_SECTION);
 }
@@ -2413,7 +2432,7 @@ void DomainMapper::lcl_startSectionGroup()
 
 void DomainMapper::lcl_endSectionGroup()
 {
-if (!m_pImpl->isInIndexContext() || !m_pImpl->isInBibliographyContext())
+if (!m_pImpl->isInIndexContext() && !m_pImpl->isInBibliographyContext())
 {
 m_pImpl->CheckUnregisteredFrameConversion();
 m_pImpl->ExecuteFrameConversion();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3501098..0d08a38 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -464,7 +464,11 @@ uno::Reference< text::XTextAppend >  
DomainMapper_Impl::GetTopTextAppend()
 return m_aTextAppendStack.top().xTextAppend;
 }
 
-
+FieldContextPtr  DomainMapper_Impl::GetTopFieldContext()
+{
+SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter", "Field stack is empty");
+return m_aFieldStack.top();
+}
 
 void DomainMapper_Impl::InitTabStopFromStyle( const uno::Sequence< 
style::TabStop >& rInitTabStops )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index ddd7775..6c7cac5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -487,6 +487,7 @@ public:
 PropertyMapPtr GetTopContextOfType(ContextType eId);
 
 ::com::sun::star::uno::Reference< ::com::sun

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

[Jacobo Aragunde Pérez]

 sw/source/filter/ww8/docxsdrexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aad35298c43795e60605e0ea71290642687c8fc4
Author: Jacobo Aragunde Pérez 
Date:   Fri Feb 28 19:47:44 2014 +0100

fdo#70838: fix size error in rotated shapes in DrawingML

We should pass the natural rectangle instead of the bounding box as
the size of the shape.

Change-Id: I3ecee9d5645f280071c2872ecd08dbcf54574b8a

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index d07e477..5ed1811 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -486,7 +486,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* 
sdrObj, const SwFrmFmt& rFr
 void DocxSdrExport::Impl::writeDMLDrawing(const SdrObject* pSdrObject, const 
SwFrmFmt* pFrmFmt, int nAnchorId)
 {
 sax_fastparser::FSHelperPtr pFS = m_pSerializer;
-Size aSize(pSdrObject->GetSnapRect().GetWidth(), 
pSdrObject->GetSnapRect().GetHeight());
+Size aSize(pSdrObject->GetLogicRect().GetWidth(), 
pSdrObject->GetLogicRect().GetHeight());
 m_rSdrExport.startDMLAnchorInline(pFrmFmt, aSize);
 
 sax_fastparser::FastAttributeList* pDocPrAttrList = pFS->createAttrList();
___
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 51550, which changed state.

Bug 51550 Summary: FILESAVE as .docx looses embedded OLE objects
https://bugs.freedesktop.org/show_bug.cgi?id=51550

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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