date:20140122

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basctl/sdi basctl/source vcl/source

2014-01-22 Thread Tsutomu Uchino

 basctl/sdi/baside.sdi   |6 ++
 basctl/source/basicide/baside2.cxx  |   14 ++
 basctl/source/basicide/baside2b.cxx |4 +---
 basctl/source/basicide/baside3.cxx  |6 ++
 vcl/source/gdi/dibtools.cxx |   12 
 5 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit f841659faf09fec69c962959b9da032fa0bc2b16
Author: Tsutomu Uchino ha...@apache.org
Date:   Wed Jan 22 07:41:16 2014 +

#i50481# make Select All command working through the main menu of Basic IDE

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 8165229..7e4012f 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -101,6 +101,12 @@ shell BasicIDEShell
 StateMethod = GetState;
 ]
 
+SID_SELECTALL
+[
+ExecMethod  = ExecuteCurrent;
+StateMethod = GetState;
+]
+
 SID_SEARCH_ITEM
 [
 ExecMethod  = ExecuteCurrent;
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index f370d3c..b417c54 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1132,6 +1132,14 @@ void __EXPORT ModulWindow::ExecuteCommand( SfxRequest 
rReq )
 GetBreakPointWindow().Invalidate();
 }
 break;
+case SID_SELECTALL:
+{
+TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, 
0x ) );
+TextView * pView = GetEditView();
+pView-SetSelection( aSel );
+pView-GetWindow()-GrabFocus();
+}
+break;
 }
 }
 
@@ -1198,6 +1206,12 @@ void __EXPORT ModulWindow::GetState( SfxItemSet rSet )
 }
 }
 break;
+case SID_SELECTALL:
+{
+if ( !GetEditView() )
+rSet.DisableItem( nWh );
+}
+break;
 }
 }
 }
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index a7f7e97..cb6ef05 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -431,9 +431,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent rKEvt 
)
 sal_Bool bWasModified = pEditEngine-IsModified();
 if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
 {
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A)  
rKEvt.GetKeyCode().IsMod1() )
-pEditView-SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 
0x, 0x ) ) );
-else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y )  
rKEvt.GetKeyCode().IsMod1() )
+if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y )  
rKEvt.GetKeyCode().IsMod1() )
 bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
 else
 {
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 84ece10..4c5cb19 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -431,6 +431,12 @@ void __EXPORT DialogWindow::GetState( SfxItemSet rSet )
 rSet.DisableItem( nWh );
 }
 break;
+
+case SID_SELECTALL:
+{
+rSet.DisableItem( nWh );
+}
+break;
 }
 }
 }
commit 352ca2f6ecf8910afa24c53d7e872f62b2321321
Author: Tsutomu Uchino ha...@apache.org
Date:   Wed Jan 22 06:16:21 2014 +

#i106063# avoid additional seek for true color DIB

The position in the stream is already at the end of color palette.

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index bdfce54..2e7d698 100755
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -419,12 +419,6 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 // Read data
 if(bNative)
 {
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != 
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
 rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
 }
 else
@@ -460,12 +454,6 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 const long nHeight(rHeader.nHeight);
 sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
 
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != 
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
 const long nI(bTopDown ? 1 : -1);
 long nY(bTopDown ? 0 : nHeight - 1);
 long nCount(nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

--- Comment #15 from Ayantha Randika randika.deult...@gmail.com ---
Hi, Im a beginner to the Libreoffice development and this is my first hack.
I have no idea what files to look at to address this issue. Can anyone
please help me? And is there documents I can refer to?
Thank You


On Wed, Jan 22, 2014 at 1:19 PM, bugzilla-dae...@freedesktop.org wrote:

   *Comment # 14 https://bugs.freedesktop.org/show_bug.cgi?id=40694#c14
 on bug 40694 https://bugs.freedesktop.org/show_bug.cgi?id=40694 from
 Ayantha Randika randika.deult...@gmail.com *

 Hi.. I hope to give this a try. Im really new here. Where should I start
 looking?

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



-- 
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 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

Samuel M. s.mehrbr...@gmail.com changed:

   What|Removed |Added

 CC||s.mehrbr...@gmail.com

--- Comment #16 from Samuel M. s.mehrbr...@gmail.com ---
Ayantha, you can use http://opengrok.libreoffice.org/ for Code Search. Pasting
the wrong error message there might be a good start.

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

Re: MABs and priority

2014-01-22 Thread Sophie

Hi Bjoern, all,
Le 17/01/2014 12:01, Bjoern Michaelsen a écrit :
 Hi,
 
 On Thu, Jan 16, 2014 at 06:21:48PM +, Michael Meeks wrote:
 + All Most Annoying Bugs - priority Highest (Bjoern)
 
 This is done now too, so right now, all NEW bugs(*) with priority highest 
 should
 also block a MAB and all NEW bugs blocking a MAB should be priority highest.
 
 I updated the MAB instructions to include setting priority: highest when
 adding a bug to MAB.
 
 for QA, this means two things, one short term, one long term.
 
 == short term ==
 
 To keep the highest=MAB equivalence clean, some regular (weekly?) checking for
 bugs that are priority:highest and not a MAB would be needed. Such bugs could
 be seen as proposed MABs and either be:
 - promoted to a MAB with the usual procedure (rationale etc.)
 - or respectfully rejected and bumped to priority:high
 
 Someone volunteering for this task?
 
 If so, it would be interesting:
 - how many such bugs there are each week
 - what is their quality (as in: how many are good MABs? how many are well 
 triaged?)
 

For information, I've forwarded and translated your mail to our qa list.
I'll have a look today to those bugs having priority:highest and not in
the Mab yet.
Cheers
Sophie

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

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

2014-01-22 Thread Tushar Bende

 sw/qa/extras/ooxmlexport/data/table-row-data-displayed-twice.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   12 
+++
 sw/source/filter/ww8/docxattributeoutput.cxx  |3 +
 sw/source/filter/ww8/wrtww8.hxx   |2 -
 sw/source/filter/ww8/ww8atr.cxx   |   17 
+++---
 5 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 92414c42cdd03d4eda5dbb4fe1a95cfe1ce3e7e9
Author: Tushar Bende tushar.be...@synerzip.com
Date:   Tue Jan 14 21:34:32 2014 +0530

fdo#73534 : Table row data was getting displayed twice after RT

There was a problem for some documents(containing table on page spanning 
across multiple pages
 pages having different Header-Footer type), during export Invalid sectPr 
was getting added
because of wrong condition check in the code.
Because of this:
1)Table row data was getting displayed twice after RT.
2)Increased number of pages after RT.
3)Header  footer were also divided into sections (like: Header-Section1 
Footer-Section1  Header-Section2 Footer-Section2).

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7440

Change-Id: I6c07e47321353e84af306c6285702852303ccee0

diff --git a/sw/qa/extras/ooxmlexport/data/table-row-data-displayed-twice.docx 
b/sw/qa/extras/ooxmlexport/data/table-row-data-displayed-twice.docx
new file mode 100644
index 000..00c63d8
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/table-row-data-displayed-twice.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8bfc251..cdb228e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2570,6 +2570,18 @@ 
DECLARE_OOXMLEXPORT_TEST(testTOCFlag_u,testTOCFlag_u.docx)
 CPPUNIT_ASSERT(contents.match( TOC \\z \\o \1-9\ \\u \\h));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTableRowDataDisplayedTwice,table-row-data-displayed-twice.docx)
+{
+// fdo#73534: There was a problem for some documents during export.Invalid 
sectPr getting added
+// because of wrong condition in code.
+// This was the reason for increasing number of pages after RT
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c70a2a4..98b36f6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -392,8 +392,9 @@ void DocxAttributeOutput::SectionBreaks(const SwTxtNode 
rNode)
 {
 const SwTxtNode* pTxtNode = static_cast SwTxtNode* ( 
aNextIndex.GetNode() );
 // If next node has no string - it is an empty node, so no need to 
output the section break
+
 if (!pTxtNode-GetTxt().isEmpty())
-m_rExport.OutputSectionBreaks( pTxtNode-GetpSwAttrSet(), 
*pTxtNode );
+m_rExport.OutputSectionBreaks( pTxtNode-GetpSwAttrSet(), 
*pTxtNode, m_tableReference-m_bTableCellOpen );
 }
 else if ( aNextIndex.GetNode().IsTableNode() )
 {
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index df34b50..06bff4b 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -693,7 +693,7 @@ public:
 sal_uLong GetSectionLineNo( const SfxItemSet* pSet, const SwNode rNd ) 
const;
 
 /// Start new section.
-void OutputSectionBreaks( const SfxItemSet *pSet, const SwNode rNd );
+void OutputSectionBreaks( const SfxItemSet *pSet, const SwNode rNd, bool 
isCellOpen = false);
 
 /// Write section properties.
 ///
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9dfc8dc..82a05c5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -396,13 +396,12 @@ bool MSWordExportBase::SetAktPageDescFromNode(const 
SwNode rNd)
 // Es duerfen nur Funktionen gerufen werden, die nicht in den
 // Ausgabebereich pO schreiben, da dieser nur einmal fuer CHP und PAP existiert
 // und damit im falschen landen wuerden.
-void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const 
SwNode rNd )
+void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const 
SwNode rNd, bool isCellOpen)
 {
 if ( bStyDef || bOutKF || bInWriteEscher || bOutPageDescs )
 return;
 
 bBreakBefore = true;
-
 bool bNewPageDesc = false;
 const SfxPoolItem* pItem=0;
 const

Contributing to LibreOffice

2014-01-22 Thread Ayantha Randika

Hi,
Im a University student from Sri Lanka and I hope to contribute to
LibreOffice as a developer. I am interested in working on this bug, Bug
40694 - Error in message warning that the column limit was exceeded for
MS-Excel format[1], which looks like a good point start. But I have no
idea what files to look at to address the issue. Can someone please help
me? Is there any documents I can refer?

[1] : https://bugs.freedesktop.org/show_bug.cgi?id=40694

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

Re: [Libreoffice-commits] core.git: fwk: Use constructor feature for ModuleUIConfigurationManager

2014-01-22 Thread Matúš Kukan

On Tue, 2014-01-21 at 16:28 +0100, Stephan Bergmann wrote:
 Removing XInitialization from a service implementation is always a 
 delicate move regarding compatibility.  Even though the new-style 
 service css.ui.ModuleUIConfigurationManager does not mention 
 XInitialization, the old-style variant (prior to 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c41a60c0d802c618ac414822615a5c9e9e92f9f
  
 fdo#46808, Convert ui::ModuleUIConfigurationManager service to new 
 style) did, and there is always a chance that (external) code obtains 
 the service implementation via a non-argument queryInstance call and 
 then explicitly queries for XInitialization.
 
 So although this change is most probably justified, it is nevertheless 
 incompatible.  Matúš, can you please manually list your relevant past 
 changes at 
 https://wiki.documentfoundation.org/ReleaseNotes/4.3#API_changes and 
 add [API CHANGE] to the commit messages of relevant future changes (to 
 allow for semi-automatic tracking)?

Makes sense,
I've found 8, and added them to the wiki.

Thanks,
Matus

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

[Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

Ayantha Randika randika.deult...@gmail.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |randika.deult...@gmail.com
   |desktop.org |

--- Comment #17 from Ayantha Randika randika.deult...@gmail.com ---
(In reply to comment #16)
 Ayantha, you can use http://opengrok.libreoffice.org/ for Code Search.
 Pasting the wrong error message there might be a good start.

Thank You very much Samuel!

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

Re: Efficient UNO component linkage GC ...

2014-01-22 Thread Stephan Bergmann


Some notes on recent changes around constructor functions:

* The change of 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=306efefe22e02248eff14f8be2cef68d75d26e55 
Minimize the constructor functions to a bare minimum to let 
constructor functions return un-acquired pointers breaks constructor 
functions that internally already have an acquired pointer.  This includes:


** Constructor functions for singletons, like 
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation 
(sfx2/source/notify/globalevents.cxx).


** Wrappers like those for which constructor functions have been 
reverted again in 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bc2ab30e302c210b725e7035ea4d17774ef90e1 
Revert 'svt: Use constructor feature for FilePicker and 
FolderPicker...' (based on the rationale it does not make a real sense 
to use constructor for implementations that act as a trampoline, which 
I do not understand).


If the stated rationale for that change is that it is annoying to see 
the boilerplate copypasted everywhere, I think there is better 
solutions for that, like providing a helper function to be called from 
the typical constructor function,


  css::uno::XInterface * acquire(cppu::OWeakObject * instance) {
assert(instance != 0);
instance-acquire();
return instance;
  }

  css::uno::XInterface * FOO_constructor_function(...) {
retrun acquire(new FOO(...));
  }

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f278397787f7b79cee8536e806e8b7113800f2ef 
Change _get_implementation()'s not to do initialization directly makes 
it more awkward to code the (assumedly) common case where a UNO service 
constructor with arguments can be implemented directly by a C++ class 
constructor with arguments.  That change forces two-step construction, 
via passing back a member function pointer, onto all such cases, with 
the apparent rationale to make the (assumedly) non-common case that does 
require two-step construction simpler to code.


(And I'm not even sure it is technically correct to force the address of 
a member function of a class derived from cppu::OWeakObject to 
cppu::constructor_InitializationFunc.  Also, for the static_cast from 
XInterface to OWeakObject in servicemanager.cxx to work, this change 
makes the---undocumented---requirement that constructor functions making 
use of the two-step--init callback return an exact one of their 
potentially many XInterface pointers; rather brittle.)


FYI, I envisioned a road where ultimately a (new-style) UNO service's 
different constructors rather directly map to a C++ implementation 
class's different constructors.


* One main reason for introducing those constructor functions in the 
first place is to allow (in specific scenarios) for direct calls of them 
from client code, bypassing the service manager.  I think it is 
beneficial to test that direct-call scenario as much as possible while 
working on this, that is why I created the manual scaffolding of 
osl/detail/component-defines.h. 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=921e2dc0393873ad0a972252000803ceadc290cb 
Reduce the number of experimental direct constructor calls reducing 
instead of increasing the number of constructor function implementations 
for which direct-calling will actually be tested is detrimental to that.


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

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

2014-01-22 Thread Jan Holesovsky

 framework/source/services/frame.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0ff31c26f3ebbad1d61c7033e946a287e3910bae
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Jan 22 09:44:09 2014 +0100

Make the casting work on Windows too.

Fixes CppunitTest_starmath_qa_cppunit on Windows.

Change-Id: I3fd73db1ebb70ac19f99bc3e337b1a8107486ae7

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 230707c..54850af 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -129,7 +129,9 @@ enum EActiveState
 @devstatus  ready to use
 @threadsafe yes
 
*//*-*/
-class Frame :   // interfaces
+class Frame :
+public  ::cppu::OWeakObject ,   // 
helper implements XInterface, XWeak
+// interfaces
 public  css::lang::XTypeProvider,
 public  css::lang::XServiceInfo ,
 public  css::frame::XFrame2 ,
@@ -145,8 +147,7 @@ class Frame :   // interfaces
 // Order is necessary for right initialization of this class!
 public  ThreadHelpBase  ,
 public  TransactionBase ,
-public  PropertySetHelper   ,   // 
helper implements ThreadHelpbase, TransactionBase, XPropertySet, 
XPropertySetInfo
-public  ::cppu::OWeakObject // 
helper implements XInterface, XWeak
+public  PropertySetHelper   // 
helper implements ThreadHelpbase, TransactionBase, XPropertySet, 
XPropertySetInfo
 {
 public:
 
___
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

2014-01-22 Thread bugzilla-daemon

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

sophie gautier.sop...@gmail.com changed:

   What|Removed |Added

 CC||gautier.sop...@gmail.com
 Depends on||73805

--- Comment #133 from sophie gautier.sop...@gmail.com ---
Add bug 73805 Crash when writing into a section with columns, with highest
priority - Sophie

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

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

2014-01-22 Thread Caolán McNamara

 35/52c7f9561f43024ca32f50e4bf63b31233b03c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02718e0f67ba191d262114509efbcd4bbf07b48c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 09:37:15 2014 +

Notes added by 'git notes add'

diff --git a/35/52c7f9561f43024ca32f50e4bf63b31233b03c 
b/35/52c7f9561f43024ca32f50e4bf63b31233b03c
new file mode 100644
index 000..3de9244
--- /dev/null
+++ b/35/52c7f9561f43024ca32f50e4bf63b31233b03c
@@ -0,0 +1 @@
+prefer: 154643d59b6e01606356b7d2e627cbe4e20302e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread László Németh

 cui/source/dialogs/SpellDialog.cxx |   13 -
 cui/source/inc/SpellDialog.hxx |2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit c49543cf31c14d4f94f01620244dd7e3ba0919ea
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Wed Jan 22 10:05:46 2014 +0100

fdo#73917 spelling dialog: don't report fully ignored words again

Change-Id: I2a8503fd2c3babab844e9cd026a57c438e015254

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 97829c7..85c04d3 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -386,8 +386,8 @@ void SpellDialog::SpellContinue_Impl(bool 
bUseSavedSentence, bool bIgnoreCurrent
 //then GetNextSentence() has to be called followed again by MarkNextError()
 //MarkNextError is not initally called if the UndoEdit mode is active
 bool bNextSentence = false;
-if((!m_pSentenceED-IsUndoEditMode()  m_pSentenceED-MarkNextError( 
bIgnoreCurrentError )) ||
-true == ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence, 
m_pSentenceED-IsUndoEditMode())  m_pSentenceED-MarkNextError( false )))
+if((!m_pSentenceED-IsUndoEditMode()  m_pSentenceED-MarkNextError( 
bIgnoreCurrentError, xSpell )) ||
+true == ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence, 
m_pSentenceED-IsUndoEditMode())  m_pSentenceED-MarkNextError( false, xSpell 
)))
 {
 const SpellErrorDescription* pSpellErrorDescription = 
m_pSentenceED-GetAlternatives();
 if( pSpellErrorDescription )
@@ -1542,7 +1542,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent 
rNEvt )
 }
 
 //---
-bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
+bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, 
com::sun::star::uno::Referencecom::sun::star::linguistic2::XSpellChecker1 
xSpell )
 {
 if (bIgnoreCurrentError)
 m_aIgnoreErrorsAt.insert( m_nErrorStart );
@@ -1582,18 +1582,21 @@ bool SentenceEditWindow_Impl::MarkNextError( bool 
bIgnoreCurrentError )
 {
 pSpellErrorDescription = static_castconst 
SpellErrorAttrib(pNextError-GetAttr()).GetErrorDescription();
 bGrammarError = pSpellErrorDescription-bIsGrammarError;
+m_nErrorStart = pNextError-GetStart();
+m_nErrorEnd = pNextError-GetEnd();
 }
 if(xChangeAll-getCount()  pSpellErrorDescription 
 (xEntry = xChangeAll-getEntry( 
pSpellErrorDescription-sErrorText )).is())
 {
-m_nErrorStart = pNextError-GetStart();
-m_nErrorEnd = pNextError-GetEnd();
 
 OUString sReplacement(getDotReplacementString(GetErrorText(), 
xEntry-getReplacementText()));
 
 ChangeMarkedWord(sReplacement, LanguageTag::convertToLanguageType( 
pSpellErrorDescription-aLocale ));
 
 aCursor.GetIndex() = aCursor.GetIndex() + 
(sal_uInt16)(xEntry-getReplacementText().getLength());
+// maybe the error found here is already added to the dictionary and 
has to be ignored
+} else if(pSpellErrorDescription  !bGrammarError  xSpell-isValid( 
GetErrorText(), LanguageTag::convertToLanguageType( 
pSpellErrorDescription-aLocale ), Sequence PropertyValue () )) {
+aCursor.GetIndex() = aCursor.GetIndex() + 1;
 }
 else
 break;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 5f88f3b..550f9c4 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -83,7 +83,7 @@ public:
 voidSetAttrib( const TextAttrib rAttr, sal_uLong nPara, 
sal_uInt16 nStart, sal_uInt16 nEnd );
 voidSetText( const OUString rStr );
 
-boolMarkNextError( bool bIgnoreCurrentError );
+boolMarkNextError( bool bIgnoreCurrentError, 
com::sun::star::uno::Referencecom::sun::star::linguistic2::XSpellChecker1 );
 voidChangeMarkedWord(const OUString rNewWord, LanguageType 
eLanguage);
 voidMoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 
nErrorEnd, bool bGrammar);
 OUStringGetErrorText() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Oliver-Rainer Wittmann

 uui/source/iahndl-ssl.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fa290c750183ab598447630ab66f382e99188edb
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Jan 21 16:17:39 2014 +

Resolves: #i123744# correct consideration of Subject Alternative Name...

field of the given certificate

(cherry picked from commit 117218483797c0aeedef9b68bdae96a727cb3426)

Change-Id: I81fbb49593b15edea2509aed81b252c8e5b0cd82

diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index d36b3e0..4c10f7c 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -296,9 +296,10 @@ handleCertificateValidationRequest_(
 
 certHostNames[0] = certHostName;
 
-for(int n = 1; n  altNames.getLength(); n++){
+for(int n = 0; n  altNames.getLength(); ++n)
+{
 if (altNames[n].Type ==  security::ExtAltNameType_DNS_NAME){
-   altNames[n].Value = certHostNames[n];
+   altNames[n].Value = certHostNames[n+1];
 }
 }
 
___
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' - 11/7218483797c0aeedef9b68bdae96a727cb3426

2014-01-22 Thread Caolán McNamara

 11/7218483797c0aeedef9b68bdae96a727cb3426 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit db930a43bfcacca15f54f72c4473361924939102
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 09:46:51 2014 +

Notes added by 'git notes add'

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

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

2014-01-22 Thread Tor Lillqvist

 framework/source/services/frame.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17cfcceb4e594e727a28ddaf311d794cd9cc9990
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Jan 22 11:55:35 2014 +0200

WaE: -Wreorder

Change-Id: I8b6e3aafa6208223a65b777c232de88cfb2e5a8c

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 54850af..4a47cda 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -560,12 +560,12 @@ DEFINE_XTYPEPROVIDER_21 (   Frame
 @onerrorASSERT in debug version or nothing in relaese version.
 
*//*-*/
 Frame::Frame( const css::uno::Reference css::uno::XComponentContext  
xContext )
-:   ThreadHelpBase  ( Application::GetSolarMutex()
 )
+:   ::cppu::OWeakObject (  
 )
+,   ThreadHelpBase  ( Application::GetSolarMutex()
 )
 ,   TransactionBase (  
 )
 ,   PropertySetHelper   ( m_aLock,
   m_aTransactionManager,
   sal_False) // sal_False = dont 
release shared mutex on calling us!
-,   ::cppu::OWeakObject (  
 )
 //  init member
 ,   m_xContext  ( xContext 
 )
 ,   m_aListenerContainer( m_aLock.getShareableOslMutex()   
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Oliver-Rainer Wittmann

 ucb/source/ucp/webdav/SerfSession.cxx |   44 ++
 ucb/source/ucp/webdav/SerfTypes.hxx   |2 -
 2 files changed, 41 insertions(+), 5 deletions(-)

New commits:
commit 4a56b4ab2c100c506096f1808cca7268e576086c
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Jan 21 16:32:58 2014 +

Resolves: #i123744# consider certificate's Subject Alternative Name...

field when searching for matching certificate host name

(cherry picked from commit 226085ad2004319c5142b392bb4b48ab79c3b747)

Change-Id: I0d1690f75c1aa3288c677823105e21bb6e969f41

diff --git a/ucb/source/ucp/webdav/SerfSession.cxx 
b/ucb/source/ucp/webdav/SerfSession.cxx
index 008b6f1..bb8c6e1 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -26,7 +26,7 @@
 #include ucbhelper/simplecertificatevalidationrequest.hxx
 
 #include AprEnv.hxx
-#include apr_strings.h
+#include apr/apr_strings.h
 
 #include DAVAuthListener.hxx
 #include SerfTypes.hxx
@@ -43,6 +43,10 @@
 #include com/sun/star/security/CertificateContainerStatus.hpp
 #include com/sun/star/security/CertificateContainer.hpp
 #include com/sun/star/security/XCertificateContainer.hpp
+#include com/sun/star/security/CertAltNameEntry.hpp
+#include com/sun/star/security/XSanExtension.hpp
+#define OID_SUBJECT_ALTERNATIVE_NAME 2.5.29.17
+
 #include com/sun/star/ucb/Lock.hpp
 #include com/sun/star/xml/crypto/XSEInitializer.hpp
 
@@ -461,7 +465,40 @@ apr_status_t SerfSession::verifySerfCertificateChain (
 
 // When the certificate matches the host name then we can use the
 // result of the verification.
-if (isDomainMatch(sServerCertificateSubject))
+bool bHostnameMatchesCertHostnames = false;
+{
+uno::Sequence uno::Reference security::XCertificateExtension   
extensions = xServerCertificate-getExtensions();
+uno::Sequence security::CertAltNameEntry  altNames;
+for (sal_Int32 i = 0 ; i  extensions.getLength(); ++i)
+{
+uno::Reference security::XCertificateExtension element = 
extensions[i];
+
+const rtl::OString aId ( (const sal_Char 
*)element-getExtensionId().getArray(), element-getExtensionId().getLength());
+if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
+{
+uno::Reference security::XSanExtension  sanExtension ( 
element, uno::UNO_QUERY );
+altNames =  sanExtension-getAlternativeNames();
+break;
+}
+}
+
+uno::Sequence ::rtl::OUString  certHostNames(altNames.getLength() + 
1);
+certHostNames[0] = sServerCertificateSubject;
+for( int n = 0; n  altNames.getLength(); ++n )
+{
+if (altNames[n].Type ==  security::ExtAltNameType_DNS_NAME)
+{
+altNames[n].Value = certHostNames[n+1];
+}
+}
+
+for ( int i = 0; i  certHostNames.getLength()  
!bHostnameMatchesCertHostnames; ++i )
+{
+bHostnameMatchesCertHostnames = isDomainMatch( certHostNames[i] );
+}
+
+}
+if ( bHostnameMatchesCertHostnames )
 {
 
 if (nVerificationResult == 0)
@@ -508,8 +545,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
 
 if ( xSelection.is() )
 {
-uno::Reference task::XInteractionApprove  xApprove(
-xSelection.get(), uno::UNO_QUERY );
+uno::Reference task::XInteractionApprove  xApprove( 
xSelection.get(), uno::UNO_QUERY );
 if ( xApprove.is() )
 {
 xCertificateContainer-addCertificate( getHostName(), 
sServerCertificateSubject,  sal_True );
diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx 
b/ucb/source/ucp/webdav/SerfTypes.hxx
index b396697..5be06a6 100644
--- a/ucb/source/ucp/webdav/SerfTypes.hxx
+++ b/ucb/source/ucp/webdav/SerfTypes.hxx
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_SERFTYPES_HXX
 #define INCLUDED_SERFTYPES_HXX
 
-#include serf.h
+#include serf/serf.h
 
 typedef serf_connection_t SerfConnection;
 
___
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' - 22/6085ad2004319c5142b392bb4b48ab79c3b747

2014-01-22 Thread Caolán McNamara

 22/6085ad2004319c5142b392bb4b48ab79c3b747 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6b33c983a1a7ad55e69c8aee877f32a3448f491
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 10:00:57 2014 +

Notes added by 'git notes add'

diff --git a/22/6085ad2004319c5142b392bb4b48ab79c3b747 
b/22/6085ad2004319c5142b392bb4b48ab79c3b747
new file mode 100644
index 000..1396af5
--- /dev/null
+++ b/22/6085ad2004319c5142b392bb4b48ab79c3b747
@@ -0,0 +1 @@
+merged as: 4a56b4ab2c100c506096f1808cca7268e576086c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

2014-01-22 Thread Stephan Bergmann

 compilerplugins/clang/implicitboolconversion.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4865115d1b1499dd9e668b976fba8ac897fe43c1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 22 11:03:15 2014 +0100

Improve Clang 3.2 hasCLanguageLinkageType workaround

Change-Id: If5c104adc05aa362d15cedf6f8953bda478897bc

diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 31377d8..bb50626 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -85,7 +85,7 @@ bool hasCLanguageLinkageType(FunctionDecl const * decl) {
 return true;
 }
 #else
-if (decl-getDeclContext()-isExternCContext()) {
+if (decl-getCanonicalDecl()-getDeclContext()-isExternCContext()) {
 return true;
 }
 #endif
___
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' - 17/e2f9c3d2eb0d3b7f559055327d37171db01c2f

2014-01-22 Thread Caolán McNamara

 17/e2f9c3d2eb0d3b7f559055327d37171db01c2f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c543b618143f1997e80d7e20574dc20357ca703b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 10:08:08 2014 +

Notes added by 'git notes add'

diff --git a/17/e2f9c3d2eb0d3b7f559055327d37171db01c2f 
b/17/e2f9c3d2eb0d3b7f559055327d37171db01c2f
new file mode 100644
index 000..df26a79
--- /dev/null
+++ b/17/e2f9c3d2eb0d3b7f559055327d37171db01c2f
@@ -0,0 +1 @@
+prefer: 8c4edbb654b5d11606980e898f45afb8df67314a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Caolán McNamara

 extras/source/autotext/lang/en-AU/acor/DocumentList.xml |1 -
 extras/source/autotext/lang/en-GB/acor/DocumentList.xml |1 -
 extras/source/autotext/lang/en-US/acor/DocumentList.xml |1 -
 extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |1 -
 extras/source/autotext/lang/ja/acor/DocumentList.xml|1 -
 extras/source/autotext/lang/ko/acor/DocumentList.xml|1 -
 extras/source/autotext/lang/zh-CN/acor/DocumentList.xml |1 -
 extras/source/autotext/lang/zh-TW/acor/DocumentList.xml |1 -
 8 files changed, 8 deletions(-)

New commits:
commit 8c4edbb654b5d11606980e898f45afb8df67314a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 10:07:05 2014 +

Resolves: #i124067# naÃ¯ve considered pretentious

Change-Id: I1878614177735559c0d38859e3af606d324b7509

diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
index 33312da..5d91d0a 100644
--- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
@@ -486,7 +486,6 @@
   block-list:block block-list:abbreviated-name=must of had 
block-list:name=must have had/
   block-list:block block-list:abbreviated-name=mysefl 
block-list:name=myself/
   block-list:block block-list:abbreviated-name=myu block-list:name=my/
-  block-list:block block-list:abbreviated-name=naive 
block-list:name=naÃ¯ve/
   block-list:block block-list:abbreviated-name=necassarily 
block-list:name=necessarily/
   block-list:block block-list:abbreviated-name=necassary 
block-list:name=necessary/
   block-list:block block-list:abbreviated-name=neccessarily 
block-list:name=necessarily/
diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
index d46b7ea..2548ff2 100644
--- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
@@ -486,7 +486,6 @@
   block-list:block block-list:abbreviated-name=must of had 
block-list:name=must have had/
   block-list:block block-list:abbreviated-name=mysefl 
block-list:name=myself/
   block-list:block block-list:abbreviated-name=myu block-list:name=my/
-  block-list:block block-list:abbreviated-name=naive 
block-list:name=naÃ¯ve/
   block-list:block block-list:abbreviated-name=necassarily 
block-list:name=necessarily/
   block-list:block block-list:abbreviated-name=necassary 
block-list:name=necessary/
   block-list:block block-list:abbreviated-name=neccessarily 
block-list:name=necessarily/
diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
index 26abc6f..b8c3da2 100644
--- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
@@ -486,7 +486,6 @@
   block-list:block block-list:abbreviated-name=must of had 
block-list:name=must have had/
   block-list:block block-list:abbreviated-name=mysefl 
block-list:name=myself/
   block-list:block block-list:abbreviated-name=myu block-list:name=my/
-  block-list:block block-list:abbreviated-name=naive 
block-list:name=naÃ¯ve/
   block-list:block block-list:abbreviated-name=necassarily 
block-list:name=necessarily/
   block-list:block block-list:abbreviated-name=necassary 
block-list:name=necessary/
   block-list:block block-list:abbreviated-name=neccessarily 
block-list:name=necessarily/
diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
index febfe61..5576dc8 100644
--- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
@@ -475,7 +475,6 @@
   block-list:block block-list:abbreviated-name=must of had 
block-list:name=must have had/
   block-list:block block-list:abbreviated-name=mysefl 
block-list:name=myself/
   block-list:block block-list:abbreviated-name=myu block-list:name=my/
-  block-list:block block-list:abbreviated-name=naive 
block-list:name=naÃ¯ve/
   block-list:block block-list:abbreviated-name=necassarily 
block-list:name=necessarily/
   block-list:block block-list:abbreviated-name=necassary 
block-list:name=necessary/
   block-list:block block-list:abbreviated-name=neccessarily 
block-list:name=necessarily/
diff --git a/extras/source/autotext/lang/ja/acor/DocumentList.xml 
b/extras/source/autotext/lang/ja/acor/DocumentList.xml
index d533d06..659af8f 100644
--- a/extras/source/autotext/lang/ja/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ja/acor/DocumentList.xml
@@ -480,7 +480,6 @@
   block-list:block block-list:abbreviated-name=must of had 
block-list:name=must have had/
   block-list:block block-list:abbreviated-name=mysefl 
block-list:name=myself/
   block-list:block block-list:abbreviated-name=myu block-list:name=my/
-  block-list:block block-list:abbreviated-name=naive

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

2014-01-22 Thread Andras Timar

 source/cy/sfx2/uiconfig/ui.po |   47 +++
 source/gd/sfx2/uiconfig/ui.po |   56 ++
 2 files changed, 51 insertions(+), 52 deletions(-)

New commits:
commit 51243d88a433300e67c53a58febea269cca9ee31
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jan 22 11:07:43 2014 +0100

Update translations for 4.2.0rc3

Change-Id: I837aedad11945ee91576412be32fa5a280bbc5c5

diff --git a/source/cy/sfx2/uiconfig/ui.po b/source/cy/sfx2/uiconfig/ui.po
index 6df5694..f36d2ae 100644
--- a/source/cy/sfx2/uiconfig/ui.po
+++ b/source/cy/sfx2/uiconfig/ui.po
@@ -3,7 +3,7 @@ msgid 
 msgstr 
 Project-Id-Version: LibO 40l10n\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
-POT-Creation-Date: 2013-12-01 17:38+0100\n
+POT-Creation-Date: 2014-01-22 10:55+0100\n
 PO-Revision-Date: 2014-01-07 21:52+\n
 Last-Translator: Rhoslyn rp...@yahoo.com\n
 Language-Team: none\n
@@ -12,7 +12,7 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n
-X-Generator: Pootle 2.5.0\n
+X-Generator: LibreOffice\n
 X-Accelerator-Marker: ~\n
 X-POOTLE-MTIME: 1389131564.0\n
 
@@ -494,19 +494,20 @@ msgid _Show License
 msgstr _Dangos y Drwydded
 
 #: licensedialog.ui
+#, fuzzy
 msgctxt 
 licensedialog.ui\n
 label\n
 label\n
 string.text
 msgid 
-%PRODUCTNAME is made available subject to the terms of GNU Lesser General 
Public License Version 3. A copy of the LGPL license can be found at 
http://www.gnu.org/licenses/lgpl-3.0.html\n;
+%PRODUCTNAME is made available subject to the terms of the Mozilla Public 
License, v. 2.0. A copy of the MPL can be obtained at 
http://mozilla.org/MPL/2.0/.\n;
 \n
 Third Party Code Additional copyright notices and license terms applicable to 
portions of the Software are set forth in the LICENSE.html file; choose Show 
License to see exact details in English.\n
 \n
 All trademarks and registered trademarks mentioned herein are the property of 
their respective owners.\n
 \n
-Copyright Â© 2000, 2013 LibreOffice contributors and/or their affiliates. All 
rights reserved.\n
+Copyright Â© 2000, 2014 LibreOffice contributors. All rights reserved.\n
 \n
 This product was created by %OOOVENDOR, based on OpenOffice.org, which is 
Copyright 2000, 2011 Oracle and/or its affiliates. %OOOVENDOR acknowledges all 
community members, please see http://www.libreoffice.org/ for more details.
 msgstr 
@@ -1012,8 +1013,8 @@ msgctxt 
 open_all\n
 label\n
 string.text
-msgid _Open
-msgstr _Agor
+msgid _Open File
+msgstr 
 
 #: startcenter.ui
 msgctxt 
@@ -1025,12 +1026,13 @@ msgid T_emplates
 msgstr _Templedi
 
 #: startcenter.ui
+#, fuzzy
 msgctxt 
 startcenter.ui\n
 create_label\n
 label\n
 string.text
-msgid Create
+msgid Create:
 msgstr Creu
 
 #: startcenter.ui
@@ -1039,16 +1041,17 @@ msgctxt 
 writer_all\n
 label\n
 string.text
-msgid New _Document
-msgstr _Dogfen Newydd
+msgid Writer _Document
+msgstr 
 
 #: startcenter.ui
+#, fuzzy
 msgctxt 
 startcenter.ui\n
 calc_all\n
 label\n
 string.text
-msgid New _Spreadsheet
+msgid Calc _Spreadsheet
 msgstr _Taenlen Newydd
 
 #: startcenter.ui
@@ -1057,16 +1060,17 @@ msgctxt 
 impress_all\n
 label\n
 string.text
-msgid New _Presentation
-msgstr _Cyflwyniad Newydd
+msgid Impress _Presentation
+msgstr 
 
 #: startcenter.ui
+#, fuzzy
 msgctxt 
 startcenter.ui\n
 draw_all\n
 label\n
 string.text
-msgid New D_rawing
+msgid Draw D_rawing
 msgstr _Lluniadu Newydd
 
 #: startcenter.ui
@@ -1075,8 +1079,8 @@ msgctxt 
 math_all\n
 label\n
 string.text
-msgid New For_mula
-msgstr _Fformiwla Newydd
+msgid Math For_mula
+msgstr 
 
 #: startcenter.ui
 msgctxt 
@@ -1084,17 +1088,8 @@ msgctxt 
 database_all\n
 label\n
 string.text
-msgid New D_atabase
-msgstr C_ronfa Ddata Newydd
-
-#: startcenter.ui
-msgctxt 
-startcenter.ui\n
-help\n
-label\n
-string.text
-msgid _Help
-msgstr _Cymorth
+msgid Base D_atabase
+msgstr 
 
 #: startcenter.ui
 msgctxt 
diff --git a/source/gd/sfx2/uiconfig/ui.po b/source/gd/sfx2/uiconfig/ui.po
index 0fe36a6..b05329b 100644
--- a/source/gd/sfx2/uiconfig/ui.po
+++ b/source/gd/sfx2/uiconfig/ui.po
@@ -3,7 +3,7 @@ msgid 
 msgstr 
 Project-Id-Version: LibO 40l10n\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
-POT-Creation-Date: 2013-11-20 13:01+0100\n
+POT-Creation-Date: 2014-01-22 10:55+0100\n
 PO-Revision-Date: 2013-12-29 01:01+\n
 Last-Translator: Michael f...@akerbeltz.org\n
 Language-Team: none\n
@@ -12,7 +12,7 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : 
(n  2  n  20) ? 2 : 3;\n
-X-Generator: Pootle 2.5.0\n
+X-Generator: LibreOffice\n
 X-Accelerator-Marker: ~\n
 X-POOTLE-MTIME: 1388278887.0\n
 
@@ -55,6 +55,15 @@ msgstr Cleachd am

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

2014-01-22 Thread Andras Timar

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

New commits:
commit 4999706daf7f9e9f4e68bf5f8874b4d4fc7c41b8
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Jan 22 11:07:43 2014 +0100

Updated core
Project: translations  51243d88a433300e67c53a58febea269cca9ee31

diff --git a/translations b/translations
index d01100e..51243d8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d01100e5ac29b11c67e2878b1963dcef11ae61ff
+Subproject commit 51243d88a433300e67c53a58febea269cca9ee31
___
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' - 35/2ca2f6ecf8910afa24c53d7e872f62b2321321

2014-01-22 Thread Caolán McNamara

 35/2ca2f6ecf8910afa24c53d7e872f62b2321321 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5b64d07df592ea8608fff4ab983dad8e08124ca8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 10:17:21 2014 +

Notes added by 'git notes add'

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

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

2014-01-22 Thread Tsutomu Uchino

 vcl/source/gdi/dibtools.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit b65991145a07287f93b9738f4b9ab3ceca36402d
Author: Tsutomu Uchino ha...@apache.org
Date:   Wed Jan 22 06:16:21 2014 +

Resolves: #i106063# avoid additional seek for true color DIB

The position in the stream is already at the end of color palette.
(cherry picked from commit 352ca2f6ecf8910afa24c53d7e872f62b2321321)

Change-Id: I1696c1b6780407ab579b6215ab13a327ae09fc32

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 79bc942..389f17e 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -414,12 +414,6 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 // Read data
 if(bNative)
 {
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != 
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
 rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
 }
 else
@@ -455,12 +449,6 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 const long nHeight(rHeader.nHeight);
 sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
 
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != 
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
 const long nI(bTopDown ? 1 : -1);
 long nY(bTopDown ? 0 : nHeight - 1);
 long nCount(nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source slideshow/source solenv/bin sw/source writerfilter/source

2014-01-22 Thread David Tardon

 commit 1ceda390389a3e7bf4b7bb72b533a355a0fa060d
 Author: Herbert D??rr h...@apache.org
 Date:   Tue Jan 21 14:09:37 2014 +
 
 #i123817# boost::shared_ptr doesn't have an implicit conversion to bool
 
 Constructs that expect it fail at least in XCode4's clang in C++11 mode.
 An implicit conversion from pointer to bool is already suspicious enough
 and a shared_ptr-pointer-bool conversion is even worse. Cleaning up
 the code fixes the build breaker seen in boost/libc++/clang environments.
 
 diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
 b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
 index ff088bf..003e3b6 100644
 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
 +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
 @@ -469,7 +469,7 @@ void ButtonBar::Paint (
  
  bool ButtonBar::IsMouseOverButton (void) const
  {
 -return mpButtonUnderMouse;
 +return (mpButtonUnderMouse.get() != NULL);

FWIW, I think the idiomatic way to do this is bool(mpButtonUnderMouse).

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

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

2014-01-22 Thread Miklos Vajna

 oox/source/vml/vmltextboxcontext.cxx   |1 +
 sw/qa/extras/ooxmlimport/data/groupshape-smarttag.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |7 +++
 3 files changed, 8 insertions(+)

New commits:
commit f2d1e5ef1cbae5959e818577bc6c94bed746dc90
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Jan 22 11:17:02 2014 +0100

VML import: parse shape text run inside w:smartTag

Change-Id: I26c2f9e3f5e560f22d3de0a7378c5cd7d0413184

diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index fe53d78..80cfd37 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -239,6 +239,7 @@ ContextHandlerRef TextBoxContext::onCreateContext( 
sal_Int32 nElement, const Att
 break;
 case OOX_TOKEN(doc, p):
 case OOX_TOKEN(doc, sdtContent):
+case OOX_TOKEN(doc, smartTag):
 if (nElement == OOX_TOKEN(doc, r))
 return new TextPortionContext( *this, mrTextBox, maParagraph, 
TextFontModel(), nElement, rAttribs );
 else
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-smarttag.docx 
b/sw/qa/extras/ooxmlimport/data/groupshape-smarttag.docx
new file mode 100755
index 000..6fc1cb2
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/groupshape-smarttag.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cde673b..bf17257 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -981,6 +981,13 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, 
groupshape-child-rotation
 CPPUNIT_ASSERT_EQUAL(OUString(com.sun.star.drawing.TextShape), 
xShapeDescriptor-getShapeType());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testGroupshapeSmarttag, groupshape-smarttag.docx)
+{
+uno::Referencedrawing::XShapes xGroupShape(getShape(1), uno::UNO_QUERY);
+// First run of shape text was missing due to the w:smartTag wrapper 
around it.
+CPPUNIT_ASSERT_EQUAL(OUString(Box 2), 
uno::Referencetext::XTextRange(xGroupShape-getByIndex(0), 
uno::UNO_QUERY)-getString());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testN793262, n793262.docx)
 {
 uno::Referencecontainer::XEnumerationAccess xHeaderText = getProperty 
uno::Referencecontainer::XEnumerationAccess 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), HeaderText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Tsutomu Uchino

 basctl/sdi/baside.sdi  |1 +
 basctl/source/basicide/baside2.cxx |   13 -
 basctl/source/basicide/baside3.cxx |5 +
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4f03eb00fcb6b1c3a06709edab56c8e2508241d5
Author: Tsutomu Uchino ha...@apache.org
Date:   Wed Jan 22 07:41:16 2014 +

Related: #i50481# improve Select All command in Basic IDE

see also fdo#37211 i.e. commit 4bc2724240b11ce4dfb7adafbe1f1c260fa44030

(cherry picked from commit f841659faf09fec69c962959b9da032fa0bc2b16)

Conflicts:
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx

Change-Id: Id679b1e16b87ec8d81fb78039318728320b9d5bc

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 271441c..586b328 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -57,6 +57,7 @@ shell basctl_Shell
 SID_SELECTALL
 [
 ExecMethod  = ExecuteCurrent;
+StateMethod = GetState;
 ]
 
 SID_CUT
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 2f8744e..c9719ff 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -952,8 +952,13 @@ void ModulWindow::ExecuteCommand (SfxRequest rReq)
 break;
 }
 case SID_SELECTALL:
-GetEditView()-SetSelection( TextSelection( TextPaM( 0, 0 ), 
TextPaM( 0x, 0x ) ) );
+{
+TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, 
0x ) );
+TextView * pView = GetEditView();
+pView-SetSelection( aSel );
+pView-GetWindow()-GrabFocus();
 break;
+}
 case SID_BASICRUN:
 {
 BasicRun();
@@ -1170,6 +1175,12 @@ void ModulWindow::GetState( SfxItemSet rSet )
 rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
 break;
 }
+case SID_SELECTALL:
+{
+if ( !GetEditView() )
+rSet.DisableItem( nWh );
+}
+break;
 }
 }
 }
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index a7b0b20..14ef27f 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -409,6 +409,11 @@ void DialogWindow::GetState( SfxItemSet rSet )
 rSet.Put(SfxVisibilityItem(nWh, false));
 break;
 }
+case SID_SELECTALL:
+{
+rSet.DisableItem( nWh );
+}
+break;
 }
 }
 }
___
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' - f8/41659faf09fec69c962959b9da032fa0bc2b16

2014-01-22 Thread Caolán McNamara

 f8/41659faf09fec69c962959b9da032fa0bc2b16 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2d3c3be4a85aac5788cd5d3f9a9707eadf22cb5d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 10:33:00 2014 +

Notes added by 'git notes add'

diff --git a/f8/41659faf09fec69c962959b9da032fa0bc2b16 
b/f8/41659faf09fec69c962959b9da032fa0bc2b16
new file mode 100644
index 000..28f8688
--- /dev/null
+++ b/f8/41659faf09fec69c962959b9da032fa0bc2b16
@@ -0,0 +1 @@
+merged as: 4f03eb00fcb6b1c3a06709edab56c8e2508241d5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Proposal: remove Live Scroll option from LibreOffice

2014-01-22 Thread Chris Sherlock

Hi everyone,

I've lodged bug 73921 at
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=73921

I would like to propose that we remove the Live Scroll option from the
code.

When Live Scroll is on, it means that when the user moves the slider in the
scroll bar, the content of the window is updated immediately.

If you turn off Live Scroll then the window is only updated after the user
has released the mouse button.

I don't really think anyone would be turning this off. However, I'd like to
get some feedback on this, so I logged the bug and I'm bringing it to the
dev list before I go ahead and start excising the code that removes the
option.

Can I get the thoughts of others? Also, should I be taking this to another
mailing list? I can't imagine many people use the setting, but I suppose
you can never be too sure.

Otherwise, the code is probably not necessary and can go.

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

Re: Windows OpenType support, Serbian cursive

2014-01-22 Thread Caolán McNamara

On Tue, 2014-01-21 at 08:58 -0800, Perka Peric wrote:
 Hello Caolán, thanks for writing to me.
 
 Yes, I always mark my texts as Serbian (Cyrillic) ... but ... LO
 (even the latest v4.1.4.2) for Windows doesn't have this [localized
 forms for Serbian] functionality. It simply doesn't work in Windows.
 
 I see you develop for Linux, but is there something developers can do
 to fix the things for Windows, maybe some other OpenType library?

Yeah, that's right, it's not implemented for Windows. I'll reply to the
development list as well to document what needs to be done.

We're using ScriptShape under windows, I believe to get the desired
functionality we need to bump up to using ScriptShapeOpenType and set
the tagLangSys field to the opentype language tag for the language being
rendered which is available as ImplLayoutArgs::maLanguageTag which is
passed to UniscribeLayout::LayoutText. Then it would probably work out
of the box.

ScriptShapeOpenType and its friends are only in Windows 7+ so we'd
probably also need to GetProcAddress to use it only when it's available
at run time and fall back to ScriptShape if it's not. (see
https://bugs.freedesktop.org/show_bug.cgi?id=55494#c19 by our very own
Fridrich moonlighting over in harfbuzz for a tip on how to do that)

We probably also then need to remove SimpleWinLayout and use
UniscribeLayout for all languages and not just those deemed complex.

This isn't something I personally plan to work on so its an open Windows
task for anyone to take on.

C.

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

Re: [Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source slideshow/source solenv/bin sw/source writerfilter/source

2014-01-22 Thread Caolán McNamara

On Wed, 2014-01-22 at 11:26 +0100, David Tardon wrote:
 FWIW, I think the idiomatic way to do this is bool(mpButtonUnderMouse)

Yeah, Mark Wright in d4bab97023e3569571a92551040574b20aceca7c fixed
those up for us with bool casts around this time last year

C.

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

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

2014-01-22 Thread Herbert Dürr

 avmedia/source/quicktime/makefile.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dbf0a30b0d2930e34cc6964982bb1141839ec5da
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jan 22 10:46:37 2014 +

#i114728# the quicktime framework was deprecated longer

diff --git a/avmedia/source/quicktime/makefile.mk 
b/avmedia/source/quicktime/makefile.mk
index 69f3d79..808360f 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -25,8 +25,11 @@ PRJ=..$/..
 PRJNAME=avmedia
 TARGET=avmediaQuickTime
 
-# the QuickTime API has been removed in OSX SDK 10.7
-.IF $(GUIBASE)==aqua  ${MACOSX_DEPLOYMENT_TARGET:s/.//}107
+# the QuickTime API has been deprecated since OSX 10.5 and has been removed in 
the OSX SDK 10.7
+.IF ($(GUIBASE) != aqua) || (${MACOSX_DEPLOYMENT_TARGET:s/.//} = 106)
+dummy:
+@echo  Nothing to build for GUIBASE=$(GUIBASE) and 
OSX$(MACOSX_DEPLOYMENT_TARGET)
+.ELSE
 
 # --- Settings --
 
@@ -77,9 +80,6 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE : target.mk
 
-.ELSE
-dummy:
-@echo  Nothing to build for GUIBASE=$(GUIBASE)
 .ENDIF
 
 ALLTAR : $(MISC)/avmediaQuickTime.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Zolnai Tamás

 include/toolkit/controls/dialogcontrol.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4aa04075fbfcecd33a5c257e69d0c5858fcfb973
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Jan 22 13:09:20 2014 +0100

Fix service name of UnoFrameControl

Change-Id: Ic213a8ac35ba7364408c52e436f052b4684be2f1

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 569edaa..f606720 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -328,7 +328,7 @@ public:
 OUString GetComponentServiceName();
 
 // ::com::sun::star::lang::XServiceInfo
-DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, 
szServiceName_UnoPageControl )
+DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, 
szServiceName_UnoFrameControl )
 };
 
 #endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Caolán McNamara

 svx/source/tbxctrls/tbcontrl.cxx |   47 +--
 1 file changed, 16 insertions(+), 31 deletions(-)

New commits:
commit 3b0cf674925dd8fd0f34c5a810afc470ce5b4a0f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 12:11:17 2014 +

Resolves: fdo#72989 color buttons not disabled in readonly docs

we we not calling EnableItem for most of the color options so it didn't get
disabled in readonly mode, and anyway it was using nSID as the itemid rather
than getId() so even if EnableItem was called it didn't have an effect.

Change-Id: Ia7b55d78d369a79d3e45c8407f859d47fceac753

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5118449..725c50c0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2547,41 +2547,26 @@ void SvxColorExtToolBoxControl::StateChanged(
 sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
-const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette  nSID == GetSlotId() )
+if (nSID == GetSlotId())
 {
-bChoiceFromPalette = sal_False;
-switch( nSID )
-{
-case SID_ATTR_CHAR_COLOR :
-case SID_ATTR_CHAR_COLOR2 :
-case SID_ATTR_CHAR_COLOR_BACKGROUND :
-case SID_BACKGROUND_COLOR :
-if ( SFX_ITEM_DONTCARE != eState )
-pItem = PTR_CAST( SvxColorItem, pState );
+ToolBox rTbx = GetToolBox();
+sal_uInt16 nId = GetId();
+rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
+rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? 
STATE_DONTKNOW : STATE_NOCHECK );
 
-if ( pItem )
-{
-pBtnUpdater-Update( pItem-GetValue() );
-mLastColor = pItem-GetValue();
-}
-break;
+if (bChoiceFromPalette)
+{
+bChoiceFromPalette = sal_False;
 
-case SID_FRAME_LINECOLOR :
-ToolBox rTbx = GetToolBox();
-rTbx.EnableItem( nSID, SFX_ITEM_DISABLED != eState );
-rTbx.SetItemState( nSID, ( SFX_ITEM_DONTCARE == eState ) ? 
STATE_DONTKNOW : STATE_NOCHECK );
+const SvxColorItem* pItem = 0;
+if ( SFX_ITEM_DONTCARE != eState )
+pItem = PTR_CAST( SvxColorItem, pState );
 
-if ( SFX_ITEM_DONTCARE != eState )
-{
-pItem = PTR_CAST( SvxColorItem, pState );
-if ( pItem )
-{
-pBtnUpdater-Update( pItem-GetValue());
-mLastColor = pItem-GetValue();
-}
-}
-break;
+if ( pItem )
+{
+pBtnUpdater-Update( pItem-GetValue() );
+mLastColor = pItem-GetValue();
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [fdo#72989] [Need Hints] How to locate codes executed at the click of a menu item in Calc

2014-01-22 Thread Caolán McNamara

On Fri, 2014-01-17 at 15:35 +0800, Daniel Dong wrote:
 Hello! I'm doing my first easyhack fdo#72989. I am puzzled how to find
 the codes executed when a menu item is clicked in Calc. Any hints?

So this one wasn't so easy actually. But FWIW when those dialogs are
opened calc goes into readonly mode so the problem is that the color
buttons aren't getting disabled in that mode. Turns out they weren't
reacting in their ::StateChanged methods to the disable signal (and were
using the wrong id anyway for the button to enable/disable)

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

C.


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/f0a30b0d2930e34cc6964982bb1141839ec5da

2014-01-22 Thread Caolán McNamara

 db/f0a30b0d2930e34cc6964982bb1141839ec5da |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 17a75fffc790af35172fe2334568fa65b61766f3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 12:29:34 2014 +

Notes added by 'git notes add'

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

Re: [libreoffice-l10n] space between values and units in spinners, fdo#71688

2014-01-22 Thread Caolán McNamara

On Tue, 2014-01-21 at 11:32 -0600, Adolfo Jayme Barrientos wrote:
 On Tue, Jan 21, 2014 at 5:59 AM, Caolán McNamara caol...@redhat.com wrote:
  [...]
  c) If you agree with icu's % formatting for your language then update
  the translations for X% to be consistent with that formatting. Otherwise
  we can fix icu or make a blacklist of languages which should be excluded
  from the default icu percent formatting.
 
 Caolán, how can we submit a fix for ICU? For instance, Spanish
 formatting should be exactly the same as German, i.e. “#,##0 %”.

So icu gets them via the CLDR, see the chart at
http://www.unicode.org/cldr/charts/24/by_type/numbers.number_formatting_patterns.html
and see the how-to-update guide at
http://cldr.unicode.org/index/bug-reports

The CLDR is an awesome piece of work, e.g. default paper sizes of
regions and so on. It's worth knowing about it and worth checking that
it's right for your locale to help out all projects.

For LibreOffice I can special case Spanish to have a space between the
value and %, but is it a normal space like between words or should it
be a narrow space like Stephen dug out from his German style guide.

C.

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

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

2014-01-22 Thread Caolán McNamara

 i18nutil/source/utility/unicode.cxx |   13 -
 vcl/source/control/field.cxx|1 +
 vcl/source/src/units.src|1 -
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit f03ce265db73388f3e0de97e4b0c8129cfc85d1f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 13:06:52 2014 +

drop translation of % now that we use icu to format it

Change-Id: Ia53815018cc5438ffbc2fecf2ec65ce69f1b90c5

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index b765ded..96bfbdb 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1440,6 +1440,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 
nValue ) const
 {
 if (meUnit != FUNIT_NONE  meUnit != FUNIT_DEGREE)
 aStr +=  ;
+assert(meUnit != FUNIT_PERCENT);
 aStr += ImplMetricToString( meUnit );
 }
 return aStr;
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 2e40585..5de6209 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -42,7 +42,6 @@ StringArray SV_FUNIT_STRINGS
  mile ; FUNIT_MILE ;  ;
  ch ; FUNIT_CHAR ;  ;
  line ; FUNIT_LINE ;  ;
- % ; FUNIT_PERCENT ;  ;
  pixels ; FUNIT_PIXEL ;  ;
  pixel ; FUNIT_PIXEL ;  ;
  Â° ; FUNIT_DEGREE ;  ;
commit 486e318b86943844011ef881556dabb4a3f7ef33
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 12:57:07 2014 +

CLDR Version 24 doesn't know about es and sl using space before %

Change-Id: I1c3e7dc28e389a9580239165d04b171e06f5618e

diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 5ef4fb5..ff92805 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -945,7 +945,18 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
 {
 // get a currency formatter for this locale ID
 UErrorCode errorCode=U_ZERO_ERROR;
-icu::Locale aLocale = LanguageTagIcu::getIcuLocale(rLangTag);
+
+LanguageTag aLangTag(rLangTag);
+
+// As of CLDR Version 24 these languages were not listed as using spacing
+// between number and % but are reported as such by our l10n groups
+// 
http://www.unicode.org/cldr/charts/24/by_type/numbers.number_formatting_patterns.html
+// so format using French which has the desired rules
+if (aLangTag.getLanguage() == es || aLangTag.getLanguage() == sl)
+aLangTag = LanguageTag(fr-FR);
+
+icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
+
 boost::scoped_ptrNumberFormat xF(
 NumberFormat::createPercentInstance(aLocale, errorCode));
 if(U_FAILURE(errorCode))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-l10n] space between values and units in spinners, fdo#71688

2014-01-22 Thread Caolán McNamara

On Tue, 2014-01-21 at 21:19 +0100, Martin Srebotnjak wrote:

 for Slovenian I already asked to include space in front of % and it
 was done. I also changed all translated strings accordingly. It was
 done for 4.2 or even before, can't remember. Hopefully those settings
 for Slovenian were inherited by 4.3.

The translations of % of vcl/LANG/source/src.po are now no longer used
in favor of the icu-based percent formatter. I checked the CLDR list[1]
and sl is not listed there as using a space, so I suggest you submit the
correct pattern to CLDR for sl at
http://cldr.unicode.org/index/bug-reports

In the mean time I have now added sl to the list of special cases (along
with es) that CLDR has currently the wrong data about and force a space
in there, so 4.3 should now again retain the space for sl

C.

[1]
http://www.unicode.org/cldr/charts/24/by_type/numbers.number_formatting_patterns.html


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

Re: Efficient UNO component linkage GC ...

2014-01-22 Thread Jan Holesovsky

Hi Stephan,

Stephan Bergmann píše v St 22. 01. 2014 v 10:22 +0100:

 I think there is better 
 solutions for that, like providing a helper function to be called from 
 the typical constructor function,
 
css::uno::XInterface * acquire(cppu::OWeakObject * instance) {
  assert(instance != 0);
  instance-acquire();
  return instance;
}
 
css::uno::XInterface * FOO_constructor_function(...) {
  retrun acquire(new FOO(...));
}

Thank you for reviewing! :-)  My problem with directly providing
arguments to the _constructor_function (and consequently to the C++
constructor) was that it was hard to distinguish whether the code
constructing the instance needs to work on an acquired interface, or
not, so thought that if we 'force' every initialization to work on the
acquired one, it leads to least trouble.

But if this is not a problem, and the implementer should be aware  make
the right choice, I am most happy; actually the resulting constructors
look really beautiful from my POV:

https://gerrit.libreoffice.org/7592

Thanks so much for this suggestion - if you are happy with the patch,
I'd push it ASAP to unbreak the Windows build...

All the best,
Kendy

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

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

2014-01-22 Thread Julien Nabet

 basic/qa/basic_coverage/test_mid_EndOutOfBounds.vb   |   15 +++
 basic/qa/basic_coverage/test_mid_NoEnd.vb|   15 +++
 basic/qa/basic_coverage/test_mid_StartOutOfBounds.vb |   15 +++
 basic/qa/basic_coverage/test_mid_first.vb|   15 +++
 4 files changed, 60 insertions(+)

New commits:
commit 4eda1a0293a869bf804056f1e9e04c984c69454d
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Jan 21 23:40:11 2014 +0100

Add some unit-tests for Mid vb function (includes fdo#73771)

Change-Id: Ib5ee18207897cbe16a818096769cdb055dc9dad7
Reviewed-on: https://gerrit.libreoffice.org/7583
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/basic/qa/basic_coverage/test_mid_EndOutOfBounds.vb 
b/basic/qa/basic_coverage/test_mid_EndOutOfBounds.vb
new file mode 100644
index 000..f54ee94
--- /dev/null
+++ b/basic/qa/basic_coverage/test_mid_EndOutOfBounds.vb
@@ -0,0 +1,15 @@
+'
+' 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/.
+'
+
+Function doUnitTest as Integer
+If (Mid(abc, 1, 4) = abc) Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+End Function
diff --git a/basic/qa/basic_coverage/test_mid_NoEnd.vb 
b/basic/qa/basic_coverage/test_mid_NoEnd.vb
new file mode 100644
index 000..76c5360
--- /dev/null
+++ b/basic/qa/basic_coverage/test_mid_NoEnd.vb
@@ -0,0 +1,15 @@
+'
+' 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/.
+'
+
+Function doUnitTest as Integer
+If (Mid(abc, 2) = bc) Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+End Function
diff --git a/basic/qa/basic_coverage/test_mid_StartOutOfBounds.vb 
b/basic/qa/basic_coverage/test_mid_StartOutOfBounds.vb
new file mode 100644
index 000..9c623ce
--- /dev/null
+++ b/basic/qa/basic_coverage/test_mid_StartOutOfBounds.vb
@@ -0,0 +1,15 @@
+'
+' 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/.
+'
+
+Function doUnitTest as Integer
+If (Mid(abc, 5, 1) = ) Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+End Function
diff --git a/basic/qa/basic_coverage/test_mid_first.vb 
b/basic/qa/basic_coverage/test_mid_first.vb
new file mode 100644
index 000..72c6509
--- /dev/null
+++ b/basic/qa/basic_coverage/test_mid_first.vb
@@ -0,0 +1,15 @@
+'
+' 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/.
+'
+
+Function doUnitTest as Integer
+If (Mid(abc, 1, 1) = a) Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+End Function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Kohei Yoshida

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit d19de47c2da0867ded7e9045f06957aa4a1f277e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 09:01:04 2014 -0500

fdo#73886: Check the right width in case the left width is zero.

Change-Id: I6a0b1dd7382f1d3c7266ba56dbfdc557737380c2

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index fc9a19c..891d71f 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -302,6 +302,8 @@ namespace drawinglayer
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
+if (!nThick)
+nThick = rtl::math::round(rSource.getRightWidth());
 
 bool bDouble = rSource.getStyle() == 
table::BorderLineStyle::DOUBLE;
 
@@ -412,6 +414,9 @@ namespace drawinglayer
 return false;
 
 double nThick = rtl::math::round(rSource.getLeftWidth());
+if (!nThick)
+nThick = rtl::math::round(rSource.getRightWidth());
+
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Stephan Bergmann

 comphelper/source/misc/types.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 930202b0b239636532bda471cc51d4750e09536f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 22 15:03:13 2014 +0100

Maybe this bool clean-up avoids false -Werror=maybe-uninitialized on Android

Change-Id: Iab12cc703d190e79650f73c646a2fbb60c6685c5

diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index fbf49f3..684f2d2 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -164,17 +164,17 @@ sal_Bool isAssignableFrom(const Type _rAssignable, const 
Type _rFrom)
 
 //--
 templateclass TYPE
-sal_Bool tryCompare(const void* _pData, const Any _rValue, sal_Bool 
_bIdentical, TYPE _rOut)
+bool tryCompare(const void* _pData, const Any _rValue, sal_Bool _bIdentical, 
TYPE _rOut)
 {
-sal_Bool bSuccess = _rValue = _rOut;
+bool bSuccess = _rValue = _rOut;
 _bIdentical = bSuccess  (_rOut == *reinterpret_castconst 
TYPE*(_pData));
 return bSuccess;
 }
 
 //--
-sal_Bool tryCompare(const void* _pData, const Any _rValue, sal_Bool 
_bIdentical, sal_Unicode _rOut)
+bool tryCompare(const void* _pData, const Any _rValue, sal_Bool _bIdentical, 
sal_Unicode _rOut)
 {
-sal_Bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR );
+bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR );
 if ( bSuccess )
 _rOut = *static_cast const sal_Unicode* ( _rValue.getValue() );
 _bIdentical = bSuccess  ( _rOut == *static_cast const sal_Unicode* ( 
_pData ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - oox/source sal/inc solenv/gbuild stlport/systemstl vcl/aqua vcl/inc

2014-01-22 Thread Herbert Dürr

 oox/source/token/tokens.txt  |2 -
 sal/inc/sal/mathconf.h   |2 -
 solenv/gbuild/platform/macosx.mk |   23 +++---
 stlport/systemstl/hash_map   |   14 
 stlport/systemstl/hash_set   |   14 
 vcl/aqua/source/gdi/ctlayout.cxx |7 
 vcl/inc/aqua/salfontutils.hxx|   62 ---
 7 files changed, 21 insertions(+), 103 deletions(-)

New commits:
commit 4899f54a8b39d66884ebd7afd1946af27c1c878b
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jan 22 14:01:11 2014 +

#i123951# remove aqua/salfontutils.hxx header

which is and was unused by by both CoreText and ATSUI

diff --git a/vcl/inc/aqua/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx
deleted file mode 100644
index 694149b..000
--- a/vcl/inc/aqua/salfontutils.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-
-
-#ifndef _SV_SALFONTUTILS_HXX
-#define _SV_SALFONTUTILS_HXX
-
-#include vcl/outfont.hxx
-
-static const char *kFontWeightThin1 = Thin;
-static const char *kFontWeightThin2 = thin;
-
-static const char *kFontWeightLight1 = Light;
-static const char *kFontWeightLight2 = light;
-
-static const char *kFontWeightBold1 = Bold;
-static const char *kFontWeightBold2 = bold;
-
-static const char *kFontWeightUltra1 = Ultra;
-static const char *kFontWeightUltra2 = ultra;
-
-static const char *kFontWeightSemi1 = Semi;
-static const char *kFontWeightSemi2 = semi;
-
-static const char *kFontWeightNormal1 = Normal;
-static const char *kFontWeightNormal2 = normal;
-
-static const char *kFontWeightMedium1 = Medium;
-static const char *kFontWeightMedium2 = medium;
-
-static const char *kFontWeightBlack1 = Black;
-static const char *kFontWeightBlack2 = black;
-
-static const char *kFontWeightRoman1 = Roman;
-static const char *kFontWeightRoman2 = roman;
-
-static const char *kFontWeightRegular1 = Regular;
-static const char *kFontWeightRegular2 = regular;
-
-
-#endif  // _SV_SALFONTUTILS_HXX
-
commit ec1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jan 22 13:46:38 2014 +

#i122195# extend macosx gbuild makefile for clang-compiler

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 43e5b7e2..073b191 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -58,13 +58,15 @@ gb_OSDEFS := \
 gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
-   -DCPPU_ENV=gcc3 \
+   -DCPPU_ENV=$(COMID) \
-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 ifeq ($(CPUNAME),POWERPC)
 gb_CPUDEFS := -DPOWERPC -DPPC
-else
+else ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
+else ifeq ($(CPUNAME),X86_64)
+gb_CPUDEFS := -DX86_64
 endif
 
 ifeq ($(strip $(SYSBASE)),)
@@ -98,11 +100,7 @@ gb_CXXFLAGS := \
-fno-common \
-fno-strict-aliasing \
-fsigned-char \
-   -malign-natural \
-   -pipe \
-   #-Wshadow \ break in compiler headers already
-   #-fsigned-char \ might be removed?
-   #-malign-natural \ might be removed?
+   -pipe
 
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
@@ -115,12 +113,15 @@ endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-   -fexceptions \
-   -fno-enforce-eh-specs \
+   -fexceptions
+
+ifeq ($(COM),GCC)
+gb_LinkTarget_EXCEPTIONFLAGS += -fno-enforce-eh-specs
+endif
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
-   -fno-exceptions \
+   -fno-exceptions
 
 gb_LinkTarget_LDFLAGS := \
-Wl,-syslibroot,$(gb_SDKDIR) \
@@ -302,7 +303,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
commit

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

2014-01-22 Thread Chris Sherlock

 desktop/source/app/app.cxx |4 ++--
 include/vcl/svapp.hxx  |2 ++
 vcl/source/app/svapp.cxx   |   17 +
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 4959f369d9bdcc2ab50cd4a70ad96a4a4fa17c76
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Wed Jan 22 18:45:19 2014 +1100

Improve settings code reability

Application::SetSettings relies on Application::GetSettings to
initialize the application's settings if this hasn't happened.
This means that GetSettings is being used not to get the app's
settings, but to initialize the settings!

I have corrected this by introducing a private static function
InitSettings(). Note that I assert if it attempts to initialize
already initialized settings, because the (Get|Set)Settings
does the check for you.

Also changed a local variable from nGet to nDragMode in
Desktop::SystemSettingsChanging to make it easier to read the
code. Whilst this is minor, a variable name of nGet seems
very sloppy.

Change-Id: I04975217c2028b3489179997db4287957578cc93
Reviewed-on: https://gerrit.libreoffice.org/7586
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 962e2b4..8c0fe6a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1951,8 +1951,8 @@ void Desktop::SystemSettingsChanging( AllSettings 
rSettings )
 sal_uInt32 nDragFullOptions = hStyleSettings.GetDragFullOptions();
 
 SvtTabAppearanceCfg aAppearanceCfg;
-sal_uInt16 nGet = aAppearanceCfg.GetDragMode();
-switch ( nGet )
+sal_uInt16 nDragMode = aAppearanceCfg.GetDragMode();
+switch ( nDragMode )
 {
 case DragFullWindow:
 nDragFullOptions |= DRAGFULL_OPTION_ALL;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 8e7b053..f0e9b80 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -780,6 +780,8 @@ public:
 
 private:
 
+static void InitSettings();
+
 DECL_STATIC_LINK( Application, PostEventHandler, void* );
 };
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a754856..ac13c73 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -519,7 +519,7 @@ void Application::SetSettings( const AllSettings rSettings 
)
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData-maAppData.mpSettings )
 {
-GetSettings();
+InitSettings();
 *pSVData-maAppData.mpSettings = rSettings;
 ResMgr::SetDefaultLocale( rSettings.GetUILanguageTag() );
 }
@@ -618,14 +618,23 @@ const AllSettings Application::GetSettings()
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData-maAppData.mpSettings )
 {
-pSVData-maAppData.mpCfgListener = new LocaleConfigurationListener;
-pSVData-maAppData.mpSettings = new AllSettings();
-
pSVData-maAppData.mpSettings-GetSysLocale().GetOptions().AddListener( 
pSVData-maAppData.mpCfgListener );
+InitSettings();
 }
 
 return *(pSVData-maAppData.mpSettings);
 }
 
+void Application::InitSettings()
+{
+ImplSVData* pSVData = ImplGetSVData();
+
+assert(!pSVData-maAppData.mpSettings); // initialization should not 
happen twice!
+
+pSVData-maAppData.mpCfgListener = new LocaleConfigurationListener;
+pSVData-maAppData.mpSettings = new AllSettings();
+pSVData-maAppData.mpSettings-GetSysLocale().GetOptions().AddListener( 
pSVData-maAppData.mpCfgListener );
+}
+
 void Application::NotifyAllWindows( DataChangedEvent rDCEvt )
 {
 ImplSVData* pSVData = ImplGetSVData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Caolán McNamara

 sc/uiconfig/scalc/ui/externaldata.ui |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 219a2939c9f58690356b2a3f64c580a0865fdc64
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 13:42:47 2014 +

reorient the ok/cancel/help buttons of external data

Change-Id: I08abe30a259014ba33bcad63a40198baa1099893

diff --git a/sc/uiconfig/scalc/ui/externaldata.ui 
b/sc/uiconfig/scalc/ui/externaldata.ui
index dfad80c..5e68d7d 100644
--- a/sc/uiconfig/scalc/ui/externaldata.ui
+++ b/sc/uiconfig/scalc/ui/externaldata.ui
@@ -1,7 +1,15 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.0 on Wed Jan 22 13:40:23 2014 --
 interface
   !-- interface-requires gtk+ 3.0 --
   !-- interface-requires LibreOffice 1.0 --
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper9/property
+property name=value60/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkDialog id=ExternalDataDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -10,12 +18,12 @@
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
+property name=orientationvertical/property
 property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area1
 property name=can_focusFalse/property
-property name=orientationvertical/property
-property name=layout_stylestart/property
+property name=layout_styleend/property
 child
   object class=GtkButton id=ok
 property name=labelgtk-ok/property
@@ -324,11 +332,4 @@
   action-widget response=0help/action-widget
 /action-widgets
   /object
-  object class=GtkAdjustment id=adjustment1
-property name=lower1/property
-property name=upper9/property
-property name=value60/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
 /interface
___
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' - c9/f0dafd9c6e22d5031b7e813c7335a6667af42f

2014-01-22 Thread Caolán McNamara

 c9/f0dafd9c6e22d5031b7e813c7335a6667af42f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54535a79444f87a622990ac3d3bceb7f5609f433
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 14:36:11 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d6/63922ca231800e593a7b6a34c98053af6c8e02

2014-01-22 Thread Caolán McNamara

 d6/63922ca231800e593a7b6a34c98053af6c8e02 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8e7d2fb2696ac11266341558f91b86ea6e88aa4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 14:37:24 2014 +

Notes added by 'git notes add'

diff --git a/d6/63922ca231800e593a7b6a34c98053af6c8e02 
b/d6/63922ca231800e593a7b6a34c98053af6c8e02
new file mode 100644
index 000..042b86a
--- /dev/null
+++ b/d6/63922ca231800e593a7b6a34c98053af6c8e02
@@ -0,0 +1 @@
+prefer: 41cc5c918e9d039144c9505550d9936277e7f091
___
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' - 14/b36850240678d6306849f331634db2392ab2ee

2014-01-22 Thread Caolán McNamara

 14/b36850240678d6306849f331634db2392ab2ee |1 +
 1 file changed, 1 insertion(+)

New commits:
commit be870c94a9c1595b3fb5b085e065cf75e8bfcbf4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 14:38:06 2014 +

Notes added by 'git notes add'

diff --git a/14/b36850240678d6306849f331634db2392ab2ee 
b/14/b36850240678d6306849f331634db2392ab2ee
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/14/b36850240678d6306849f331634db2392ab2ee
@@ -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' - ec/1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8

2014-01-22 Thread Caolán McNamara

 ec/1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b76b50128b3a953bdd2739d4a15687754e11067c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 14:39:56 2014 +

Notes added by 'git notes add'

diff --git a/ec/1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8 
b/ec/1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/ec/1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8
@@ -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' - 48/99f54a8b39d66884ebd7afd1946af27c1c878b

2014-01-22 Thread Caolán McNamara

 48/99f54a8b39d66884ebd7afd1946af27c1c878b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a97e22affe1b542d5d6cb24074a124323c225fa7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 14:41:12 2014 +

Notes added by 'git notes add'

diff --git a/48/99f54a8b39d66884ebd7afd1946af27c1c878b 
b/48/99f54a8b39d66884ebd7afd1946af27c1c878b
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/48/99f54a8b39d66884ebd7afd1946af27c1c878b
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Stephan Bergmann

 framework/source/services/frame.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 22bb2660ebd068c89fccda8a6c58d2a5a7bdcca8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 22 16:17:18 2014 +0100

-Werror,-Wreorder

Change-Id: Iff7837eb1390ddcf9e281912d7d91f76e8daf221

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 08642a5..2bc93d6 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -559,8 +559,7 @@ DEFINE_XTYPEPROVIDER_21 (   Frame
 @onerrorASSERT in debug version or nothing in relaese version.
 
*//*-*/
 Frame::Frame( const css::uno::Reference css::uno::XComponentContext  
xContext )
-:   ::cppu::OWeakObject (  
 )
-,   ThreadHelpBase  ( Application::GetSolarMutex()
 )
+:   ThreadHelpBase  ( Application::GetSolarMutex()
 )
 ,   TransactionBase (  
 )
 ,   PropertySetHelper   ( m_aLock,
   m_aTransactionManager,
___
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 writerfilter/source

2014-01-22 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|6 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|   17 -
 writerfilter/source/dmapper/StyleSheetTable.cxx |   14 ++
 3 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 8766011bccfd0f12f8dd77d2f94eb16e2e8c3471
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Jan 22 13:26:07 2014 +0100

DOCX import: set document-level font size default based on default para 
style

DOCX has two defaults: there can be default paragraph/run properties,
and also a paragraph/character style can be marked as default.

In this case the problem was that no doc-level default was specified,
but the default para style set a char height, and shape text is expected
to inherit that. Fix this by setting doc-level font size to default para
style, in case it's not set yet -- that matches what the binary import
does.

Also, adjust the export side, so that these duplicated default font size
is not written on export.

Change-Id: I63b368e7704142171d58f48d08052ac7616ab166

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bf17257..ac5c8c65 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -984,8 +984,12 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, 
groupshape-child-rotation
 DECLARE_OOXMLIMPORT_TEST(testGroupshapeSmarttag, groupshape-smarttag.docx)
 {
 uno::Referencedrawing::XShapes xGroupShape(getShape(1), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xShape(xGroupShape-getByIndex(0), 
uno::UNO_QUERY);
 // First run of shape text was missing due to the w:smartTag wrapper 
around it.
-CPPUNIT_ASSERT_EQUAL(OUString(Box 2), 
uno::Referencetext::XTextRange(xGroupShape-getByIndex(0), 
uno::UNO_QUERY)-getString());
+CPPUNIT_ASSERT_EQUAL(OUString(Box 2), xShape-getString());
+
+// Font size of the shape text was 10.
+CPPUNIT_ASSERT_EQUAL(12.f, getPropertyfloat(xShape-getText(), 
CharHeight));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testN793262, n793262.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 98b36f6..92e0881 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2590,6 +2590,21 @@ void DocxAttributeOutput::LatentStyles()
 m_pSerializer-endElementNS(XML_w, XML_latentStyles);
 }
 
+/// Should the font size we have written out as a default one?
+bool lcl_isDefaultFontSize(const SvxFontHeightItem rFontHeight, SwDoc* pDoc)
+{
+bool bRet = rFontHeight.GetHeight() != 200; // see 
StyleSheetTable_Impl::StyleSheetTable_Impl() where we set this default
+// Additionally, if the default para style has the same font size, then 
don't write it here.
+SwTxtFmtColl* pDefaultStyle = 
pDoc-GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+if (pDefaultStyle)
+{
+const SfxPoolItem* pItem = 0;
+if (pDefaultStyle-GetAttrSet().HasItem(RES_CHRATR_FONTSIZE, pItem))
+return static_castconst SvxFontHeightItem*(pItem)-GetHeight() 
!= rFontHeight.GetHeight();
+}
+return bRet;
+}
+
 void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem rHt)
 {
 bool bMustWrite = true;
@@ -2614,7 +2629,7 @@ void DocxAttributeOutput::OutputDefaultItem(const 
SfxPoolItem rHt)
 bMustWrite = true;
 break;
 case RES_CHRATR_FONTSIZE:
-bMustWrite = static_cast const SvxFontHeightItem 
(rHt).GetHeight() != 200; // see StyleSheetTable_Impl::StyleSheetTable_Impl() 
where we set this default
+bMustWrite = lcl_isDefaultFontSize(static_cast const 
SvxFontHeightItem (rHt), m_rExport.pDoc);
 break;
 case RES_CHRATR_KERNING:
 bMustWrite = static_cast const SvxKerningItem (rHt).GetValue() 
!= 0;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 05648a6..c7c098b 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -795,6 +795,20 @@ void StyleSheetTable::lcl_sprm(Sprm  rSprm)
 m_pImpl-m_pCurrentEntry-pProperties-InsertProps(pProps);
 
 m_pImpl-m_rDMapper.PopStyleSheetProperties( );
+
+if (m_pImpl-m_pCurrentEntry-nStyleTypeCode == 
STYLE_TYPE_PARA  m_pImpl-m_pCurrentEntry-bIsDefaultStyle)
+{
+// The current style is the default paragraph style.
+PropertyMapPtr pProperties = 
m_pImpl-m_pCurrentEntry-pProperties;
+if (pProperties-find(PROP_CHAR_HEIGHT) != 
pProperties-end()  m_pImpl-m_pDefaultParaProps-find(PROP_CHAR_HEIGHT) == 
m_pImpl-m_pDefaultParaProps-end())
+{
+// We provide a

Windows TB builds of master have all sputtered

2014-01-22 Thread V Stuart Foote

If no one has noticed, the four TB Windows builds of master went bad late on
the 21st.





--
View this message in context: 
http://nabble.documentfoundation.org/Windows-TB-builds-of-master-have-all-sputtered-tp4093494.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: long paras + tools/string.hxx

2014-01-22 Thread Caolán McNamara

On Tue, 2014-01-21 at 11:15 -0200, Olivier Hallot wrote:
 Em 21-01-2014 11:12, Caolán McNamara escreveu:
  Dunno. Rather doubt it though. How to reproduce ?
 Just save a file with one longpara (master as old as last friday).

Fixed now with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5c6781be6a28374d17215be94f83f8d8e2e35b0a
a few static casts to sal_uInt16 escaped me, so we looped on export with
the truncated values never getting to the end of the paragraph
eventually making us fall over with out of mem.

C.

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

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

2014-01-22 Thread Caolán McNamara

 sw/source/core/unocore/unoflatpara.cxx |4 ++--
 sw/source/core/unocore/unoportenum.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5c6781be6a28374d17215be94f83f8d8e2e35b0a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 15:30:37 2014 +

longparas: sneaky sal_uInt16 casts truncating values causing loop

on exporting a longpara document to our own .odt format

Change-Id: I2e517cd5ec6a29c8bcf853361a24bde25df15abb

diff --git a/sw/source/core/unocore/unoflatpara.cxx 
b/sw/source/core/unocore/unoflatpara.cxx
index 8213e50..cadc923 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -193,7 +193,7 @@ lang::Locale SAL_CALL 
SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa
 if (!mpTxtNode)
 return LanguageTag::convertToLocale( LANGUAGE_NONE );
 
-const lang::Locale aLocale( SW_BREAKITER()-GetLocale( mpTxtNode-GetLang( 
static_castsal_uInt16(nPos), static_castsal_uInt16(nLen) ) ) );
+const lang::Locale aLocale( SW_BREAKITER()-GetLocale( 
mpTxtNode-GetLang(nPos, nLen) ) );
 return aLocale;
 }
 
@@ -206,7 +206,7 @@ lang::Locale SAL_CALL 
SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo
 if (!mpTxtNode)
 return LanguageTag::convertToLocale( LANGUAGE_NONE );
 
-const lang::Locale aLocale( SW_BREAKITER()-GetLocale( mpTxtNode-GetLang( 
static_castsal_uInt16(nPos), static_castsal_uInt16(nLen) ) ) );
+const lang::Locale aLocale( SW_BREAKITER()-GetLocale( 
mpTxtNode-GetLang(nPos, nLen) ) );
 return aLocale;
 }
 
diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 7a46dd0..76059b4 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -1018,7 +1018,7 @@ static void lcl_MoveCursor( SwUnoCrsr * const pUnoCrsr,
 
 if (nMovePos  nCurrentIndex)
 {
-pUnoCrsr-GetPoint()-nContent = static_castsal_uInt16(nMovePos);
+pUnoCrsr-GetPoint()-nContent = nMovePos;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Chris Sherlock

 include/vcl/svapp.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e6e3ce2c9558d3d5aedec5388011ba408ed555fc
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Jan 23 02:26:39 2014 +1100

Fix misaligned code comment

I accidentally introduced this problem in commit 89a7b8a13285

Moved line of code to before the correct function.

Change-Id: Ic044a5607dc385140ca51d1bf4aa734c0cf99904
Reviewed-on: https://gerrit.libreoffice.org/7595
Reviewed-by: Jan-Marek Glogowski glo...@fbihome.de
Tested-by: Jan-Marek Glogowski glo...@fbihome.de

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index f0e9b80..f0fe3ca 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -631,10 +631,9 @@ public:
 TRUE/ if the system font is suitable for our UI
 FALSE/ if the test string could not be displayed with the system font
  */
-
-// default name of the application for message dialogs and printing
 static bool ValidateSystemFont();
 
+// default name of the application for message dialogs and printing
 static void SetDisplayName( const OUString rDisplayName );
 static OUString GetDisplayName();
 
___
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 writerfilter/source

2014-01-22 Thread Zolnai Tamás

 sw/qa/extras/ooxmlimport/data/fdo73389.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 +++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   19 ---
 3 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 7a0eec199901962b03f04371e9474caf8c408c01
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Mon Jan 20 13:44:46 2014 +0100

fdo#73389 Writer does not show a docx-document with nested table correctly

The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa

(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx

Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
Reviewed-on: https://gerrit.libreoffice.org/7565
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx 
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2c72214..32545c2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -137,6 +137,7 @@ public:
 void testBnc779620();
 void testRPrChangeClosed();
 void testFdo65090();
+void testFdo73389();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -239,6 +240,7 @@ void Test::run()
 {bnc779620.docx, Test::testBnc779620},
 {rprchange_closed.docx, Test::testRPrChangeClosed},
 {fdo65090.docx, Test::testFdo65090},
+{fdo73389.docx, Test::testFdo73389},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1673,6 +1675,14 @@ void Test::testFdo65090()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty 
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0), 
TableColumnSeparators).getLength());
 }
 
+void Test::testFdo73389()
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// This was 9340, i.e. the width of the inner table was too large.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2842), 
getPropertysal_Int32(xTables-getByIndex(0), Width));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 59afbb3..157fbf8 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,20 +142,13 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 */
 bool bFixed = false;
 sal_Int32 nRowFixedWidth = 0;
-if (!m_aCellWidths.empty())
+IntVectorPtr pCellWidths = getCurrentCellWidths();
+// Step 1. Check whether any cell has fixed width 
in the given row of table.
+for (std::vectorsal_Int32::const_iterator 
aValIter = pCellWidths-begin(); aValIter != pCellWidths-end(); ++aValIter)
 {
-// Step 1. Check whether any cell has fixed 
width in the given row of table.
-::std::vector IntVectorPtr ::iterator itr;
-for (itr = m_aCellWidths.begin(); itr != 
m_aCellWidths.end(); itr ++)
-{
-IntVectorPtr itrVal = (*itr);
-for 
(std::vectorsal_Int32::const_iterator aValIter = itrVal-begin(); aValIter != 
itrVal-end(); ++aValIter)
-{
-// Sum the width of cells to find the 
total width of given row
-nRowFixedWidth += (*aValIter);
-bFixed = true;
-}
-}
+// Sum the width of cells to find the total 
width of given row
+nRowFixedWidth += (*aValIter);
+bFixed = true;
 }
 
 // Check whether the total width of given row is

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua

2014-01-22 Thread Herbert Dürr

 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |   14 +++-
 vcl/aqua/source/dtrans/PictToBmpFlt.cxx  |   30 ++-
 2 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit b201c7b5bf8af3423392b031c818008d39ec8d26
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed Jan 22 14:26:16 2014 +

#i123895# implement DragDrop for images on OSX=10.6

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index c3650e5..095a5ee 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -608,7 +608,13 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider( const 
NSString* systemFlavo
 }
   else
   */
-  if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == 
NSOrderedSame)
+#ifdef MAC_OS_X_VERSION_10_6
+  if ([systemFlavor caseInsensitiveCompare: NSPasteboardTypePNG] == 
NSOrderedSame)
+{
+  dp = DataProviderPtr_t( new PNGDataProvider( data, 
NSPNGFileType));
+} else
+#endif // MAC_OS_X_VERSION_10_5
+ if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == 
NSOrderedSame)
 {
   dp = DataProviderPtr_t( new PNGDataProvider( data, 
PICTImageFileType));
 }
@@ -657,6 +663,12 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider( const 
NSString* systemFlavo
 {
   dp = DataProviderPtr_t(new HTMLFormatDataProvider(systemData));
 }
+#ifdef MAC_OS_X_VERSION_10_6
+  else if ([systemFlavor caseInsensitiveCompare: NSPasteboardTypePNG] == 
NSOrderedSame)
+{
+  dp = DataProviderPtr_t( new PNGDataProvider(systemData, NSPNGFileType));
+}
+#endif // MAC_OS_X_VERSION_10_6
   else if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == 
NSOrderedSame)
 {
   dp = DataProviderPtr_t( new PNGDataProvider(systemData, 
PICTImageFileType));
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx 
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 2697fcd..ef103a8 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -39,6 +39,9 @@
 bool PICTtoPNG( com::sun::star::uno::Sequencesal_Int8 rPictData,
 com::sun::star::uno::Sequencesal_Int8 rPngData)
 {
+#ifdef MAC_OS_X_VERSION_10_6
+return false;
+#else // MAC_OS_X_VERSION_10_6
 ComponentInstance pngExporter = NULL;
 if( OpenADefaultComponent( GraphicsExporterComponentType, kQTFileTypePNG, 
pngExporter) != noErr)
 return false;
@@ -72,12 +75,16 @@ bool PICTtoPNG( com::sun::star::uno::Sequencesal_Int8 
rPictData,
 CloseComponent( pngExporter);
 
 return (nPngSize  0);
+#endif // MAC_OS_X_VERSION_10_6
 }
 
 
 bool PNGtoPICT( com::sun::star::uno::Sequencesal_Int8 rPngData,
com::sun::star::uno::Sequencesal_Int8 rPictData)
 {
+#ifdef MAC_OS_X_VERSION_10_6
+return false;
+#else // MAC_OS_X_VERSION_10_6
 ComponentInstance pictExporter;
 if( OpenADefaultComponent( GraphicsImporterComponentType, kQTFileTypePNG, 
pictExporter) != noErr)
 return false;
@@ -99,9 +106,11 @@ bool PNGtoPICT( com::sun::star::uno::Sequencesal_Int8 
rPngData,
 rtl_copyMemory( rPictData.getArray(), ((sal_Int8*)*hPict), nPictSize);
 HUnlock( (Handle)hPict);
 
+#if __MAC_OS_X_VERSION_MAX_ALLOWED = 1060
 // Release the data associated with the picture
-// Note: This function is deprecated in Mac OSX 10.4
+// Note: This function has been deprecated in OSX 10.4 and removed in 
OSX 10.7
 KillPicture( hPict);
+#endif
 }
 
 if( hPng)
@@ -110,15 +119,24 @@ bool PNGtoPICT( com::sun::star::uno::Sequencesal_Int8 
rPngData,
 CloseComponent( pictExporter);
 
 return (nPictSize  512);
+#endif // MAC_OS_X_VERSION_10_6
 }
 
 bool ImageToPNG( com::sun::star::uno::Sequencesal_Int8 rImgData,
  com::sun::star::uno::Sequencesal_Int8 rPngData,
  NSBitmapImageFileType eInFormat)
 {
+// short circuit for PNG-PNG request
+if( eInFormat == NSPNGFileType) {
+rPngData = rImgData;
+return true;
+}
+
+// special handling for old PICT images that are not supported by 
NSBitmapImage
 if( eInFormat == PICTImageFileType)
 return PICTtoPNG( rImgData, rPngData);
 
+// let Cocoa's NSBitmapImageRep do the conversion
 NSData* pData = [NSData dataWithBytesNoCopy: 
(void*)rImgData.getConstArray() length: rImgData.getLength() freeWhenDone: 0];
 if( !pData)
 return false;
@@ -131,6 +149,7 @@ bool ImageToPNG( com::sun::star::uno::Sequencesal_Int8 
rImgData,
 if( !pOut)
 return false;
 
+// get the conversion result
 const size_t nPngSize = [pOut length];
 rPngData.realloc( nPngSize);
 [pOut getBytes: rPngData.getArray() length: nPngSize];
@@ -142,9 +161,17 @@ bool PNGToImage( com::sun::star::uno::Sequencesal_Int8 
rPngData,

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

2014-01-22 Thread Stephan Bergmann

 xmloff/source/style/xmlimppr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77637324abc193d831bb4a0fa6f9a91ef3601960
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 22 17:15:11 2014 +0100

warning C4805: '|=' : unsafe mix of type 'bool' and type 'sal_Bool'

Change-Id: I9a23865f7b1cf9d88f5b4f754b15e95554da3fda

diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 4ffac03..7173fb0 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -188,7 +188,7 @@ void SvXMLImportPropertyMapper::importXML(
 nReference = -1;
 }
 
-sal_Bool bSet = sal_False;
+bool bSet = false;
 if( ( nFlags  MID_FLAG_SPECIAL_ITEM_IMPORT ) == 0 )
 {
 // let the XMLPropertySetMapper decide how to 
import the value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Kohei Yoshida

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |4 
 sw/source/core/layout/paintfrm.cxx  |   14 --
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit d17c9ee705f9885f61f84dc2d244c4d0c0c39928
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 11:37:33 2014 -0500

fdo#73886: Let's keep the left border outer and right inner.

This reduces the complexity a bit.

Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 891d71f..5e055fa 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -302,8 +302,6 @@ namespace drawinglayer
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
-if (!nThick)
-nThick = rtl::math::round(rSource.getRightWidth());
 
 bool bDouble = rSource.getStyle() == 
table::BorderLineStyle::DOUBLE;
 
@@ -414,8 +412,6 @@ namespace drawinglayer
 return false;
 
 double nThick = rtl::math::round(rSource.getLeftWidth());
-if (!nThick)
-nThick = rtl::math::round(rSource.getRightWidth());
 
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 4bb672a..b173c1e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4757,16 +4757,10 @@ lcl_MakeBorderLine(SwRect const rRect,
 ?   lcl_GetExtent(0, pEndNeighbour)
 :   lcl_GetExtent(pEndNeighbour, 0);
 
-double const nLeftWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetInWidth() : rBorder.GetOutWidth();
-double const nRightWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetOutWidth() : rBorder.GetInWidth();
-Color const aLeftColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorIn(isLeftOrTopBorder)
-: rBorder.GetColorOut(isLeftOrTopBorder);
-Color const aRightColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorOut(isLeftOrTopBorder)
-: rBorder.GetColorIn(isLeftOrTopBorder);
+double const nLeftWidth = rBorder.GetOutWidth();
+double const nRightWidth = rBorder.GetInWidth();
+Color const aLeftColor = rBorder.GetColorOut(isLeftOrTopBorder);
+Color const aRightColor = rBorder.GetColorIn(isLeftOrTopBorder);
 
 ::rtl::ReferenceBorderLinePrimitive2D const xLine =
 new BorderLinePrimitive2D(
___
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' - b2/01c7b5bf8af3423392b031c818008d39ec8d26

2014-01-22 Thread Caolán McNamara

 b2/01c7b5bf8af3423392b031c818008d39ec8d26 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c1e65dc57f3e2a61141b3d76448fc34a6c33f284
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 16:37:16 2014 +

Notes added by 'git notes add'

diff --git a/b2/01c7b5bf8af3423392b031c818008d39ec8d26 
b/b2/01c7b5bf8af3423392b031c818008d39ec8d26
new file mode 100644
index 000..faee786
--- /dev/null
+++ b/b2/01c7b5bf8af3423392b031c818008d39ec8d26
@@ -0,0 +1 @@
+prefer: e417ce79d97693ab21df7f37be1d86f6e0353a5f
___
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' - sw/source

2014-01-22 Thread Kohei Yoshida

 sw/source/core/layout/paintfrm.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 3205bbedfbc8cc76125eb53acc1e6281748f5876
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 09:01:04 2014 -0500

fdo#73886: Let's keep the left border outer and right inner.

This reduces the complexity a bit.

Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 615d7d8..4762252 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4614,16 +4614,10 @@ lcl_MakeBorderLine(SwRect const rRect,
 ?   lcl_GetExtent(0, pEndNeighbour)
 :   lcl_GetExtent(pEndNeighbour, 0);
 
-double const nLeftWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetInWidth() : rBorder.GetOutWidth();
-double const nRightWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetOutWidth() : rBorder.GetInWidth();
-Color const aLeftColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorIn(isLeftOrTopBorder)
-: rBorder.GetColorOut(isLeftOrTopBorder);
-Color const aRightColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorOut(isLeftOrTopBorder)
-: rBorder.GetColorIn(isLeftOrTopBorder);
+double const nLeftWidth = rBorder.GetOutWidth();
+double const nRightWidth = rBorder.GetInWidth();
+Color const aLeftColor = rBorder.GetColorOut(isLeftOrTopBorder);
+Color const aRightColor = rBorder.GetColorIn(isLeftOrTopBorder);
 
 ::rtl::ReferenceBorderLinePrimitive2D const xLine =
 new BorderLinePrimitive2D(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Caolán McNamara

 cui/source/customize/acccfg.cxx   |   16 
 cui/source/customize/eventdlg.cxx |2 +-
 cui/source/customize/macropg.cxx  |   27 +++
 cui/source/customize/macropg_impl.hxx |2 +-
 cui/source/factory/dlgfact.cxx|3 ---
 cui/source/inc/acccfg.hxx |   24 
 cui/source/inc/connect.hxx|2 +-
 cui/source/inc/headertablistbox.hxx   |   29 +
 cui/source/tabpages/macroass.cxx  |4 ++--
 9 files changed, 33 insertions(+), 76 deletions(-)

New commits:
commit 945394d8679e1f8c61d4cdab53420192a53472a6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jan 22 16:34:32 2014 +

rename _HeaderTabListBox to MacroEventListBox

Change-Id: I310b1e0c48723b383b9eb15b8df763bac3bfd687

diff --git a/cui/source/customize/eventdlg.cxx 
b/cui/source/customize/eventdlg.cxx
index abe8013..2fcb6cf 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -63,7 +63,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, 
const SfxItemSet rSet,
 {
 mpImpl-pStrEvent   = new OUString( CUI_RES( STR_EVENT ));
 mpImpl-pAssignedMacro  = new OUString( CUI_RES( STR_ASSMACRO ));
-mpImpl-pEventLB= new _HeaderTabListBox( this, CUI_RES( 
LB_EVENT ));
+mpImpl-pEventLB= new MacroEventListBox( this, CUI_RES( 
LB_EVENT ));
 mpImpl-pAssignFT   = new FixedText( this,  CUI_RES( FT_ASSIGN ));
 mpImpl-pAssignPB   = new PushButton( this, CUI_RES( PB_ASSIGN ));
 mpImpl-pDeletePB   = new PushButton( this, CUI_RES( PB_DELETE ));
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index db9a6a8..b362a99 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -99,9 +99,9 @@ static long nTabs[] =
 #define LB_MACROS_ITEMPOS2
 
 
-IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
+IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
 {
-DBG_ASSERT( pBar == maHeaderBar, *_HeaderTabListBox::HeaderEndDrag_Impl: 
something is wrong here... );
+DBG_ASSERT( pBar == maHeaderBar, *MacroEventListBox::HeaderEndDrag_Impl: 
something is wrong here... );
 (void)pBar;
 
 if( !maHeaderBar.GetCurItemId() )
@@ -133,7 +133,7 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, 
HeaderBar*, pBar )
 return 1;
 }
 
-bool _HeaderTabListBox::Notify( NotifyEvent rNEvt )
+bool MacroEventListBox::Notify( NotifyEvent rNEvt )
 {
 bool nRet = Control::Notify( rNEvt );
 
@@ -146,7 +146,7 @@ bool _HeaderTabListBox::Notify( NotifyEvent rNEvt )
 return nRet;
 }
 
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId rId )
+MacroEventListBox::MacroEventListBox( Window* pParent, const ResId rId )
 : Control( pParent, rId )
 , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
 , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
@@ -157,7 +157,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, 
const ResId rId )
 maListBox.EnableCellFocus();
 }
 
-void _HeaderTabListBox::Resize()
+void MacroEventListBox::Resize()
 {
 Control::Resize();
 
@@ -174,23 +174,23 @@ void _HeaderTabListBox::Resize()
 maListBox.SetPosSizePixel( aPnt, aSize );
 }
 
-void _HeaderTabListBox::ConnectElements( void )
+void MacroEventListBox::ConnectElements( void )
 {
 Resize();
 
 // set handler
-maHeaderBar.SetEndDragHdl( LINK( this, _HeaderTabListBox, 
HeaderEndDrag_Impl ) );
+maHeaderBar.SetEndDragHdl( LINK( this, MacroEventListBox, 
HeaderEndDrag_Impl ) );
 
 maListBox.InitHeaderBar( maHeaderBar );
 }
 
-void _HeaderTabListBox::Show( sal_Bool bVisible, sal_uInt16 nFlags )
+void MacroEventListBox::Show( sal_Bool bVisible, sal_uInt16 nFlags )
 {
 maListBox.Show( bVisible, nFlags );
 maHeaderBar.Show( bVisible, nFlags );
 }
 
-void _HeaderTabListBox::Enable( bool bEnable, bool bChild )
+void MacroEventListBox::Enable( bool bEnable, bool bChild )
 {
 maListBox.Enable( bEnable, bChild );
 maHeaderBar.Enable( bEnable, bChild );
@@ -818,7 +818,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const 
Reference frame::XFram
 {
 mpImpl-pStrEvent   = new OUString( CUI_RES( 
STR_EVENT ) );
 mpImpl-pAssignedMacro  = new OUString( CUI_RES( 
STR_ASSMACRO ) );
-mpImpl-pEventLB= new _HeaderTabListBox( this,  CUI_RES( 
LB_EVENT ) );
+mpImpl-pEventLB= new MacroEventListBox( this,  CUI_RES( 
LB_EVENT ) );
 mpImpl-pAssignFT   = new FixedText( this,  CUI_RES( 
FT_ASSIGN ) );
 mpImpl-pAssignPB   = new PushButton( this, CUI_RES( 
PB_ASSIGN ) );
 mpImpl-pDeletePB   = new PushButton( this, CUI_RES( 
PB_DELETE ) );
diff --git a/cui/source/customize/macropg_impl.hxx

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

2014-01-22 Thread Stephan Bergmann

 include/svl/itemset.hxx  |9 +++--
 svl/source/items/itemset.cxx |   19 +++
 sw/source/core/attr/format.cxx   |2 +-
 sw/source/core/attr/swatrset.cxx |2 +-
 sw/source/core/docnode/node.cxx  |6 +++---
 5 files changed, 11 insertions(+), 27 deletions(-)

New commits:
commit 0d5c8dff302c26cd916824434873e3286959435a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 22 18:16:01 2014 +0100

Clean up SfxItemSet::Put

* Make inherited overloads visible via using in SfxAllItemSet.

* The overload with SfxItemSet argument:
** need not be virtual (verified by temporarily marking it SAL_FINAL);
** should apparently return bool.

Change-Id: I5c57ec3d757d3d32a3e23be12964e7ebb81e6211

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 5c05647..a471069 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -127,8 +127,8 @@ public:
 virtual const SfxPoolItem*  Put( const SfxPoolItem, sal_uInt16 nWhich );
 const SfxPoolItem*  Put( const SfxPoolItem rItem )
 { return Put(rItem, rItem.Which()); }
-virtual int Put( const SfxItemSet,
- sal_Bool bInvalidAsDefault = sal_True );
+boolPut( const SfxItemSet,
+ bool bInvalidAsDefault = true );
 voidPutExtended( const SfxItemSet,
  SfxItemState eDontCareAs = 
SFX_ITEM_UNKNOWN,
  SfxItemState eDefaultAs = 
SFX_ITEM_UNKNOWN );
@@ -181,10 +181,7 @@ public:
 
 virtual SfxItemSet *Clone( sal_Bool bItems = sal_True, SfxItemPool 
*pToPool = 0 ) const;
 virtual const SfxPoolItem*  Put( const SfxPoolItem, sal_uInt16 nWhich );
-const SfxPoolItem*  Put( const SfxPoolItem rItem )
-{ return Put(rItem, rItem.Which()); }
-virtual int Put( const SfxItemSet,
- sal_Bool bInvalidAsDefault = sal_True );
+using SfxItemSet::Put;
 };
 
 #endif // INCLUDED_SVL_ITEMSET_HXX
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index bc27dd1..b305121 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -630,7 +630,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem 
rItem, sal_uInt16 nWhich
 
 // ---
 
-int SfxItemSet::Put( const SfxItemSet rSet, sal_Bool bInvalidAsDefault )
+bool SfxItemSet::Put( const SfxItemSet rSet, bool bInvalidAsDefault )
 {
 DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
 bool bRet = false;
@@ -658,7 +658,7 @@ int SfxItemSet::Put( const SfxItemSet rSet, sal_Bool 
bInvalidAsDefault )
 pPtr += 2;
 }
 }
-return int(bRet);
+return bRet;
 }
 
 // ---
@@ -922,7 +922,7 @@ bool SfxItemSet::Set
 }
 }
 else
-bRet = Put(rSet, sal_False);
+bRet = Put(rSet, false);
 
 return bRet;
 }
@@ -2005,19 +2005,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const 
SfxPoolItem rItem, sal_uInt16 nWhi
 }
 
 // ---
-
-
-/*  Diese Methode wird forwarded, damit sie nicht durch die anderen
-Put-Methoden dieser SubClass gehided wird.
-*/
-
-int SfxAllItemSet::Put( const SfxItemSet rSet, sal_Bool bInvalidAsDefault )
-{
-//? pruefen, ob Which-Ranges erweitert werden
-return SfxItemSet::Put( rSet, bInvalidAsDefault );
-}
-
-// ---
 // Item disablen, wenn durch ein VoidItem mit dem Which-Wert 0 ausgedrueckt
 
 void SfxItemSet::DisableItem(sal_uInt16 nWhich)
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 025faf7..277957f2 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -447,7 +447,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet rSet )
( RES_GRFFMTCOLL == nFmtWhich ||
  RES_TXTFMTCOLL == nFmtWhich ) ) )
 {
-if( ( bRet = (0 != aSet.Put( rSet ))) )
+if( ( bRet = aSet.Put( rSet )) )
 aSet.SetModifyAtAttr( this );
 // #i71574#
 if ( nFmtWhich == RES_TXTFMTCOLL )
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 9f41cd6..083cd2a 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -127,7 +127,7 @@ bool SwAttrSet::Put_BC( const SfxItemSet rSet,
 {
 pNewSet = pNew;
 pOldSet = pOld;
-bool nRet = 0 != SfxItemSet::Put( rSet );
+bool nRet = SfxItemSet::Put( rSet );
 pOldSet = pNewSet = 0;
 return nRet;
 }
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index e2f6eca..e0710b3

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

2014-01-22 Thread Kohei Yoshida

 sw/source/core/layout/paintfrm.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 046efce827f74c7e8af6f63911821fce49443610
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 09:01:04 2014 -0500

fdo#73886: Let's keep the left border outer and right inner.

This reduces the complexity a bit.

Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index d8e0de4..525f46c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4757,16 +4757,10 @@ lcl_MakeBorderLine(SwRect const rRect,
 ?   lcl_GetExtent(0, pEndNeighbour)
 :   lcl_GetExtent(pEndNeighbour, 0);
 
-double const nLeftWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetInWidth() : rBorder.GetOutWidth();
-double const nRightWidth = (isLeftOrTopBorder == isVertical)
- ? rBorder.GetOutWidth() : rBorder.GetInWidth();
-Color const aLeftColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorIn(isLeftOrTopBorder)
-: rBorder.GetColorOut(isLeftOrTopBorder);
-Color const aRightColor = (isLeftOrTopBorder == isVertical)
-? rBorder.GetColorOut(isLeftOrTopBorder)
-: rBorder.GetColorIn(isLeftOrTopBorder);
+double const nLeftWidth = rBorder.GetOutWidth();
+double const nRightWidth = rBorder.GetInWidth();
+Color const aLeftColor = rBorder.GetColorOut(isLeftOrTopBorder);
+Color const aRightColor = rBorder.GetColorIn(isLeftOrTopBorder);
 
 ::rtl::ReferenceBorderLinePrimitive2D const xLine =
 new BorderLinePrimitive2D(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-01-22 Thread bugzilla-daemon

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

Bug 65675 depends on bug 73243, which changed state.

Bug 73243 Summary: ACCESSIBILITY: [a11y] Thumbnail View in StartCenter and 
Template Manager not firing focus on List elements with keyboard movements
https://bugs.freedesktop.org/show_bug.cgi?id=73243

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: android/Bootstrap

2014-01-22 Thread Matúš Kukan

 android/Bootstrap/Makefile.shared |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7efbca66429bbf47f3f9579270c5c0d4a190
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Jan 21 09:18:43 2014 +0100

android: Remove native-code.cxx on make clean.

Change-Id: Ib287792c754c4b3ee6c8a45749ef9ad7197df84a

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 7af927b..7c8dea9 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -69,6 +69,7 @@ uninstall:
 clean: android_version_setup properties
$(ANT) -quiet -keep-going clean
rm -rf assets libs $(SODEST) $(OBJLOCAL) 
$(BOOTSTRAPDIR)/no-resource-compress.xml
+   rm -f native-code.cxx
 
 #
 # Build / link the single .so for this app
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

--- Comment #18 from Ayantha Randika randika.deult...@gmail.com ---
It looks like LibreOffice Version: 4.3.0.0.alpha0+ doesnt give any warning when
tring to save a spreadsheet that has too many columns as a (.xls).LibreOffice
3.5.7.2 gives wrong warning as mentioned above. But Version: 4.3.0.0.alpha0+
gives nothing.

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

Re: long paras + tools/string.hxx

2014-01-22 Thread Olivier Hallot

Em 22-01-2014 13:35, Caolán McNamara escreveu:
 On Tue, 2014-01-21 at 11:15 -0200, Olivier Hallot wrote:
 Em 21-01-2014 11:12, Caolán McNamara escreveu:
 Dunno. Rather doubt it though. How to reproduce ?
 Just save a file with one longpara (master as old as last friday).
 
 Fixed now with
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=5c6781be6a28374d17215be94f83f8d8e2e35b0a
 a few static casts to sal_uInt16 escaped me, so we looped on export with
 the truncated values never getting to the end of the paragraph
 eventually making us fall over with out of mem.
 
 C.
 
Fantastic!
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

Samuel M. s.mehrbr...@gmail.com changed:

   What|Removed |Added

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

--- Comment #19 from Samuel M. s.mehrbr...@gmail.com ---
So I'm closing this bug as per Comment 11 and Comment 18
If it still persists, please reopen.

-- 
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 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

--- Comment #20 from Ayantha Randika randika.deult...@gmail.com ---
I think I have corrected both errors. Now it warns and gives the correct
warning. I will submit the patch for review as soon as I figure out the
Sending a Patch to Gerrit instructions.


On Thu, Jan 23, 2014 at 1:25 AM, bugzilla-dae...@freedesktop.org wrote:

  Samuel M. s.mehrbr...@gmail.com changed bug 
 40694https://bugs.freedesktop.org/show_bug.cgi?id=40694
  What Removed Added  Status REOPENED RESOLVED  Resolution --- WORKSFORME

  *Comment # 19 https://bugs.freedesktop.org/show_bug.cgi?id=40694#c19
 on bug 40694 https://bugs.freedesktop.org/show_bug.cgi?id=40694 from
 Samuel M. s.mehrbr...@gmail.com *

 So I'm closing this bug as per Comment 11 
 https://bugs.freedesktop.org/show_bug.cgi?id=40694#c11 and Comment 18 
 https://bugs.freedesktop.org/show_bug.cgi?id=40694#c18
 If it still persists, please reopen.

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



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

2014-01-22 Thread Miklos Vajna

 writerfilter/source/dmapper/GraphicImport.cxx  |   24 ---
 writerfilter/source/doctok/resources.xmi   |   77 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   11 ++-
 writerfilter/source/rtftok/rtfvalue.cxx|   13 
 writerfilter/source/rtftok/rtfvalue.hxx|1 
 5 files changed, 21 insertions(+), 105 deletions(-)

New commits:
commit dd34ecba1048549d122a759cd5c7f743f5899d73
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Jan 22 21:44:45 2014 +0100

writerfilter: refactor to avoid redundant FSPA class in doctok

Change-Id: Ic546c62ec24ef3c6b9189ba8378686a6f94714dc

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 420504d..6df518d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -489,30 +489,6 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_CT_Border_frame: // ignored
 break;
-
-case NS_rtf::LN_WR: //wrapping
-switch( nIntValue )
-{
-case 0: //0 like 2, but doesn't require absolute object
-m_pImpl-bIgnoreWRK = false;
-case 2: //2 wrap around absolute object
-m_pImpl-nWrap = text::WrapTextMode_PARALLEL;
-break;
-case 1: //1 no text next to shape
-m_pImpl-nWrap = text::WrapTextMode_NONE;
-break;
-case 3: //3 wrap as if no object present
-m_pImpl-nWrap = text::WrapTextMode_THROUGHT;
-break;
-case 4: //4 wrap tightly around object
-m_pImpl-bIgnoreWRK = false;
-case 5: //5 wrap tightly, but allow holes
-m_pImpl-nWrap = text::WrapTextMode_PARALLEL;
-m_pImpl-bContour = true;
-break;
-default:;
-}
-break;
 case NS_ooxml::LN_CT_PositiveSize2D_cx:// 90407;
 case NS_ooxml::LN_CT_PositiveSize2D_cy:// 90408;
 {
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 90fc42b..3ed1167e 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -333,83 +333,6 @@
   /UML:Classifier.feature
 /UML:Class
 !--Class Style--
-!--Class FSPA--
-UML:Class xmi.id=FSPA name=FSPA
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue26/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=size/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:Classifier.feature
-UML:Attribute name=wr
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValuetext wrapping mode
-  0 like 2, but doesn't require absolute object
-  1 no text next to shape
-  2 wrap around absolute object
-  3 wrap as if no object present
-  4 wrap tightly around object
-  5 wrap tightly, but allow holes
-  6-15 reserved for future use/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=comment/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0x14/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=offset/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue5/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=shift/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue01E0/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=mask/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue:4/UML:TaggedValue.dataValue
-

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

2014-01-22 Thread Armin Le Grand

 vcl/source/gdi/impgraph.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit b5797deea72476fbcec4315f1f18249fd39bbaea
Author: Armin Le Grand a...@apache.org
Date:   Wed Jan 22 20:25:16 2014 +

i123983 Corrected Graphic Metafile fallback creator

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index afa97e5..d427e96 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -710,22 +710,21 @@ const GDIMetaFile ImpGraphic::ImplGetGDIMetaFile() const
 pThat-maEx = maSvgData-getReplacement();
 }
 
-VirtualDevice aVirDev;
-const Size aSizePixel(maEx.GetSizePixel());
-
-pThat-maMetaFile.Record(aVirDev);
-
+// #123983# directly create a metafile with the same PrefSize and 
PrefMapMode
+// the bitmap has, this will be an always correct metafile
 if(maEx.IsTransparent())
 {
-aVirDev.DrawBitmapEx(Point(), maEx);
+pThat-maMetaFile.AddAction(new MetaBmpExScaleAction(Point(), 
maEx.GetPrefSize(), maEx));
 }
 else
 {
-aVirDev.DrawBitmap(Point(), maEx.GetBitmap());
+pThat-maMetaFile.AddAction(new MetaBmpScaleAction(Point(), 
maEx.GetPrefSize(), maEx.GetBitmap()));
 }
 
 pThat-maMetaFile.Stop();
-pThat-maMetaFile.SetPrefSize(aSizePixel);
+pThat-maMetaFile.WindStart();
+pThat-maMetaFile.SetPrefSize(maEx.GetPrefSize());
+pThat-maMetaFile.SetPrefMapMode(maEx.GetPrefMapMode());
 }
 
 return maMetaFile;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Julien Nabet

 basic/source/runtime/methods.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 04ad856f79de3f2987b8e23ce9d12c1cdaa73dd0
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Jan 19 21:56:40 2014 +0100

Resolves: fdo#73771 Non-standard behaviour for Function Mid

Change-Id: I90be516235228574dc219447a0eef3a34f83bee2
Reviewed-on: https://gerrit.libreoffice.org/7539
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd)
Reviewed-on: https://gerrit.libreoffice.org/7579
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 200b7b7..31825c8 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1308,7 +1308,8 @@ RTLFUNC(Mid)
 {
 nLen = aArgStr.getLength() - nStartPos;
 }
-aResultStr = aArgStr.copy( nStartPos, nLen );
+if (nLen  0)
+aResultStr = aArgStr.copy( nStartPos, nLen );
 }
 rPar.Get(0)-PutString( aResultStr );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Takeshi Abe

 sw/inc/docsh.hxx |2 +-
 sw/source/core/doc/docdesc.cxx   |7 ---
 sw/source/core/edit/autofmt.cxx  |8 
 sw/source/ui/dbui/dbmgr.cxx  |5 ++---
 sw/source/ui/dochdl/swdtflvr.cxx |6 ++
 sw/source/ui/lingu/hyp.cxx   |8 +---
 sw/source/ui/uiview/viewsrch.cxx |9 -
 7 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit 8532dbcfa88051104dd6eea73b75147874cdcf4a
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jan 23 07:50:33 2014 +0900

Avoid possible resource leaks in case of exception

Change-Id: I58d1b270de2fe1d8ffb1867e5c36ab5ebf332ae0

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1b0b819..52b7ebc 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -53,6 +53,8 @@
 #include pagedeschint.hxx
 #include tgrditem.hxx
 
+#include boost/scoped_ptr.hpp
+
 using namespace com::sun::star;
 
 static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
@@ -653,7 +655,7 @@ void SwDoc::PrtDataChanged()
 OSL_ENSURE( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
 0 != getPrinter( sal_False ), PrtDataChanged will be called 
recursively! );
 SwRootFrm* pTmpRoot = GetCurrentLayout();
-SwWait *pWait = 0;
+boost::scoped_ptrSwWait pWait;
 bool bEndAction = false;
 
 if( GetDocShell() )
@@ -668,7 +670,7 @@ void SwDoc::PrtDataChanged()
  pSh-GetViewOptions()-IsPrtFormat()) )
 {
 if ( GetDocShell() )
-pWait = new SwWait( *GetDocShell(), true );
+pWait.reset(new SwWait( *GetDocShell(), true ));
 
 pTmpRoot-StartAllAction();
 bEndAction = true;
@@ -708,7 +710,6 @@ void SwDoc::PrtDataChanged()
 
 if ( bEndAction )
 pTmpRoot-EndAllAction();
-delete pWait;
 }
 
 // We collect the GlobalNames of the servers at runtime, who don't want to be 
notified
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index fef903d..31cb24a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -64,6 +64,8 @@
 #include comcore.hrc
 #include numrule.hxx
 
+#include boost/scoped_ptr.hpp
+
 using namespace ::com::sun::star;
 
 //JP 16.12.99: definition:
@@ -2537,7 +2539,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags rFlags,
 
 void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
 {
-SwWait* pWait = 0;
+boost::scoped_ptrSwWait pWait;
 
 SET_CURR_SHELL( this );
 StartAllAction();
@@ -2548,7 +2550,7 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* 
pAFlags )
 {
 aAFFlags = *pAFlags;
 if( !aAFFlags.bAFmtByInput )
-pWait = new SwWait( *GetDoc()-GetDocShell(), true );
+pWait.reset(new SwWait( *GetDoc()-GetDocShell(), true ));
 }
 
 SwPaM* pCrsr = GetCrsr();
@@ -2570,8 +2572,6 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* 
pAFlags )
 
 EndUndo( UNDO_AUTOFORMAT );
 EndAllAction();
-
-delete pWait;
 }
 
 void SwEditShell::AutoFmtBySplitNode()
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index f1c4b2e..8a2f111 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -473,7 +473,7 @@ void SwNewDBMgr::ImportFromConnection(  SwWrtShell* pSh )
 if( pSh-HasSelection() )
 pSh-DelRight();
 
-SwWait *pWait = 0;
+boost::scoped_ptrSwWait pWait;
 
 {
 sal_uLong i = 0;
@@ -481,7 +481,7 @@ void SwNewDBMgr::ImportFromConnection(  SwWrtShell* pSh )
 
 ImportDBEntry(pSh);
 if( 10 == ++i )
-pWait = new SwWait( *pSh-GetView().GetDocShell(), 
true);
+pWait.reset(new SwWait( *pSh-GetView().GetDocShell(), 
true));
 
 } while(ToNextMergeRecord());
 }
@@ -489,7 +489,6 @@ void SwNewDBMgr::ImportFromConnection(  SwWrtShell* pSh )
 pSh-DoGroupUndo(bGroupUndo);
 pSh-EndUndo(UNDO_EMPTY);
 pSh-EndAllAction();
-delete pWait;
 }
 }
 }
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index d07f2fb..326b492 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -835,9 +835,9 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
 else if ( pWrtShell-IsSelection() || pWrtShell-IsFrmSelected() ||
   pWrtShell-IsObjSelected() )
 {
-SwWait *pWait = 0;
+boost::scoped_ptrSwWait pWait;
 if( pWrtShell-ShouldWait() )
-pWait = new SwWait( *pWrtShell-GetView().GetDocShell(), true );
+pWait.reset(new SwWait( *pWrtShell-GetView().GetDocShell(), true 
));
 
 pClpDocFac = new SwDocFac;
 
@@ -958,8 +958,6 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )

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

2014-01-22 Thread Michael Stahl

 sw/source/core/docnode/ndtbl.cxx |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit b2f9d1b43e4b14cc48327cdce14a03c826096579
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 22 21:11:01 2014 +0100

fdo#67238: sw: fix table cell Unprotect

SwDoc::UnProtectCells() was setting the old box format (from aFmts)
instead of the new one, and actually these 2 vectors are a map.

(regression from 772101649cf16233bbaf0900aa9ebbc915151a95)

Change-Id: I0881a1c499c51b5f3c257e9def1a2e9a00bcb639

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 6892e2b..cc85950 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4424,22 +4424,23 @@ sal_Bool SwDoc::UnProtectCells( const SwSelBoxes 
rBoxes )
 ? new SwUndoAttrTbl( *rBoxes[0]-GetSttNd()-FindTableNode() )
 : 0;
 
-std::vectorSwFrmFmt* aFmts, aNewFmts;
+std::mapSwFrmFmt*, SwTableBoxFmt* aFmtsMap;
 for (size_t i = rBoxes.size(); i; )
 {
 SwTableBox* pBox = rBoxes[ --i ];
 SwFrmFmt* pBoxFmt = pBox-GetFrmFmt();
 if( pBoxFmt-GetProtect().IsCntntProtected() )
 {
-std::vectorSwFrmFmt*::iterator it = std::find( 
aFmts.begin(), aFmts.end(), pBoxFmt );
-if( aFmts.end() != it )
-pBox-ChgFrmFmt( (SwTableBoxFmt*)*it );
+std::mapSwFrmFmt*, SwTableBoxFmt*::const_iterator const it =
+aFmtsMap.find(pBoxFmt);
+if (aFmtsMap.end() != it)
+pBox-ChgFrmFmt(it-second);
 else
 {
-aFmts.push_back( pBoxFmt );
-pBoxFmt = pBox-ClaimFrmFmt();
-pBoxFmt-ResetFmtAttr( RES_PROTECT );
-aNewFmts.push_back( pBoxFmt );
+SwTableBoxFmt *const pNewBoxFmt(
+dynamic_castSwTableBoxFmt*(pBox-ClaimFrmFmt()));
+pNewBoxFmt-ResetFmtAttr( RES_PROTECT );
+aFmtsMap.insert(std::make_pair(pBoxFmt, pNewBoxFmt));
 }
 bChgd = sal_True;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-22 Thread Kohei Yoshida

 sc/source/ui/inc/tabvwsh.hxx   |4 +---
 sc/source/ui/view/formatsh.cxx |8 +---
 sc/source/ui/view/tabvwsh5.cxx |   18 +++---
 sc/source/ui/view/tabvwsha.cxx |   18 +++---
 4 files changed, 20 insertions(+), 28 deletions(-)

New commits:
commit dabf147d1d7e892ce07202fbe89a584f0d592a62
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 14:37:14 2014 -0500

Use scoped_ptr for these.

Change-Id: I9452950ad6a101c2b9299dca5ff6e1713cac774c

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 285b68e..a60ca98 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -388,9 +388,7 @@ public:
 
 voidForceMove() { Move(); }
 
-voidMakeNumberInfoItem  ( ScDocument*pDoc,
-  ScViewData*pViewData,
-  SvxNumberInfoItem**ppItem );
+SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* 
pViewData );
 
 voidUpdateNumberFormatter   ( const SvxNumberInfoItem  rInfoItem );
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3da636d..16412c4 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -81,6 +81,8 @@
 #include scabstdlg.hxx
 #include editeng/fontitem.hxx
 
+#include boost/scoped_ptr.hpp
+
 using namespace ::com::sun::star;
 
 namespace {
@@ -774,8 +776,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
 {
 if ( pStyleSheet )
 {
-SvxNumberInfoItem* pNumberInfoItem = NULL;
-
 SfxStyleFamily  eFam= pStyleSheet-GetFamily();
 SfxAbstractTabDialog* pDlg= NULL;
 sal_uInt16  nRsc= 0;
@@ -818,7 +818,9 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
 }
 }
 
-pTabViewShell-MakeNumberInfoItem( pDoc, 
GetViewData(), pNumberInfoItem );
+boost::scoped_ptrSvxNumberInfoItem 
pNumberInfoItem(
+pTabViewShell-MakeNumberInfoItem(pDoc, 
GetViewData()));
+
 pDocSh-PutItem( *pNumberInfoItem );
 nRsc = RID_SCDLG_STYLES_PAR;
 
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index c6fcace..52a2262 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -308,9 +308,7 @@ void ScTabViewShell::Notify( SfxBroadcaster rBC, const 
SfxHint rHint )
 
 //--
 
-void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc,
- ScViewData* pViewData,
- SvxNumberInfoItem** ppItem )
+SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, 
ScViewData* pViewData )
 {
 //--
 // NumberInfo-Item konstruieren:
@@ -361,26 +359,24 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument*  
   pDoc,
 switch ( eValType )
 {
 case SVX_VALUE_TYPE_STRING:
-*ppItem = new SvxNumberInfoItem(
+return new SvxNumberInfoItem(
 pDoc-GetFormatTable(),
 aCellString,
 SID_ATTR_NUMBERFORMAT_INFO );
-break;
 
 case SVX_VALUE_TYPE_NUMBER:
-*ppItem = new SvxNumberInfoItem(
+return new SvxNumberInfoItem(
 pDoc-GetFormatTable(),
 nCellValue,
 SID_ATTR_NUMBERFORMAT_INFO );
-break;
 
 case SVX_VALUE_TYPE_UNDEFINED:
 default:
-*ppItem = new SvxNumberInfoItem(
-pDoc-GetFormatTable(),
-(const sal_uInt16)
-SID_ATTR_NUMBERFORMAT_INFO );
+;
 }
+
+return new SvxNumberInfoItem(
+pDoc-GetFormatTable(), static_castconst 
sal_uInt16(SID_ATTR_NUMBERFORMAT_INFO));
 }
 
 //--
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 09f482b..9c064bd 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -464,17 +464,16 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
 //--
 void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest rReq, const OString 
rName)
 {
-SfxAbstractTabDialog * pDlg = NULL;
 ScDocument* pDoc= GetViewData()-GetDocument();
 
 SvxBoxItem  aLineOuter( ATTR_BORDER );
 SvxBoxInfoItem  aLineInner( ATTR_BORDER_INNER

[Libreoffice-commits] core.git: cui/source include/svtools include/svx sc/source svtools/source

2014-01-22 Thread Kohei Yoshida

 cui/source/inc/border.hxx  |8 ++-
 cui/source/tabpages/border.cxx |   88 -
 include/svtools/ctrlbox.hxx|9 ++-
 include/svx/svxids.hrc |4 +
 sc/source/ui/view/tabvwsha.cxx |   18 +++
 svtools/source/control/ctrlbox.cxx |9 +--
 6 files changed, 96 insertions(+), 40 deletions(-)

New commits:
commit 3d9545757246c20d261db0723f70dd91f92d3519
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 22 16:31:49 2014 -0500

Only allow approved border styles in cell borders.

Line styles such as inset, outset, embossed etc are not supportable in Calc.
So, don't show them in the UI.

Change-Id: Ie7be74193d01e13a79132a979e2d9a2e4d06de3f

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 793d584..f0bb77b 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -26,6 +26,9 @@
 #include svtools/valueset.hxx
 #include sfx2/tabdlg.hxx
 #include svx/frmsel.hxx
+#include svx/flagsdef.hxx
+
+#include set
 
 // forward ---
 
@@ -34,7 +37,6 @@ namespace editeng
 class SvxBorderLine;
 }
 
-#include svx/flagsdef.hxx
 
 class SvxBorderTabPage : public SfxTabPage
 {
@@ -106,6 +108,8 @@ private:
 boolmbUseMarginItem;
 boolmbSync;
 
+std::setsal_Int16 maUsedBorderStyles;
+
 // Handler
 DECL_LINK( SelStyleHdl_Impl, ListBox* pLb );
 DECL_LINK( SelColHdl_Impl, ListBox* pLb );
@@ -130,6 +134,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 87c5e24..e54f266 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -39,6 +39,7 @@
 #include svx/flagsdef.hxx
 #include sfx2/request.hxx
 #include svl/intitem.hxx
+#include svl/ilstitem.hxx
 #include sfx2/itemconnect.hxx
 #include sal/macros.h
 #include borderconn.hxx
@@ -155,6 +156,16 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const 
SfxItemSet rCoreAttrs
 is needed across various functions... */
 mbUseMarginItem = 
rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),sal_True) != 
SFX_ITEM_UNKNOWN;
 
+const SfxPoolItem* pItem = NULL;
+if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, pItem))
+{
+const SfxIntegerListItem* p = static_castconst 
SfxIntegerListItem*(pItem);
+std::vectorsal_Int32 aUsedStyles;
+p-GetList(aUsedStyles);
+for (size_t i = 0, n = aUsedStyles.size(); i  n; ++i)
+maUsedBorderStyles.insert(static_castsal_Int16(aUsedStyles[i]));
+}
+
 // set metric
 FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs );
 
@@ -268,7 +279,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const 
SfxItemSet rCoreAttrs
 
 if ( pDocSh )
 {
-const SfxPoolItem* pItem = pDocSh-GetItem( SID_COLOR_TABLE );
+pItem = pDocSh-GetItem( SID_COLOR_TABLE );
 if ( pItem != NULL )
 pColorTable = ( (SvxColorListItem*)pItem )-GetColorList();
 }
@@ -348,6 +359,15 @@ void SvxBorderTabPage::ResetFrameLine_Impl( 
svx::FrameBorderType eBorder, const
 }
 }
 
+bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const
+{
+if (maUsedBorderStyles.empty())
+// All border styles are allowed.
+return true;
+
+return maUsedBorderStyles.count(nStyle)  0;
+}
+
 // ---
 
 void SvxBorderTabPage::Reset( const SfxItemSet rSet )
@@ -1001,38 +1021,48 @@ 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 },
+{ 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,

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

2014-01-22 Thread Armin Le Grand

 drawinglayer/source/primitive2d/cropprimitive2d.cxx |  172 
 svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx|3 
 svx/source/sdr/contact/viewcontactofgraphic.cxx |8 
 3 files changed, 74 insertions(+), 109 deletions(-)

New commits:
commit 08d42c4da0a3f6dc105080102c1b1de4bce987a1
Author: Armin Le Grand a...@apache.org
Date:   Thu Jan 23 02:12:41 2014 +

i123950 unified and redefined CropPrimitive2D::get2DDecomposition

diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx 
b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index 76dd206..371d871 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -79,112 +79,78 @@ namespace drawinglayer
 
 if(getChildren().hasElements())
 {
-// decompose to have current translate and scale
-basegfx::B2DVector aScale, aTranslate;
-double fRotate, fShearX;
-
-getTransformation().decompose(aScale, aTranslate, fRotate, 
fShearX);
-
-// detect 180 degree rotation, this is the same as mirrored in 
X and Y,
-// thus change to mirroring. Prefer mirroring here. Use the 
equal call
-// with getSmallValue here, the original which uses 
rtl::math::approxEqual
-// is too correct here. Maybe this changes with enhanced 
precision in aw080
-// to the better so that this can be reduced to the more 
precise call again
-if(basegfx::fTools::equal(fabs(fRotate), F_PI, 0.1))
-{
-aScale.setX(aScale.getX() * -1.0);
-aScale.setY(aScale.getY() * -1.0);
-fRotate = 0.0;
-}
-
-// create target translate and scale
-const bool bMirroredX(aScale.getX()  0.0);
-const bool bMirroredY(aScale.getY()  0.0);
-basegfx::B2DVector aTargetScale(aScale);
-basegfx::B2DVector aTargetTranslate(aTranslate);
-
-if(bMirroredX)
-{
-aTargetTranslate.setX(aTargetTranslate.getX() + 
getCropRight());
-aTargetScale.setX(aTargetScale.getX() - getCropLeft() - 
getCropRight());
-}
-else
-{
-aTargetTranslate.setX(aTargetTranslate.getX() - 
getCropLeft());
-aTargetScale.setX(aTargetScale.getX() + getCropRight() + 
getCropLeft());
-}
-
-if(bMirroredY)
-{
-aTargetTranslate.setY(aTargetTranslate.getY() + 
getCropBottom());
-aTargetScale.setY(aTargetScale.getY() - getCropTop() - 
getCropBottom());
-}
-else
-{
-aTargetTranslate.setY(aTargetTranslate.getY() - 
getCropTop());
-aTargetScale.setY(aTargetScale.getY() + getCropBottom() + 
getCropTop());
-}
-
-// create ranges to make comparisons
-const basegfx::B2DRange aCurrent(
-aTranslate.getX(), aTranslate.getY(),
-aTranslate.getX() + aScale.getX(), aTranslate.getY() + 
aScale.getY());
-const basegfx::B2DRange aCropped(
-aTargetTranslate.getX(), aTargetTranslate.getY(),
-aTargetTranslate.getX() + aTargetScale.getX(), 
aTargetTranslate.getY() + aTargetScale.getY());
+// get original object scale in unit coordinates (no mirroring)
+const basegfx::B2DVector 
aObjectScale(basegfx::absolute(getTransformation() * basegfx::B2DVector(1.0, 
1.0)));
 
-if(aCropped.isEmpty())
+// we handle cropping, so when no width or no height, content 
will be empty,
+// so only do something when we have a width and a height
+if(!aObjectScale.equalZero())
 {
-// nothing to return since cropped content is completely 
empty
-}
-else if(aCurrent.equal(aCropped))
-{
-// no crop, just use content
-xRetval = getChildren();
-}
-else
-{
-// build new combined content transformation
-basegfx::B2DHomMatrix 
aNewObjectTransform(getTransformation());
-
-// remove content transform by inverting
-aNewObjectTransform.invert();
-
-// add target values and original shear/rotate
-aNewObjectTransform = 
basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
-aTargetScale.getX(),
-aTargetScale.getY(),
-fShearX,
-

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

2014-01-22 Thread Norbert Thiebaud

 configmgr/source/childaccess.cxx |  219 ---
 configmgr/source/childaccess.hxx |   16 +-
 2 files changed, 146 insertions(+), 89 deletions(-)

New commits:
commit 753eeac8a641d70ad0c44bb15fa8949ac991f5d9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed Jan 22 22:37:35 2014 -0600

coverity#704575 et al.  and clean-up.

Change-Id: I24b38b63d26bc2d4e1d479754120dfd5b5635737

diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 9e80d1b..f4481c7 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -75,78 +75,91 @@ ChildAccess::ChildAccess(
 Components  components, rtl::Reference RootAccess  const  root,
 rtl::Reference Access  const  parent, OUString const  name,
 rtl::Reference Node  const  node):
-Access(components), root_(root), parent_(parent), name_(name), node_(node),
-inTransaction_(false)
+Access(components), m_rRoot(root), m_rParent(parent), m_sName(name), 
m_rNode(node),
+m_bInTransaction(false)
 {
-lock_ = lock();
+m_pLock = lock();
 assert(root.is()  parent.is()  node.is());
 }
 
 ChildAccess::ChildAccess(
 Components  components, rtl::Reference RootAccess  const  root,
 rtl::Reference Node  const  node):
-Access(components), root_(root), node_(node), inTransaction_(false)
+Access(components), m_rRoot(root), m_rNode(node), m_bInTransaction(false)
 {
-lock_ = lock();
+m_pLock = lock();
 assert(root.is()  node.is());
 }
 
-Path ChildAccess::getAbsolutePath() {
+Path ChildAccess::getAbsolutePath()
+{
 assert(getParentAccess().is());
 Path path(getParentAccess()-getAbsolutePath());
-path.push_back(name_);
+path.push_back(m_sName);
 return path;
 }
 
-Path ChildAccess::getRelativePath() {
+Path ChildAccess::getRelativePath()
+{
 Path path;
 rtl::Reference Access  parent(getParentAccess());
-if (parent.is()) {
+if (parent.is())
+{
 path = parent-getRelativePath();
 }
-path.push_back(name_);
+path.push_back(m_sName);
 return path;
 }
 
-OUString ChildAccess::getRelativePathRepresentation() {
+OUString ChildAccess::getRelativePathRepresentation()
+{
 OUStringBuffer path;
 rtl::Reference Access  parent(getParentAccess());
-if (parent.is()) {
+if (parent.is())
+{
 path.append(parent-getRelativePathRepresentation());
-if (!path.isEmpty()) {
+if (!path.isEmpty())
+{
 path.append('/');
 }
 }
-path.append(Data::createSegment(node_-getTemplateName(), name_));
+path.append(Data::createSegment(m_rNode-getTemplateName(), m_sName));
 return path.makeStringAndClear();
 }
 
-rtl::Reference Node  ChildAccess::getNode() {
-return node_;
+rtl::Reference Node  ChildAccess::getNode()
+{
+return m_rNode;
 }
 
-bool ChildAccess::isFinalized() {
-return node_-getFinalized() != Data::NO_LAYER ||
-(parent_.is()  parent_-isFinalized());
+bool ChildAccess::isFinalized()
+{
+return m_rNode-getFinalized() != Data::NO_LAYER ||
+(m_rParent.is()  m_rParent-isFinalized());
 }
 
-OUString ChildAccess::getNameInternal() {
-return name_;
+OUString ChildAccess::getNameInternal()
+{
+return m_sName;
 }
 
-rtl::Reference RootAccess  ChildAccess::getRootAccess() {
-return root_;
+rtl::Reference RootAccess  ChildAccess::getRootAccess()
+{
+return m_rRoot;
 }
 
-rtl::Reference Access  ChildAccess::getParentAccess() {
-return parent_;
+rtl::Reference Access  ChildAccess::getParentAccess()
+{
+return m_rParent;
 }
 
-void ChildAccess::acquire() throw () {
+void ChildAccess::acquire() throw ()
+{
 Access::acquire();
 }
 
-void ChildAccess::release() throw () {
+void ChildAccess::release() throw ()
+{
 Access::release();
 }
 
@@ -154,16 +167,16 @@ css::uno::Reference css::uno::XInterface  
ChildAccess::getParent()
 throw (css::uno::RuntimeException)
 {
 assert(thisIs(IS_ANY));
-osl::MutexGuard g(*lock_);
+osl::MutexGuard g(*m_pLock);
 checkLocalizedPropertyAccess();
-return static_cast cppu::OWeakObject * (parent_.get());
+return static_cast cppu::OWeakObject * (m_rParent.get());
 }
 
 void ChildAccess::setParent(css::uno::Reference css::uno::XInterface  const 
)
 throw (css::lang::NoSupportException, css::uno::RuntimeException)
 {
 assert(thisIs(IS_ANY));
-osl::MutexGuard g(*lock_);
+osl::MutexGuard g(*m_pLock);
 checkLocalizedPropertyAccess();
 throw css::lang::NoSupportException(
 setParent, static_cast cppu::OWeakObject * (this));
@@ -174,7 +187,7 @@ sal_Int64 ChildAccess::getSomething(
 throw (css::uno::RuntimeException)
 {
 assert(thisIs(IS_ANY));
-osl::MutexGuard g(*lock_);
+osl::MutexGuard g(*m_pLock);
 checkLocalizedPropertyAccess();
 return aIdentifier == getTunnelId()
 ? reinterpret_cast sal_Int64 (this) : 0;
@@ -185,51 +198,61 @@ void

LibreOffice Gerrit News for core on 2014-01-23

2014-01-22 Thread gerrit

Moin!

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

 First time contributors doing great things ! 
+ fdo#63154 Removed unused solar.h reference
  in https://gerrit.libreoffice.org/7604 from Alexandre Vicenzi
  about module accessibility, include, toolkit, unotools
+ fdo#63154 Removed unused solar.h reference in chart2
  in https://gerrit.libreoffice.org/7603 from Alexandre Vicenzi
  about module chart2
+ Change Application::SystemSettingsChanging to OverrideSystemSettings
  in https://gerrit.libreoffice.org/7602 from Chris Sherlock
  about module desktop, include, svtools, vcl
+ Move notification of data change handlers to DataChanged
  in https://gerrit.libreoffice.org/7601 from Chris Sherlock
  about module include, vcl
+ Document more of VCL's Application class
  in https://gerrit.libreoffice.org/7588 from Chris Sherlock
  about module include
+ related: fdo#73682 Introduce HTML detection service
  in https://gerrit.libreoffice.org/7600 from Maxim Monastirsky
  about module build, filter, postprocess, solenv
+ Translated German comments
  in https://gerrit.libreoffice.org/7599 from Stefan Ring
  about module sw
+ German translation: translated assertion-/exception-like strings
  in https://gerrit.libreoffice.org/7598 from Stefan Ring
  about module sw
+ Move defines into settings.hxx
  in https://gerrit.libreoffice.org/7585 from Chris Sherlock
  about module desktop, include, vcl
+ fdo#69646 Export of table with auto-width, at least one column with auto-
  in https://gerrit.libreoffice.org/7594 from Sushil Shinde
  about module sw
+ fdo#69656 table with auto-width and at least one column with auto-width.
  in https://gerrit.libreoffice.org/7593 from Sushil Shinde
  about module offapi, sw, writerfilter
+ Fix for Footer is missing if fisrt page different header/footer is set
  in https://gerrit.libreoffice.org/7589 from Rohit Deshmukh
  about module sw
+ fdo#73550 : Fix for files having spacing issues due to missing pPr/rPr fo
  in https://gerrit.libreoffice.org/7587 from Nikhil Walvekar
  about module sw
 End of freshness 



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

+ remove SvStream::operator methods
  in https://gerrit.libreoffice.org/7495 from Noel Grandin
+ convert more SvStream::operator calls
  in https://gerrit.libreoffice.org/7494 from Noel Grandin
+ Fix misaligned code comment
  in https://gerrit.libreoffice.org/7595 from Chris Sherlock
+ Introduce static inline cppu::acquire(), and make use of that.
  in https://gerrit.libreoffice.org/7592 from Jan Holesovsky
+ Improve settings code reability
  in https://gerrit.libreoffice.org/7586 from Chris Sherlock
+ Document VCL Application class
  in https://gerrit.libreoffice.org/7515 from Chris Sherlock
+ Add some unit-tests for Mid vb function (includes fdo#73771)
  in https://gerrit.libreoffice.org/7583 from Julien Nabet
+ fdo#73534 : Table row data was getting displayed twice after RT
  in https://gerrit.libreoffice.org/7440 from Tushar Bende


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

+ fdo#57950: Remove chained appends in dbaccess
  in https://gerrit.libreoffice.org/7512 from Anderson Roberto


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

+ fdo#72563 : Pageref field tag not preserved
  in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ upgrade liborcus
  in https://gerrit.libreoffice.org/7310 from Markus Mohrhard
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ fdo#71788: Unit test case for corruption of file after roundtrip.
  in https://gerrit.libreoffice.org/6853 from Pallavi Jadhav
+ fdo#72804 Add firebird.msg to install.
  in https://gerrit.libreoffice.org/7254 from Andrzej Hunt
+ Export CoreText-related SPI stuff
  in https://gerrit.libreoffice.org/7143 from Douglas Mencken
+ fix previous commit
  in https://gerrit.libreoffice.org/7101 from Markus Mohrhard
+ CID#736173: Out-of-bound read
  in https://gerrit.libreoffice.org/6973 from Julien Nabet
+ fdo#60698: Merge animcore into sd and slideshow
  in https://gerrit.libreoffice.org/7108 from Marcos Souza
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ Code clean-up/consolidation task.
  in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ fdo#71043 -  Use STACK lint tool to clean code
  in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz
+ Increase number of remembered recent documents from 10 to 25
  in

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

2014-01-22 Thread Tor Lillqvist

 include/sal/log-areas.dox|6 --
 sfx2/source/appl/app.cxx |4 -
 sfx2/source/appl/appinit.cxx |2 
 sfx2/source/appl/appopen.cxx |2 
 sfx2/source/bastyp/fltfnc.cxx|2 
 sfx2/source/control/objface.cxx  |   86 ++-
 sfx2/source/doc/docfile.cxx  |6 +-
 sfx2/source/doc/objcont.cxx  |2 
 sfx2/source/doc/objstor.cxx  |   22 -
 sfx2/source/doc/sfxbasemodel.cxx |4 -
 sfx2/source/view/frmload.cxx |2 
 11 files changed, 64 insertions(+), 74 deletions(-)

New commits:
commit 6479c8815eb1f01d691904d8080b3bca79c31c9c
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Jan 23 08:19:48 2014 +0200

Bin useless as96863, mb93783, mv76033 verbiage from SAL_INFO output

Change-Id: I58b6c311e9f13e433468863e639467428e5b268e

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index e58a1a5..039ae60 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -146,7 +146,7 @@ SfxApplication* SfxApplication::GetOrCreate()
 ::osl::MutexGuard aGuard(theApplicationMutex::get());
 if (!pApp)
 {
-SAL_INFO( sfx.appl, sfx2 (mb93783) ::SfxApplication::SetApp );
+SAL_INFO( sfx.appl, SfxApplication::SetApp );
 
 pApp = new SfxApplication;
 
@@ -180,7 +180,7 @@ SfxApplication* SfxApplication::GetOrCreate()
 SfxApplication::SfxApplication()
 : pAppData_Impl( 0 )
 {
-SAL_INFO( sfx.appl, sfx2 (mb93783) ::SfxApplication::SfxApplication );
+SAL_INFO( sfx.appl, SfxApplication::SfxApplication );
 
 SetName( OUString(StarOffice) );
 SvtViewOptions::AcquireOptions();
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index f59ebfe..98bca56 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -199,7 +199,7 @@ OUString GetSpecialCharsForEdit(Window* pParent, const 
Font rFont)
 
 bool SfxApplication::Initialize_Impl()
 {
-SAL_INFO( sfx.appl, sfx2 (mb93783) ::SfxApplication::Initialize_Impl );
+SAL_INFO( sfx.appl, SfxApplication::Initialize_Impl );
 
 #ifdef TLX_VALIDATE
 StgIo::SetErrorLink( LINK( this, SfxStorageErrHdl, Error ) );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 31ded84..2e83717 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1126,7 +1126,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
 
 void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
 {
-SAL_INFO( sfx.bastyp, sfx2 (as96863) ::SfxFilterContainer::ReadFilters 
);
+SAL_INFO( sfx.bastyp, SfxFilterContainer::ReadFilters );
 if ( !pFilterArr )
 CreateFilterArr();
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index bd29707..963df13 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1798,7 +1798,7 @@ void SfxMedium::Transfer_Impl()
 
 if ( !aNameURL.isEmpty()  ( !pImp-m_eError || (pImp-m_eError  
ERRCODE_WARNING_MASK) ) )
 {
-SAL_INFO( sfx.doc, sfx2 (mv76033) SfxMedium::Transfer_Impl, copying 
to target );
+SAL_INFO( sfx.doc, SfxMedium::Transfer_Impl, copying to target );
 
 Reference  ::com::sun::star::ucb::XCommandEnvironment  xEnv;
 Reference XOutputStream  rOutStream;
@@ -2084,7 +2084,7 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content aOriginalCont
const OUString aExtension,
const OUString aDestDir )
 {
-SAL_INFO( sfx.doc, sfx2 (mv76033) SfxMedium::DoInternalBackup_Impl( 
with destdir ) );
+SAL_INFO( sfx.doc, SfxMedium::DoInternalBackup_Impl( with destdir ) );
 
 if ( !pImp-m_aBackupURL.isEmpty() )
 return; // the backup was done already
@@ -2160,7 +2160,7 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content aOriginalCont
 //--
 void SfxMedium::DoBackup_Impl()
 {
-SAL_INFO( sfx.doc, sfx2 (mv76033) SfxMedium::DoBackup_Impl );
+SAL_INFO( sfx.doc, SfxMedium::DoBackup_Impl );
 
// source file name is the logical name of this medium
 INetURLObject aSource( GetURLObject() );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 243f818..47331fd 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1767,7 +1767,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 //
 sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium rSrcMedium, 
SfxMedium rTargetMedium )
 {
-SAL_INFO( sfx.doc, sfx2 (mv76033) 
SfxObjectShell::DisconnectStorage_Impl );
+SAL_INFO( sfx.doc, SfxObjectShell::DisconnectStorage_Impl );
 
 // this method disconnects the storage from source medium, and attaches it 
to the backup created by the target medium
 
@@ -1825,7 +1825,7 @@ sal_Bool

Re: A stack trace for BZ bug 73464 - 4.2.0.2 RC2 QA Blocker -- crash when IA2 bridge is active and ENTER key is pressed

2014-01-22 Thread V Stuart Foote

Unfortunately looks like the same IA2 crashing issue continues with the RC3
build.  Not fit for release.

fdo#73464 https://bugs.freedesktop.org/show_bug.cgi?id=73464  




--
View this message in context: 
http://nabble.documentfoundation.org/A-stack-trace-for-BZ-bug-73464-4-2-0-2-RC2-QA-Blocker-crash-when-IA2-bridge-is-active-and-ENTER-key-d-tp4091751p4093597.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-qa] [ANN] LibreOffice 4.2.0 RC3 test builds available

2014-01-22 Thread Christian Lohmaier

Hi *,

for the upcoming new version 4.2.0, the builds for rc3 are now
available on pre-releases (windows helppacks still uploading)

Besides the usual builds, there are also 64bit builds for Mac
available for testing.

4.2.0 rc3 is the last scheduled release candidate and will be promoted
to final if no blocking issues are found.

Reminder: Starting with 4.2.0rc1, developers (and people doing some
low-level QA) on windows can make use of the symbol server to get
pdb files for debugging the release builds. The symbol server's URL is

http://dev-downloads.libreoffice.org/symstore/symbols

and starting with 4.2.0rc2 the symbol files are also source-indexed¹.
This means the debugger can now download and display the sourcecode
that corresponds to the build².

see
https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg
on how to make use of it

See

https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.0_release

for the complete schedule.

Grab the builds from here here:

 http://dev-builds.libreoffice.org/pre-releases/

The builds include the full set of languages.

If you've a bit of time, please give them a try  report any severe
bugs not yet in bugzilla here, so we can incorporate  them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

The list of fixed bugs relative to 4.2.0 RC2 is here:

http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-0-release-4.2.0.3.log

So playing with the areas touched there also greatly appreciated  -
and validation that those bugs are really fixed.

Special thanks to all QA, developers, bugreporters who did make this possible.

You'll find the number of bugs along with the names in the wiki (
https://wiki.documentfoundation.org/Releases/4.1.4/RC3#Thanks_to_all_who_took_part_in_handling_the_issues
)

Of course also big thanks to contributors who do great work in other
areas that cannot be put into numbers!

Thanks a lot for your help,
Christian

[1] generated header files or sources of the external projects that
are built as part of LibreOffice are not included.
[2] the command to checkout the sources is using powershell. Windows
XP or Vista users might have to download and install powershell
separately from the optional updates from the latest ServicePacks or
from Microsoft's download site (search for Windows Management
Framework)
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] New run ready for RC3

2014-01-22 Thread Pedro

Hi Sophie

Why are the Locale languages limited to those few? 

Are these particularly problematic or representative? Or is it simply
related to the number of users/collaborators?

I could test in PT-BR but I would rather test in my native language PT-PT (I
think there are enough native EN_US Windows testers around)

Isn't it possible that the list of Locale languages is the same as the
number of languages available in LO?
http://www.libreoffice.org/download/?type=win-x86version=4.1.4lang=pick

Cheers,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-New-run-ready-for-RC3-tp4093033p4093593.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] New run ready for RC3

2014-01-22 Thread Sophie

Hi Pedro,
Le 23/01/2014 06:48, Pedro a écrit :
 Hi Sophie
 
 Why are the Locale languages limited to those few? 
 
 Are these particularly problematic or representative? Or is it simply
 related to the number of users/collaborators?

There are no particularity with those listed, that was only created
because with the available persons when we tested the localization of
the tests.
 
 I could test in PT-BR but I would rather test in my native language PT-PT (I
 think there are enough native EN_US Windows testers around)
 
 Isn't it possible that the list of Locale languages is the same as the
 number of languages available in LO?
 http://www.libreoffice.org/download/?type=win-x86version=4.1.4lang=pick

In fact, that actually has no incidence because there is no localization
of the tests or of the MozTrap interface available. I should better
remove the languages in the list than add some, that would be less
confusing.
When we will have a translation and a way to handle the translated
tests, all the LO language will be added :)

Cheers
Sophie
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

--- Comment #15 from Ayantha Randika randika.deult...@gmail.com ---
Hi, Im a beginner to the Libreoffice development and this is my first hack.
I have no idea what files to look at to address this issue. Can anyone
please help me? And is there documents I can refer to?
Thank You


On Wed, Jan 22, 2014 at 1:19 PM, bugzilla-dae...@freedesktop.org wrote:

   *Comment # 14 https://bugs.freedesktop.org/show_bug.cgi?id=40694#c14
 on bug 40694 https://bugs.freedesktop.org/show_bug.cgi?id=40694 from
 Ayantha Randika randika.deult...@gmail.com *

 Hi.. I hope to give this a try. Im really new here. Where should I start
 looking?

  --
 You are receiving this mail because:

- You are on the CC list for the bug.


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



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

[Libreoffice-bugs] [Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

Samuel M. s.mehrbr...@gmail.com changed:

   What|Removed |Added

 CC||s.mehrbr...@gmail.com

--- Comment #16 from Samuel M. s.mehrbr...@gmail.com ---
Ayantha, you can use http://opengrok.libreoffice.org/ for Code Search. Pasting
the wrong error message there might be a good start.

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

[Libreoffice-bugs] [Bug 40694] Error in message warning that the column limit was exceeded for MS-Excel format

2014-01-22 Thread bugzilla-daemon

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

Ayantha Randika randika.deult...@gmail.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |randika.deult...@gmail.com
   |desktop.org |

--- Comment #17 from Ayantha Randika randika.deult...@gmail.com ---
(In reply to comment #16)
 Ayantha, you can use http://opengrok.libreoffice.org/ for Code Search.
 Pasting the wrong error message there might be a good start.

Thank You very much Samuel!

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

[Libreoffice-bugs] [Bug 73918] New: file:// protocol does not work with LibreOffice 4.x

2014-01-22 Thread bugzilla-daemon

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

  Priority: medium
Bug ID: 73918
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: file:// protocol does not work with LibreOffice 4.x
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: a.soren...@tji.dk
  Hardware: x86-64 (AMD64)
Status: UNCONFIRMED
   Version: 4.1.4.2 release
 Component: BASIC
   Product: LibreOffice

This looks like a regression between Libreoffice 3.x and 4.x.

This worked correctly while we where using LibreOffice 3.6, but after upgrading
to 4.1 the functionality no longer works.

We have an Excel file containing a hyperlink pointing to a .odt file.
We click on the link, and now LibreOffice should launch and show the file.

However, a LibreOffice process i started, by nothing shows. (after upgrading to
4.1)

Environment:
Windows 7 (64-bit)
LibreOffice 4.1 upgraded from LibreOffice 3.6


I have attached 3 files
A simple excel file containing a link
A simple odt file (must be in the same directory as the excel file)
A snapshot of the process (and arguments) of the launched process.

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

[Libreoffice-bugs] [Bug 73918] file:// protocol does not work with LibreOffice 4.x

2014-01-22 Thread bugzilla-daemon

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

--- Comment #1 from a.soren...@tji.dk ---
Created attachment 92570
  -- https://bugs.freedesktop.org/attachment.cgi?id=92570action=edit
Odt test file

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

[Libreoffice-bugs] [Bug 73918] file:// protocol does not work with LibreOffice 4.x

2014-01-22 Thread bugzilla-daemon

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

--- Comment #2 from a.soren...@tji.dk ---
Created attachment 92571
  -- https://bugs.freedesktop.org/attachment.cgi?id=92571action=edit
Excel test file

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

[Libreoffice-bugs] [Bug 50092] FILESAVE: Wrong line and paragragh spacing when saving as Office2010 docx

2014-01-22 Thread bugzilla-daemon

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

suokunl...@gmail.com changed:

   What|Removed |Added

Summary|FILESAVE: Wrong line|FILESAVE: Wrong line and
   |spacing when saving as  |paragragh spacing when
   |Office2010 docx |saving as Office2010 docx

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

[Libreoffice-bugs] [Bug 73918] file:// protocol does not work with LibreOffice 4.x

2014-01-22 Thread bugzilla-daemon

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

--- Comment #3 from a.soren...@tji.dk ---
Created attachment 92572
  -- https://bugs.freedesktop.org/attachment.cgi?id=92572action=edit
Screen dump of the libreoffice process which is launched

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

[Libreoffice-bugs] [Bug 73919] New: Language choice switches from English english to American English

2014-01-22 Thread bugzilla-daemon

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

  Priority: medium
Bug ID: 73919
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Language choice switches from English english to
American English
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: bren...@nancy.inra.fr
  Hardware: Other
Status: UNCONFIRMED
   Version: unspecified
 Component: Writer
   Product: LibreOffice

Created attachment 92574
  -- https://bugs.freedesktop.org/attachment.cgi?id=92574action=edit
Photo of the language popuo window

Everytime I install a new version of LibreOffice, I get as language choices in
the popup window on the bottom of the screen French and German.
As I also write much in English, on the first time I use a new version, I will
click on more... and choose English (British ?) English (in my French version
called Anglais (Royaume-Uni)).  This language will then appear in the small
popup window. When I then close down LibreOffice and start again, I will either
get in the popup window German and French as choices (probably because my
system language is French, but my keyboard layout is German), but regularly I
will also get American English as a choice rather than English English. I have
observed this behaviour for a long time now, probably even before LibreOffice
was forked off from OpenOffice, but I have not been able to figure out a clear
systematic behaviour. I only observe that regularly the American English choice
turns up rather than the British English one, when I have not chosen manually
the text language. 
I have now just decided to report this as recently it has been annoying me a
bit more than before ;-)

Cheers

Oliver

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

[Libreoffice-bugs] [Bug 73805] EDITING: Crash when writing into a section with columns

2014-01-22 Thread bugzilla-daemon

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

sophie gautier.sop...@gmail.com changed:

   What|Removed |Added

 Blocks||60270

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

[Libreoffice-bugs] [Bug 60270] LibreOffice 4.1 most annoying bugs

2014-01-22 Thread bugzilla-daemon

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

sophie gautier.sop...@gmail.com changed:

   What|Removed |Added

 CC||gautier.sop...@gmail.com
 Depends on||73805

--- Comment #133 from sophie gautier.sop...@gmail.com ---
Add bug 73805 Crash when writing into a section with columns, with highest
priority - Sophie

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

[Libreoffice-bugs] [Bug 73814] PNG obtained from original ODG file badly distorted when inserted in Writer document

2014-01-22 Thread bugzilla-daemon

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

--- Comment #10 from Alex Thurgood ipla...@yahoo.co.uk ---
(In reply to comment #9)
 cannot reproduce this bug with the second attachment on Linux (master,
 current 4.2 or 4.2.0.1)
 
 both Insert-Image in Writer and opening PNG in Draw + Copy/Paste work for me

Hi Michael,

The problem is not with the PNG attachments I have uploaded, they are
screenshots illustrating the problem, as I mentioned in my original
submission.


Let me retrace the history.
I created a Draw ODG file for my company's logo at the beginning of 2010 with
the first release of LO, or possibly OpenOffice.org 3.2.1.

I exported the objects in that Draw file to a PNG image.

That PNG image was then inserted into my Writer template.

This was done in 2010.

In LO 4.1.3.2 and in most (but not all) of the previous versions of LO as
tested and reported here, the Writer template/document displays the PNG image
correctly.

Release candidates 4.2rc1 and rc2 both display the PNG image incorrectly in
letters I have written based on that template. This means that all of the
letters I have written to my clients using that template now display
incorrectly when opened in 4.2

I will not upload the files here because I have no desire for them to become
public, not to mention the potential for trademark dilution of the logo.

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

1 2 3 >

1 - 100 of 246 matches

Mail list logo