date:20130703

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

2013-07-03 Thread Markus Mohrhard

 sc/source/filter/excel/excform.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f45c47af72369859d1937cb8b46cba370031509a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Jul 3 08:11:32 2013 +0200

xls cells have all hard number format, fdo#66506

Change-Id: Ia2dd206bd1e9a91bef0021a9317f0d6486b2f276

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 269c66f..3f8f008 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -141,6 +141,7 @@ void ImportExcel::Formula(
 
 if (pCell)
 {
+pCell-SetNeedNumberFormat(false);
 if( eErr != ConvOK )
 ExcelToSc::SetError( *pCell, eErr );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Frédéric Wang

 include/xmloff/xmltoken.hxx  |1 
 starmath/source/mathmlexport.cxx |   56 ---
 xmloff/source/core/xmltoken.cxx  |1 
 3 files changed, 31 insertions(+), 27 deletions(-)

New commits:
commit c61f35275c613cf7ba6f1aa7bc8235340f9df8f7
Author: FrÃ©dÃ©ric Wang fred.w...@free.fr
Date:   Sun Jun 30 16:15:14 2013 +0200

 fdo#66282 - MathML export: improve ExportBrace

Change-Id: If15038f8942c649703659e05868162c31785c762
Reviewed-on: https://gerrit.libreoffice.org/4632
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 690aad0..2523ad1 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -736,6 +736,7 @@ namespace xmloff { namespace token {
 XML_FALSE,
 XML_FAMILY,
 XML_FAST,
+XML_FENCE,
 XML_FIELD_NUMBER,
 XML_FILE_NAME,
 XML_FILL,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index a523693..1dd1634 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1144,51 +1144,53 @@ void SmXMLExport::ExportBrace(const SmNode *pNode, int 
nLevel)
 const SmNode *pTemp;
 const SmNode *pLeft=pNode-GetSubNode(0);
 const SmNode *pRight=pNode-GetSubNode(2);
-SvXMLElementExport *pFences=0,*pRow=0;
-if ( ((pLeft)  (pLeft-GetToken().eType != TNONE)) 
-((pRight)  (pRight-GetToken().eType != TNONE)) 
-(pNode-GetScaleMode() == SCALE_HEIGHT))
-{
-sal_Unicode nArse[2];
-nArse[1] = 0;
-nArse[0] = static_cast
-const SmMathSymbolNode* (pLeft)-GetText()[0];
-OSL_ENSURE(nArse[0] != 0x,Non existent symbol);
-AddAttribute(XML_NAMESPACE_MATH, XML_OPEN,nArse);
-nArse[0] = static_cast
-const SmMathSymbolNode* (pRight)-GetText()[0];
-OSL_ENSURE(nArse[0] != 0x,Non existent symbol);
-AddAttribute(XML_NAMESPACE_MATH, XML_CLOSE,nArse);
-pFences = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, 
XML_MFENCED,
-sal_True,sal_True);
-}
-else if (pLeft  (pLeft-GetToken().eType != TNONE))
+SvXMLElementExport *pRow=0;
+
+// This used to generate mfenced or mrow+mo elements according to
+// the stretchiness of fences. The MathML recommendation defines an
+// mrow+mo construction that is equivalent to the mfenced element:
+// http://www.w3.org/TR/MathML3/chapter3.html#presm.mfenced
+// To simplify our code and avoid issues with mfenced implementations in
+// MathML rendering engines, we now always generate mrow+mo elements.
+// See #fdo 66282.
+
+// mrow
+pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW,
+sal_True, sal_True);
+
+//   mo fence=true opening-fence /mo
+if (pLeft  (pLeft-GetToken().eType != TNONE))
 {
-pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW,
-sal_True, sal_True);
+AddAttribute(XML_NAMESPACE_MATH, XML_FENCE, XML_TRUE);
 if (pNode-GetScaleMode() == SCALE_HEIGHT)
 AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_TRUE);
 else
 AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_FALSE);
 ExportNodes(pLeft, nLevel+1);
 }
-else
-pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW,
-sal_True, sal_True);
 
 if (NULL != (pTemp = pNode-GetSubNode(1)))
+{
+// mrow
+SvXMLElementExport aRow(*this, XML_NAMESPACE_MATH, XML_MROW,
+sal_True, sal_True);
 ExportNodes(pTemp, nLevel+1);
-if (pFences)
-delete pFences;
-else if (pRight  (pRight-GetToken().eType != TNONE))
+// /mrow
+}
+
+//   mo fence=true closing-fence /mo
+if (pRight  (pRight-GetToken().eType != TNONE))
 {
+AddAttribute(XML_NAMESPACE_MATH, XML_FENCE, XML_TRUE);
 if (pNode-GetScaleMode() == SCALE_HEIGHT)
 AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_TRUE);
 else
 AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_FALSE);
 ExportNodes(pRight, nLevel+1);
 }
+
 delete pRow;
+// /mrow
 }
 
 void SmXMLExport::ExportRoot(const SmNode *pNode, int nLevel)
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 164f03c..1de3179 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -741,6 +741,7 @@ namespace xmloff { namespace token {
 TOKEN( false,   XML_FALSE ),
 TOKEN( family,  XML_FAMILY ),
 TOKEN( fast,XML_FAST ),
+TOKEN( fence,   XML_FENCE ),
 TOKEN( field-number,XML_FIELD_NUMBER ),
 TOKEN( file-name,

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-07-03 Thread bugzilla-daemon

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

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Status|REOPENED|NEW

--- Comment #237 from Petr Mladek pmla...@suse.cz ---
(In reply to comment #235)
 About my last post about 51453...it's an annoying bug, but it's listed
 against OpenOffice at the Apache site:
 https://issues.apache.org/ooo/show_bug.cgi?id=51453
 
 It still applies to LibreOffice. What's the right way to get this fixed?

First, thanks for bringing up this problem. Please, open bug against
LibreOffice in the FreeDesktop bugzilla and mention there links to original bug
report. A simple link would be enough but it might speed up the things if you
provide a test document and simple steps how to reproduce it.

Otherwise, I would prefer to handle this problem as a normal but. I understand
that it is annoying for certain people but there are many other bugs that
affect more people and are even more annoying. I think that this one does not
qualify for the top priority queue.

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-07-03 Thread bugzilla-daemon

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

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Depends on||66508

-- 
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' - 51/3bfe206105974552c2b93fbe9dc8be854375e0

2013-07-03 Thread Caolán McNamara

 51/3bfe206105974552c2b93fbe9dc8be854375e0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d347bf5843b2ad509f6cd62f5ad7d0cafbeeffa
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 08:47:40 2013 +0100

Notes added by 'git notes add'

diff --git a/51/3bfe206105974552c2b93fbe9dc8be854375e0 
b/51/3bfe206105974552c2b93fbe9dc8be854375e0
new file mode 100644
index 000..85f63cf
--- /dev/null
+++ b/51/3bfe206105974552c2b93fbe9dc8be854375e0
@@ -0,0 +1 @@
+merged as: 30d8575cf59d3bc1feee2643d52c986004eb652a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Jian Hong Cheng

 sw/source/filter/ww8/ww8par6.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 30d8575cf59d3bc1feee2643d52c986004eb652a
Author: Jian Hong Cheng chen...@apache.org
Date:   Fri Aug 31 10:07:04 2012 +

Resolves: #i120718# page border and shadow to doc.

The shadow depth and color changed

* source/filter/ww8/ww8par6.cxx
MS Word Binary compatibility

Patch by: Fan Zheng,zheng.easy...@gmail.com
Found by: dongjun zong,zongdj...@gmail.com
Review by: Jian Hong Cheng,chen...@apache.org
(cherry picked from commit 513bfe206105974552c2b93fbe9dc8be854375e0)

Change-Id: If090141a92d9aa00f60b622a5d8dcbe8d92860c0

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 6435e3c..4f981d4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1399,7 +1399,9 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem rShadow, 
const short *pSizeArray,
 if (bRet)
 {
 rShadow.SetColor(Color(COL_BLACK));
-short nVal = pSizeArray[WW8_RIGHT];
+//i120718
+short nVal = pbrc[WW8_RIGHT].DetermineBorderProperties(bVer67);
+//End
 if (nVal  0x10)
 nVal = 0x10;
 rShadow.SetWidth(nVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Fridrich Štrba

 solenv/gbuild/platform/com_MSC_class.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54aac00e51652deec3d71524eec97f171c5cd40e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 09:48:32 2013 +0200

Build msc .exe and .dll executables with -safeseh flag

Change-Id: Iabebc288b68a6729aae05e2875f7bb39d923699a

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index bafa63f..a93a130 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -236,6 +236,7 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
-opt:noref \
-incremental:no \
-debug \
+   -safeseh \
-nxcompat \
-dynamicbase \
-manifest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source cui/uiconfig cui/UIConfig_cui.mk extensions/source include/sfx2 sfx2/source sw/source

2013-07-03 Thread Caolán McNamara

 chart2/source/controller/dialogs/dlg_NumberFormat.cxx |3 
 cui/UIConfig_cui.mk   |5 -
 cui/uiconfig/ui/formatnumberdialog.ui |   81 ++
 extensions/source/propctrlr/formcomponenthandler.cxx  |4 
 include/sfx2/basedlgs.hxx |9 +-
 sfx2/source/dialog/basedlgs.cxx   |   31 --
 sw/source/ui/chrdlg/tblnumfm.cxx  |3 
 7 files changed, 115 insertions(+), 21 deletions(-)

New commits:
commit e8fdd77a66fe92fae063394683c6d9f64c9f54e6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jul 2 20:16:40 2013 +0100

restore title on Format Number single tab dialogs

Allow a .ui to be given to the SingleTabDialog ctor. There are *three*
single-tab Format Number dialogs, we really should combine them together 
into
one dialog.

Change-Id: I1021c9b968764bd9ad35832958ef2bd067fca798

diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx 
b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 348f667..741bebc 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -40,7 +40,8 @@ namespace chart
 using namespace ::com::sun::star;
 
 NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet rSet)
-: SfxSingleTabDialog(pParent, rSet)
+: SfxSingleTabDialog(pParent, rSet, FormatNumberDialog,
+cui/ui/formatnumberdialog.ui)
 {
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 ::CreateTabPage fnCreatePage = pFact-GetTabPageCreatorFunc( 
RID_SVXPAGE_NUMBERFORMAT );
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4bd60b4..bf0e766 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
+   cui/uiconfig/ui/formatnumberdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
cui/uiconfig/ui/effectspage \
@@ -59,8 +60,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optuserpage \
cui/uiconfig/ui/optviewpage \
cui/uiconfig/ui/pageformatpage \
-cui/uiconfig/ui/paragalignpage \
-cui/uiconfig/ui/paraindentspacing \
+   cui/uiconfig/ui/paragalignpage \
+   cui/uiconfig/ui/paraindentspacing \
cui/uiconfig/ui/pastespecial \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
diff --git a/cui/uiconfig/ui/formatnumberdialog.ui 
b/cui/uiconfig/ui/formatnumberdialog.ui
new file mode 100644
index 000..6671d4b
--- /dev/null
+++ b/cui/uiconfig/ui/formatnumberdialog.ui
@@ -0,0 +1,81 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=FormatNumberDialog
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesFormat Number/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+

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

2013-07-03 Thread Olivier Hallot

 sw/source/ui/chrdlg/drpcps.cxx |   20 
 sw/source/ui/inc/drpcps.hxx|   13 -
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 753624e9e423366bd60c6b128c2f0697c778d9a4
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Sun Jun 30 18:25:36 2013 -0300

Finishing touch on Drop Caps widget UI conversion.

Change-Id: I896d64d602cab9671373c619a6a02807ec6bc6ac
Reviewed-on: https://gerrit.libreoffice.org/4643
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 6b33d81..5bd791f 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -544,11 +544,15 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const 
SfxItemSet rSet)
 get(m_pDropCapsField,spinFLD_DROPCAPS);
 get(m_pLinesField,spinFLD_LINES);
 get(m_pDistanceField,spinFLD_DISTANCE);
-get(m_pContentFL,frameFL_CONTENT);
+get(m_pSwitchText,labelFT_DROPCAPS);
+get(m_pLinesText,labelTXT_LINES);
+get(m_pDistanceText,labelTXT_DISTANCE);
+get(m_pTemplateText,labelTXT_TEMPLATE);
 get(m_pTextText,labelTXT_TEXT);
 get(m_pTextEdit,entryEDT_TEXT);
 get(m_pTemplateBox,comboBOX_TEMPLATE);
 get(m_pPict,drawingareaWN_EXAMPLE);
+
 m_pPict-SetDropCapsPage(this);
 
 SetExchangeSupport();
@@ -563,7 +567,6 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const 
SfxItemSet rSet)
 // Metrics
 SetMetric( *m_pDistanceField, GetDfltMetric(bHtmlMode) );
 
-
 m_pPict-SetBorderStyle( WINDOW_BORDER_MONO );
 
 // Install handler
@@ -675,16 +678,16 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
 
 m_pWholeWordCB-Enable( bChecked  !bHtmlMode );
 
-//aSwitchText.Enable( bChecked  !m_pWholeWordCB-IsChecked() );
+m_pSwitchText-Enable( bChecked  !m_pWholeWordCB-IsChecked() );
 m_pDropCapsField-Enable( bChecked  !m_pWholeWordCB-IsChecked() );
-//aLinesText   .Enable( bChecked );
+m_pLinesText-Enable( bChecked );
 m_pLinesField-Enable( bChecked );
-//aDistanceText.Enable( bChecked );
+m_pDistanceText-Enable( bChecked );
 m_pDistanceField-Enable( bChecked );
-//aTemplateText .Enable( bChecked );
+m_pTemplateText-Enable( bChecked );
 m_pTemplateBox-Enable( bChecked );
 m_pTextEdit-Enable( bChecked  !bFormat );
-//aTextText .Enable( bChecked  !bFormat );
+m_pTextText-Enable( bChecked  !bFormat );
 
 if ( bChecked )
 {
@@ -692,7 +695,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
 m_pDropCapsField-GrabFocus();
 }
 else
-m_pPict-SetText(OUString());
+m_pPict-SetText();
 
 bModified = sal_True;
 
@@ -707,6 +710,7 @@ Page: CheckBox's Click-Handler
 IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl)
 {
 m_pDropCapsField-Enable( !m_pWholeWordCB-IsChecked() );
+m_pSwitchText-Enable(!m_pWholeWordCB-IsChecked());
 
 ModifyHdl(m_pDropCapsField);
 
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx
index d0bcd7401..52ec44a 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/ui/inc/drpcps.hxx
@@ -53,22 +53,17 @@ class SwDropCapsPict;
 class SwDropCapsPage : public SfxTabPage
 {
 friend class SwDropCapsPict;
-// TODO: Work in progress
-VclGrid* m_pSwDropCapsGrid;
-//FixedLine   aSettingsFL;
 CheckBox*m_pDropCapsBox;
 CheckBox*m_pWholeWordCB;
-//FixedText   aSwitchText;
+FixedText*   m_pSwitchText;
 NumericField*m_pDropCapsField;
-//FixedText   aLinesText;
+FixedText*   m_pLinesText;
 NumericField*m_pLinesField;
-//FixedText   aDistanceText;
+FixedText*   m_pDistanceText;
 MetricField* m_pDistanceField;
-
-VclFrame*m_pContentFL;
 FixedText*   m_pTextText;
 Edit*m_pTextEdit;
-//FixedText   aTemplateText;
+FixedText*   m_pTemplateText;
 ListBox* m_pTemplateBox;
 
 SwDropCapsPict*  m_pPict;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Adam Co

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

New commits:
commit af5fabc13f293d3064688abc4b0747dc9dc5cb0a
Author: Adam Co rattles2...@gmail.com
Date:   Mon Jul 1 14:11:36 2013 +0300

fix for wrong case value in dmapper

Change-Id: I8463c72e2a18ca7fe0adacc8f523a8cff04db516
Reviewed-on: https://gerrit.libreoffice.org/4654
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c371c9a..c7bc9d3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1342,8 +1342,6 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 }
 }
 break;
-case NS_ooxml::LN_CT_LineNumber_start:
-case NS_ooxml::LN_CT_LineNumber_distance:
 case NS_ooxml::LN_CT_TrackChange_author:
 m_pImpl-SetCurrentRedlineAuthor( sStringValue );
 break;
@@ -1365,6 +1363,8 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 case NS_ooxml::LN_token:
 m_pImpl-SetCurrentRedlineToken( nIntValue );
 break;
+case NS_ooxml::LN_CT_LineNumber_start:
+case NS_ooxml::LN_CT_LineNumber_distance:
 case NS_ooxml::LN_CT_LineNumber_countBy:
 case NS_ooxml::LN_CT_LineNumber_restart:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Michael Stahl

 sfx2/source/dialog/templdlg.cxx |   44 ++--
 sfx2/source/inc/templdgi.hxx|1 
 2 files changed, 26 insertions(+), 19 deletions(-)

New commits:
commit 8c51ceb7166e63950cd7284fd59e8971c43605ee
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 2 20:46:33 2013 +0200

fdo#61429: Stylist: try a little harder to restore hierarchical

Change-Id: I30972224c5a9aa12c4ef4c2b5ca80e7aece0baad
(cherry picked from commit 8f04b172c5c78fa80c3692a729f0191425195869)
Reviewed-on: https://gerrit.libreoffice.org/4687
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c551bac..4ef3cdf 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -958,14 +958,17 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 ReadResource();
 pBindings-Invalidate( SID_STYLE_FAMILY );
 pBindings-Update( SID_STYLE_FAMILY );
+
 Update_Impl();
 
 aFilterLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
FilterSelectHdl ) );
 aFmtLb.SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
ApplyHdl ) );
 aFmtLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
FmtSelectHdl ) );
 
+
 aFilterLb.Show();
-aFmtLb.Show();
+if (!bHierarchical)
+aFmtLb.Show();
 }
 
 //-
@@ -1282,6 +1285,7 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 if (pTreeBox || m_bWantHierarchical)
 {
 
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
+EnableHierarchical(true);
 }
 
 // show maximum 14 entries
@@ -1290,21 +1294,12 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 }
 else
 {
-if (m_bWantHierarchical)
-{
-nActFilter = 0;
-aFilterLb.SelectEntry(SfxResId(
-STR_STYLE_FILTER_HIERARCHICAL).toString());
-}
+if (nActFilter  aFilterLb.GetEntryCount() - 1)
+aFilterLb.SelectEntryPos(nActFilter + 1);
 else
 {
-if (nActFilter  aFilterLb.GetEntryCount() - 1)
-aFilterLb.SelectEntryPos(nActFilter + 1);
-else
-{
-nActFilter = 0;
-aFilterLb.SelectEntryPos(1);
-}
+nActFilter = 0;
+aFilterLb.SelectEntryPos(1);
 }
 }
 
@@ -1740,11 +1735,11 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
 //-
 
 // Handler der Listbox der Filter
-IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
+void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
 {
-if ( 
SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString().equals(pBox-GetSelectEntry())
 )
+if (bEnable)
 {
-if ( !bHierarchical )
+if (!bHierarchical)
 {
 // Turn on treeView
 bHierarchical=sal_True;
@@ -1775,7 +1770,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, 
ListBox *, pBox )
 pTreeBox-Show();
 }
 }
-
 else
 {
 DELETEZ(pTreeBox);
@@ -1783,9 +1777,21 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, 
FilterSelectHdl, ListBox *, pBox )
 // If bHierarchical, then the family can have changed
 // minus one since hierarchical is inserted at the start
 m_bWantHierarchical = sal_False; // before FilterSelect
-FilterSelect(pBox-GetSelectEntryPos() - 1, bHierarchical );
+FilterSelect(aFilterLb.GetSelectEntryPos() - 1, bHierarchical );
 bHierarchical=sal_False;
 }
+}
+
+IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
+{
+if 
(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString().equals(pBox-GetSelectEntry()))
+{
+EnableHierarchical(true);
+}
+else
+{
+EnableHierarchical(false);
+}
 
 return 0;
 }
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index c78ad47..ebefb76 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -202,6 +202,7 @@ protected:
 voidResetFocus();
 voidEnableDelete();
 voidInitialize();
+voidEnableHierarchical(bool);
 
 voidFilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = 
sal_False );
 voidSetFamilyState( sal_uInt16 nSlotId, const 
SfxTemplateItem* );
___

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

2013-07-03 Thread Michael Stahl

 sfx2/source/dialog/templdlg.cxx |   44 ++--
 sfx2/source/inc/templdgi.hxx|1 
 2 files changed, 26 insertions(+), 19 deletions(-)

New commits:
commit 6906a700c436892429032fce0c7e055dd97b083a
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 2 20:46:33 2013 +0200

fdo#61429: Stylist: try a little harder to restore hierarchical

Change-Id: I30972224c5a9aa12c4ef4c2b5ca80e7aece0baad
(cherry picked from commit 8f04b172c5c78fa80c3692a729f0191425195869)
Reviewed-on: https://gerrit.libreoffice.org/4686
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 3d81345..dc5324c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1038,6 +1038,7 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 ReadResource();
 pBindings-Invalidate( SID_STYLE_FAMILY );
 pBindings-Update( SID_STYLE_FAMILY );
+
 Update_Impl();
 
 aFilterLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
FilterSelectHdl ) );
@@ -1045,8 +1046,10 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 aFmtLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
FmtSelectHdl ) );
 aFmtLb.SetSelectionMode(MULTIPLE_SELECTION);
 
+
 aFilterLb.Show();
-aFmtLb.Show();
+if (!bHierarchical)
+aFmtLb.Show();
 }
 
 //-
@@ -1367,6 +1370,7 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 if (pTreeBox || m_bWantHierarchical)
 {
 
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
+EnableHierarchical(true);
 }
 
 // show maximum 14 entries
@@ -1375,21 +1379,12 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 }
 else
 {
-if (m_bWantHierarchical)
-{
-nActFilter = 0;
-aFilterLb.SelectEntry(SfxResId(
-STR_STYLE_FILTER_HIERARCHICAL).toString());
-}
+if (nActFilter  aFilterLb.GetEntryCount() - 1)
+aFilterLb.SelectEntryPos(nActFilter + 1);
 else
 {
-if (nActFilter  aFilterLb.GetEntryCount() - 1)
-aFilterLb.SelectEntryPos(nActFilter + 1);
-else
-{
-nActFilter = 0;
-aFilterLb.SelectEntryPos(1);
-}
+nActFilter = 0;
+aFilterLb.SelectEntryPos(1);
 }
 }
 
@@ -1827,11 +1822,11 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
 //-
 
 // Handler der Listbox der Filter
-IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
+void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
 {
-if ( 
SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString().equals(pBox-GetSelectEntry())
 )
+if (bEnable)
 {
-if ( !bHierarchical )
+if (!bHierarchical)
 {
 // Turn on treeView
 bHierarchical=sal_True;
@@ -1862,7 +1857,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, 
ListBox *, pBox )
 pTreeBox-Show();
 }
 }
-
 else
 {
 DELETEZ(pTreeBox);
@@ -1870,9 +1864,21 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, 
FilterSelectHdl, ListBox *, pBox )
 // If bHierarchical, then the family can have changed
 // minus one since hierarchical is inserted at the start
 m_bWantHierarchical = sal_False; // before FilterSelect
-FilterSelect(pBox-GetSelectEntryPos() - 1, bHierarchical );
+FilterSelect(aFilterLb.GetSelectEntryPos() - 1, bHierarchical );
 bHierarchical=sal_False;
 }
+}
+
+IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
+{
+if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString() == 
pBox-GetSelectEntry())
+{
+EnableHierarchical(true);
+}
+else
+{
+EnableHierarchical(false);
+}
 
 return 0;
 }
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 88405fa..f685a71 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -201,6 +201,7 @@ protected:
 voidResetFocus();
 voidEnableDelete();
 voidInitialize();
+voidEnableHierarchical(bool);
 
 voidFilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = 
sal_False );
 voidSetFamilyState( sal_uInt16 nSlotId, const 
SfxTemplateItem* );

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

2013-07-03 Thread Markus Mohrhard

 sc/source/filter/excel/excform.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4a9100d70a5074b6537223fa2ab3a29cde5213b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Jul 3 08:11:32 2013 +0200

xls cells have all hard number format, fdo#66506

Change-Id: Ia2dd206bd1e9a91bef0021a9317f0d6486b2f276
(cherry picked from commit f45c47af72369859d1937cb8b46cba370031509a)
Reviewed-on: https://gerrit.libreoffice.org/4689
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 3cb4367..1d7d496 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -139,6 +139,7 @@ void ImportExcel::Formula(
 
 if (pCell)
 {
+pCell-SetNeedNumberFormat(false);
 if( eErr != ConvOK )
 ExcelToSc::SetError( *pCell, eErr );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Christian Lohmaier

 source/sa-IN/sysui/desktop/share.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 576c36310413f55a282838588f60bc639de8dd59
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 10:29:46 2013 +0200

fdo#66007 - spurious  causing entity warning errors

was already fixed for mn in ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7

Change-Id: I122816833b315cc62b856a461cb3f3671dd68042
Reviewed-on: https://gerrit.libreoffice.org/4691
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/source/sa-IN/sysui/desktop/share.po 
b/source/sa-IN/sysui/desktop/share.po
index 4a6a57a..4a3b8e4 100644
--- a/source/sa-IN/sysui/desktop/share.po
+++ b/source/sa-IN/sysui/desktop/share.po
@@ -258,7 +258,7 @@ msgctxt 
 ms-word-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
+msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
 
 #: documents.ulf
 #, fuzzy
@@ -267,7 +267,7 @@ msgctxt 
 ms-word-document2\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
+msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
 
 #: documents.ulf
 #, fuzzy
@@ -311,7 +311,7 @@ msgctxt 
 ms-word-document-12\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
+msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
 
 #: documents.ulf
 #, fuzzy
@@ -364,7 +364,7 @@ msgctxt 
 openxmlformats-officedocument-wordprocessingml-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
+msgstr Microsoft Word à¤²à¥à¤à¤ªà¤¤à¥à¤°à¤®à¥
 
 #: documents.ulf
 #, fuzzy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Christian Lohmaier

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

New commits:
commit 24a71a92cf4f0273e0f118fa1a8898af70add62d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 10:29:46 2013 +0200

Updated core
Project: translations  576c36310413f55a282838588f60bc639de8dd59

fdo#66007 - spurious  causing entity warning errors

was already fixed for mn in ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7

Change-Id: I122816833b315cc62b856a461cb3f3671dd68042
Reviewed-on: https://gerrit.libreoffice.org/4691
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/translations b/translations
index e148daf..576c363 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e148dafb1b7c07a131e803ca477b6c281790d809
+Subproject commit 576c36310413f55a282838588f60bc639de8dd59
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-1] fdo#66007 - spurious causing entity warning errors

2013-07-03 Thread Christian Lohmaier (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4691

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/translations 
refs/changes/91/4691/1

fdo#66007 - spurious  causing entity warning errors

was already fixed for mn in ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7

Change-Id: I122816833b315cc62b856a461cb3f3671dd68042
---
M source/sa-IN/sysui/desktop/share.po
1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/source/sa-IN/sysui/desktop/share.po 
b/source/sa-IN/sysui/desktop/share.po
index 4a6a57a..4a3b8e4 100644
--- a/source/sa-IN/sysui/desktop/share.po
+++ b/source/sa-IN/sysui/desktop/share.po
@@ -258,7 +258,7 @@
 ms-word-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word लेखपत्रम्
+msgstr Microsoft Word लेखपत्रम्
 
 #: documents.ulf
 #, fuzzy
@@ -267,7 +267,7 @@
 ms-word-document2\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word लेखपत्रम्
+msgstr Microsoft Word लेखपत्रम्
 
 #: documents.ulf
 #, fuzzy
@@ -311,7 +311,7 @@
 ms-word-document-12\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word लेखपत्रम्
+msgstr Microsoft Word लेखपत्रम्
 
 #: documents.ulf
 #, fuzzy
@@ -364,7 +364,7 @@
 openxmlformats-officedocument-wordprocessingml-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word लेखपत्रम्
+msgstr Microsoft Word लेखपत्रम्
 
 #: documents.ulf
 #, fuzzy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I122816833b315cc62b856a461cb3f3671dd68042
Gerrit-PatchSet: 1
Gerrit-Project: translations
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com

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

[PUSHED libreoffice-4-1] fdo#66007 - spurious causing entity warning errors

2013-07-03 Thread Andras Timar (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4691

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I122816833b315cc62b856a461cb3f3671dd68042
Gerrit-PatchSet: 2
Gerrit-Project: translations
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Gerrit-Reviewer: Andras Timar ati...@suse.com

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/bc6d61062ac472145bb98d3eef77f45b939084

2013-07-03 Thread Caolán McNamara

 96/bc6d61062ac472145bb98d3eef77f45b939084 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4987fc59a2a74751642b8f9dc958bc8ea5233a97
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 09:42:53 2013 +0100

Notes added by 'git notes add'

diff --git a/96/bc6d61062ac472145bb98d3eef77f45b939084 
b/96/bc6d61062ac472145bb98d3eef77f45b939084
new file mode 100644
index 000..96e9a13
--- /dev/null
+++ b/96/bc6d61062ac472145bb98d3eef77f45b939084
@@ -0,0 +1 @@
+prefer: 54aac00e51652deec3d71524eec97f171c5cd40e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Fridrich Štrba

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8102d3f91699a9a576b5ceacb62906e9d6dd807c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 10:53:32 2013 +0200

exclude the -safeseh from 64-bit windows

Change-Id: I341a7c3bdd00de5e4f3e097c32fb05cff62b10b7

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index a93a130..e8c30bf 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -236,7 +236,7 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
-opt:noref \
-incremental:no \
-debug \
-   -safeseh \
+   $(if $(filter NO,$(LIBRARY_X64)), -safeseh) \
-nxcompat \
-dynamicbase \
-manifest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-file-lists

2013-07-03 Thread Tomáš Chvátal

 bin/distro-install-file-lists |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 49752e82f575bf107caa5a01fd89c4bbfb8c0528
Author: TomÃ¡Å¡ ChvÃ¡tal tchva...@suse.cz
Date:   Wed Jul 3 11:12:40 2013 +0200

Try to fix collision in packages with libkde4bello.so.

Change-Id: I6936d79d6a05005b74cd551c1255b42a9be36bd1

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index bbd462b..22b120f 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -219,7 +219,7 @@ if test z$OOO_VENDOR != zDebian ; then
 # tde subpackage
 test -f $DESTDIR/gid_Module_Optional_Tde  cp 
$DESTDIR/gid_Module_Optional_Tde tde_list.txt || :
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/tdefilepicker
-mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/fps_tde.uno.so
+mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/fps_tdelo.so
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_tdel..so
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libtdeab1l..so
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libtdeabdrv1l..so
@@ -228,23 +228,23 @@ if test z$OOO_VENDOR != zDebian ; then
 # kde subpackage
 test -f $DESTDIR/gid_Module_Optional_Kde  cp 
$DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/kdefilepicker
-mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/fps_kde.uno.so
+mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/fps_kdelo.so
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_kdel..so
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libkab1l..so
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libkabdrv1l..so
 add_used_directories kde_list.txt common_list.txt
 
 # create kde4 subpackage
-mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/program/kde4be1.uno.so
+mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/program/kde4be1lo.so
 mv_file_between_flists kde4_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_kde4l..so
-mv_file_between_flists kde4_list.txt common_list.txt 
$INSTALLDIR/program/fps_kde4.uno.so
+mv_file_between_flists kde4_list.txt common_list.txt 
$INSTALLDIR/program/fps_kde4lo.so
 add_used_directories kde4_list.txt common_list.txt
 
 # gnome subpackage
 test -f $DESTDIR/gid_Module_Optional_Gnome  cp 
$DESTDIR/gid_Module_Optional_Gnome gnome_list.txt || :
 mv_file_between_flists gnome_list.txt common_list.txt 
$INSTALLDIR/program/libevoab2.so
 mv_file_between_flists gnome_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_gtk[0-9]*l..so
-mv_file_between_flists common_list.txt gnome_list.txt 
$INSTALLDIR/program/ucpgvfs1.uno.so
+mv_file_between_flists common_list.txt gnome_list.txt 
$INSTALLDIR/program/ucpgvfs1lo.so
 add_used_directories gnome_list.txt common_list.txt
 
 # mono subpackage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk postprocess/signing

2013-07-03 Thread Fridrich Štrba

 postprocess/CustomTarget_signing.mk |9 +
 postprocess/signing/signing.pl  |6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 523258e675e881d6f8efc031e3885d0197c8aad0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 11:18:41 2013 +0200

Fix Windows signing and timestamping

Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index a9c4a45..e44c324 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -26,11 +26,12 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 ifeq ($(COM),MSC)
 ifneq ($(ENABLE_DBGUTIL),TRUE)
-   $(PERL) $ -e $(SRCDIR)/postprocess/signing/no_signing.txt
+   $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
+   -e $(SRCDIR)/postprocess/signing/no_signing.txt
-l $(subst .done,_log.txt,$@) \
-   -f $(PFXFILE) \
-   -p $(PFXPASSWORD) \
-   -t $(TIMESTAMPURL) \
+   $(if $(PFXFILE),-f $(PFXFILE)) \
+   $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
+   $(if $($(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
$(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \
 touch $@
 else
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b937f0e..686e56a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -147,9 +147,9 @@ sub sign_files  #09.07.2007 10:36
 }
 $signtool .=  -v if ($opt_verbose);
 $commandline_base = $signtool;
-$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile != );
-$commandline_base .=  -p $opt_pass if ($opt_pass != );
-$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url != 
);
+$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile ne );
+$commandline_base .=  -p $opt_pass if ($opt_pass ne );
+$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url ne 
);
 
 # Here switch between:
 # one command line for muliple files (all doesn't work, too much) / for 
each file one command line
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2013-07-03 Thread Fridrich Štrba

 postprocess/CustomTarget_signing.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 428e77a0693ecb56a529970233666c25c55fc0f6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 11:24:18 2013 +0200

OOps

Change-Id: Idd7e957064d89d9a5b1fbec9b5fb7d7961872d3e

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index e44c324..bf9aa0c 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -31,7 +31,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
-l $(subst .done,_log.txt,$@) \
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
-   $(if $($(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
+   $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
$(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \
 touch $@
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk postprocess/signing

2013-07-03 Thread Fridrich Štrba

 postprocess/CustomTarget_signing.mk |9 +
 postprocess/signing/signing.pl  |6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 92b5d7f7c9ae3af23833df9fe7a503e844b913e4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 11:18:41 2013 +0200

Fix Windows signing and timestamping

Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4
(cherry picked from commit 523258e675e881d6f8efc031e3885d0197c8aad0)
Reviewed-on: https://gerrit.libreoffice.org/4692
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index a9c4a45..bf9aa0c 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -26,11 +26,12 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 ifeq ($(COM),MSC)
 ifneq ($(ENABLE_DBGUTIL),TRUE)
-   $(PERL) $ -e $(SRCDIR)/postprocess/signing/no_signing.txt
+   $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
+   -e $(SRCDIR)/postprocess/signing/no_signing.txt
-l $(subst .done,_log.txt,$@) \
-   -f $(PFXFILE) \
-   -p $(PFXPASSWORD) \
-   -t $(TIMESTAMPURL) \
+   $(if $(PFXFILE),-f $(PFXFILE)) \
+   $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
+   $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
$(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \
 touch $@
 else
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b937f0e..686e56a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -147,9 +147,9 @@ sub sign_files  #09.07.2007 10:36
 }
 $signtool .=  -v if ($opt_verbose);
 $commandline_base = $signtool;
-$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile != );
-$commandline_base .=  -p $opt_pass if ($opt_pass != );
-$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url != 
);
+$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile ne );
+$commandline_base .=  -p $opt_pass if ($opt_pass ne );
+$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url ne 
);
 
 # Here switch between:
 # one command line for muliple files (all doesn't work, too much) / for 
each file one command line
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LO 4.0.4.2 on illumos based OS

2013-07-03 Thread Gabriele Bulfon

ah sorry the relevant one is gb_Executable__get_rpath
I also tried using Sun ld, but looks like options for ld are always
gnu-ld ones, so compilation
stop much earlier.
...any clue?
sure, if you want to use Sun ld you need to change quite a few things in
solaris.mk to use different options.
--
Michael Stahl | Software Engineer
Platform Engineering - Desktop Team
Red Hat
Better technology. Faster innovation. Powered by community collaboration.
See how it works at redhat.com
Progressing in LO build, it reached the connectivity source point and I got 
this:
[build CMP] connectivity/source/drivers/mysql/mysql
[build CXX] connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
[build CXX] connectivity/source/drivers/odbcbase/OStatement.cxx
[build CXX] connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
[build CXX] connectivity/source/drivers/odbcbase/OResultSet.cxx
[build CXX] connectivity/source/drivers/odbcbase/OTools.cxx
[build CXX] connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
[build CXX] connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
[build CXX] connectivity/source/drivers/odbcbase/ODriver.cxx
[build CXX] connectivity/source/drivers/odbcbase/OConnection.cxx
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx:
 In member function 'virtual rtl::OUString 
connectivity::odbc::OConnection::getCatalog()':
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx:423:
 error: invalid conversion from 'sal_Int32*' to 'SQLINTEGER*'
make[2]: *** 
[/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CxxObject/connectivity/source/drivers/odbcbase/OConnection.o]
 Error 1
Any idea??
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-07-03 Thread Lionel Elie Mamane

 dbaccess/source/ui/browser/unodatbr.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 95e74a5033ba3ddc6906baba5d3b5ed0510b3a27
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jul 2 15:21:13 2013 +0200

i#112615 table names are allowed slashes

Change-Id: I1b69c4575d79ba1b6a6e9cd83abaf18bad54fd79
Reviewed-on: https://gerrit.libreoffice.org/4677
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index d7994ba..3513889 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1244,7 +1244,21 @@ SvTreeListEntry* 
SbaTableQueryBrowser::getObjectEntry(const OUString _rDataSour
 sal_Int32 nIndex = 0;
 do
 {
-OUString sPath = sCommand.getToken( 0, '/', nIndex );
+OUString sPath;
+switch (_nCommandType)
+{
+case CommandType::TABLE:
+sPath = sCommand;
+nIndex = -1;
+break;
+
+default:
+assert(false);
+// in non-debug builds, fall through.
+case CommandType::QUERY:
+sPath = sCommand.getToken( 0, '/', nIndex );
+break;
+}
 pObject = 
m_pTreeView-getListBox().GetEntryPosByName(sPath, pCommandType);
 pCommandType = pObject;
 if ( nIndex = 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - i18npool/source officecfg/registry solenv/inc sw/source

2013-07-03 Thread Oliver-Rainer Wittmann

 i18npool/source/localedata/data/pt_PT.xml  |2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 solenv/inc/minor.mk|6 +++---
 sw/source/filter/ww8/ww8scan.cxx   |8 +---
 4 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 609e0583acbcf8c9a062d889df392aa49bb991eb
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Wed Jul 3 08:45:55 2013 +

WW8 import: further adjustment to the validation check for PLCF position 
arrays

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6db4cf6..c71b27e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -940,15 +940,17 @@ namespace {
 {
 bool bIsValid = true;
 
-WW8_CP nValue = 0;
+//WW8_CP nValue = 0;
 for ( sal_Int32 i = 0; i = nMaxIndex; ++i )
 {
-if ( pPLCFPosArray[i] != 0  pPLCFPosArray[i]  nValue )
+if ( pPLCFPosArray[i]  0
+  !( i == nMaxIndex-1  pPLCFPosArray[i] == -63488 )   // 
pPLCFPosArray[nMaxIndex-1]==-63488 seems to be allowed
+  !( i == nMaxIndex-1  pPLCFPosArray[i] == -65536 ) ) // 
pPLCFPosArray[nMaxIndex-1]==-65536 seems to be allowed
 {
 bIsValid = false;
 break;
 }
-nValue = pPLCFPosArray[i];
+//nValue = pPLCFPosArray[i];
 }
 
 return bIsValid;
commit a88242ee00ca1b5d8da95ad2e04af2edd3d2c802
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Wed Jul 3 08:43:34 2013 +

#122614# disable help agent by default

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 32dca84..8000a10 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3473,7 +3473,7 @@
descSpecifies whether the 
HelpAgent is enabled./desc
labelenable HelpAgent/label
/info
-   valuetrue/value
+   valuefalse/value
/prop
prop oor:name=Timeout oor:type=xs:int
info
commit e8082b7306e1db2806edad6a8f0c851d20af1a63
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Wed Jul 3 08:40:46 2013 +

#122648# fix minor translation issue in localedata, not on Pootle

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index fbd301e..d24cb36 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -176,7 +176,7 @@
 DefaultName/DefaultName
 /FormatElement
 FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER  formatindex=0
-FormatCodeEstandar/FormatCode
+FormatCodePadrÃ£o/FormatCode
 DefaultName/DefaultName
 /FormatElement
 FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER  formatindex=1
commit e02d01cc658b6ca067ddc048e5a68bb4f2d16313
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Wed Jul 3 08:13:46 2013 +

increase build number for next snapshot

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 7e9a080..8fbfec4 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
 #
 # *
 RSCVERSION=400
-RSCREVISION=400m2(Build:9701)
-BUILD=9701
-LAST_MINOR=m2
+RSCREVISION=400m3(Build:9702)
+BUILD=9702
+LAST_MINOR=m3
 SOURCEVERSION=AOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Frédéric Wang

 extras/source/truetype/symbol/OpenSymbol.sfd |   12 ++--
 extras/source/truetype/symbol/README |5 +
 extras/source/truetype/symbol/opens___.ttf   |binary
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit c5887193572ea1295b9d36008af5851127fd9647
Author: FrÃ©dÃ©ric Wang fred.w...@free.fr
Date:   Wed Jul 3 11:58:37 2013 +0200

Fix glyph names in OpenSymbol and add a note in the README

Change-Id: Iddea789abf66c144aef38176bb97660adaaa3d9a
Reviewed-on: https://gerrit.libreoffice.org/4695
Tested-by: Khaled Hosny khaledho...@eglug.org
Reviewed-by: Khaled Hosny khaledho...@eglug.org

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 6a7991c..463b8a1 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -4,7 +4,7 @@ FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
 Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME - 
TRIPLE PRIME (c) 2013 Mathias Hasselmann
-Version: 102.5
+Version: 102.6
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -773,7 +773,7 @@ ShortTable: maxp 16
   0
   0
 EndShort
-LangName: 1033   Regular OpenSymbol  Version 102.5 
+LangName: 1033   Regular OpenSymbol  Version 102.6 
 GaspTable: 1 65535 2 0
 Encoding: Custom
 UnicodeInterp: none
@@ -107692,7 +107692,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: graveaccent
+StartChar: grave
 Encoding: 993 96 1004
 Width: 681
 Flags: W
@@ -107709,7 +107709,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: acuteaccent
+StartChar: acute
 Encoding: 994 180 1005
 Width: 681
 Flags: W
@@ -107742,7 +107742,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: verticalline
+StartChar: bar
 Encoding: 996 124 1007
 Width: 813
 Flags: W
@@ -107758,7 +107758,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: doubleverticalline
+StartChar: uni2016
 Encoding: 997 8214 1008
 Width: 1183
 Flags: W
diff --git a/extras/source/truetype/symbol/README 
b/extras/source/truetype/symbol/README
index fee3cef..67efc7b 100644
--- a/extras/source/truetype/symbol/README
+++ b/extras/source/truetype/symbol/README
@@ -14,3 +14,8 @@ the .sfd where the version is mentioned, e.g.
 
 -LangName: 1033   Regular OpenSymbol  Version 102.3
 +LangName: 1033   Regular OpenSymbol  Version 102.4
+
+The glyph names in the font should follow Adobe Glyph list for new fonts
+(http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt) or just 
the
+uni scheme (see http://www.adobe.com/devnet/opentype/archives/glyph.html 
for
+the rationale).
diff --git a/extras/source/truetype/symbol/opens___.ttf 
b/extras/source/truetype/symbol/opens___.ttf
index 5fc1649..51f2a4d 100644
Binary files a/extras/source/truetype/symbol/opens___.ttf and 
b/extras/source/truetype/symbol/opens___.ttf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Frédéric Wang

 starmath/source/mathmlexport.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 477f5880039830885b12831ba2995e63953384aa
Author: FrÃ©dÃ©ric Wang fred.w...@free.fr
Date:   Wed Jul 3 12:17:53 2013 +0200

 fdo#66281 - followup: fix a comment for overbrace.

Change-Id: Ia88a1585a6ade94b1ecc95bf4b3d0a38881b71dd
Reviewed-on: https://gerrit.libreoffice.org/4699
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 1dd1634..12f7f5a 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1469,9 +1469,17 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int 
nLevel)
 
 void SmXMLExport::ExportVerticalBrace(const SmNode *pNode, int nLevel)
 {
-// Place the overbrace value OVER a horizontal brace and then place that
-// expression OVER the overbrace value. Similarly for the underbrace
-// construction.
+// [body] overbrace [script]
+//
+// Position body, overbrace and script vertically. First place the 
overbrace
+// OVER the body and then the script OVER this expression.
+//
+//  [script]
+//   --[overbrace]--
+// XX[body]XXX
+//
+// Similarly for the underbrace construction.
+
 XMLTokenEnum which;
 
 switch (pNode-GetToken().eType)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - extras/source include/vcl svtools/source vcl/source

2013-07-03 Thread Caolán McNamara

 extras/source/glade/libreoffice-catalog.xml.in |   89 ++---
 include/vcl/builder.hxx|2 
 include/vcl/field.hxx  |4 +
 svtools/source/control/ctrlbox.cxx |   25 +--
 vcl/source/control/combobox.cxx|   27 ---
 vcl/source/control/field.cxx   |   12 +++
 vcl/source/window/builder.cxx  |   62 +++--
 7 files changed, 159 insertions(+), 62 deletions(-)

New commits:
commit 30db63e8a3f8806a1b00e14cd70bc75f3e66211e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 11:39:16 2013 +0100

arrange a way to describe non-dropdown MetricBoxes

i.e. use a VclComboBoxNumeric which now has an
adjustment option and a dropdown option (defaulting to true).

Rework existing glade widget placeholders to be children of that widget
placeholder.

Centralize the dropdown bit tweaking logic.

Change-Id: Ib6dc4d19b367986e9d6a2fc2bead51e198892893

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index f717ee0..ad045c5 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -30,30 +30,92 @@
 glade-widget-class title=Hyphen Edit name=cuilo-HyphenEdit
 generic-name=ReplaceEdit parent=GtkEntry
 icon-name=widget-gtk-textentry/
+
+glade-widget-class title=VclComboBoxText name=VclComboBoxText
+generic-name=ComboBoxText parent=GtkComboBoxText
+icon-name=widget-gtk-comboboxtext
+  properties
+property save=True query=False id=dropdown default=True 
name=Use DropDown
+  parameter-spec
+typeGParamBoolean/type
+  /parameter-spec
+/property
+property save=True query=False id=max-width-chars default=-1 
name=Maximum Width in Characters
+  parameter-spec
+typeGParamInt/type
+min-1/min
+  /parameter-spec
+  tooltipThe desired maximum width of the ComboBox, in 
characters/tooltip
+/property
+  /properties
+/glade-widget-class
+
+glade-widget-class title=VclComboBoxNumeric name=VclComboBoxNumeric
+generic-name=ComboBoxNumeric parent=VclComboBoxText
+icon-name=widget-gtk-comboboxtext
+  properties
+property save=True query=False id=adjustment name=Adjustment
+  parameter-spec
+typeGParamObject/type
+value-typeGtkAdjustment/value-type
+  /parameter-spec
+  tooltipList of widgets in this group/tooltip
+/property
+  /properties
+/glade-widget-class
+
 glade-widget-class title=Color ListBox name=svtlo-ColorListBox
 generic-name=Color ListBox parent=GtkComboBox
-icon-name=widget-gtk-combobox/
+icon-name=widget-gtk-combobox
+  properties
+property id=dropdown default=True common=True/
+  /properties
+/glade-widget-class
+
 glade-widget-class title=Other Color ListBox name=svxlo-ColorLB
 generic-name=Other Color ListBox parent=GtkComboBox
 icon-name=widget-gtk-combobox/
+
 glade-widget-class title=Font Name ListBox name=svtlo-FontNameBox
 generic-name=Font name ListBox parent=GtkComboBox
-icon-name=widget-gtk-combobox/
+icon-name=widget-gtk-combobox
+  properties
+property id=dropdown default=True common=True/
+  /properties
+/glade-widget-class
+
 glade-widget-class title=Sidebar Font Name ListBox 
name=svxlo-SvxSBFontNameBox
 generic-name=Sidebar Font name ListBox 
parent=GtkComboBox
 icon-name=widget-gtk-combobox/
+
 glade-widget-class title=Font Size ListBox name=svtlo-FontSizeBox
 generic-name=Font Size ListBox parent=GtkComboBox
-icon-name=widget-gtk-combobox/
+icon-name=widget-gtk-combobox
+  properties
+property id=dropdown default=True common=True/
+  /properties
+/glade-widget-class
+
 glade-widget-class title=Line ListBox name=svtlo-LineListBox
 generic-name=Line ListBox parent=GtkComboBox
-icon-name=widget-gtk-combobox/
+icon-name=widget-gtk-combobox
+  properties
+property id=dropdown default=True common=True/
+  /properties
+/glade-widget-class
+
 glade-widget-class title=Language ListBox 
name=svxcorelo-SvxLanguageBox
 generic-name=LanguageBox parent=GtkComboBox
 icon-name=widget-gtk-combobox/
+
 glade-widget-class title=Font ListBox

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

2013-07-03 Thread Caolán McNamara

 cui/source/tabpages/tabstpge.cxx |8 +---
 include/svtools/ruler.hxx|2 +-
 svtools/source/control/ruler.cxx |7 +++
 svx/source/dialog/svxruler.cxx   |3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 491bb212fae98c93197401cbd10aff8e24dc541f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 12:37:29 2013 +0100

allow changing the fill color user for tab previews

Change-Id: Ie20e900fe9e1f9bfdcd5784b380aa4574d52c001

diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 0426c3b..b620af1 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -45,7 +45,9 @@ private:
 public:
 
 TabWin_Impl( Window* pParent, WinBits nBits) :
-Window( pParent, nBits ){}
+Window( pParent, nBits )
+{
+}
 
 virtual voidPaint( const Rectangle rRect );
 
@@ -55,7 +57,7 @@ public:
 
 extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window 
*pParent, VclBuilder::stringmap )
 {
-return new TabWin_Impl(pParent, WB_BORDER);
+return new TabWin_Impl(pParent, 0);
 }
 // static 
 
@@ -87,7 +89,7 @@ void TabWin_Impl::Paint( const Rectangle )
 Size aSize = GetOutputSizePixel();
 aPnt.X() = aSize.Width() / 2;
 aPnt.Y() = aSize.Height() / 2;
-Ruler::DrawTab( this, aPnt, nTabStyle );
+Ruler::DrawTab( this, GetSettings().GetStyleSettings().GetFontColor(), 
aPnt, nTabStyle );
 }
 
 // class SvxTabulatorTabPage -
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 5a45710..bee6f05 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -767,7 +767,7 @@ public:
 sal_uInt16  GetTabCount() const;
 const RulerTab* GetTabs() const;
 
-static void DrawTab( OutputDevice* pDevice,
+static void DrawTab( OutputDevice* pDevice, const Color 
rFillColor,
  const Point rPos, sal_uInt16 nStyle );
 
 voidSetStyle( WinBits nStyle );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 7e5e2f1..0a68369 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2746,15 +2746,14 @@ void Ruler::SetStyle( WinBits nStyle )
 
 // ---
 
-void Ruler::DrawTab( OutputDevice* pDevice, const Point rPos, sal_uInt16 
nStyle )
+void Ruler::DrawTab( OutputDevice* pDevice, const Color rFillColor, const 
Point rPos, sal_uInt16 nStyle )
 {
-/*const StyleSettingsrStyleSettings =*/ 
pDevice-GetSettings().GetStyleSettings();
 Point   aPos( rPos );
-sal_uInt16  nTabStyle = nStyle  (RULER_TAB_STYLE | 
RULER_TAB_RTL);
+sal_uInt16  nTabStyle = nStyle  (RULER_TAB_STYLE | 
RULER_TAB_RTL);
 
 pDevice-Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
 pDevice-SetLineColor();
-pDevice-SetFillColor( 
pDevice-GetSettings().GetStyleSettings().GetShadowColor() );
+pDevice-SetFillColor(rFillColor);
 ImplCenterTabPos( aPos, nTabStyle );
 ImplDrawRulerTab( pDevice, aPos, nTabStyle, nStyle  );
 pDevice-Pop();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e8fd30c..b878b3b 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3571,13 +3571,14 @@ void SvxRuler::Command( const CommandEvent rCEvt )
 const Size aSz(RULER_TAB_WIDTH+2, RULER_TAB_HEIGHT+2);
 aDev.SetOutputSize(aSz);
 aDev.SetBackground(Wallpaper(Color(COL_WHITE)));
+Color 
aFillColor(aDev.GetSettings().GetStyleSettings().GetShadowColor());
 const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
 
 for ( sal_uInt16 i = RULER_TAB_LEFT; i  RULER_TAB_DEFAULT; ++i )
 {
 sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
 nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT);
-DrawTab(aDev, aPt, nStyle);
+DrawTab(aDev, aFillColor, aPt, nStyle);
 aMenu.InsertItem(i+1,
  String(ResId(RID_SVXSTR_RULER_START+i, 
DIALOG_MGR())),
  Image(aDev.GetBitmap(Point(), aSz), 
Color(COL_WHITE)));
___
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' - 60/9e0583acbcf8c9a062d889df392aa49bb991eb

2013-07-03 Thread Caolán McNamara

 60/9e0583acbcf8c9a062d889df392aa49bb991eb |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3702d6969329f514572d23cb85a247e0b78536d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 12:59:45 2013 +0100

Notes added by 'git notes add'

diff --git a/60/9e0583acbcf8c9a062d889df392aa49bb991eb 
b/60/9e0583acbcf8c9a062d889df392aa49bb991eb
new file mode 100644
index 000..547b31e
--- /dev/null
+++ b/60/9e0583acbcf8c9a062d889df392aa49bb991eb
@@ -0,0 +1 @@
+prefer: 9042604f1ba0e1e6e0dc8b8f45f9b67169fd462e
___
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' - e0/2d01cc658b6ca067ddc048e5a68bb4f2d16313

2013-07-03 Thread Caolán McNamara

 e0/2d01cc658b6ca067ddc048e5a68bb4f2d16313 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 127734391c1e79d3129d6d4809208e7f14923fc2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:00:15 2013 +0100

Notes added by 'git notes add'

diff --git a/e0/2d01cc658b6ca067ddc048e5a68bb4f2d16313 
b/e0/2d01cc658b6ca067ddc048e5a68bb4f2d16313
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/e0/2d01cc658b6ca067ddc048e5a68bb4f2d16313
@@ -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 'libreoffice-4-0' - postprocess/signing

2013-07-03 Thread Fridrich Štrba

 postprocess/signing/makefile.mk |   11 ++-
 postprocess/signing/signing.pl  |6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 32469d729eeea0b79eba5927e502a342748d8ee9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 11:18:41 2013 +0200

Fix Windows signing and timestamping

(cherry picked from commit 523258e675e881d6f8efc031e3885d0197c8aad0)
Reviewed-on: https://gerrit.libreoffice.org/4692
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 92b5d7f7c9ae3af23833df9fe7a503e844b913e4)

Conflicts:
postprocess/CustomTarget_signing.mk

Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4
Reviewed-on: https://gerrit.libreoffice.org/4694
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk
index 3c6acf0..47e63e5 100644
--- a/postprocess/signing/makefile.mk
+++ b/postprocess/signing/makefile.mk
@@ -32,11 +32,20 @@ LOGFILE=$(MISC)$/signing_log.txt
 IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/*.exe
 TIMESTAMPURL*=http://timestamp.globalsign.com/scripts/timestamp.dll;
 
+PFXFILE_OPTION=
+.IF $(PFXFILE)!=
+PFXFILE_OPTION=-f $(PFXFILE)
+.ENDIF # $(PFXFILE)!=
+PFXPASSWORD_OPTION=
+.IF $(PFXPASSWORD)!=
+PFXPASSWORD_OPTION=-p $(PFXPASSWORD)
+.ENDIF # $(PFXPASSWORD)!=
+
 signing.done :
 .IF $(WINDOWS_BUILD_SIGNING)==TRUE
 .IF $(COM)==MSC
 .IF $(product)==full
-$(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) -f $(PFXFILE) -p 
$(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES)  $(TOUCH) 
$(MISC)$/signing.done
+$(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) $(PFXFILE_OPTION) 
$(PFXPASSWORD_OPTION) -t $(TIMESTAMPURL) $(IMAGENAMES)  $(TOUCH) 
$(MISC)$/signing.done
 .ELSE  # $(product)==full
 @echo Doing nothing on non product builds ...
 .ENDIF # $(product)==full
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b937f0e..686e56a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -147,9 +147,9 @@ sub sign_files  #09.07.2007 10:36
 }
 $signtool .=  -v if ($opt_verbose);
 $commandline_base = $signtool;
-$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile != );
-$commandline_base .=  -p $opt_pass if ($opt_pass != );
-$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url != 
);
+$commandline_base .=  -f $opt_pfxfile if ($opt_pfxfile ne );
+$commandline_base .=  -p $opt_pass if ($opt_pass ne );
+$commandline_base .=  -t $opt_timestamp_url if ($opt_timestamp_url ne 
);
 
 # Here switch between:
 # one command line for muliple files (all doesn't work, too much) / for 
each file one command line
___
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' - sc/source

2013-07-03 Thread Laurent Godard

 sc/source/filter/xml/xmltabi.cxx |   12 +---
 sc/source/ui/unoobj/cellsuno.cxx |7 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 944929e656fdb66dca162dfd39253757de7cbd16
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Jul 1 15:43:46 2013 +0200

simplify AddPrintRanges calls at import time

  - at import time, use directly core functions
  - honor IsUndoEnabled in uno calls

Change-Id: If1e762df0ca9cfa22fa2c0e75518fe892be602b6
Reviewed-on: https://gerrit.libreoffice.org/4656
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/4696

diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index a7f014c..a1bc801 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -359,14 +359,12 @@ void ScXMLTableContext::EndElement()
 SCTAB nCurTab = rTables.GetCurrentSheet();
 if (!sPrintRanges.isEmpty())
 {
-Reference sheet::XPrintAreas  xPrintAreas(
-rTables.GetCurrentXSheet(), UNO_QUERY);
-
-if( xPrintAreas.is() )
+ ScRangeList aRangeList;
+ScRangeStringConverter::GetRangeListFromString( aRangeList, 
sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
+size_t nCount = aRangeList.size();
+for (size_t i=0; i nCount; i++ )
 {
-Sequence table::CellRangeAddress  aRangeList;
-ScRangeStringConverter::GetRangeListFromString( aRangeList, 
sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
-xPrintAreas-setPrintAreas( aRangeList );
+pDoc-AddPrintRange( nCurTab, *aRangeList[i] );
 }
 }
 else if (!bPrintEntireSheet)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 763bf67..1d0a8e8 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7503,13 +7503,15 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 throw(uno::RuntimeException)
 {
 SolarMutexGuard aGuard;
+ScPrintRangeSaver* pOldRanges;
 ScDocShell* pDocSh = GetDocShell();
 if ( pDocSh )
 {
 ScDocument* pDoc = pDocSh-GetDocument();
 SCTAB nTab = GetTab_Impl();
 
-ScPrintRangeSaver* pOldRanges = pDoc-CreatePrintRangeSaver();
+if ( pDoc-IsUndoEnabled() )
+pOldRanges = pDoc-CreatePrintRangeSaver();
 
 sal_uInt16 nCount = (sal_uInt16) aPrintAreas.getLength();
 pDoc-ClearPrintRanges( nTab );
@@ -7524,7 +7526,8 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 }
 }
 
-PrintAreaUndo_Impl( pOldRanges );   // Undo, Umbrueche, Modified etc.
+if ( pDoc-IsUndoEnabled() )
+PrintAreaUndo_Impl( pOldRanges );   // Undo, Umbrueche, Modified 
etc.
 }
 }
 
___
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' - sc/qa

2013-07-03 Thread Christian Lohmaier

 sc/qa/unit/subsequent_filters-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5304ec328af11e5a56ef15da759ba3e8c0a9a12c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 13:58:41 2013 +0200

temporarily disable tests known to fail

Change-Id: I95c3c1af64b7d8b499c085c345b26d2df7e31965
Reviewed-on: https://gerrit.libreoffice.org/4700
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 367fd42..fcd6bd3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -149,8 +149,8 @@ public:
 CPPUNIT_TEST(testDatabaseRangesXLS);
 CPPUNIT_TEST(testDatabaseRangesXLSX);
 CPPUNIT_TEST(testFormatsODS);
-CPPUNIT_TEST(testFormatsXLS);
-CPPUNIT_TEST(testFormatsXLSX);
+//CPPUNIT_TEST(testFormatsXLS); TODO: Fix this
+//CPPUNIT_TEST(testFormatsXLSX); TODO: Fix this
 CPPUNIT_TEST(testMatrixODS);
 CPPUNIT_TEST(testMatrixXLS);
 CPPUNIT_TEST(testBorderODS);
___
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' - sc/source

2013-07-03 Thread Laurent Godard

 sc/source/filter/xml/xmlexprt.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 42e32bb7a0a015a2726b148425410fa275c808c9
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Jul 1 11:32:47 2013 +0200

the calculation of the progressbar leads to very slow saving

Change-Id: Ibba31126161b77b499561c5a74c057a56c07a4a8
Reviewed-on: https://gerrit.libreoffice.org/4647
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Reviewed-on: https://gerrit.libreoffice.org/4698
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 9089f27..2a543cd 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2443,10 +2443,10 @@ void ScXMLExport::_ExportAutoStyles()
 if (xCellRangesQuery.is())
 {
 Referencesheet::XSheetCellRanges 
xSheetCellRanges(xCellRangesQuery-queryContentCells(sheet::CellFlags::FORMATTED));
-Referencesheet::XSheetOperation 
xSheetOperation(xSheetCellRanges, uno::UNO_QUERY);
-if (xSheetCellRanges.is()  xSheetOperation.is())
+if (xSheetCellRanges.is())
 {
-sal_uInt32 
nCount(sal_uInt32(xSheetOperation-computeFunction(sheet::GeneralFunction_COUNT)));
+uno::Sequence table::CellRangeAddress  
aCellRangeAddresses (xSheetCellRanges-getRangeAddresses());
+sal_uInt32 nCount(aCellRangeAddresses.getLength());
 Referencecontainer::XEnumerationAccess 
xCellsAccess(xSheetCellRanges-getCells());
 if (xCellsAccess.is())
 {
___
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' - a8/8242ee00ca1b5d8da95ad2e04af2edd3d2c802

2013-07-03 Thread Caolán McNamara

 a8/8242ee00ca1b5d8da95ad2e04af2edd3d2c802 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8641a238942c05687705b652be740a89bd62a6a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:06:48 2013 +0100

Notes added by 'git notes add'

diff --git a/a8/8242ee00ca1b5d8da95ad2e04af2edd3d2c802 
b/a8/8242ee00ca1b5d8da95ad2e04af2edd3d2c802
new file mode 100644
index 000..dbca6ef
--- /dev/null
+++ b/a8/8242ee00ca1b5d8da95ad2e04af2edd3d2c802
@@ -0,0 +1 @@
+prefer: 66714f1888eaccef4eb5341971278ae7dfafa16b
___
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' - e8/082b7306e1db2806edad6a8f0c851d20af1a63

2013-07-03 Thread Caolán McNamara

 e8/082b7306e1db2806edad6a8f0c851d20af1a63 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2fa7af8627713e3de67774aad3b3f75b5cfe0b7a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:10:17 2013 +0100

Notes added by 'git notes add'

diff --git a/e8/082b7306e1db2806edad6a8f0c851d20af1a63 
b/e8/082b7306e1db2806edad6a8f0c851d20af1a63
new file mode 100644
index 000..a3557b9
--- /dev/null
+++ b/e8/082b7306e1db2806edad6a8f0c851d20af1a63
@@ -0,0 +1 @@
+prefer: 06b6e220b5e9250c688daaea4a7eb2ae64f1863c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Caolán McNamara

 cui/source/inc/tabstpge.hxx   |4 
 cui/source/tabpages/tabstpge.cxx  |   13 +++--
 cui/uiconfig/ui/paratabspage.ui   |6 ++
 i18npool/source/localedata/data/pt_AO.xml |2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 72ca010b217a6df3a0edd47f3bedd60882e5681c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:11:42 2013 +0100

sync the FixedFormatskey1 entry of pt-AO with other pt entries

because Estandar is Spanish so that's not right anyway and
commit 06b6e220b5e9250c688daaea4a7eb2ae64f1863c fixed the same
problem for pt-PT

Change-Id: Ia3955cbf2af89e03a574a25a5d968a7d2d2d818a

diff --git a/i18npool/source/localedata/data/pt_AO.xml 
b/i18npool/source/localedata/data/pt_AO.xml
index fc83a11..37f1eb5 100644
--- a/i18npool/source/localedata/data/pt_AO.xml
+++ b/i18npool/source/localedata/data/pt_AO.xml
@@ -145,7 +145,7 @@
   FormatCodeDD-MM- HH:MM:SS/FormatCode
 /FormatElement
 FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER  formatindex=0
-  FormatCodeEstandar/FormatCode
+  FormatCodeGeral/FormatCode
 /FormatElement
 FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER  formatindex=1
   FormatCode0/FormatCode
commit a4e9c5f3420eba9d1de8817aa553d50bbf2bc81d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:09:15 2013 +0100

restore a11y relations and some other clean up

Change-Id: Ic44d45a969bc7e4c809906a59650eab1ee37c424

diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 8ffa903..c19f085 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -23,6 +23,7 @@
 #include vcl/edit.hxx
 #include vcl/field.hxx
 #include vcl/fixed.hxx
+#include vcl/layout.hxx
 #include sfx2/tabdlg.hxx
 
 #include editeng/tstpitem.hxx
@@ -94,6 +95,9 @@ private:
 PushButton* m_pDelAllBtn;
 PushButton* m_pDelBtn;
 
+VclContainer*   m_pTypeFrame;
+VclContainer*   m_pFillFrame;
+
 // local variables, internal functions
 SvxTabStop  aAktTab;
 SvxTabStopItem  aNewTabs;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index b620af1..ba44cf2 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -141,6 +141,9 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, 
const SfxItemSet rAt
 get(m_pDelAllBtn,buttonBTN_DELALL);
 get(m_pDelBtn,buttonBTN_DEL);
 
+get(m_pTypeFrame, frameFL_TABTYPE);
+get(m_pFillFrame, frameFL_FILLCHAR);
+
 // This page needs ExchangeSupport
 SetExchangeSupport();
 
@@ -160,7 +163,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, 
const SfxItemSet rAt
 m_pCenterTab-SetClickHdl( aLink );
 
 m_pDezChar-SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, 
GetDezCharHdl_Impl ) );
-//m_pDezChar-SetMaxTextLen(1);
 m_pDezChar-Disable();
 m_pDezCharLabel-Disable();
 
@@ -171,7 +173,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, 
const SfxItemSet rAt
 m_pFillSolidLine-SetClickHdl( aLink );
 m_pFillSpecial-SetClickHdl( aLink );
 m_pFillChar-SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, 
GetFillCharHdl_Impl ) );
-//m_pFillChar-SetMaxTextLen(1);
 m_pFillChar-Disable();
 
 m_pTabBox-SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, 
SelectHdl_Impl ) );
@@ -336,8 +337,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 
nFlag )
 m_pDezCharLabel-Disable();
 m_pDezChar-Disable();
 }
-// if ( ( TABTYPE_ALL  nFlag ) == TABTYPE_ALL )
-// m_pTabTypeLabel-Disable();
+ if ( ( TABTYPE_ALL  nFlag ) == TABTYPE_ALL )
+ m_pTypeFrame-Disable();
 if ( ( TABFILL_NONE  nFlag ) == TABFILL_NONE )
 m_pNoFillChar-Disable();
 if ( ( TABFILL_POINT  nFlag ) == TABFILL_POINT )
@@ -351,8 +352,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 
nFlag )
 m_pFillSpecial-Disable();
 m_pFillChar-Disable();
 }
-// if ( ( TABFILL_ALL  nFlag ) == TABFILL_ALL )
-// m_pFillLabel-Disable();
+ if ( ( TABFILL_ALL  nFlag ) == TABFILL_ALL )
+ m_pFillFrame-Disable();
 }
 
 // ---
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index 709e9df..fe2e2f8 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -416,6 +416,9 @@
 property name=xalign0.09003576278687/property
 property name=draw_indicatorTrue/property
 property 
name=groupradiobuttonBTN_FILLCHAR_NO/property
+accessibility
+  relation type=label-for 
target=entryED_FILLCHAR_OTHER/
+/accessibility

[Libreoffice-commits] core.git: helpcontent2

2013-07-03 Thread Caolán McNamara

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

New commits:
commit 052ad2cf198aa27eb1719be1864477119c6576e9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:27:29 2013 +0100

Updated core
Project: help  765c807900c41dec96a0872ade229d4ca3fc50ac

diff --git a/helpcontent2 b/helpcontent2
index af95be0..765c807 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit af95be046caf1abca0b310406bdae5a8b10a1a1b
+Subproject commit 765c807900c41dec96a0872ade229d4ca3fc50ac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Caolán McNamara

 helpers/help_hid.lst   |   16 -
 source/text/shared/00/0001.xhp |2 -
 source/text/shared/01/05030300.xhp |   60 +++--
 3 files changed, 32 insertions(+), 46 deletions(-)

New commits:
commit 765c807900c41dec96a0872ade229d4ca3fc50ac
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 13:27:29 2013 +0100

update help ids for tabs tabpage .ui conversion

Change-Id: Ibab36b40dff2f149b973deedbf69c1091945489f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 09027b9..e461ac8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3797,7 +3797,6 @@ HID_TABLE_DESIGN_TABPAGE_GENERAL,38893,
 HID_TABLE_TEXTFLOW,53196,
 HID_TABLE_TOOLBOX,54828,
 HID_TABORDER_CONTROLS,38193,
-HID_TABULATOR,33782,
 HID_TAB_AUTOINCREMENTVALUE,38996,
 HID_TAB_DESIGN_DESCWIN,38882,
 HID_TAB_DESIGN_FIELDCONTROL,38880,
@@ -7226,8 +7225,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEARCH_NAME,703334441,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
 svx_Edit_RID_SVXPAGE_LINEEND_DEF_EDT_NAME,701581313,
-svx_Edit_RID_SVXPAGE_TABULATOR_ED_FILLCHAR_OTHER,700745773,
-svx_Edit_RID_SVXPAGE_TABULATOR_ED_TABTYPE_DECCHAR,700745756,
 svx_Edit_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME,706627585,
 svx_Edit_RID_SVX_MDLG_DOCRECOVERY_BROKEN_ED_BROKEN_SAVEDIR,1237780485,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
@@ -7439,7 +7436,6 @@ 
svx_MenuButton_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,701558810,
 svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE,705507642,
 svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646,
 svx_Menu_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,537296896,
-svx_MetricBox_RID_SVXPAGE_TABULATOR_ED_TABPOS,700753418,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_OFADLG_PRCNT_SET_ED_RIGHT_MARGIN,1345903204,
@@ -7751,9 +7747,6 @@ svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW,705499960,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH,704860694,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER,704860693,
-svx_PushButton_RID_SVXPAGE_TABULATOR_BTN_DEL,700748339,
-svx_PushButton_RID_SVXPAGE_TABULATOR_BTN_DELALL,700748340,
-svx_PushButton_RID_SVXPAGE_TABULATOR_BTN_NEW,700748338,
 svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_MADDIN1,706679304,
 svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_MADDIN2,706679305,
 svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_SEARCH,706679300,
@@ -7827,15 +7820,6 @@ 
svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOCHAR,705430027,
 svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOFRAME,705430029,
 svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPAGE,705430025,
 svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPARA,705430026,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_FILLCHAR_DASHLINE,700744234,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_FILLCHAR_NO,700744232,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_FILLCHAR_OTHER,700744236,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_FILLCHAR_POINTS,700744233,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_FILLCHAR_UNDERSCORE,700744235,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_TABTYPE_CENTER,700744216,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_TABTYPE_DECIMAL,700744218,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_TABTYPE_LEFT,700744212,
-svx_RadioButton_RID_SVXPAGE_TABULATOR_BTN_TABTYPE_RIGHT,700744214,
 svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_GRADIENT,701596170,
 svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_LINEAR,701596169,
 svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_OFF,701596168,
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index fa3b330..eee31d5 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -91,7 +91,7 @@
 bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE id=bm_id3149762 
localize=false/
 bookmark xml-lang=en-US branch=hid/ui/gradientpage/delete 
id=bm_id3148924 localize=false/
 bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE 
id=bm_id3153717 localize=false/
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL id=bm_id3156007 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/paratabspage/buttonBTN_DEL 
id=bm_id3156007 localize=false/
 bookmark xml-lang=en-US 
branch=hid/basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE id=bm_id3143232 
localize=false/
 bookmark xml-lang=en-US 
branch=hid/basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE id=bm_id3214514 
localize=false/
 bookmark xml-lang=en-US 
branch=hid/basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE id=bm_id3145749 
localize=false/
diff --git a/source/text/shared/01/05030300.xhp 
b/source/text/shared/01/05030300.xhp
index 4ef9e3f..999baef 100644
--- a/source/text/shared/01/05030300.xhp
+++

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

2013-07-03 Thread Manal Alhassoun

 extras/source/glade/libreoffice-catalog.xml.in |3 
 starmath/UIConfig_smath.mk |1 
 starmath/inc/dialog.hxx|   33 -
 starmath/inc/starmath.hrc  |1 
 starmath/inc/utility.hxx   |1 
 starmath/source/dialog.cxx |  117 ++---
 starmath/source/smres.src  |  171 
 starmath/source/utility.cxx|   11 
 starmath/uiconfig/smath/ui/fonttypedialog.ui   |  510 +
 9 files changed, 589 insertions(+), 259 deletions(-)

New commits:
commit 1611669c400a87e6a092e6312fd83b4f9f89257b
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Wed Jul 3 13:20:16 2013 +0300

fonttypedialog.ui widget

Change-Id: I4aac9046a004d84cd47d563aee8b7338e0d17896
Reviewed-on: https://gerrit.libreoffice.org/4697
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index f3ba921..962c42f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -15,6 +15,9 @@
 --
 glade-catalog name=LibreOffice domain=glade-3 depends=gtk+ 
version=1.0
   glade-widget-classes
+glade-widget-class title=Font PickListBox name=smlo-SmFontPickListBox
+generic-name=SmFontPickListBox 
parent=GtkComboBoxText
+icon-name=widget-gtk-comboboxtext/
 glade-widget-class title=Thesaurus View 
name=cuilo-ThesaurusAlternativesCtrl
 generic-name=ThesaurusAlternativesCtrl 
parent=GtkTextView
 icon-name=widget-gtk-textview/
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 402ddec..3683c15 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/fontsizedialog \
+   starmath/uiconfig/smath/ui/fonttypedialog \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
starmath/uiconfig/smath/ui/smathsettings \
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index a16b2f5..4274266 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -142,27 +142,16 @@ public:
 
 class SmFontTypeDialog : public ModalDialog
 {
-FixedText   aFixedText1;
-SmFontPickListBox   aVariableFont;
-FixedText   aFixedText2;
-SmFontPickListBox   aFunctionFont;
-FixedText   aFixedText3;
-SmFontPickListBox   aNumberFont;
-FixedText   aFixedText4;
-SmFontPickListBox   aTextFont;
-FixedText   aFixedText5;
-SmFontPickListBox   aSerifFont;
-FixedText   aFixedText6;
-SmFontPickListBox   aSansFont;
-FixedText   aFixedText7;
-SmFontPickListBox   aFixedFont;
-FixedLine   aFixedLine1;
-FixedLine   aFixedLine2;
-OKButtonaOKButton1;
-HelpButton  aHelpButton1;
-CancelButtonaCancelButton1;
-MenuButton  aMenuButton;
-PushButton  aDefaultButton;
+SmFontPickListBox* m_pVariableFont;
+SmFontPickListBox* m_pFunctionFont;
+SmFontPickListBox* m_pNumberFont;
+SmFontPickListBox* m_pTextFont;
+SmFontPickListBox* m_pSerifFont;
+SmFontPickListBox* m_pSansFont;
+SmFontPickListBox* m_pFixedFont;
+HelpButton* m_pHelpButton1;
+MenuButton* m_pMenuButton;
+PushButton* m_pDefaultButton;
 
 OutputDevice   *pFontListDev;
 
@@ -171,7 +160,7 @@ class SmFontTypeDialog : public ModalDialog
 DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
-SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool 
bFreeRes = true);
+SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice);
 
 void ReadFrom(const SmFormat rFormat);
 void WriteTo (SmFormat rFormat) const;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 74aebf6..192f22e 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -77,7 +77,6 @@
 
 
 #define RID_FONTDIALOG  (RID_APP_START + 2)
-#define RID_FONTTYPEDIALOG  (RID_APP_START + 4)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS  (RID_APP_START + 11)
 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 01a41cd..1770a91 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -159,6 +159,7 @@ protected:
 
 public:
 SmFontPickListBox(Window* pParent, const ResId rResId);
+SmFontPickListBox (Window* pParent, WinBits nBits);
 
 SmFontPickListBox operator = (const

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

2013-07-03 Thread Caolán McNamara

 starmath/inc/dialog.hxx  |1 -
 starmath/inc/helpids.h   |1 -
 starmath/source/dialog.cxx   |   13 -
 starmath/uiconfig/smath/ui/fonttypedialog.ui |   27 ---
 4 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit 1ec3fac48866c27d0c4b6ffb44befcba66d1f229
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:00:50 2013 +0100

don't need an explicit help handler, the default will be fine

Change-Id: I61643e507a68e66e1798c2d21a3f9372027fda1a

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4274266..5f47fc9 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -149,7 +149,6 @@ class SmFontTypeDialog : public ModalDialog
 SmFontPickListBox* m_pSerifFont;
 SmFontPickListBox* m_pSansFont;
 SmFontPickListBox* m_pFixedFont;
-HelpButton* m_pHelpButton1;
 MenuButton* m_pMenuButton;
 PushButton* m_pDefaultButton;
 
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 437fe42..8ee31c1 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -20,7 +20,6 @@
 #define STARMATH_HELPIDS_H
 
 #define HID_SMA_FONTDIALOG
STARMATH_HID_SMA_FONTDIALOG
-#define HID_SMA_FONTTYPEDIALOG
STARMATH_HID_SMA_FONTTYPEDIALOG
 #define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
 #define HID_SMA_SYMDEFINEDIALOG   
STARMATH_HID_SMA_SYMDEFINEDIALOG
 #define HID_SMA_WIN_DOCUMENT  
STARMATH_HID_SMA_WIN_DOCUMENT
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b42a278..c445fb3 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -533,17 +533,6 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, 
DefaultButtonClickHdl, Button *, EMPTY
 }
 IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, 
pButton )
 
-IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG 
/*pButton*/ )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_FONTTYPEDIALOG ), m_pHelpButton1 );
-}
-return 0;
-}
-
 SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice 
*pFntListDevice)
 : ModalDialog(pParent, FontsDialog, 
modules/smath/ui/fonttypedialog.ui),
 pFontListDev(pFntListDevice)
@@ -555,12 +544,10 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, 
OutputDevice *pFntListDevic
 get(m_pSerifFont, serifCB);
 get(m_pSansFont, sansCB);
 get(m_pFixedFont, fixedCB);
-get(m_pHelpButton1, help);
 get(m_pMenuButton, modify);
 get(m_pDefaultButton, default);
 
 m_pDefaultButton-SetClickHdl(LINK(this, SmFontTypeDialog, 
DefaultButtonClickHdl));
-m_pHelpButton1-SetClickHdl(LINK(this, SmFontTypeDialog, 
HelpButtonClickHdl));
 
 m_pMenuButton-GetPopupMenu()-SetSelectHdl(LINK(this, SmFontTypeDialog, 
MenuSelectHdl));
 }
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui 
b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 92b10f0..b31f045 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkDialog id=FontsDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -23,7 +24,6 @@
 property name=can_defaultTrue/property
 property name=has_defaultTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
@@ -38,7 +38,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
@@ -53,7 +52,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
   /object
   packing
@@ -68,7 +66,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object

[Libreoffice-commits] core.git: helpcontent2

2013-07-03 Thread Caolán McNamara

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

New commits:
commit 6ec6f14c101dd0af06ae03581d7c807d610eeddf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:07:47 2013 +0100

Updated core
Project: help  e4fcd6566109736c1d2c17cd1b8be157ee7097db

diff --git a/helpcontent2 b/helpcontent2
index 765c807..e4fcd65 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 765c807900c41dec96a0872ade229d4ca3fc50ac
+Subproject commit e4fcd6566109736c1d2c17cd1b8be157ee7097db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Caolán McNamara

 helpers/help_hid.lst  |   10 -
 source/text/smath/01/0501.xhp |   39 +++---
 2 files changed, 20 insertions(+), 29 deletions(-)

New commits:
commit e4fcd6566109736c1d2c17cd1b8be157ee7097db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:07:47 2013 +0100

update help ids math font types dialog .ui conversion

Change-Id: I5a10a7ba19187f81cd837c92b6b2f04f68717fdf

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e461ac8..af7c2aa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3543,7 +3543,6 @@ HID_SMA_EXISTS,63160,
 HID_SMA_EXPX,63135,
 HID_SMA_FACTX,63131,
 HID_SMA_FONTDIALOG,63026,
-HID_SMA_FONTTYPEDIALOG,63028,
 HID_SMA_FONTXY,63223,
 HID_SMA_FORALL,63161,
 HID_SMA_FORMAT_CAT,63186,
@@ -6965,19 +6964,10 @@ starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_4,1401573380,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_5,1401573381,
-starmath_ListBox_RID_FONTTYPEDIALOG_1,1401490945,
-starmath_ListBox_RID_FONTTYPEDIALOG_2,1401490946,
-starmath_ListBox_RID_FONTTYPEDIALOG_3,1401490947,
-starmath_ListBox_RID_FONTTYPEDIALOG_4,1401490948,
-starmath_ListBox_RID_FONTTYPEDIALOG_5,1401490949,
-starmath_ListBox_RID_FONTTYPEDIALOG_6,1401490950,
-starmath_ListBox_RID_FONTTYPEDIALOG_7,1401490951,
 starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865,
 starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975,
-starmath_MenuButton_RID_FONTTYPEDIALOG_1,1401499649,
 starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
-starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
 starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
 starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891,
diff --git a/source/text/smath/01/0501.xhp 
b/source/text/smath/01/0501.xhp
index ade6e73..a05061e 100644
--- a/source/text/smath/01/0501.xhp
+++ b/source/text/smath/01/0501.xhp
@@ -37,8 +37,9 @@ dedr: fixed #i30893#/lastedited
 bookmark_valuedefining; formula fonts/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:ChangeFont id=bm_id3153925 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/fonttypedialog/FontDialog id=bm_id3153926 
localize=false/
 paragraph role=heading id=hd_id3156261 xml-lang=en-US level=1 
l10n=U oldref=1Fonts/paragraph
-paragraph role=paragraph id=par_id3153716 xml-lang=en-US l10n=U 
oldref=2variable id=schriftartentextahelp hid=SID_FONTDefines the 
fonts that can be applied to formula elements./ahelp
+paragraph role=paragraph id=par_id3153716 xml-lang=en-US l10n=U 
oldref=2variable id=schriftartentextahelp 
hid=modules/smath/ui/fonttypedialog/FontDialogDefines the fonts that can be 
applied to formula elements./ahelp
 /variable/paragraph
 section id=howtoget
   embed href=text/smath/00/0004.xhp#fmtsfa/
@@ -47,35 +48,35 @@ dedr: fixed #i30893#/lastedited
 paragraph role=paragraph id=par_id3151187 xml-lang=en-US l10n=U 
oldref=4You can define fonts for the variables, functions, numbers and 
inserted text that form the elements of your formula./paragraph
 paragraph role=paragraph id=par_id3156318 xml-lang=en-US l10n=U 
oldref=5The list boxes in the emphFonts/emph dialog display a default 
font for all elements. To change to a different font, click 
emphModify/emph, then select the element type. A new dialog box appears. 
Select the desired font and check any desired attributes, then click 
emphOK/emph. To set the changes as the default fonts, click the 
emphDefault/emph button./paragraph
 paragraph role=note id=par_id3148831 xml-lang=en-US l10n=U 
oldref=6If you want to mark individual text segments with a font other than 
that used for the whole text, then enter the link 
href=text/smath/01/0501.xhp name=FONTFont/link command in the 
emphCommands/emph window./paragraph
-bookmark xml-lang=en-US branch=hid/starmath:ListBox:RID_FONTTYPEDIALOG:1 
id=bm_id3147509 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/fonttypedialog/variableCB id=bm_id3147509 
localize=false/
 paragraph role=heading id=hd_id3154262 xml-lang=en-US level=3 
l10n=U oldref=7Variables/paragraph
-paragraph role=paragraph id=par_id3147516 xml-lang=en-US l10n=U 
oldref=8ahelp hid=STARMATH_LISTBOX_RID_FONTTYPEDIALOG_1You can select 
the fonts for the variables in your formula./ahelp For example, in the 
formula x=SIN(y), x and y are variables, and will reflect the assigned 
font./paragraph
-bookmark xml-lang=en-US branch=hid/starmath:ListBox:RID_FONTTYPEDIALOG:2 
id=bm_id3152943 localize=false/
+paragraph role=paragraph id=par_id3147516 xml-lang=en-US l10n=U 
oldref=8ahelp hid=modules/smath/ui/fonttypedialog/variableCBYou can 
select the fonts for the variables in your formula./ahelp For example, in the 
formula x=SIN(y), x and y are variables, and will reflect the assigned

Re: Thoughts on LibreOffice Math

2013-07-03 Thread Frédéric WANG


/  problem with that is that there are actually 2 text editing components,
//  Writer and EditEngine (used by Impress/Draw/Calc)... the current
//  architecture of Math embedded objects has the advantage that it works
//  with both of these and so in all applications.
/
That is something we will have to consider, but the current way is just
counter intuitive, not only that inserting a formula is deeply hidden
behind multiple level menus, but also editing a formula switches to a
completely different UI causing much disruption IMO (and the need to
click a formula to edit it is just annoying). I don't mind keeping Math
as separate competent, but we need a more integrated math editing that
what we have now.
BTW, I'm wondering how using MathML (or more generally ODF objects) is 
related to this GSOC idea:


https://wiki.documentfoundation.org/Development/Gsoc/Ideas#ODF_Formulas_in_Writer

I'm not really sure to understand to which fields the proposal refers, 
but my idea was to use MathML everywhere in LibreOffice Writer.


--
Frédéric Wang
maths-informatique-jeux.com/blog/frederic

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

[Libreoffice-commits] core.git: cui/source include/svl svl/Library_svl.mk svl/source

2013-07-03 Thread Caolán McNamara

 cui/source/tabpages/chardlg.cxx |1 
 include/svl/sfontitm.hxx|  208 
 svl/Library_svl.mk  |1 
 svl/source/items/sfontitm.cxx   |  130 -
 4 files changed, 340 deletions(-)

New commits:
commit bf54e43bdf33e26066afdbd459b1c41829b7473e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:13:37 2013 +0100

there are no SfxFontItem used anywhere

Change-Id: I7af08b7790a631d5d385a546a472e2868d79cb46

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index fff3610..ce57a4d 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -21,7 +21,6 @@
 #include vcl/svapp.hxx
 #include unotools/pathoptions.hxx
 #include svtools/ctrltool.hxx
-#include svl/sfontitm.hxx
 #include sfx2/printer.hxx
 #include sfx2/objsh.hxx
 #include sfx2/viewsh.hxx
diff --git a/include/svl/sfontitm.hxx b/include/svl/sfontitm.hxx
deleted file mode 100644
index 068eb93..000
--- a/include/svl/sfontitm.hxx
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SFONTITM_HXX
-#define _SFONTITM_HXX
-
-#include tools/color.hxx
-#include tools/gen.hxx
-#include tools/string.hxx
-#include i18nlangtag/lang.h
-#include svl/poolitem.hxx
-
-//
-class SfxFontItem: public SfxPoolItem
-{
-XubString m_aName;
-XubString m_aStyleName;
-Size m_aSize;
-Color m_aColor;
-Color m_aFillColor;
-rtl_TextEncoding m_nCharSet;
-LanguageType m_nLanguage;
-sal_Int16 m_nFamily;
-sal_Int16 m_nPitch;
-sal_Int16 m_nWeight;
-sal_Int16 m_nWidthType;
-sal_Int16 m_nItalic;
-sal_Int16 m_nUnderline;
-sal_Int16 m_nStrikeout;
-sal_Int16 m_nOrientation;
-unsigned m_bWordLine: 1;
-unsigned m_bOutline: 1;
-unsigned m_bShadow: 1;
-unsigned m_bKerning: 1;
-unsigned m_bHasFont: 1;
-unsigned m_bHasColor: 1;
-unsigned m_bHasFillColor: 1;
-
-public:
-TYPEINFO();
-
-inline SfxFontItem(sal_uInt16 nWhich);
-
-virtual int operator ==(const SfxPoolItem  rItem) const;
-
-virtual SfxPoolItem * Create(SvStream  rStream, sal_uInt16) const;
-virtual SvStream  Store(SvStream  rStream, sal_uInt16) const;
-
-virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
-{ return new SfxFontItem(*this); }
-
-sal_Bool hasFont() const { return m_bHasFont; }
-sal_Bool hasColor() const { return m_bHasColor; }
-sal_Bool hasFillColor() const { return m_bHasFillColor; }
-
-const XubString  getName() const { return m_aName; }
-const XubString  getStyleName() const { return m_aStyleName; }
-
-const Size  getSize() const { return m_aSize; }
-const Color  getColor() const { return m_aColor; }
-const Color  getFillColor() const { return m_aFillColor; }
-
-rtl_TextEncoding getCharSet() const { return m_nCharSet; }
-
-LanguageType getLanguage() const { return m_nLanguage; }
-
-sal_Int16 getFamily() const { return m_nFamily; }
-sal_Int16 getPitch() const { return m_nPitch; }
-sal_Int16 getWeight() const { return m_nWeight; }
-sal_Int16 getWidthType() const { return m_nWidthType; }
-sal_Int16 getItalic() const { return m_nItalic; }
-sal_Int16 getUnderline() const { return m_nUnderline; }
-sal_Int16 getStrikeout() const { return m_nStrikeout; }
-sal_Int16 getOrientation() const { return m_nOrientation; }
-sal_Bool getWordLine() const { return m_bWordLine; }
-sal_Bool getOutline() const { return m_bOutline; }
-sal_Bool getShadow() const { return m_bShadow; }
-sal_Bool getKerning() const { return m_bKerning; }
-
-inline void setFont(sal_Int16 nTheFamily, const XubString  rTheName,
-const XubString  rTheStyleName, sal_Int16 nThePitch,
-rtl_TextEncoding nTheCharSet);
-inline void setWeight(sal_Int16 nTheWeight);
-inline void setItalic(sal_Int16 nTheItalic);
-inline void setHeight(sal_Int32 nHeight);
-inline void setColor(const Color

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/uiconfig

2013-07-03 Thread Efe Gürkan YALAMAN

 cui/uiconfig/ui/aboutconfigdialog.ui |   42 ++-
 1 file changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 59d6be7a126b67d26ba6189050b0ae23022af317
Author: Efe GÃ¼rkan YALAMAN efeyala...@gmail.com
Date:   Wed Jul 3 16:17:43 2013 +0300

Default and Edit buttons added to the tabpage

Change-Id: Ia4802c4da9c2041a1de542f1f09ea853caccc58a

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index f07871d..6a39f86 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -4,12 +4,14 @@
   object class=GtkBox id=AboutConfig
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
 property name=spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=vexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
@@ -24,7 +26,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
-property name=spacing6/property
 child
   object class=GtkGrid id=grid1
 property name=can_focusFalse/property
@@ -125,6 +126,45 @@
   packing
 property name=expandFalse/property
 property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButtonBox id=buttonbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=spacing12/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=default
+property name=label translatable=yesDefault/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=edit
+property name=label translatable=yesEdit/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
 property name=position1/property
   /packing
 /child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Caolán McNamara

 cui/uiconfig/ui/paratabspage.ui |  667 +++-
 1 file changed, 329 insertions(+), 338 deletions(-)

New commits:
commit 12e20bd9aca9cddd00599c76bc256849266cd7f4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:31:39 2013 +0100

put tab tabpages frames side by side

Change-Id: Ia0816a891bc4ab508f42cf6651df03d9566b560b

diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index fe2e2f8..f4eb961 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -19,6 +19,7 @@
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=vexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
@@ -28,6 +29,7 @@
 property name=can_focusFalse/property
 property name=vexpandTrue/property
 property name=top_padding6/property
+property name=left_padding12/property
 child
   object class=VclComboBoxNumeric id=ED_TABPOS:0cm
 property name=visibleTrue/property
@@ -58,419 +60,408 @@
   /packing
 /child
 child
-  object class=GtkBox id=box2
+  object class=GtkFrame id=frameFL_TABTYPE
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=hexpandTrue/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
 child
-  object class=GtkFrame id=frameFL_TABTYPE
+  object class=GtkAlignment id=alignment2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=label_xalign0/property
-property name=shadow_typenone/property
+property name=top_padding6/property
+property name=left_padding12/property
 child
-  object class=GtkAlignment id=alignment2
+  object class=GtkGrid id=grid2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=top_padding6/property
-property name=left_padding12/property
+property name=row_spacing6/property
+property name=column_spacing12/property
 child
-  object class=GtkGrid id=grid2
+  object class=GtkRadioButton 
id=radiobuttonBTN_TABTYPE_DECIMAL
+property name=label 
translatable=yesDeci_mal/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=row_spacing6/property
-property name=column_spacing12/property
-child
-  object class=GtkRadioButton 
id=radiobuttonBTN_TABTYPE_DECIMAL
-property name=label 
translatable=yesDeci_mal/property
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=receives_defaultFalse/property
-property name=use_underlineTrue/property
-property name=xalign0/property
-property name=draw_indicatorTrue/property
-property 
name=groupradiobuttonBTN_TABTYPE_LEFT/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach3/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=GtkEntry id=entryED_TABTYPE_DECCHAR
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=invisible_charâ¢/property
-property name=width_chars1/property
-  /object
-  packing
-property name=left_attach1/property
-property name=top_attach4/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=cuilo-TabWin_Impl 
id=drawingareaWIN_TABLEFT
-property name=visibleTrue/property
-property name=can_focusFalse/property
-

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

2013-07-03 Thread Caolán McNamara

 vcl/source/control/combobox.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 67249b4aa56bf38c4c573226a06d293e0415bbea
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 14:51:01 2013 +0100

readjust the combobox optimal size calculation, needs to be more stable

Change-Id: I1e9b07e5e5e53ae62baa77610f47083b580eaf7d

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 35f2e6f..77735c8 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1073,11 +1073,11 @@ Size ComboBox::CalcMinimumSize() const
 {
 aSz = mpImplLB-CalcSize( mpImplLB-GetEntryList()-GetEntryCount() );
 aSz.Height() += mnDDHeight;
-aSz.Width() = std::max(aSz.Width(), 
Edit::CalcMinimumSizeForText(GetText()).Width());
 }
 else
 {
-aSz = Edit::CalcMinimumSizeForText(GetText());
+aSz.Height() = Edit::CalcMinimumSizeForText(GetText()).Height();
+aSz.Width() = mpImplLB-GetMaxEntryWidth();
 }
 
 if (m_nMaxWidthChars != -1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Miklos Vajna

 unusedcode.easy  |1 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   37 ---
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
 3 files changed, 41 deletions(-)

New commits:
commit 0be6adc8fcf9f4017b409aa3ec51a1e8c663e608
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jul 3 15:52:45 2013 +0200

Drop unused DomainMapperTableManager::CopyTextProperties()

Change-Id: Ibe99d4f3f4254329ca1b7269221f4e7cba1201a1

diff --git a/unusedcode.easy b/unusedcode.easy
index 529c1ef..2c163f9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -223,4 +223,3 @@ utl::ConfigItem::getUniqueSetElementName(rtl::OUString 
const, rtl::OUString)
 utl::toISO8601(com::sun::star::util::Time const)
 vcl::unohelper::getNaturalStringSorterForAppLocale()
 vclmain::createApplication()
-writerfilter::dmapper::DomainMapperTableManager::CopyTextProperties(boost::shared_ptrwriterfilter::dmapper::PropertyMap,
 boost::shared_ptrwriterfilter::dmapper::StyleSheetTable)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 6aabf59..54bbe4a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -724,43 +724,6 @@ void DomainMapperTableManager::clearData()
 }
 
 
-void lcl_CopyTextProperties(PropertyMapPtr pToFill,
-const StyleSheetEntry* pStyleSheetEntry, StyleSheetTablePtr 
pStyleSheetTable)
-{
-if( !pStyleSheetEntry )
-return;
-//fill base style properties first, recursively
-if( !pStyleSheetEntry-sBaseStyleIdentifier.isEmpty())
-{
-const StyleSheetEntryPtr pParentStyleSheet =
-
pStyleSheetTable-FindStyleSheetByISTD(pStyleSheetEntry-sBaseStyleIdentifier);
-OSL_ENSURE( pParentStyleSheet, table style not found );
-lcl_CopyTextProperties( pToFill, pParentStyleSheet.get( ), 
pStyleSheetTable);
-}
-
-PropertyMap::const_iterator aPropIter = 
pStyleSheetEntry-pProperties-begin();
-while(aPropIter != pStyleSheetEntry-pProperties-end())
-{
-//copy all text properties form the table style to the current run 
attributes
-if( aPropIter-first.bIsTextProperty )
-pToFill-insert(*aPropIter);
-++aPropIter;
-}
-}
-void DomainMapperTableManager::CopyTextProperties(PropertyMapPtr pContext, 
StyleSheetTablePtr pStyleSheetTable)
-{
-if( !m_pTableStyleTextProperies.get())
-{
-m_pTableStyleTextProperies.reset( new PropertyMap );
-const StyleSheetEntryPtr pStyleSheetEntry = 
pStyleSheetTable-FindStyleSheetByISTD(
-m_sTableStyleName);
-OSL_ENSURE( pStyleSheetEntry, table style not found );
-lcl_CopyTextProperties(m_pTableStyleTextProperies, 
pStyleSheetEntry.get( ), pStyleSheetTable);
-}
-pContext-InsertProps(m_pTableStyleTextProperies);
-}
-
-
 }}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6243b61..f36ac5d2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -93,9 +93,6 @@ public:
 const OUString getTableStyleName() const { return m_sTableStyleName; }
 const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue 
getCurrentTablePosition();
 
-/// copy the text properties of the table style and its parent into 
pContext
-voidCopyTextProperties(PropertyMapPtr pContext, StyleSheetTablePtr 
pStyleSheetTable);
-
 inline virtual void cellProps(TablePropertyMapPtr pProps)
 {
 if ( m_pStyleProps.get( ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/docs

2013-07-03 Thread Jürgen Schmidt

 odk/docs/images/sdk_head-1.png |binary
 1 file changed

New commits:
commit 15dd4c3a97a4ad101b8ad47573067e5bb44e37a2
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Wed Jul 3 13:03:44 2013 +

#122620# update SDK doc html header image

diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png
index 3dd9b1d..686c576 100644
Binary files a/odk/docs/images/sdk_head-1.png and 
b/odk/docs/images/sdk_head-1.png differ
___
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' - 15/dd4c3a97a4ad101b8ad47573067e5bb44e37a2

2013-07-03 Thread Caolán McNamara

 15/dd4c3a97a4ad101b8ad47573067e5bb44e37a2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 822cd7e8d85b07f711751085ed5e806ede428b12
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 15:34:07 2013 +0100

Notes added by 'git notes add'

diff --git a/15/dd4c3a97a4ad101b8ad47573067e5bb44e37a2 
b/15/dd4c3a97a4ad101b8ad47573067e5bb44e37a2
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/15/dd4c3a97a4ad101b8ad47573067e5bb44e37a2
@@ -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: sw/inc sw/source

2013-07-03 Thread Michael Stahl

 sw/inc/doc.hxx|4 
 sw/source/core/doc/doclay.cxx |5 -
 sw/source/core/doc/docnew.cxx |1 -
 sw/source/core/view/vnew.cxx  |   11 ---
 4 files changed, 21 deletions(-)

New commits:
commit f8dfa3a81a5382b2f18a705bd512625754167573
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 3 15:58:31 2013 +0200

sw: remove SwDoc::ShareLayout

It is a crude hack that is no longer necessary because the underlying
problems that caused crashes when deleting the layout have been fixed.

Change-Id: I601bdb0dc0aff5f4ddb8b8f4ba4c8d1f72c7

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e3eeb61..9a6d715 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -79,7 +79,6 @@ class SwList;
 #include memory
 
 #include boost/scoped_ptr.hpp
-#include boost/shared_ptr.hpp
 #include boost/ptr_container/ptr_vector.hpp
 
 namespace editeng { class SvxBorderLine; }
@@ -317,7 +316,6 @@ class SW_DLLPUBLIC SwDoc :
 SwDefTOXBase_Impl * mpDefTOXBases;   /// defaults of SwTOXBase's
 
 ViewShell   *mpCurrentView;  /// SwDoc should get a new member 
mpCurrentView//swmod 071225
-boost::shared_ptrSwRootFrm mpLayoutPtr;
 SdrModel*mpDrawModel;/// StarView Drawing
 
 SwDocUpdtFld*mpUpdtFlds; /// Struct for updating fields
@@ -1770,8 +1768,6 @@ public:
 const SwDocShell* GetDocShell() const   { return mpDocShell; }
 void SetDocShell( SwDocShell* pDSh );
 
-void ShareLayout( boost::shared_ptrSwRootFrm rPtr);
-
 /** in case during copying of embedded object a new shell is created,
  it should be set here and cleaned later */
 void SetTmpDocShell( SfxObjectShellLock rLock ){ mxTmpDocShell = 
rLock; }
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index b320e79..926a8c70 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -2303,9 +2303,4 @@ std::setSwRootFrm* SwDoc::GetAllLayouts()
 return aAllLayouts;
 } //swmod 070825
 
-void SwDoc::ShareLayout(boost::shared_ptrSwRootFrm rPtr)
-{
-mpLayoutPtr = rPtr;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 88707bb..e2ace8c 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -519,7 +519,6 @@ SwDoc::~SwDoc()
 delete mpPgPViewPrtData;
 
 mbDtor = true;
-mpLayoutPtr.reset();
 
 delete mpRedlineTbl;
 delete mpUnoCrsrTbl;
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index a8b293e..2c3053a 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -128,17 +128,6 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
 // switched to two step construction because creating the layout 
in SwRootFrm needs a valid pLayout set
 mpLayout = SwRootFrmPtr(new SwRootFrm( mpDoc-GetDfltFrmFmt(), 
this ));
 mpLayout-Init( mpDoc-GetDfltFrmFmt() );
-
-// mba: the layout refactoring overlooked an important detail
-// prior to that change, the layout always was destroyed in the 
dtor of swdoc
-// it is necessary to suppress notifications in the layout when 
the layout is discarded in its dtor
-// unfortunately this was done by asking whether the doc is in 
dtor - though the correct question should
-// have been if the rootfrm is in dtor (or even better: discard 
the layout before the SwRootFrm is destroyed!)
-// SwDoc::IsInDtor() is used at several places all over the code 
that need to be checked whether
-// pDoc-IsInDtor() means what is says or in fact should check 
for pRootFrm-IsInDtor(). As this will take some time, I decided
-// to postpone that investigations and the changes it will bring 
to the 3.5 release and for 3.4 make sure
-// that the layout still gets destroyed in the doc dtor. This is 
done by sharing the layout (that we still have) with the doc.
-GetDoc()-ShareLayout( mpLayout );
 }
 }
 SizeChgNotify();//swmod 071108
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-1-0'

2013-07-03 Thread Christian Lohmaier

New branch 'libreoffice-4-1-0' available with the following commits:
commit daab0627ac561fe67f512e5beb5a96edceea9edb
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 16:52:26 2013 +0200

Branch libreoffice-4-1-0

This is 'libreoffice-4-1-0' - the stable branch for the 4.1.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.1.x release,
please use the 'libreoffice-4-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3f38578f6f71177247d93848c2fed287d0c9ac3d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-1-0'

2013-07-03 Thread Christian Lohmaier

New branch 'libreoffice-4-1-0' available with the following commits:
commit b24f654d9fc42aed208f938bd0119e60559481ee
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 16:52:26 2013 +0200

Branch libreoffice-4-1-0

This is 'libreoffice-4-1-0' - the stable branch for the 4.1.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.1.x release,
please use the 'libreoffice-4-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I0c9604010dcf54944274aed5c1cbccceaa80b5de

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-1-0'

2013-07-03 Thread Christian Lohmaier

New branch 'libreoffice-4-1-0' available with the following commits:
commit 9c0209d831365ff1a10d686a6519d42434ec8e8a
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 16:52:25 2013 +0200

Branch libreoffice-4-1-0

This is 'libreoffice-4-1-0' - the stable branch for the 4.1.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.1.x release,
please use the 'libreoffice-4-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3831d868749736b27e3be668f35d61374fa00309

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-1-0'

2013-07-03 Thread Christian Lohmaier

New branch 'libreoffice-4-1-0' available with the following commits:
commit 9f8a4cf33560e658f60f51d421e170277a95a89e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 16:52:47 2013 +0200

Branch libreoffice-4-1-0

This is 'libreoffice-4-1-0' - the stable branch for the 4.1.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.1.x release,
please use the 'libreoffice-4-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I8f8984ec1987cf53933f6cac86e821f746864923

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Christian Lohmaier

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

New commits:
commit fa4cb4c3235d3fcedd68d0e876de663b33c09688
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 16:58:33 2013 +0200

bump product version to 4.1.1.0.0+

Change-Id: I5f7a01a9382f74114a40d52ec3f5c8ac2358586e

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

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

2013-07-03 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-07-03 16:08 -0700

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

iQIcBAABAgAGBQJR1D5+AAoJEPQ0oe+v7q6jqL4P/04+ZXmqvIGSqLfK69COtRYy
x00Bwjd8EabkdDhEKatXmLtbhD5CvPYgqAaCs5iat6Pj76lug1IzxwbF1ugt/AK1
NQV7LylCuFupaE2vTXhquDNrCX1JaYNOje1icJ5jsPYYADOI38oCFvnjRrOMzbsN
aIYYhDvmYNfE9bfKfI5CkRd8/94qmeVszahJAi7WyuD6pKe4t3vqCohxgqVkmNS+
mo/CLYMxPa5heCAYQriDEtq7A4rJ/4hgvrXV9eHOXvqTkRWqatpEM8wRyle335G9
OPRHP6K4PAsMhUnqoHuWoyNoS1LoLS5SH/MxGbW1ZjUqEGvp27h3ansRmljsF9Ao
2A3q63O0CwtJJWgrvak1ZBFEkBTZOPGRfEZKwabrRvB7Y8MoBll05PA+YONXuK5O
kYC5aadSJPo74hxfQ8dZWrO1yxYUX9TpstwGgEDgbwrrg8xTZcgbhtsDW5xK9F1w
/Y7GH+JD66xpN41FepOUgEbgIYXRVfmYvGUcwXwtUkE8YDsZQf1UDGWz7rXGynzn
HB89AVoyV+1D40pt/aXsUBhdW/S2ERzPWw6rT5Ko6cBL4+5j8CowdTELtw4Vz765
pn++vF4HiN/gKXERCmj85nrMGD8/d0rqy5goZIpMKzlL3GmJFY1qdRN17+LqQyyk
QWAOO4fsoOXgnIcnXGEf
=uQti
-END PGP SIGNATURE-

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

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

2013-07-03 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-07-03 16:08 -0700

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

iQIcBAABAgAGBQJR1D6AAAoJEPQ0oe+v7q6jyTMQALHLBOOCXCrjPJheYKnr6DlJ
BUj9VqwBOfrrvBFtBbcyqdD7hcseGZRsvowhRGSIFSSIM2bbvUDbuebn0vVrDsJ/
FAPRyk1UMXWttPffD5ABWEwQ/4fTFktkNY+QGFHW52uaGKszq8z7XiMBYIlK9NaS
OtX1ywfXrjybgnDmm4VWN5dAeXAIHyexSPaNLq/0J7pUfoZOHcLwXl5y9V1lzHjS
eG6q5c2cd31ZDVLO5ll0PgYoo7q+8VU2TuMXAYCHn/ffGfgfvvhgkAZ+DT3MS0/m
h7OMq9YaYABnj1Ji7leyvfPGCYuFNDGm1BXheMfHZW1JnQSwHP3G5VS5EIRH3Hoj
M7ysHBDtYRbIJkIxBMI47c9q/exlPgrJ/cnKPiMmF2S5jkS6bSgNjFNIoNB3NQ1g
0XcJTlvYK/tFYBOybKRlYTtH939iY/GK9+/QFxy9y0+Tgy2sql353WYp3WRZSSIh
8n0yaGx9U0RnG6SQ9w35Be/OYiJs9L4OYxUMB3ktnH15i/iFs01o5vk7RJYsnLzA
H/CcqpXGYh/UGK2Tv2UqtAiLgS0uLbxMasqZE9AGkCW9XB09rxEXB8RaGtysMrFW
qwe31/9YtA12rsKM8eAp0g5u+TstjUd/+4SRpNu+DKQ1R4/X9YmWtDdGbMa5Zz3k
SMc3/DlYGkMBm1jPE1zH
=mv9c
-END PGP SIGNATURE-

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

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

2013-07-03 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-07-03 16:08 -0700

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

iQIcBAABAgAGBQJR1D6CAAoJEPQ0oe+v7q6jpJ8P/08wad9QZzAVJ2vfXv/UxON+
u+JRM6oIqQfCzmFceb3lJpP7Sp5Mk+F04iE8VZjGn3pEhJ3Z92zsuXrcbbfRmqVH
LltjVGzuS2lt9XR3vq7hMg0DoMLOMN5u/txFjypuLiDqS27UhdyQbaTF+/mGbD9l
1QKZT3pYj7cHKaqVjBELvls47gJ0kgvlJAIzYhUthWM8tiRby5XmDZquL46dIfZ3
d7vGzY27rnsEdMjto0+ZcwJBrP/l1D8Ro0mEiwXqu6s9aiCseid7KFYW8TTpi0kV
KTaRC+xCypLb5/kcJCjQF8qqH5ruRb03oXfJmnLWaFKKuBgtKy7AASTpzgzZI9AB
9DSFxpEUeKiOyjIXyyOMPMvpWs/tx3CVrLdoz4dxxFVZA1APZ0EDZxSlBuSh1Id0
eF94wS2FjcVRn0HTWYgfJ7hRdiif3DKm77LG5iHhrMOo9WAqPF2jKQUa0lEb88VK
3/ZzjsOBwh9tpCTV0h0KjXxz5mWK6qx5Z2t4SORkKFoqC/h77qelqJQ5cFNzxen1
K5b9mKFN9eZjowQcxaFqSMe1lH+3K/QFk0cbO6xnrs+evDqtRsMuz1GQkP5cYyvn
KvG23HFQjrBz7AzC4koEIOkIAeonQFNYCg4kx9UkBeWllPGuL9PHcuEv/vRfIGpg
K8P3xI9flM7UhGZwBF5h
=9zvk
-END PGP SIGNATURE-

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

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

2013-07-03 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-07-03 16:08 -0700

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

iQIcBAABAgAGBQJR1D6DAAoJEPQ0oe+v7q6jn6YQAIRaHgKfXH4CCSvGSTSAR+fn
QReCtYlwInrSCt6fmgY3lMxQ7QhudUi86DzaQe5Wql0Xj9eWomHYGXASPR2/OB74
XKPr/SzXhc6wtqBVGnkxHnnh7MtHiAUP5EnTTbqhAPMFjIudiuTuHDkvnh3J3om8
h4A+XzdYtrvBRs+MMHCtQQpFIvfR5l+zdSllAdRzn33OQdNTkDfwhxSqCuCbalB4
RSbIcQXWV+31aA595cEXHGfFkTPIgrGQBd2GFcbrCJEzURYHYErLqaHu67abPTiE
a+GaJhcOAXvP8ibyqb0lvIOdEEjwY8xuaumJvCkh03Nf9hfL8W4xIat2dk4EsT0Z
6UxfCK6IremdbNswQ4Tqioav2UlCNMbDeDuLXrNjfSGvo3ZzrYisTDSiRpG2IfOY
up72gmmIthnGHdY2yVG27wsfWhveSB9Tf15blM0PWZRdSeO4BPYWLUQZXMLdNc7w
vZrEGWcLvHEjo0QNsvrElPG2nXqHIJd6RP4Fs1PR2PzGf1xU0gQbuc72Bhx4XihG
Uy4ff2nOVIYvgH7BYSohU1rg+P2kSSh17P50Fvd74O13Zvezc2KTcxhYCpMv322k
YCATLz91w4y321YqLaLS7jzifuKIcMfU6n9PW8NtCPOrpsXxCJt10Wnnxtz58X8r
b9rWOCdkgWlqgr4xsmav
=95D5
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.1-185:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Fridrich Štrba

 starmath/source/smdetect.cxx  |7 +++
 sw/source/ui/uno/swdetect.cxx |8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 36c64c875f5819bf5ada2bb657c490441bc24644
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 17:14:32 2013 +0200

Ugly workaround for historic sxw files produced once by libwpd/wpd2sxw

Change-Id: I2d22c12896b241d79ded723acb0a6753cc1468ee

diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index fd23917..5c3d987 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -116,7 +116,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 lDescriptor[nProperty].Value = sTemp;
 aURL = sTemp;
 }
-else if( !aURL.Len()  lDescriptor[nProperty].Name.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM(FileName)) )
+else if( !aURL.Len()  lDescriptor[nProperty].Name == FileName )
 {
 lDescriptor[nProperty].Value = sTemp;
 aURL = sTemp;
@@ -241,7 +241,11 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 }
 catch (const WrappedTargetException aWrap)
 {
-if (!bDeepDetection)
+/* Cater for non-compliant sxw files created once upon 
a time by old libwpd/wpd2sxw combo
+   Don't bail-out early if the document is considered 
as corrupted. This allows us not to
+   reach the -- apparently -- catch-all 
SmFilterDetect::detect.
+ */
+if (!bDeepDetection  aTypeName != 
writer_StarOffice_XML_Writer)
 // Bail out early unless it's a deep detection.
 return OUString();
 
commit 9a9b8f0b34bc647a923fc7e79d8b5f61535c1f7b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 3 17:09:02 2013 +0200

Bail early the same way as in 709f6ba6a

Change-Id: I8447d776ba315db5ef961818bc577d13e4f35a20

diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 39b67b7..d82fa03 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -95,6 +95,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 
 sal_Bool bRepairPackage = sal_False;
 sal_Bool bRepairAllowed = sal_False;
+bool bDeepDetection = false;
 
 // now some parameters that can already be in the array, but may be 
overwritten or new inserted here
 // remember their indices in the case new values must be added to the array
@@ -145,6 +146,8 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 lDescriptor[nProperty].Value = bRepairPackage;
 else if( lDescriptor[nProperty].Name == DocumentTitle )
 nIndexOfDocumentTitle = nProperty;
+else if (lDescriptor[nProperty].Name == DeepDetection)
+bDeepDetection = lDescriptor[nProperty].Value.getsal_Bool();
 }
 
 // can't check the type for external filters, so set the dont flag 
accordingly
@@ -230,6 +233,10 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 }
 catch( const WrappedTargetException aWrap )
 {
+if (!bDeepDetection)
+// Bail out early unless it's a deep detection.
+return OUString();
+
 packages::zip::ZipIOException aZipException;
 
 // repairing is done only if this type is requested 
from outside
___
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/inc sw/source

2013-07-03 Thread Michael Stahl

 sw/inc/doc.hxx|4 
 sw/source/core/doc/doclay.cxx |5 -
 sw/source/core/doc/docnew.cxx |1 -
 sw/source/core/view/vnew.cxx  |   11 ---
 4 files changed, 21 deletions(-)

New commits:
commit 076bc3ce70b9254e00547de34a86dafd76ed1e51
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 3 15:58:31 2013 +0200

sw: remove SwDoc::ShareLayout

It is a crude hack that is no longer necessary because the underlying
problems that caused crashes when deleting the layout have been fixed.

Change-Id: I601bdb0dc0aff5f4ddb8b8f4ba4c8d1f72c7
(cherry picked from commit f8dfa3a81a5382b2f18a705bd512625754167573)
Reviewed-on: https://gerrit.libreoffice.org/4706
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 13256ea7..0769ae2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -79,7 +79,6 @@ class SwList;
 #include memory
 
 #include boost/scoped_ptr.hpp
-#include boost/shared_ptr.hpp
 #include boost/ptr_container/ptr_vector.hpp
 
 namespace editeng { class SvxBorderLine; }
@@ -317,7 +316,6 @@ class SW_DLLPUBLIC SwDoc :
 SwDefTOXBase_Impl * mpDefTOXBases;   /// defaults of SwTOXBase's
 
 ViewShell   *mpCurrentView;  /// SwDoc should get a new member 
mpCurrentView//swmod 071225
-boost::shared_ptrSwRootFrm mpLayoutPtr;
 SdrModel*mpDrawModel;/// StarView Drawing
 
 SwDocUpdtFld*mpUpdtFlds; /// Struct for updating fields
@@ -1772,8 +1770,6 @@ public:
 const SwDocShell* GetDocShell() const   { return mpDocShell; }
 void SetDocShell( SwDocShell* pDSh );
 
-void ShareLayout( boost::shared_ptrSwRootFrm rPtr);
-
 /** in case during copying of embedded object a new shell is created,
  it should be set here and cleaned later */
 void SetTmpDocShell( SfxObjectShellLock rLock ){ mxTmpDocShell = 
rLock; }
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index b320e79..926a8c70 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -2303,9 +2303,4 @@ std::setSwRootFrm* SwDoc::GetAllLayouts()
 return aAllLayouts;
 } //swmod 070825
 
-void SwDoc::ShareLayout(boost::shared_ptrSwRootFrm rPtr)
-{
-mpLayoutPtr = rPtr;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 94ebfea..91aa23b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -520,7 +520,6 @@ SwDoc::~SwDoc()
 delete mpPgPViewPrtData;
 
 mbDtor = true;
-mpLayoutPtr.reset();
 
 delete mpRedlineTbl;
 delete mpUnoCrsrTbl;
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index a8b293e..2c3053a 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -128,17 +128,6 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
 // switched to two step construction because creating the layout 
in SwRootFrm needs a valid pLayout set
 mpLayout = SwRootFrmPtr(new SwRootFrm( mpDoc-GetDfltFrmFmt(), 
this ));
 mpLayout-Init( mpDoc-GetDfltFrmFmt() );
-
-// mba: the layout refactoring overlooked an important detail
-// prior to that change, the layout always was destroyed in the 
dtor of swdoc
-// it is necessary to suppress notifications in the layout when 
the layout is discarded in its dtor
-// unfortunately this was done by asking whether the doc is in 
dtor - though the correct question should
-// have been if the rootfrm is in dtor (or even better: discard 
the layout before the SwRootFrm is destroyed!)
-// SwDoc::IsInDtor() is used at several places all over the code 
that need to be checked whether
-// pDoc-IsInDtor() means what is says or in fact should check 
for pRootFrm-IsInDtor(). As this will take some time, I decided
-// to postpone that investigations and the changes it will bring 
to the 3.5 release and for 3.4 make sure
-// that the layout still gets destroyed in the doc dtor. This is 
done by sharing the layout (that we still have) with the doc.
-GetDoc()-ShareLayout( mpLayout );
 }
 }
 SizeChgNotify();//swmod 071108
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Cédric Bosdonnat

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   37 +++---
 1 file changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 94a9bce4fb61aeeece8809eec1cbdc37101bdd22
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jul 3 17:43:33 2013 +0200

n#825976: writerfilter initial support of SEQ fields

No switch and no numeric formatting is taken into account ATM, just the
defaults, but at least we have the fields properly created.

Change-Id: Ib17c5e93199044a05005e4648c7e4cc81baf51dd

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0cd81c3..10ed343 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3142,7 +3142,37 @@ void DomainMapper_Impl::CloseFieldCommand()
 break;
 case FIELD_SECTION  : break;
 case FIELD_SECTIONPAGES : break;
-case FIELD_SEQ  : break;
+case FIELD_SEQ  :
+{
+OUString sIdentifier = 
lcl_ExtractParameter(pContext-GetCommand(), sizeof( SEQ) );
+if (xFieldProperties.is()  !sIdentifier.isEmpty())
+{
+uno::Reference beans::XPropertySet xMaster = 
FindOrCreateFieldMaster(
+
com.sun.star.text.fieldmaster.SetExpression, sIdentifier);
+
+// SubType 1 makes the difference between range 
and normal SetExpression
+xMaster-setPropertyValue(
+rPropNameSupplier.GetName(PROP_SUB_TYPE),
+uno::makeAny(sal_Int8(1)));
+
+uno::Reference text::XDependentTextField  
xDependentField(
+xFieldInterface, uno::UNO_QUERY_THROW );
+xDependentField-attachTextFieldMaster( xMaster );
+
+// TODO This formula may change with the flags of 
the SEQ field
+rtl::OUString sFormula = sIdentifier + +1;
+xFieldProperties-setPropertyValue(
+rPropNameSupplier.GetName(PROP_CONTENT),
+uno::makeAny(sFormula));
+
+// TODO Take care of the numeric formatting 
definition, default is Arabic
+xFieldProperties-setPropertyValue(
+
rPropNameSupplier.GetName(PROP_NUMBERING_TYPE),
+
uno::makeAny(style::NumberingType::ARABIC));
+}
+
+}
+break;
 case FIELD_SET  : break;
 case FIELD_SKIPIF   : break;
 case FIELD_STYLEREF : break;
@@ -3218,15 +3248,14 @@ void DomainMapper_Impl::CloseFieldCommand()
 rPropNameSupplier.GetName(PROP_NUMBERING_TYPE),
 uno::makeAny( 
lcl_ParseNumberingType(pContext-GetCommand()) ));
 break;
-
 }
 }
 //set the text field if there is any
 pContext-SetTextField( uno::Reference text::XTextField ( 
xFieldInterface, uno::UNO_QUERY ) );
 }
-catch( const uno::Exception )
+catch( const uno::Exception e )
 {
-OSL_FAIL( Exception in CloseFieldCommand() );
+SAL_WARN( writerfilter, Exception in CloseFieldCommand():   
e.Message );
 }
 pContext-SetCommandCompleted();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sysui/desktop

2013-07-03 Thread Rob Weir

 sysui/desktop/icons/hicolor/128x128/apps/main.png|binary
 sysui/desktop/icons/hicolor/128x128/apps/startcenter.png |binary
 sysui/desktop/icons/hicolor/16x16/apps/main.png  |binary
 sysui/desktop/icons/hicolor/16x16/apps/startcenter.png   |binary
 sysui/desktop/icons/hicolor/32x32/apps/main.png  |binary
 sysui/desktop/icons/hicolor/32x32/apps/startcenter.png   |binary
 sysui/desktop/icons/hicolor/48x48/apps/main.png  |binary
 sysui/desktop/icons/hicolor/48x48/apps/startcenter.png   |binary
 8 files changed

New commits:
commit 3644618b981866d46c16af39f7e0ca97c44e714d
Author: Rob Weir robw...@apache.org
Date:   Wed Jul 3 14:48:57 2013 +

Additional logo updates for Release Blocker issue 122620

diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png 
b/sysui/desktop/icons/hicolor/128x128/apps/main.png
old mode 100644
new mode 100755
index 1b51a60..8961348
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/main.png and 
b/sysui/desktop/icons/hicolor/128x128/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
old mode 100644
new mode 100755
index 1b51a60..8961348
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png and 
b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png 
b/sysui/desktop/icons/hicolor/16x16/apps/main.png
index 3aa8f08..602796f 100755
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/main.png and 
b/sysui/desktop/icons/hicolor/16x16/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
old mode 100644
new mode 100755
index 3aa8f08..602796f
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png and 
b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png 
b/sysui/desktop/icons/hicolor/32x32/apps/main.png
index 296c6f4..774ffd4 100755
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/main.png and 
b/sysui/desktop/icons/hicolor/32x32/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
old mode 100644
new mode 100755
index 296c6f4..774ffd4
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png and 
b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png 
b/sysui/desktop/icons/hicolor/48x48/apps/main.png
index 86bcf59..f04c0ed 100755
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/main.png and 
b/sysui/desktop/icons/hicolor/48x48/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png 
b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
old mode 100644
new mode 100755
index 86bcf59..f04c0ed
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png and 
b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source wizards/com

2013-07-03 Thread Lionel Elie Mamane

 dbaccess/source/sdbtools/connection/objectnames.cxx |4 
 wizards/com/sun/star/wizards/db/DBMetaData.java |5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8079326b97df9b9da56bc62f67df705efb407409
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 3 18:10:38 2013 +0200

database suggestname: no '/' for queries

In particular, this keeps the new query wizard
from silently failing by default
when the underlying table name has a slash: it would
generate a name proposal based on the table name,
and then use suggestName to get a similar,
yet guaranteed allowed name.

In this case, the guaranteed allowed part was failing,
since suggestName failed to strip slashes, which are
forbidden in query names.

Change-Id: I53d3976979ee45f5659765ed5dd3371b78837b5b

diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx 
b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 9e1d0dd..add3509 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -419,6 +419,10 @@ namespace sdbtools
 else
 sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) );
 }
+else if( _CommandType == CommandType::QUERY )
+{
+sBaseName=sBaseName.replace('/', '_');
+}
 
 OUString sName( sBaseName );
 sal_Int32 i = 1;
commit 7b957555d0027e9e7eeb8f31dcba6aa6408f4e16
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 3 18:04:28 2013 +0200

handle non-wrapped SQLException

This happens e.g. when the user types a forbidden name for the query
(e.g. containing '/'

Also uniformise Logger usage instead of exception.printStackTrace

Change-Id: I29b14b65dae487e0eb61b90ceba968142981e755

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java 
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 39c4f84..a75009c 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -856,11 +856,12 @@ public class DBMetaData
 callSQLErrorMessageDialog(sqlError, null);
 return false;
 }
-exception.printStackTrace(System.err);
+Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, 
null, exception );
 }
 catch (SQLException e)
 {
-Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, 
null, e );
+callSQLErrorMessageDialog(e, null);
+return false;
 }
 catch (Exception e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/source

2013-07-03 Thread Akash Shetye

 sc/inc/datauno.hxx  |2 ++
 sc/source/filter/inc/workbookhelper.hxx |4 
 sc/source/filter/oox/tablebuffer.cxx|3 +++
 sc/source/filter/oox/workbookhelper.cxx |   15 +++
 sc/source/ui/docshell/dbdocfun.cxx  |   15 ++-
 sc/source/ui/inc/dbdocfun.hxx   |2 ++
 sc/source/ui/unoobj/datauno.cxx |   12 
 7 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit 27d635053cc44a1013b7e5e5c50a11d1d9b39a28
Author: Akash Shetye shetyeak...@gmail.com
Date:   Wed Jul 3 22:14:22 2013 +0530

Tried to add code for filling in formatting attribute in ScDBData failed

The problem is with the use of XDatabaseRange in the filter import code. We 
do not deal directly with ScDBData objects. Since I cannot modify the 
XDatabaseRange definition we need to find a cleverer way to call 
SetTableFormatting on an ScDBData object. I am kinda stuck here. Please help.

Change-Id: Ia64da4f4c161b88912b97c27ad9f52a86f3564ef

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 2acde18..0613c79 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -23,6 +23,7 @@
 #include global.hxx
 #include queryparam.hxx
 #include subtotalparam.hxx
+#include dbdataformatting.hxx
 
 #include com/sun/star/sheet/TableFilterField.hpp
 #include com/sun/star/sheet/GeneralFunction.hpp
@@ -625,6 +626,7 @@ public:
 virtual void SAL_CALL   addNewByName( const OUString aName,
 const 
::com::sun::star::table::CellRangeAddress aRange )
 
throw(::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL   addDatabaseRangeFormatting( const OUString aName, 
const ScDBDataFormatting rTableFormatData ) throw 
(::com::sun::star::uno::RuntimeException);
 virtual void SAL_CALL   removeByName( const OUString aName )
 throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/sc/source/filter/inc/workbookhelper.hxx 
b/sc/source/filter/inc/workbookhelper.hxx
index fa1ce19..a3ac4d9 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -25,6 +25,7 @@
 #include oox/helper/storagebase.hxx
 #include biffhelper.hxx
 #include rangenam.hxx
+#include dbdataformatting.hxx
 
 namespace com { namespace sun { namespace star {
 namespace container { class XNameAccess; }
@@ -197,6 +198,9 @@ public:
 OUString orName,
 const ::com::sun::star::table::CellRangeAddress 
rRangeAddr ) const;
 
+/** Allows setting the table(database range) formatting attribute of 
ScDBData instances*/
+void addDatabaseFormatting( const OUString rName, const 
ScDBDataFormatting rDBDataFormatting );
+
 /** Creates and returns an unnamed database range on-the-fly in the Calc 
document.
 The range will not be buffered in the global table buffer. */
 ::com::sun::star::uno::Reference ::com::sun::star::sheet::XDatabaseRange 
diff --git a/sc/source/filter/oox/tablebuffer.cxx 
b/sc/source/filter/oox/tablebuffer.cxx
index c4580c6..b1b930d 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -111,8 +111,11 @@ void Table::finalizeImport()
 
 //Setting the ScDBDataFormatting (Table style) attribute.
 ScDBDataFormatting aTableFormatting = getStyles().getTableStyle( 
maModel.maTableStyleName )-getTableFormatting(); //May fail in cases of 
malformed corrupt table/table#.xml where the maTableStyleName is messed up
+
+//can mess up if aTableFormatting is nothing. Need to handle that
 aTableFormatting.SetBandedRows( maModel.mbShowRowStripes );
 aTableFormatting.SetBandedColumns( maModel.mbShowColumnStripes );
+addDatabaseFormatting( maDBRangeName, aTableFormatting );
 //Add this table formatting information to the ScDBData instance.
 //xDatabaseRange-SetTableFormatting( aTableFormatting );
 //Still figuring how to have an ScDBData object out of this
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 6ab4eca..ade4821 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -174,6 +174,8 @@ public:
 ScRangeData* createLocalNamedRangeObject( OUString orName, const 
Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags, 
sal_Int32 nTab ) const;
 /** Creates and returns a database range on-the-fly in the Calc document. 
*/
 Reference XDatabaseRange  createDatabaseRangeObject( OUString orName, 
const CellRangeAddress rRangeAddr ) const;
+/** Adds a DBData formatting object to a DB Range's formatting attribute*/
+void addDatabaseFormatting( const OUString rName, const 
ScDBDataFormatting rDBDataFormatting );
 /** Creates and returns an unnamed database range on-the-fly in the Calc 
document. */
 Reference

[Libreoffice-commits] core.git: 2 commits - boost/boost.transform_width.patch boost/UnpackedTarball_boost.mk vcl/source

2013-07-03 Thread Tor Lillqvist

 boost/UnpackedTarball_boost.mk|1 +
 boost/boost.transform_width.patch |   11 +++
 vcl/source/window/builder.cxx |2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 6116f93586ebfc6256f6f953e347e0d273ae2d7c
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 3 19:46:16 2013 +0300

WaE: unused variable 'sAdjustment' [loplugin]

Change-Id: I1417254b748a7516024dd098928b3f22dca1e584

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5d02b3b..c5fd105 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1162,7 +1162,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 
 if (!sPattern.isEmpty())
 {
-OString sAdjustment = extractAdjustment(rMap);
+extractAdjustment(rMap);
 OString sUnit = extractUnit(sPattern);
 FieldUnit eUnit = detectMetricUnit(sUnit);
 SAL_WARN(vcl.layout, making metric box for   name.getStr() 
sUnit.getStr()
commit 2ffd377f725e79c7411dfbe1a3a7a847d749efc6
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 3 19:43:34 2013 +0300

std::min comes from algorithm

Fixes configuration error in libvisio.

Change-Id: I6a6f743eca5fdfc990aadd69406b21d3ccdc6435

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index fefe8fa..36b8285 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -40,6 +40,7 @@ boost_patches += boost.auto_link.patch
 boost_patches += boost.endian.patch
 boost_patches += boost.loplugin.patch
 boost_patches += boost.std.move.patch
+boost_patches += boost.transform_width.patch
 boost_patches += boost.wundef.patch
 boost_patches += boost.wunused.patch
 boost_patches += boost.wshadow.patch
diff --git a/boost/boost.transform_width.patch 
b/boost/boost.transform_width.patch
new file mode 100644
index 000..747a17d
--- /dev/null
+++ b/boost/boost.transform_width.patch
@@ -0,0 +1,11 @@
+--- foo/foo/foo/boost/archive/iterators/transform_width.hpp
 foo/foo/foo/boost/archive/iterators/transform_width.hpp
+@@ -23,6 +23,8 @@
+ // stream length is some common multiple of x and y.  E.G. Base64 6 bit
+ // character and 8 bit bytes. Lowest common multiple is 24 = 4 6 bit 
characters
+ // or 3 8 bit characters
++
++#include algorithm
+ 
+ #include boost/config.hpp // for BOOST_DEDUCED_TYPENAME  PTFO
+ #include boost/serialization/pfto.hpp
___
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-0' - configure.ac

2013-07-03 Thread Christian Lohmaier

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

New commits:
commit 44ff9270a0a6ea7cf64256a71055c5cf6a17a6dc
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 3 19:07:33 2013 +0200

bump product version to 4.1.0.2.0+

Change-Id: I1d12f6772ec3e4fe076784680ebd4a47bb3628f3

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

Re: [GSOC]Use Widget Layout for the Start Center Weekly Update 02

2013-07-03 Thread Krisztian Pinter

Hi,

Thank you for sharing this, I tried removing the toplevel, and checking the
visibility option, but it didn't help, unfortunately.


I decided to take a different approach. I started again with the original
source files which use resource files, and changed only one button to be
dynamically allocated, so I call
mpWriterButton = new PushButton( this, STC_BUTTON_STYLE );
in the ctor of BackingWindow. The reason I tried this is because .ui
buttons use pointers to buttons as well.
This causes a crash in Window::PreNotify(NotifyEvent) when mpWriterButton
is clicked, the other buttons work fine.

When I change the button to be a .ui button, and instead of the above I
call this:
m_pUIBuilder = new VclBuilder(this, getUIRootDir(),
modules/StartModule/ui/startcenter.ui, StartCenter);
get( mpWriterButton,writer);
it's not drawn, but it actually works; I can select it using the arrow
keys, and when I press enter Writer starts. Since I left the manual
formatting code for the buttons intact for now, I'd expect that to properly
size and position this button, but it doesn't.


On 3 July 2013 01:48, Efe Gürkan YALAMAN efeyala...@gmail.com wrote:

 Hi,

 I solved my problem. I hope it helps you too.

 The layout thing I mentioned before is related to ui file. If ui file
 contains a toplevel it returns false. I cleaned toplevels and it returns
 true now. It is probably not related to your problem.

 So I figured out on other ui files almost everything has visible option
 setted True. I changed mine that way and checked with ui-previewer.
 Problem is gone now.

 Hope it helps.

 Cheers.


 --
 Efe Gürkan YALAMAN
 http://about.me/efegurkan

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-07-03 Thread bugzilla-daemon

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

Michael Meeks michael.me...@novell.com changed:

   What|Removed |Added

 Depends on||66524

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

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

2013-07-03 Thread Tor Lillqvist

 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6aabd119c67f73699f7ba33099bdecd78fe18c9
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 3 21:46:26 2013 +0300

WaE: unused parameter 'rMat'

Change-Id: I5307b6eaee66dd66fbf64673767f7ac6a8225470

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index ca064fe..6a96129 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -57,7 +57,7 @@ public:
const ScFormulaCellGroupRef xGroup, ScTokenArray 
rCode);
 };
 
-ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix rMat)
+ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix /* 
rMat */)
 {
 return ScMatrixRef();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

2013-07-03 Thread Kohei Yoshida

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

New commits:
commit 180ba887e532d6e0764e99665a852a787b9954ad
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 15:12:32 2013 -0400

Allow fallback to cell-based calculation.

when cell groups are circular dependent.

Change-Id: I20b3e522d6bfe4b70e0f59fe64eac065c9509bd9

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 82daadf..98081356 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -62,6 +62,7 @@
 #include svl/broadcast.hxx
 #include svl/listeneriter.hxx
 #include vcl/outdev.hxx
+#include formula/errorcodes.hxx
 
 #include boost/scoped_ptr.hpp
 
@@ -2172,7 +2173,15 @@ bool appendDouble(
 {
 ScFormulaCell rFC = **itData;
 if (!rFC.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next 
visit.
+rFC.SetErrCode(0);
+rFC.SetDirtyVar();
+}
 return false;
+}
 
 rArray.push_back(fVal);
 }
@@ -2261,7 +2270,15 @@ const double* ScColumn::FetchDoubleArray( 
sc::FormulaGroupContext rCxt, SCROW n
 {
 ScFormulaCell rCell = **it;
 if (!rCell.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next 
visit.
+rCell.SetErrCode(0);
+rCell.SetDirtyVar();
+}
 return NULL;
+}
 
 rArray.push_back(fVal);
 }
@@ -2276,7 +2293,15 @@ const double* ScColumn::FetchDoubleArray( 
sc::FormulaGroupContext rCxt, SCROW n
 {
 ScFormulaCell rCell = **it;
 if (!rCell.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next visit.
+rCell.SetErrCode(0);
+rCell.SetDirtyVar();
+}
 return NULL;
+}
 
 rArray.push_back(fVal);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 36/44618b981866d46c16af39f7e0ca97c44e714d

2013-07-03 Thread Caolán McNamara

 36/44618b981866d46c16af39f7e0ca97c44e714d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2e8a331fc2d3880caeb24a62bac68f5ce2e84631
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 3 20:26:56 2013 +0100

Notes added by 'git notes add'

diff --git a/36/44618b981866d46c16af39f7e0ca97c44e714d 
b/36/44618b981866d46c16af39f7e0ca97c44e714d
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/36/44618b981866d46c16af39f7e0ca97c44e714d
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Lionel Elie Mamane

 reportdesign/source/core/sdr/RptModel.cxx |2 ++
 reportdesign/source/ui/dlg/AddField.cxx   |2 ++
 svtools/source/contnr/treelistbox.cxx |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit c63b74d22d360893bb9e1200f59099ffb7943705
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 3 21:34:26 2013 +0200

fdo#61725 add SolarMutex until it works

Change-Id: I757bbfbc4a548f17d797ac00197588bc6e2907f6

diff --git a/reportdesign/source/core/sdr/RptModel.cxx 
b/reportdesign/source/core/sdr/RptModel.cxx
index 9553291..640018b 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -22,6 +22,7 @@
 #include dbaccess/dbsubcomponentcontroller.hxx
 #include tools/debug.hxx
 #include unotools/pathoptions.hxx
+#include vcl/svapp.hxx
 
 #include UndoActions.hxx
 #include UndoEnv.hxx
@@ -111,6 +112,7 @@ SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum)
 // 
-
 OReportPage* OReportModel::createNewPage(const uno::Reference 
report::XSection  _xSection)
 {
+SolarMutexGuard aSolarGuard;
 OReportPage* pPage = new OReportPage( *this ,_xSection);
 InsertPage(pPage);
 m_pUndoEnv-AddSection(_xSection);
diff --git a/reportdesign/source/ui/dlg/AddField.cxx 
b/reportdesign/source/ui/dlg/AddField.cxx
index d849d01..bee9548 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -305,6 +305,8 @@ namespace
 //---
 void OAddFieldWindow::Update()
 {
+SolarMutexGuard aSolarGuard;
+
 if ( m_pContainerListener.is() )
 m_pContainerListener-dispose();
 m_pContainerListener = NULL;
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 10c3c65..3f02d6e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3692,6 +3692,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, 
pData )
 void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* 
pEntry1,
 SvTreeListEntry* pEntry2, sal_uLong nPos )
 {
+SolarMutexGuard aSolarGuard;
+
 if( nActionId == LISTACTION_CLEARING )
 CancelTextEditing();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source

2013-07-03 Thread Kohei Yoshida

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

New commits:
commit a3aaf1dfe355e4fcc3e8ff2758f6dc137294dd1c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 15:12:32 2013 -0400

Allow fallback to cell-based calculation.

when cell groups are circular dependent.

Change-Id: I20b3e522d6bfe4b70e0f59fe64eac065c9509bd9

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 542cd92..932e613 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -62,6 +62,7 @@
 #include svl/broadcast.hxx
 #include svl/listeneriter.hxx
 #include vcl/outdev.hxx
+#include formula/errorcodes.hxx
 
 #include boost/scoped_ptr.hpp
 
@@ -2175,7 +2176,15 @@ bool appendDouble(
 {
 ScFormulaCell rFC = **itData;
 if (!rFC.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next 
visit.
+rFC.SetErrCode(0);
+rFC.SetDirtyVar();
+}
 return false;
+}
 
 rArray.push_back(fVal);
 }
@@ -2264,7 +2273,15 @@ const double* ScColumn::FetchDoubleArray( 
sc::FormulaGroupContext rCxt, SCROW n
 {
 ScFormulaCell rCell = **it;
 if (!rCell.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next 
visit.
+rCell.SetErrCode(0);
+rCell.SetDirtyVar();
+}
 return NULL;
+}
 
 rArray.push_back(fVal);
 }
@@ -2279,7 +2296,15 @@ const double* ScColumn::FetchDoubleArray( 
sc::FormulaGroupContext rCxt, SCROW n
 {
 ScFormulaCell rCell = **it;
 if (!rCell.GetErrorOrValue(nErr, fVal) || nErr)
+{
+if (nErr == ScErrorCodes::errCircularReference)
+{
+// This cell needs to be recalculated on next visit.
+rCell.SetErrCode(0);
+rCell.SetDirtyVar();
+}
 return NULL;
+}
 
 rArray.push_back(fVal);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source

2013-07-03 Thread Efe Gürkan YALAMAN

 cui/source/options/optaboutconfig.cxx |   14 +-
 cui/source/options/optaboutconfig.hxx |3 +--
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 4597f78aba99176b8c4ef89c724c057a7f1b16b9
Author: Efe GÃ¼rkan YALAMAN efeyala...@gmail.com
Date:   Wed Jul 3 22:50:03 2013 +0300

Multi column listboxes initial headerbar added

Change-Id: Ie5f4019e2565ae24a53e820f933c226cb9517660

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 22aff88..6a46085 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -15,7 +15,8 @@ using namespace svx;
 CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const 
SfxItemSet rItemSet )
 :SfxTabPage( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui, 
rItemSet)
 {
-//get(m_pEditBtn, );
+get(m_pDefaultBtn,default);
+get(m_pEditBtn, edit);
 
 m_pPrefCtrl = getSvxSimpleTableContainer(preferences);
 
@@ -25,6 +26,17 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* 
pParent, const SfxItemSet
 
 WinBits nBits = WB_SCROLL | WB_SORT;
 pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
+//FIXME use define's for ItemID's, InsertItem(itemID, text, nsize, winbits)
+HeaderBar rBar = pPrefBox-GetTheHeaderBar();
+rBar.InsertItem( 1, getFixedText(preference)-GetText(), 0, HIB_LEFT | 
HIB_VCENTER );
+rBar.InsertItem( 2, getFixedText(status)-GetText(), 0,  HIB_LEFT | 
HIB_VCENTER );
+rBar.InsertItem( 3, getFixedText(type)-GetText(), 0,  HIB_LEFT | 
HIB_VCENTER );
+rBar.InsertItem( 4, getFixedText(value)-GetText(), 0,  HIB_LEFT | 
HIB_VCENTER );
+//FIXME this numbers are just for testing purposes implement this better 
and more dynamic way.
+long aTabs[] = {12,12,12,12};
+
+pPrefBox-SetTabs(aTabs, MAP_PIXEL);
+
 }
 
 CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
diff --git a/cui/source/options/optaboutconfig.hxx 
b/cui/source/options/optaboutconfig.hxx
index e0d8815..6848a8f 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -24,8 +24,7 @@ class CuiAboutConfigTabPage : public SfxTabPage
 {
 private:
 SvxSimpleTableContainer* m_pPrefCtrl;
-//In case of tab page we can think a revert button
-//PushButton* m_pDefaultBtn
+PushButton* m_pDefaultBtn;
 PushButton* m_pEditBtn;
 
 ::svx::OptHeaderTabListBox* pPrefBox;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Tomaž Vajngerl

 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 926275d07184d441b3bfa1ceca26c4c1f2bc61db
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Wed Jul 3 22:05:30 2013 +0200

Compiler error fixes in PolynomialRegressionCurveCalculator

Change-Id: Ie78e10fea0b798fae5ce2cee96798bcc65bbccbe

diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index 50de7d3..ce64ed6 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -21,6 +21,7 @@
 #include macros.hxx
 #include RegressionCalculationHelper.hxx
 
+#include cmath
 #include rtl/math.hxx
 #include rtl/ustrbuf.hxx
 #include gauss.hxx
@@ -72,17 +73,17 @@ void SAL_CALL 
PolynomialRegressionCurveCalculator::recalculateRegression(
 for (sal_Int32 j = 0; j  aNumberOfPowers; j++)
 {
 if (mForceIntercept)
-aPowers[j] += std::pow(x, j + 2);
+aPowers[j] += std::pow(x, (int) j + 2);
 else
-aPowers[j] += std::pow(x, j);
+aPowers[j] += std::pow(x, (int) j);
 }
 
 for (sal_Int32 j = 0; j  aNoElements; j++)
 {
 if (mForceIntercept)
-aMatrix[j * aNoRows + aNoElements] += std::pow(x, j + 1) * ( y 
- mInterceptValue );
+aMatrix[j * aNoRows + aNoElements] += std::pow(x, (int) j + 1) 
* ( y - mInterceptValue );
 else
-aMatrix[j * aNoRows + aNoElements] += std::pow(x, j) * y;
+aMatrix[j * aNoRows + aNoElements] += std::pow(x, (int) j) * y;
 }
 
 yAverage += y;
@@ -143,7 +144,7 @@ double SAL_CALL 
PolynomialRegressionCurveCalculator::getCurveValue( double x )
 fResult = 0.0;
 for (size_t i = 0; imResult.size(); i++)
 {
-fResult += mResult[i] * std::pow(x, i);
+fResult += mResult[i] * std::pow(x, (int) i);
 }
 return fResult;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Tomaž Vajngerl

 chart2/source/inc/LinearRegressionCurveCalculator.hxx |3 +-
 chart2/source/inc/RegressionCurveCalculator.hxx   |3 +-
 chart2/source/tools/LinearRegressionCurveCalculator.cxx   |   10 
 chart2/source/tools/RegressionCurveCalculator.cxx |3 +-
 offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl |   16 ++
 xmloff/source/chart/SchXMLSeries2Context.cxx  |5 ++--
 6 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 27a4d5597c0757611d0e2e682d0c05441859cc4e
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Wed Jul 3 22:44:22 2013 +0200

Fixes to compiler errors, setRegressionProperties description.

Change-Id: I40ef93746e5f2a43ce58f0080db0b643e22404a1

diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx 
b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index 79c6d5d..add9825 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -36,7 +36,8 @@ private:
 sal_Int32 aDegree,
 sal_Bool  aForceIntercept,
 doubleaInterceptValue,
-sal_Int32 aPeriod);
+sal_Int32 aPeriod)
+throw (com::sun::star::uno::RuntimeException);
 
 virtual com::sun::star::uno::Sequence 
com::sun::star::geometry::RealPoint2D  SAL_CALL getCurveValues(
 double min,
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx 
b/chart2/source/inc/RegressionCurveCalculator.hxx
index a8cf124..347492c 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -62,7 +62,8 @@ protected:
 sal_Int32 aDegree,
 sal_Bool  aForceIntercept,
 doubleaInterceptValue,
-sal_Int32 aPeriod);
+sal_Int32 aPeriod)
+throw (com::sun::star::uno::RuntimeException);
 
 virtual void SAL_CALL recalculateRegression(
 const com::sun::star::uno::Sequence double  aXValues,
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx 
b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 07c19a4..ec32892 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -26,7 +26,6 @@
 
 using namespace ::com::sun::star;
 
-
 namespace chart
 {
 
@@ -38,10 +37,11 @@ 
LinearRegressionCurveCalculator::~LinearRegressionCurveCalculator()
 {}
 
 void LinearRegressionCurveCalculator::setRegressionProperties(
-sal_Int32 /*aDegree*/,
-sal_Bool  aForceIntercept,
-doubleaInterceptValue,
-sal_Int32 aPeriod)
+sal_Int32 /*aDegree*/,
+sal_Bool  aForceIntercept,
+doubleaInterceptValue,
+sal_Int32 aPeriod )
+throw (uno::RuntimeException)
 {
 PolynomialRegressionCurveCalculator::setRegressionProperties(
 1,
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx 
b/chart2/source/tools/RegressionCurveCalculator.cxx
index 8337d95..771cf76 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -73,7 +73,8 @@ void RegressionCurveCalculator::setRegressionProperties(
 sal_Int32   aDegree,
 sal_BoolaForceIntercept,
 double  aInterceptValue,
-sal_Int32   aPeriod)
+sal_Int32   aPeriod )
+throw (uno::RuntimeException)
 {
 mDegree = aDegree;
 mForceIntercept = aForceIntercept;
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl 
b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
index 506475a..efb57ad 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
@@ -36,7 +36,23 @@ module chart2
 
 interface XRegressionCurveCalculator : com::sun::star::uno::XInterface
 {
+/** set calculation properties for curve calculation.
 
+@param degree
+Degree of polynomial regression curve, value should be greater 
than zero
+If the curve is not polynomial, this property has no effect.
+
+@param period
+Period of a moving average regression curve, value should greater 
or equal to 2
+If the curve is not moving average regression curve, this property 
has no effect.
+
+@param forceIntercept
+Should force the intercept value.
+
+@param interceptValue
+Intercept value.
+
+*/
 void setRegressionProperties( [in] long degree,
   [in] boolean forceIntercept,
   [in] double interceptValue,
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx 
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index e01a8ae1..a955d32 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -871,7 +871,7 @@ void

[PUSHED] module rsc: String, bool and other clean-up.

2013-07-03 Thread Norbert Thiebaud (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4690

Approvals:
  LibreOffice gerrit bot: Verified
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dcde42e6068631a5a643961a764df86dc63dca2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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

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

2013-07-03 Thread Tomaž Vajngerl

 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit e14e818ac3b890ee35c7be349ae39e8e3bdc277d
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Wed Jul 3 23:00:43 2013 +0200

Polynomial curve equation: show x^1 as x

Change-Id: I86ff9b5cc2f3fa60533794ed9ecd1175924c1d25

diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index ce64ed6..19d224d 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -189,8 +189,15 @@ OUString 
PolynomialRegressionCurveCalculator::ImplGetRepresentation(
 
 if(i  0)
 {
-aBuf.appendAscii( x^ );
-aBuf.append(i);
+if (i == 1)
+{
+aBuf.appendAscii( x );
+}
+else
+{
+aBuf.appendAscii( x^ );
+aBuf.append(i);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Julien Nabet

 forms/source/misc/InterfaceContainer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16f72241f7649c2b4cd4f704c225e1fed39d0081
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Jul 4 00:00:18 2013 +0200

Try to fix clang tinderbox

Change-Id: I48124ea0f617396d92f82e4afd8b84a162af2862

diff --git a/forms/source/misc/InterfaceContainer.cxx 
b/forms/source/misc/InterfaceContainer.cxx
index c8c3cf6..9e91c2b8 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -593,7 +593,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference 
XObjectInputStream 
 }
 catch( const Exception )
 {
-SAL_WARN(forms, OInterfaceContainerHelper::read: 
reading succeeded, but not inserting! );
+SAL_WARN(forms.misc, OInterfaceContainerHelper::read: 
reading succeeded, but not inserting! );
 // create a placeholder
 xElement = xElement.query( lcl_createPlaceHolder( 
m_xContext ) );
 if ( !xElement.is() )
@@ -1136,7 +1136,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const 
OUString _rName, const An
 }
 catch( const Exception )
 {
-SAL_WARN(forms, OInterfaceContainer::insertByName: caught an 
exception! );
+SAL_WARN(forms.misc, OInterfaceContainer::insertByName: caught an 
exception! );
 }
 implInsert( m_aItems.size(), xElementProps, sal_True, 
aElementMetaData.get(), sal_True );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-07-03 Thread Julien Nabet

 offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl |2 +-
 offapi/com/sun/star/table/AccessibleCellView.idl|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e5c9bdcddb590902ab2d79c379f9659d52a7f9e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Jul 4 00:38:39 2013 +0200

Fix some idl descriptions

Change-Id: I214c52649f6bd72daf56f11a42962ae5e7585b57

diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl 
b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index cae0daa..7673927 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -44,7 +44,7 @@ service AccessibleSpreadsheetPageView
 liThe children returned by
 
::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
 all support the interface XAccessible. Calling
-
::com::sun::star::accessibility::XAccessibleContext::getAccessibleContext()
+
::com::sun::star::accessibility::XAccessible::getAccessibleContext()
 for these children returns
 an object that supports one of the following services./li
 ul
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl 
b/offapi/com/sun/star/table/AccessibleCellView.idl
index 13d5495..d09f00b 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -48,7 +48,7 @@ service AccessibleCellView
 liThe children returned by
 
::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild()
 all support the interface XAccessible. Calling
-
::com::sun::star::accessibility::XAccessibleContext::getAccessibleContext()
+
::com::sun::star::accessibility::XAccessible::getAccessibleContext()
 for these children returns an object that supports the service
 ::com::sun::star::text::AccessibleParagraphView:
 A child of this kind is returned for every paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Julien Nabet

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

New commits:
commit 8a0c3a8e240d0ff44c07ecc946759726fdb605ad
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Jul 4 00:41:39 2013 +0200

Add log area forms.misc

Change-Id: I8adedda46bb56022d317b04ad162a41c95261165

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a5d7517..d70665a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -133,6 +133,7 @@ certain functionality.
 @section forms
 
 @li @c forms.component
+@li @c forms.misc
 @li @c forms.runtime
 
 @section formula
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-03 Thread Ivan Timofeev

 vcl/source/control/scrbar.cxx|4 ++--
 vcl/source/gdi/salgdilayout.cxx  |4 ++--
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 6d16423a82847c82f6915f03cdd0179c42d23929
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Jun 24 22:55:55 2013 +0400

fdo#66335: fix fdo#44582 and fdo#63254 differently

This combines the following cherry picked commits:

1) fdo#66335: gtk: Revert hacks for RTL scrollbars

returning false here in getNativeControlRegion results in a fallback to
square buttons in vcl scrollbar code. But there is no problem in gtk+ 
backend
in this case, let's fix the problem differently.

This reverts commits 898a3e84807bccbb876e3f5583728f6d24e05e9a and
e8e82bd2109b82ddd535cdac30303249c6b62942.

(cherry picked from commit 48e1d9c7afe5c2a39d9a08d7a38f7c8ff39d8c84)

2) fdo#44582: fix scrollbars in RTL UI

(cherry picked from commit e3a801e2454eed2e61202bbacca01fe3fcc20c1d)

3) fdo#63254: correct re-mirroring formula

This patch fixes horizontal scrollbar in Calc when a sheet is RTL and UI is 
LTR.

When a particular window (horizontal scrollbar in this case) is RTL and a 
whole
UI is LTR this code used for mirroring and re-mirroring back coordinates. 
AFAICS
mirroring is correct, but re-mirroring is not.

The used formula comes from commit 
69b684b12e42bf1396bdffca88ca880ac3c2e00b, and
the same formula appears in the other variant of overloaded function 
mirror:
 mirror(sal_uInt32, const SalPoint*, SalPoint*, const OutputDevice*, bool),
but it does not affect the bug.

(cherry picked from commit a08f579e3704fbd97590f9b050d250ae445725a7)

Change-Id: If23ae46f1286048808faf878953dfa65e67d1962
Reviewed-on: https://gerrit.libreoffice.org/4621
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Reviewed-by: Abdulaziz A Alayed aala...@kacst.edu.sa
Tested-by: Abdulaziz A Alayed aala...@kacst.edu.sa

diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b326915..d283daf 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -317,9 +317,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
 
 if ( GetStyle()  WB_HORZ )
 {
-if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
+if ( GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()? 
PART_BUTTON_RIGHT: PART_BUTTON_LEFT,
 aControlRegion, 0, ImplControlValue(), OUString(), 
aBoundingRegion, aBtn1Region ) 
- GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
+ GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()? 
PART_BUTTON_LEFT: PART_BUTTON_RIGHT,
 aControlRegion, 0, ImplControlValue(), OUString(), 
aBoundingRegion, aBtn2Region ) )
 {
 maBtn1Rect = aBtn1Region;
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 01137b6..f8c3d1c 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -107,7 +107,7 @@ void SalGraphics::mirror( long x, const OutputDevice 
*pOutDev, bool bBack ) con
 {
 long devX = pOutDevRef-GetOutOffXPixel();   // re-mirrored 
mnOutOffX
 if( bBack )
-x = x - pOutDevRef-GetOutputWidthPixel() + devX - 
pOutDevRef-GetOutOffXPixel() + 1;
+x = devX + (pOutDevRef-GetOutputWidthPixel() + devX) - (x 
+ 1);
 else
 x = pOutDevRef-GetOutputWidthPixel() - (x - devX) + 
pOutDevRef-GetOutOffXPixel() - 1;
 }
@@ -143,7 +143,7 @@ void SalGraphics::mirror( long x, long nWidth, const 
OutputDevice *pOutDev, bo
 {
 long devX = pOutDevRef-GetOutOffXPixel();   // re-mirrored 
mnOutOffX
 if( bBack )
-x = x - pOutDevRef-GetOutputWidthPixel() + devX - 
pOutDevRef-GetOutOffXPixel() + nWidth;
+x = devX + (pOutDevRef-GetOutputWidthPixel() + devX) - (x 
+ nWidth);
 else
 x = pOutDevRef-GetOutputWidthPixel() - (x - devX) + 
pOutDevRef-GetOutOffXPixel() - nWidth;
 }
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 370a406..d8c645a 100755
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1048,13 +1048,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
 if (!rNativeContentRegion.GetHeight())
 rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-//fdo#63254 horizontal

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

2013-07-03 Thread Khaled Hosny

 include/sal/log-areas.dox   |2 +-
 vcl/generic/glyphs/gcach_layout.cxx |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e703b429cf448deddc7682a33c3e6221889efe98
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Jul 4 01:23:38 2013 +0200

Minor

Change-Id: I6a9f34e6da1344e718ef5c8dc136fac7244b0f47

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d70665a..4e0d8ab 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -297,7 +297,7 @@ certain functionality.
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
 @li @c vcl.gtk - Gtk+ 2/3 plugin
-@li @c vcl.harfbuzz.layout
+@li @c vcl.harfbuzz - HarfBuzz text layout
 @li @c vcl.headless - bitmap-based backend
 @li @c vcl.kde - KDE
 @li @c vcl.kde4 - KDE4
diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 0f69e59..c76bda6 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -148,7 +148,7 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, 
hb_tag_t nTableTag, void* pU
 
 ServerFont* pFont = (ServerFont*) pUserData;
 
-SAL_INFO(vcl.harfbuzz.layout, getFontTable(  pFont  ,   
pTagName  ));
+SAL_INFO(vcl.harfbuzz, getFontTable(  pFont  ,   pTagName  
));
 
 sal_uLong nLength;
 const unsigned char* pBuffer = pFont-GetTable(pTagName, nLength);
@@ -221,7 +221,7 @@ static hb_position_t getGlyphKerningH(hb_font_t* /*font*/, 
void* pFontData,
 ServerFont* pFont = (ServerFont*) pFontData;
 FT_Face aFace = pFont-GetFtFace();
 
-SAL_INFO(vcl.harfbuzz.layout, getGlyphKerningH(  pFont  ,   
nGlyphIndex1  ,   nGlyphIndex2  ));
+SAL_INFO(vcl.harfbuzz, getGlyphKerningH(  pFont  ,   
nGlyphIndex1  ,   nGlyphIndex2  ));
 
 FT_Error error;
 FT_Vector kerning;
@@ -252,7 +252,7 @@ static hb_bool_t getGlyphExtents(hb_font_t* /*font*/, void* 
pFontData,
 ServerFont* pFont = (ServerFont*) pFontData;
 FT_Face aFace = pFont-GetFtFace();
 
-SAL_INFO(vcl.harfbuzz.layout, getGlyphExtents(  pFont  ,   
nGlyphIndex  ));
+SAL_INFO(vcl.harfbuzz, getGlyphExtents(  pFont  ,   
nGlyphIndex  ));
 
 FT_Error error;
 error = FT_Load_Glyph(aFace, nGlyphIndex, FT_LOAD_DEFAULT);
@@ -276,7 +276,7 @@ static hb_bool_t getGlyphContourPoint(hb_font_t* /*font*/, 
void* pFontData,
 ServerFont* pFont = (ServerFont*) pFontData;
 FT_Face aFace = pFont-GetFtFace();
 
-SAL_INFO(vcl.harfbuzz.layout, getGlyphContourPoint(  pFont  ,  
 nGlyphIndex  ,   nPointIndex  ));
+SAL_INFO(vcl.harfbuzz, getGlyphContourPoint(  pFont  ,   
nGlyphIndex  ,   nPointIndex  ));
 
 FT_Error error;
 error = FT_Load_Glyph(aFace, nGlyphIndex, FT_LOAD_DEFAULT);
@@ -350,7 +350,7 @@ bool HbLayoutEngine::layout(ServerFontLayout rLayout, 
ImplLayoutArgs rArgs)
 ServerFont rFont = rLayout.GetServerFont();
 FT_Face aFtFace = rFont.GetFtFace();
 
-SAL_INFO(vcl.harfbuzz.layout, layout(  this  ,rArgs=  rArgs  
));
+SAL_INFO(vcl.harfbuzz, layout(  this  ,rArgs=  rArgs  ));
 
 hb_font_t *pHbFont = hb_font_create(mpHbFace);
 hb_font_set_funcs(pHbFont, getFontFuncs(), rFont, NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/qa sc/source

2013-07-03 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx|   66 +--
 sc/source/core/data/column3.cxx |   75 
 2 files changed, 102 insertions(+), 39 deletions(-)

New commits:
commit 0505e1abb5e5a91165594ecd9551e1c606076d2c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 19:32:31 2013 -0400

More test on shared formula group adjustment on value insertions.

Change-Id: Icaa48ef790cd71abdfc1d026ac912a88f727c0d5

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6221b62..d29aa89 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -54,6 +54,7 @@
 #include tokenarray.hxx
 #include scopetools.hxx
 #include dociter.hxx
+#include editutil.hxx
 
 #include formula/IFunctionDescription.hxx
 
@@ -6434,6 +6435,38 @@ void Test::testSharedFormulas()
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(14), pFC-GetSharedTopRow());
 CPPUNIT_ASSERT_EQUAL(static_castSCROW(4), pFC-GetSharedLength());
 
+// Set numeric value to B15, to make B16:B18 shared.
+aPos.SetRow(14);
+m_pDoc-SetValue(aPos, 1.2);
+aPos.SetRow(15);
+pFC = m_pDoc-GetFormulaCell(aPos);
+// B16:B18 should be shared.
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(15), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), pFC-GetSharedLength());
+
+// Set string value to B16 to make B17:B18 shared.
+aPos.SetRow(15);
+ScCellValue aCell(Test);
+CPPUNIT_ASSERT_MESSAGE(This should be a string value., aCell.meType == 
CELLTYPE_STRING);
+aCell.commit(*m_pDoc, aPos);
+CPPUNIT_ASSERT_EQUAL(*aCell.mpString, m_pDoc-GetString(aPos));
+aPos.SetRow(16);
+pFC = m_pDoc-GetFormulaCell(aPos);
+// B17:B18 should be shared.
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(16), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), pFC-GetSharedLength());
+
+// Set edit text to B17. Now B18 should be non-shared.
+ScFieldEditEngine rEditEngine = m_pDoc-GetEditEngine();
+rEditEngine.SetText(Edit Text);
+aPos.SetRow(16);
+m_pDoc-SetEditText(aPos, rEditEngine.CreateTextObject());
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, m_pDoc-GetCellType(aPos));
+aPos.SetRow(17);
+pFC = m_pDoc-GetFormulaCell(aPos);
+CPPUNIT_ASSERT_MESSAGE(B18 should be a formula cell., pFC);
+CPPUNIT_ASSERT_MESSAGE(B18 should be non-shared., !pFC-IsShared());
+
 m_pDoc-DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index aa9fb88..38dbd15 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1764,7 +1764,6 @@ void ScColumn::SetEditText( SCROW nRow, EditTextObject* 
pEditText )
 sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
 maCells.set(it, nRow, pEditText);
 maCellTextAttrs.set(nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 BroadcastNewCell(nRow);
@@ -1776,7 +1775,6 @@ void ScColumn::SetEditText( sc::ColumnBlockPosition 
rBlockPos, SCROW nRow, Edit
 rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, pEditText);
 rBlockPos.miCellTextAttrPos = maCellTextAttrs.set(
 rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 BroadcastNewCell(nRow);
@@ -2286,7 +2284,6 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 
nError)
 sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
 it = maCells.set(it, nRow, pCell);
 maCellTextAttrs.set(nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 ActivateNewFormulaCell(it, nRow, *pCell);
@@ -2300,7 +2297,6 @@ void ScColumn::SetRawString( SCROW nRow, const OUString 
rStr, bool bBroadcast )
 sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
 maCells.set(it, nRow, rStr);
 maCellTextAttrs.set(nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 if (bBroadcast)
@@ -2317,7 +2313,6 @@ void ScColumn::SetRawString(
 rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, rStr);
 rBlockPos.miCellTextAttrPos = maCellTextAttrs.set(
 rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 if (bBroadcast)
@@ -2332,7 +2327,6 @@ void ScColumn::SetValue( SCROW nRow, double fVal )
 sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
 maCells.set(it, nRow, fVal);
 maCellTextAttrs.set(nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 BroadcastNewCell(nRow);
@@ -2348,7 +2342,6 @@ void ScColumn::SetValue(
 rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, fVal);
 rBlockPos.miCellTextAttrPos = maCellTextAttrs.set(
 rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr());
-RegroupFormulaCells(nRow);
 CellStorageModified();
 
 if

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

2013-07-03 Thread Takeshi Abe

 svx/source/dialog/svxbmpnumvalueset.cxx |2 +-
 svx/source/fmcomp/fmgridif.cxx  |4 ++--
 svx/source/form/ParseContext.cxx|2 +-
 svx/source/form/fmundo.cxx  |2 +-
 svx/source/stbctrls/zoomctrl.cxx|2 +-
 svx/source/xml/xmlgrhlp.cxx |2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit be8aee915815ba77c366d88c07626787e2f74443
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jul 4 09:45:49 2013 +0900

Mark as const

Change-Id: I24f04c541af1b93115781b4f4be4f01f137c481b

diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx 
b/svx/source/dialog/svxbmpnumvalueset.cxx
index e909321..7951fe3 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -127,7 +127,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 
nNumberingType,
 }
 void  SvxNumValueSet::UserDraw( const UserDrawEvent rUDEvt )
 {
-static sal_uInt16 aLinesArr[] =
+static const sal_uInt16 aLinesArr[] =
 {
 15, 10,
 20, 30,
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 53781d2..32350b7 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1272,7 +1272,7 @@ void FmXGridPeer::removeModifyListener(const Reference 
::com::sun::star::util::
 Sequence sal_Bool  SAL_CALL FmXGridPeer::queryFieldDataType( const Type 
xType ) throw(RuntimeException)
 {
 // eine 'Konvertierungstabelle'
-static sal_Bool bCanConvert[LAST_KNOWN_TYPE][4] =
+static const sal_Bool bCanConvert[LAST_KNOWN_TYPE][4] =
 {
 { sal_False, sal_False, sal_False, sal_False }, //  
FormComponentType::CONTROL
 { sal_False, sal_False, sal_False, sal_False }, //  
FormComponentType::COMMANDBUTTON
@@ -2767,7 +2767,7 @@ Sequence ::com::sun::star::util::URL 
FmXGridPeer::getSupportedURLs()
 static Sequence ::com::sun::star::util::URL aSupported;
 if (aSupported.getLength() == 0)
 {
-static OUString sSupported[] = {
+static const OUString sSupported[] = {
 FMURL_RECORD_MOVEFIRST,
 FMURL_RECORD_MOVEPREV,
 FMURL_RECORD_MOVENEXT,
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 49017c4..1e4dd6e 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -128,7 +128,7 @@ OString 
OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) con
 // 
-
 IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const 
OString rToken) const
 {
-static IParseContext::InternationalKeyCode Intl_TokenID[] =
+static const IParseContext::InternationalKeyCode Intl_TokenID[] =
 {
 KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE,
 KEY_FALSE, KEY_IS, KEY_BETWEEN, KEY_OR,
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index b66d2ed..db3f1f2 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -555,7 +555,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const 
PropertyChangeEvent evt)
 return;
 
 // if it's a default value property of a control model, set the 
according value property
-static OUString pDefaultValueProperties[] = {
+static const OUString pDefaultValueProperties[] = {
 OUString(FM_PROP_DEFAULT_TEXT), OUString(FM_PROP_DEFAULTCHECKED), 
OUString(FM_PROP_DEFAULT_DATE), OUString(FM_PROP_DEFAULT_TIME),
 OUString(FM_PROP_DEFAULT_VALUE), 
OUString(FM_PROP_DEFAULT_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_DEFAULT)
 };
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 8ad0c2e..80db8d4 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -57,7 +57,7 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 
nValueSet )
 
 nZoom( nZ )
 {
-static sal_uInt16 aTable[] =
+static const sal_uInt16 aTable[] =
 {
 SVX_ZOOM_ENABLE_50, ZOOM_50,
 SVX_ZOOM_ENABLE_100,ZOOM_100,
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3eaf770..99d5548 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -463,7 +463,7 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const 
String rFileName ) con
 const char* pMimeType;
 };
 
-static XMLGraphicMimeTypeMapper aMapper[] =
+static const XMLGraphicMimeTypeMapper aMapper[] =
 {
 { gif, image/gif },
 { png, image/png },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

2013-07-03 Thread Kohei Yoshida

 sc/source/core/data/column.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 697a73b070b2be75685dc6f1c2c695064a4d6148
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 21:34:13 2013 -0400

These methods shouldn't affect formula grouping.

They only change sheet index values in all formula cells uniformly;
they should not affect how they are grouped.

Change-Id: Ie05152de1d6fc5799145e5721c57fd74f8f58239

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 6a2dbd3..2ec0647 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2782,10 +2782,7 @@ void ScColumn::UpdateDeleteTab(SCTAB nDelPos, bool 
bIsMove, ScColumn* /*pRefUndo
 DeleteTabUpdater aFunc(maCellTextAttrs, nDelPos, nSheets, nTab, bIsMove);
 sc::ProcessFormulaEditText(maCells, aFunc);
 if (aFunc.isModified())
-{
-RegroupFormulaCells();
 CellStorageModified();
-}
 }
 
 void ScColumn::UpdateInsertTabAbs(SCTAB nNewPos)
@@ -2793,10 +2790,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nNewPos)
 InsertAbsTabUpdater aFunc(maCellTextAttrs, nTab, nNewPos);
 sc::ProcessFormulaEditText(maCells, aFunc);
 if (aFunc.isModified())
-{
-RegroupFormulaCells();
 CellStorageModified();
-}
 }
 
 void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
@@ -2807,10 +2801,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB 
nNewPos, SCTAB nTabNo )
 MoveTabUpdater aFunc(maCellTextAttrs, nTab, nOldPos, nNewPos);
 sc::ProcessFormulaEditText(maCells, aFunc);
 if (aFunc.isModified())
-{
-RegroupFormulaCells();
 CellStorageModified();
-}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

2013-07-03 Thread Kohei Yoshida

 sc/source/core/data/column.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9e559f4e73ef0a0a90822d0cd5644d8ebc7ed01f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 21:38:53 2013 -0400

???

Change-Id: Id13bf81cd65fdc0677832993bded37e08f226c0d

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 2ec0647..68f7aa3 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2015,8 +2015,7 @@ void ScColumn::CopyScenarioTo( ScColumn rDestCol ) const
 if ( ((ScMergeFlagAttr)pPattern-GetItem( ATTR_MERGE_FLAG 
)).IsScenario() )
 {
 rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS );
-((ScColumn*)this)-
-CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, 
rDestCol);
+CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, rDestCol);
 
 //  UpdateUsed not needed, is already done in TestCopyScenario 
(obsolete comment ?)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source

2013-07-03 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx|   42 
 sc/source/core/data/column.cxx  |1 
 sc/source/core/data/column3.cxx |   32 ++
 3 files changed, 66 insertions(+), 9 deletions(-)

New commits:
commit da05371a0ead3feff4b9fc237a80f5b2307cf6cd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 3 22:48:31 2013 -0400

Adjust formula grouping on range deletion.

Change-Id: Id3c2cd0a3cffa299c8424f9c9e4989ce8bd60719

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d29aa89..baf957f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6467,7 +6467,49 @@ void Test::testSharedFormulas()
 CPPUNIT_ASSERT_MESSAGE(B18 should be a formula cell., pFC);
 CPPUNIT_ASSERT_MESSAGE(B18 should be non-shared., !pFC-IsShared());
 
+// Set up a new group for shared formulas in B2:B10.
+clearRange(m_pDoc, ScRange(0,0,0,2,100,0));
+
+aPos.SetRow(1);
+m_pDoc-SetString(aPos, =A2*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A3*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A4*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A5*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A6*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A7*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A8*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A9*10);
+aPos.IncRow();
+m_pDoc-SetString(aPos, =A10*10);
+
+pFC = m_pDoc-GetFormulaCell(aPos);
+CPPUNIT_ASSERT_MESSAGE(B10 should be a formula cell., pFC);
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(1), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(9), pFC-GetSharedLength());
+
+// Delete A4:B8. This should splite the grouping to B2:B3 and B9:B10.
+clearRange(m_pDoc, ScRange(0,3,0,1,7,0));
+aPos.SetRow(1);
+pFC = m_pDoc-GetFormulaCell(aPos);
+CPPUNIT_ASSERT_MESSAGE(B2 should be a formula cell., pFC);
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(1), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), pFC-GetSharedLength());
+
+aPos.SetRow(8);
+pFC = m_pDoc-GetFormulaCell(aPos);
+CPPUNIT_ASSERT_MESSAGE(B9 should be a formula cell., pFC);
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(8), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), pFC-GetSharedLength());
+
 m_pDoc-DeleteTab(0);
+
 }
 
 namespace {
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 68f7aa3..bdfde88 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2808,7 +2808,6 @@ void ScColumn::UpdateCompile( bool bForceIfNameInUse )
 {
 UpdateCompileHandler aFunc(bForceIfNameInUse);
 sc::ProcessFormula(maCells, aFunc);
-RegroupFormulaCells();
 }
 
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 38dbd15..203bb96 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -739,17 +739,33 @@ class EmptyCells
 ScColumn mrColumn;
 sc::ColumnBlockPosition mrPos;
 sc::CellStoreType::iterator miPos;
-sc::CellStoreType mrCells;
-sc::CellTextAttrStoreType mrAttrs;
+
+void splitFormulaGrouping(sc::CellStoreType rCells, const 
sc::CellStoreType::position_type rPos)
+{
+if (rPos.first-type == sc::element_type_formula)
+{
+ScFormulaCell rCell = *sc::formula_block::at(*rPos.first-data, 
rPos.second);
+mrColumn.UnshareFormulaCell(rPos, rCell);
+}
+}
+
 public:
-EmptyCells(sc::ColumnBlockPosition rPos, ScColumn rColumn, 
sc::CellStoreType rCells, sc::CellTextAttrStoreType rAttrs) :
-mrColumn(rColumn), mrPos(rPos), mrCells(rCells), mrAttrs(rAttrs) {}
+EmptyCells(sc::ColumnBlockPosition rPos, ScColumn rColumn) :
+mrColumn(rColumn), mrPos(rPos) {}
 
 void operator() (const sc::SingleColumnSpanSet::Span rSpan)
 {
-mrPos.miCellPos = mrCells.set_empty(mrPos.miCellPos, rSpan.mnRow1, 
rSpan.mnRow2);
-mrPos.miCellTextAttrPos = mrAttrs.set_empty(mrPos.miCellTextAttrPos, 
rSpan.mnRow1, rSpan.mnRow2);
-mrColumn.RegroupFormulaCells(rSpan.mnRow1, rSpan.mnRow2);
+sc::CellStoreType rCells = mrColumn.GetCellStore();
+
+// First, split formula grouping at the top and bottom boundaries
+// before emptying the cells.
+sc::CellStoreType::position_type aPos = 
rCells.position(mrPos.miCellPos, rSpan.mnRow1);
+splitFormulaGrouping(rCells, aPos);
+aPos = rCells.position(aPos.first, rSpan.mnRow2);
+splitFormulaGrouping(rCells, aPos);
+
+mrPos.miCellPos = rCells.set_empty(mrPos.miCellPos, rSpan.mnRow1, 
rSpan.mnRow2);
+mrPos.miCellTextAttrPos = 
mrColumn.GetCellAttrStore().set_empty(mrPos.miCellTextAttrPos, rSpan.mnRow1, 
rSpan.mnRow2);
 }
 };
 
@@ -783,7 +799,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, 
sal_uInt16 nDelFlag)

[Libreoffice-qa] [ANNOUNCE] Branch libreoffice-4-1-0 and Tag libreoffice-4.1.0.2 created

2013-07-03 Thread Christian Lohmaier

Hi all,

The tag libreoffice-4.1.0.2 (AKA 4.1.0 RC2) and the corresponding
branch libreoffice-4-1-0 have been created.
The branch will be used for fine tuning of the 4.1.0 release. (there
is one additional RC planned)

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-4-1 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-4-1' branch is still active and will be used for the
4.1.1 bugfix release. Please read more at

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

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-1-0 origin/libreoffice-4-1-0

To checkout the tag, use

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

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-4-1-0 when you have switched to it.  This will
save you some git shouting at you.

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

Attached is the list of changes against RC1

Happy hacking,
Christian


bugs-changelog-libreoffice-4-1-0-release-4.1.0.2.log
Description: Binary data


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


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


commits-libreoffice-4-1-0-release-4.1.0.2.log
Description: Binary data
___
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-qa] Fwd: Bug submission Assistant

2013-07-03 Thread Jean Spiteri

Can anyone tell me the database schema of the 'versions' table of our
Bugzilla? I am investigating whether I can stretch my skills to do it.
Also, where can I make a new query to get the 'inactive' status of each
version?

Sincerely,
Jean Spiteri. *
*


On Sat, Jun 22, 2013 at 3:01 PM, Rob Snelders libreoff...@ertai.nl wrote:

 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1

 Hi Jean,

 You can't really create a VM. That is a problem at the moment.

 The pages [1] and [2] have information how the BSA works. Please
 remember that some information is old and needs to be revised.

 If you use [3] then you can different parts of the page and how they
 work. That you can also run on a local build. That is the most that
 you can work.

 The were also unit-tests at [4] but they broke a long while ago and
 still need fixing. But I never really looked into that.

 Hopefully this gives more background. Please let me know when you have
 more questions.

 - --
 Greetings,
 Rob Snelders

 [1]: https://wiki.documentfoundation.org/Bug_Submission_Assistant
 [2]: https://wiki.documentfoundation.org/QA/BSA/Implementation
 [3]:
 https://bugassistant.libreoffice.org/libreoffice/bug/bug.html?skin=login
 [4]: https://bugassistant.libreoffice.org/libreoffice/bug/test.html

 Op 22-06-13 13:50, Jean Spiteri schreef:
  In order to help me, can I make a copy of the bug assistant in a
  VM? If yes, how?
 
  Sincerely, Jean Spiteri. * *
 
 
  On Fri, Jun 21, 2013 at 5:43 PM, Robinson Tryon
  bishop.robin...@gmail.com mailto:bishop.robin...@gmail.com
  wrote:
 
  On Fri, Jun 21, 2013 at 10:35 AM, Jean Spiteri
  beimaginativeegr...@gmail.com
  mailto:beimaginativeegr...@gmail.com wrote:
  From what I have understood, the versions are got via a file
  named: version.xhtml. Is this correct or not?
 
  The processed version #s are formatted and then saved in
  version.xhtml. They are slurped from the query.cgi page that is
  downloaded using curl in the Makefile.
 
  Does that help?
 
  Cheers, --R
 
 

 -BEGIN PGP SIGNATURE-
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

 iQEcBAEBAgAGBQJRxaAaAAoJEGs78UIq7mKy+RsIALixh5BfvNkSwQSBph0G0VES
 0LzO+xg8rXn8m2IM0Vfdv5UIYfTgleO+8ERDMEE+q6+H4bAPSBwW3XF2tZen4IpJ
 PWtyPswNGLjKTCeYLi0ihLdF018TRMTlRuHjIHS7ETwW35frm0t/fmKlju733OXl
 S7XqlyNo/CRvvZEa4HmwV9FxJmKExJHQfH7ZbhviO+5BdhQOXGuerqJ1gDGIHdUu
 ka/gD7tcWg/0gyFQ1lLNrT1Qijo5KswMKsqmAfF79l3lZjNMlwtkpDNbgygHvpKy
 wv4aCZA5bLs+r8UT/zo0k/IXVN7mROrRVE3IHsz/mOkchXZJGJOVpDb08zDtr48=
 =BVLa
 -END PGP SIGNATURE-

___
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 66528] Hyperlinks within spreadsheet not working after upgrade from Version 4.0.2.2 to Version 4.0.4.2

2013-07-03 Thread bugzilla-daemon

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

--- Comment #5 from melin...@thebookkeepingcompany.com.au ---
This is the file that we are working on.

Have deleted the original hyperlink and re established the link but it wont
work

Melinda Koth
[PO Box 512 Logo]

From: bugzilla-dae...@freedesktop.org [mailto:bugzilla-dae...@freedesktop.org]
Sent: Wednesday, 3 July 2013 3:13 PM
To: Melinda Koth
Subject: [Bug 66528] Hyperlinks within spreadsheet not working after upgrade
from Version 4.0.2.2 to Version 4.0.4.2

Comment # 1https://bugs.freedesktop.org/show_bug.cgi?id=66528#c1 on bug
66528https://bugs.freedesktop.org/show_bug.cgi?id=66528 from
ign_christianmailto:ign_christ...@yahoo.com

Clicked using Ctrl+click?



Have you tried resetting user profile? If that still unsolve the problem,

please attach your sample file  steps to reproduce.


You are receiving this mail because:

  *   You are on the CC list for the bug.
  *   You reported the bug.

-- 
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 65627] FORMATTING: Calc unable to change decimal places after worksheet is saved and re-opened

2013-07-03 Thread bugzilla-daemon

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

Markus Mohrhard markus.mohrh...@googlemail.com changed:

   What|Removed |Added

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

--- Comment #11 from Markus Mohrhard markus.mohrh...@googlemail.com ---
Then let us assume it is fixed.

The patch has been pushed to 4-1 meanwhile so we can assume it is fixed. Please
check with 4.1.0.2

-- 
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 63521] FILESAVE: LibreOffice Draw - retaining slant and corner radius values

2013-07-03 Thread bugzilla-daemon

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

--- Comment #9 from Mohith Manoj mohith.ma...@skanray.com ---
I have confirmed this behaviour in LO 4.0.4.2 in Win7 x64

-- 
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 66506] FORMATTING: Rendering date format not correct for xls file in 4.1 LO

2013-07-03 Thread bugzilla-daemon

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard||target:4.2.0

--- Comment #9 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Markus Mohrhard committed a patch related to this issue.
It has been pushed to master:

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

xls cells have all hard number format, fdo#66506



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

-- 
You are receiving this mail because:
You are 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 66535] New: Other: Possible packaging bug in 4.1 RC1 debs

2013-07-03 Thread bugzilla-daemon

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

  Priority: medium
Bug ID: 66535
  Keywords: regression
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Other: Possible packaging bug in 4.1 RC1 debs
  Severity: normal
Classification: Unclassified
OS: Linux (All)
  Reporter: sergio.calleg...@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.1.0.1 rc
 Component: Installation
   Product: LibreOffice

Problem description: 

Trying to install one gets

Unpacking libobasis4.1-kde-integration (from
.../libobasis4.1-kde-integration_4.1.0.1-1_amd64.deb) ...
dpkg: error processing
./LibreOffice_4.1.0.1_Linux_x86-64_deb/DEBS/libobasis4.1-kde-integration_4.1.0.1-1_amd64.deb
(--install):
 trying to overwrite '/opt/libreoffice4.1/program/libkdebe1lo.so', which is
also in package libobasis4.1-core01 4.1.0.1-1


Operating System: Ubuntu
Version: 4.1.0.1 rc
Last worked in: 4.0.4.2 release

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

1 - 100 of 436 matches

Mail list logo