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

[Yousuf Philips]

 sw/source/uibase/utlui/statusbar.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1143c0e9e0ad940b339fa1f5b75f5822e02362a
Author: Yousuf Philips 
Date:   Sat Apr 25 07:37:57 2015 +0400

Add missing info of page number statusbar field in writer

Change-Id: I98ad97629f8984a24fc4ed9e6238e391c8bfa008
Reviewed-on: https://gerrit.libreoffice.org/15525
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/uibase/utlui/statusbar.src 
b/sw/source/uibase/utlui/statusbar.src
index 1424ea2..558da31 100644
--- a/sw/source/uibase/utlui/statusbar.src
+++ b/sw/source/uibase/utlui/statusbar.src
@@ -29,7 +29,7 @@ String STR_VIEWLAYOUT_BOOK
 };
 String STR_BOOKCTRL_HINT
 {
-Text [ en-US ] = "Page number in document. Click to open Navigator 
window.";
+Text [ en-US ] = "Page number in document. Click to open Navigator window 
or right-click for bookmark list.";
 };
 String STR_BOOKCTRL_HINT_EXTENDED
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx  |2 ++
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |7 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 3717ee4bdc059fe2ed912efde20fd0c965b3fca3
Author: Caolán McNamara 
Date:   Fri Apr 24 11:01:50 2015 +0100

Resolves: tdf#73211 gtk checkboxes need erase afer toggling

because an unchecked checkbox can have a smaller paint area
than a checked checkbox. This has always bugged me

(cherry picked from commit d194074aa34e3724dd9b93fbc81bf2ba793cd37a)

Conflicts:
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx

Change-Id: Iac0f075089611b47c381863a9655445d732bfddc
Reviewed-on: https://gerrit.libreoffice.org/15508
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2c6036b..828f5aa 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -538,6 +538,8 @@ void GtkData::initNWF( void )
 pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
 pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
 
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+
 if( SalGetDesktopEnvironment() == "KDE" )
 {
 // #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 0bb0c34..9d11e5e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1470,7 +1470,12 @@ bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPart nP
 return false;
 }
 
-void GtkData::initNWF() {}
+void GtkData::initNWF()
+{
+ImplSVData* pSVData = ImplGetSVData();
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+}
+
 void GtkData::deInitNWF() {}
 
 void GtkSalGraphics::getStyleContext(GtkStyleContext** style, GtkWidget* 
widget)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/dmapper/TablePropertiesHandler.cxx |   37 +
 1 file changed, 3 insertions(+), 34 deletions(-)

New commits:
commit 8166244e7354e879d16e150738e3b3dff885cab5
Author: Miklos Vajna 
Date:   Sat Apr 25 10:46:38 2015 +0200

writerfilter: remove remaining doctok bits from TablePropertiesHandler

Change-Id: I61d1907a8c3a53c526992cc615478ee57a097fb6
Reviewed-on: https://gerrit.libreoffice.org/15528
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx 
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index ac56304..52f8ea1 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -67,9 +67,8 @@ namespace dmapper {
 sal_Int32 nIntValue = ((pValue.get() != nullptr) ? pValue->getInt() : 
0);
 switch( nSprmId )
 {
-case NS_ooxml::LN_CT_TrPrBase_jc: //90706
+case NS_ooxml::LN_CT_TrPrBase_jc:
 case NS_ooxml::LN_CT_TblPrBase_jc:
-case 0x5400: // sprmTJc
 {
 sal_Int16 nOrient = 
ConversionHelper::convertTableJustification( nIntValue );
 TablePropertyMapPtr pTableMap( new TablePropertyMap );
@@ -77,17 +76,7 @@ namespace dmapper {
 insertTableProps( pTableMap );
 }
 break;
-case 0x9601: // sprmTDxaLeft
-break;
-case 0x9602: // sprmTDxaGapHalf
-{
-//m_nGapHalf = ConversionHelper::convertTwipToMM100( nIntValue 
);
-TablePropertyMapPtr pPropMap( new TablePropertyMap );
-pPropMap->setValue( TablePropertyMap::GAP_HALF, 
ConversionHelper::convertTwipToMM100( nIntValue ) );
-insertTableProps(pPropMap);
-}
-break;
-case NS_ooxml::LN_CT_TrPrBase_trHeight: //90703
+case NS_ooxml::LN_CT_TrPrBase_trHeight:
 {
 //contains unit and value
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
@@ -181,23 +170,7 @@ namespace dmapper {
 insertRowProps(pPropMap);
 }
 break;
-case 0x9407: // sprmTDyaRowHeight
-{
-// table row height - negative values indicate 'exact height' 
- positive 'at least'
-TablePropertyMapPtr pPropMap( new TablePropertyMap );
-bool bMinHeight = true;
-sal_Int16 nHeight = static_cast( nIntValue );
-if( nHeight < 0 )
-{
-bMinHeight = false;
-nHeight *= -1;
-}
-pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny(bMinHeight ? 
text::SizeType::MIN : text::SizeType::FIX ));
-pPropMap->Insert( PROP_HEIGHT, 
uno::makeAny(ConversionHelper::convertTwipToMM100( nHeight )));
-insertRowProps(pPropMap);
-}
-break;
-case NS_ooxml::LN_CT_TcPrBase_vAlign://90694
+case NS_ooxml::LN_CT_TcPrBase_vAlign:
 {
 sal_Int16 nVertOrient = text::VertOrientation::NONE;
 switch( nIntValue )
@@ -314,10 +287,6 @@ namespace dmapper {
 }
 }
 break;
-case 0xd61a : // sprmTCellTopColor
-case 0xd61b : // sprmTCellLeftColor
-case 0xd61c : // sprmTCellBottomColor
-case 0xd61d : // sprmTCellRightColor
 case NS_ooxml::LN_CT_TcPrBase_shd:
 {
 // each color sprm contains as much colors as cells are in a 
row
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 2 commits - vcl/source

[Michael Meeks]

 vcl/source/control/combobox.cxx |3 +++
 vcl/source/window/window.cxx|8 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0cde74f788a054fa2b65107a030dd463b8d11c7a
Author: Michael Meeks 
Date:   Sat Apr 25 12:16:28 2015 +0100

Make Window's inDispose map more precisely to mbInDtor.

Change-Id: I545aa03d46b0673aafe73daa23047d2a4b6936dd

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index cb457e4..a280209 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -139,9 +139,8 @@ bool Window::IsDisposed() const
 
 void Window::dispose()
 {
-mpWindowImpl->mbInDispose = true;
-
-assert( mpWindowImpl && mpWindowImpl->mbInDispose ); // should only be 
called from disposeOnce()
+assert( mpWindowImpl );
+assert( !mpWindowImpl->mbInDispose ); // should only be called from 
disposeOnce()
 assert( !mpWindowImpl->mpParent ||
 !mpWindowImpl->mpParent->IsDisposed() ||
 "vcl::Window child should have its parent disposed first" );
@@ -159,6 +158,8 @@ void Window::dispose()
 xCanvasComponent->dispose();
 }
 
+mpWindowImpl->mbInDispose = true;
+
 CallEventListeners( VCLEVENT_OBJECT_DYING );
 
 // do not send child events for frames that were registered as native 
frames
@@ -576,6 +577,7 @@ void Window::dispose()
 
 Window::~Window()
 {
+// FIXME: we should kill all LazyDeletor usage.
 vcl::LazyDeletor::Undelete( this );
 disposeOnce();
 }
commit ca7c519c6e95890deb047ea6137303b8ec55c491
Author: Michael Meeks 
Date:   Sat Apr 25 12:15:43 2015 +0100

Make combobox tolerate post-dispose usage better.

Change-Id: I5d7127bfc639591862cea91f0597ef050112b43b

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 94b8f3cfa..4606325 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -804,6 +804,9 @@ void ComboBox::Modify()
 
 void ComboBox::ImplUpdateFloatSelection()
 {
+if (!mpImplLB)
+return;
+
 // move text in the ListBox into the visible region
 mpImplLB->SetCallSelectionChangedHdl( false );
 if ( !IsMultiSelectionEnabled() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/qa/extras/chart2export.cxx|   21 
 chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx |binary
 oox/source/export/chartexport.cxx|   33 +++
 3 files changed, 54 insertions(+)

New commits:
commit 3aec78edd7e36a950866a91060f85cfcd3b4fbdd
Author: Markus Mohrhard 
Date:   Sat Apr 25 15:19:10 2015 +0200

add test for tdf#88848

Change-Id: I1ad26038db7ee386d7d6dc333e29845753ab8ec3

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 2535dcb..f087463 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -92,6 +92,7 @@ public:
 void testNoMarkerXLSX();
 void testTitleManualLayoutXLSX();
 void testPlotAreaManualLayoutXLSX();
+void testLegendManualLayoutXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -148,6 +149,7 @@ public:
 CPPUNIT_TEST(testNoMarkerXLSX);
 CPPUNIT_TEST(testTitleManualLayoutXLSX);
 CPPUNIT_TEST(testPlotAreaManualLayoutXLSX);
+CPPUNIT_TEST(testLegendManualLayoutXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1368,6 +1370,25 @@ void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
 CPPUNIT_ASSERT(nH != nW);
 }
 
+void Chart2ExportTest::testLegendManualLayoutXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode", "val", 
"edge");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode", "val", 
"edge");
+
+OUString aXVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x", "val");
+double nX = aXVal.toDouble();
+CPPUNIT_ASSERT(nX > 0 && nX < 1);
+
+OUString aYVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:y", "val");
+double nY = aYVal.toDouble();
+CPPUNIT_ASSERT(nY > 0 && nY < 1);
+CPPUNIT_ASSERT(nX != nY);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx 
b/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx
new file mode 100644
index 000..16ea011
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx differ
commit 0afab16d9afb8ccd1f089447868b25a960ec595b
Author: Markus Mohrhard 
Date:   Sat Apr 25 15:00:30 2015 +0200

support manualLayout for legends OOXML export, tdf#88848

Change-Id: If7ac2a2294e20617fd8b599597085658051f5515

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index e0f8745..263db8d 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -996,6 +996,39 @@ void ChartExport::exportLegend( Reference< 
css::chart::XChartDocument > rChartDo
 pFS->singleElement( FSNS( XML_c, XML_legendPos ),
 XML_val, strPos,
 FSEND );
+}
+
+uno::Any aRelativePos = xProp->getPropertyValue("RelativePosition");
+if (aRelativePos.hasValue())
+{
+chart2::RelativePosition aPos = 
aRelativePos.get();
+pFS->startElement(FSNS(XML_c, XML_layout), FSEND);
+pFS->startElement(FSNS(XML_c, XML_manualLayout), FSEND);
+
+pFS->singleElement(FSNS(XML_c, XML_xMode),
+XML_val, "edge",
+FSEND);
+pFS->singleElement(FSNS(XML_c, XML_yMode),
+XML_val, "edge",
+FSEND);
+
+double x = aPos.Primary;
+double y = aPos.Secondary;
+
+pFS->singleElement(FSNS(XML_c, XML_x),
+XML_val, IS(x),
+FSEND);
+pFS->singleElement(FSNS(XML_c, XML_y),
+XML_val, IS(y),
+FSEND);
+SAL_WARN_IF(aPos.Anchor != 0, "oox.chart", "unsupported anchor 
position");
+
+pFS->endElement(FSNS(XML_c, XML_manualLayout));
+pFS->endElement(FSNS(XML_c, XML_layout));
+}
+
+if (strPos != NULL)
+{
 pFS->singleElement( FSNS( XML_c, XML_overlay ),
 XML_val, "0",
 FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] French dictionary update

[Olivier R.]

Hello *,

Here is a patch to update the French dictionary:
0001-Update-French-dictionary-v5.patch

  

For 4.4 and 4.5/5.0

Thanks.

Olivier



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-French-dictionary-update-tp4147192.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 vcl/source/control/combobox.cxx   |6 +++---
 vcl/source/window/brdwin.cxx  |9 +++--
 vcl/source/window/toolbox.cxx |2 +-
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit ed3c69588a7f65cb534075a68607b094c40664f0
Author: Caolán McNamara 
Date:   Sat Apr 25 15:39:05 2015 +0100

gtk3: get the right height for Combo boxes

Change-Id: Ib856952572104d224cd731237bf7c33d028e6544

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3d5a41f..be0e048 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -104,7 +104,7 @@ void ComboBox::ImplCalcEditHeight()
 
 Rectangle aCtrlRegion( Point( 0, 0 ), Size( 10, 10 ) );
 Rectangle aBoundRegion, aContentRegion;
-ImplControlValue aControlValue;
+EditBoxValue aControlValue(GetTextHeight());
 ControlType aType = IsDropDownBox() ? CTRL_COMBOBOX : CTRL_EDITBOX;
 if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL,
 aCtrlRegion,
@@ -981,7 +981,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const
 long nButtonDownWidth = 0;
 
 vcl::Window *pBorder = GetWindow( WINDOW_BORDER );
-ImplControlValue aControlValue;
+EditBoxValue aControlValue(GetTextHeight());
 Point aPoint;
 Rectangle aContent, aBound;
 
@@ -1414,7 +1414,7 @@ ComboBox::ComboBoxBounds 
ComboBox::calcComboBoxDropDownComponentBounds(const Siz
 longnBottom = rOutSz.Height();
 
 vcl::Window *pBorder = GetWindow( WINDOW_BORDER );
-ImplControlValue aControlValue;
+EditBoxValue aControlValue(GetTextHeight());
 Point aPoint;
 Rectangle aContent, aBound;
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index e4322e1..c472777 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1043,6 +1043,8 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, 
long nWidth, long nHei
 std::unique_ptr xControlValue(new 
ImplControlValue());
 if (pCtrl)
 {
+xControlValue.reset(new EditBoxValue(pCtrl->GetTextHeight()));
+
 switch( pCtrl->GetType() )
 {
 case WINDOW_LISTBOX:
@@ -1077,10 +1079,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* 
pDev, long nWidth, long nHei
 if (pCtrl->GetStyle() & WB_SPIN)
 aCtrlType = CTRL_SPINBOX;
 else
-{
 aCtrlType = CTRL_EDITBOX;
-xControlValue.reset(new 
EditBoxValue(pWin->GetTextHeight()));
-}
 break;
 default:
 break;
@@ -1201,6 +1200,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 
nDrawFlags, OutputDevice*
 std::unique_ptr xControlValue(new ImplControlValue());
 if( pWin && (pCtrl = mpBorderWindow->GetWindow( WINDOW_CLIENT )) != NULL )
 {
+xControlValue.reset(new EditBoxValue(pCtrl->GetTextHeight()));
 switch( pCtrl->GetType() )
 {
 case WINDOW_MULTILINEEDIT:
@@ -1219,10 +1219,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 
nDrawFlags, OutputDevice*
 if( pCtrl->GetStyle() & WB_SPIN )
 aCtrlType = CTRL_SPINBOX;
 else
-{
 aCtrlType = CTRL_EDITBOX;
-xControlValue.reset(new 
EditBoxValue(pCtrl->GetTextHeight()));
-}
 break;
 
 case WINDOW_LISTBOX:
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 34ad659..5b62793 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1655,7 +1655,7 @@ bool ToolBox::ImplCalcItem()
 {
 Rectangle aRect( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
 Rectangle aReg( aRect );
-ImplControlValue aVal;
+EditBoxValue aVal(GetTextHeight());
 Rectangle aNativeBounds, aNativeContent;
 if( IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
 {
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9c992ba..77dfa59 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1069,7 +1069,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType 
nType, ControlPart nPar
 {
 aEditRect = NWGetComboBoxButtonRect( nType, nPart, rControlRegion );
 }
-else if (nType == CTRL_EDITBOX)
+else if ((nType == CTRL_EDITBOX || nType == CTRL_COMBOBOX) && nPart == 
PART_ENTIRE_CONTROL)
 {
 gtk_style_context_save(mpEntryStyle);
 gtk_style_context_add_class(mpEntrySty

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

[Lionel Elie Mamane]

 connectivity/source/commontools/FValue.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 062c3afd4e829692cf022c5011b2a226d21c35e4
Author: Lionel Elie Mamane 
Date:   Sat Apr 25 19:34:58 2015 +0200

tdf#90614 oups... I was too eager in replacing getAny() with makeAny()

also handle the SQLNULL case

Change-Id: Ie7fffd6b46ed8b3dfa7231928f55743f71d2ea98

diff --git a/connectivity/source/commontools/FValue.cxx 
b/connectivity/source/commontools/FValue.cxx
index ba02dbb..93648c1 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -885,6 +885,9 @@ Any ORowSetValue::makeAny() const
 {
 switch(getTypeKind())
 {
+case DataType::SQLNULL:
+assert(rValue == Any());
+break;
 case DataType::CHAR:
 case DataType::VARCHAR:
 case DataType::DECIMAL:
@@ -964,7 +967,7 @@ Any ORowSetValue::makeAny() const
 break;
 default:
 SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): 
UNSUPPORTED TYPE!");
-rValue = makeAny();
+rValue = getAny();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a57309fec223ef62a929807d078baafb0057005e
Author: Caolán McNamara 
Date:   Sat Apr 25 20:12:00 2015 +0100

gtk3: honour the control region height if it is larger

Change-Id: I99a5a597dbc14521b27f9149411199d23b907c1e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 77dfa59..97c7929 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1084,6 +1084,8 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType 
nType, ControlPart nPar
 
 gint nWidgetHeight = nTextHeight + padding.top + padding.bottom + 
border.top + border.bottom;
 
+nWidgetHeight = std::max(nWidgetHeight, 
rControlRegion.GetHeight());
+
 aEditRect = Rectangle(rControlRegion.TopLeft(), 
Size(rControlRegion.GetWidth(), nWidgetHeight));
 
 gtk_style_context_restore(mpEntryStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 11 commits - framework/source include/sfx2 qadevOOo/tests sfx2/source solenv/gbuild sw/inc sw/source unoxml/source

[Michael Stahl]

 framework/source/fwe/classes/framelistanalyzer.cxx |2 
 framework/source/services/autorecovery.cxx |2 
 include/sfx2/DocumentMetadataAccess.hxx|2 
 qadevOOo/tests/java/ifc/table/_XTableCharts.java   |2 
 sfx2/source/doc/Metadatable.cxx|1 
 sfx2/source/doc/SfxDocumentMetaData.cxx|1 
 solenv/gbuild/CppunitTest.mk   |3 
 sw/inc/pam.hxx |9 -
 sw/inc/swcrsr.hxx  |7 
 sw/inc/viscrs.hxx  |1 
 sw/source/core/access/acccell.cxx  |4 
 sw/source/core/access/acccontext.cxx   |  176 +
 sw/source/core/access/acccontext.hxx   |   52 ++
 sw/source/core/access/accdoc.cxx   |   45 -
 sw/source/core/access/accdoc.hxx   |6 
 sw/source/core/access/accframebase.cxx |   14 -
 sw/source/core/access/accmap.cxx   |   14 -
 sw/source/core/access/accpage.cxx  |6 
 sw/source/core/access/accpara.cxx  |   14 -
 sw/source/core/crsr/pam.cxx|9 -
 sw/source/core/crsr/swcrsr.cxx |4 
 sw/source/core/crsr/viscrs.cxx |2 
 sw/source/core/edit/eddel.cxx  |2 
 sw/source/core/edit/edglss.cxx |3 
 sw/source/core/text/frminf.cxx |2 
 sw/source/core/unocore/unoobj2.cxx |2 
 sw/source/core/unocore/unotextmarkup.cxx   |6 
 sw/source/filter/basflt/shellio.cxx|2 
 sw/source/filter/html/swhtml.cxx   |   13 -
 sw/source/filter/ww8/ww8par.cxx|4 
 sw/source/filter/ww8/ww8par2.cxx   |2 
 sw/source/filter/ww8/ww8par5.cxx   |6 
 unoxml/source/rdf/librdf_repository.cxx|1 
 33 files changed, 168 insertions(+), 251 deletions(-)

New commits:
commit c23dd470d49d722197c148f4ef64a6a3350af88d
Author: Michael Stahl 
Date:   Sat Apr 25 22:24:58 2015 +0200

sw: same treatment for SwCursor's fake "copy constructor"

Change-Id: Id627274ca6ad87e7e85b5ce64419ed68a5d4c9c3

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 1e84b16..5e3ea0a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -69,6 +69,8 @@ class SW_DLLPUBLIC SwCursor : public SwPaM
 
 using SwPaM::Find;
 
+SwCursor(SwCursor const& rPaM) SAL_DELETED_FUNCTION;
+
 protected:
 _SwCursor_SavePos* CreateNewSavePos() const;
 void SaveState();
@@ -86,8 +88,9 @@ public:
 SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel );
 virtual ~SwCursor();
 
-// @@@ semantic: no copy ctor.
-SwCursor( SwCursor& rCpy);
+/// this takes a second parameter, which indicates the Ring that
+/// the new cursor should be part of (may be null)
+SwCursor(SwCursor const& rCursor, SwPaM* pRing);
 
 public:
 
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a96d366..99b25f7 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -126,6 +126,7 @@ public:
 SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos );
 SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos,
 const Point& rPtPos, SwPaM* pRing = 0 );
+// note: *intentionally* links the new shell cursor into the old one's Ring
 SwShellCrsr( SwShellCrsr& );
 virtual ~SwShellCrsr();
 
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index e0a1a9c..dcca20d 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -123,8 +123,8 @@ SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing, 
bool bColumnSel )
 }
 
 // @@@ semantic: no copy ctor.
-SwCursor::SwCursor( SwCursor& rCpy )
-: SwPaM( rCpy, &rCpy )
+SwCursor::SwCursor(SwCursor const& rCpy, SwPaM *const pRing)
+: SwPaM( rCpy, pRing )
 , m_pSavePos(nullptr)
 , m_nRowSpanOffset(rCpy.m_nRowSpanOffset)
 , m_nCursorBidiLevel(rCpy.m_nCursorBidiLevel)
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 11ef0f5..f5cdeb8 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -528,7 +528,7 @@ SwShellCrsr::SwShellCrsr(
 {}
 
 SwShellCrsr::SwShellCrsr( SwShellCrsr& rICrsr )
-: SwCursor(rICrsr)
+: SwCursor(rICrsr, &rICrsr)
 , SwSelPaintRects(*rICrsr.GetShell())
 , m_MarkPt(rICrsr.GetMkPos())
 , m_PointPt(rICrsr.GetPtPos())
commit bdf3c9bff607e3977c8455927b21ba292530d25a
Author: Michael Stahl 
Date:   Sat Apr 25 22:17:06 2015 +0200

sw: replace SwPaM's so-called "copy constructor"

Make explict that it links the new SwPaM into a Ring, by adding a 2nd
parameter for the Ring.

Change-Id: I8ac0bb1a8bede8b67a3a8874cf805bd88aad2819

diff --git a/sw/inc/pam.hxx b/sw/inc

Re: passing a dynamic parameter to a cppunittest

[Michael Stahl]

On 25.04.2015 01:58, Markus Mohrhard wrote:
> so this is a question for our gbuild experts: Is there a way to pass a
> parameter through to the cppunit tester from the command line.
> 
> So I would like to have something like:
> 
> make CppunitTest_my_test testname1 testname2 testname3
> 
> and get the testname1, testname2, testname3 as argument to
> sal/cppunittester/cppunittester.cxx.
> 
> It would help if that would be possible for even just one argument.

pretty easy, this should work on master now:

make CppunitTest_my_test CPPUNITTEST_ARGS="testname1 testname2"


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

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

[Thorsten Wagner]

 vcl/quartz/ctfonts.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3a96d8ead86dc210085f09076fd270f247442f0a
Author: Thorsten Wagner 
Date:   Fri Apr 24 00:11:41 2015 +0200

tdf#90822: Descenders cropped

Change-Id: I0985fb290c18630aab2d33a5ac59e32a172e7630
Reviewed-on: https://gerrit.libreoffice.org/15502
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 584ceaa..02db1af 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -123,10 +123,10 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& 
rMetric ) const
 
 const CGFloat fAscent = CTFontGetAscent( aCTFontRef );
 const CGFloat fCapHeight = CTFontGetCapHeight( aCTFontRef );
-rMetric.mnAscent   = fAscent;
-rMetric.mnDescent  = CTFontGetDescent( aCTFontRef );
-rMetric.mnExtLeading   = CTFontGetLeading( aCTFontRef );
-rMetric.mnIntLeading   = fAscent - fCapHeight;
+rMetric.mnAscent   = lrint( fAscent );
+rMetric.mnDescent  = lrint( CTFontGetDescent( aCTFontRef ));
+rMetric.mnExtLeading   = lrint( CTFontGetLeading( aCTFontRef ));
+rMetric.mnIntLeading   = lrint( fAscent - fCapHeight );
 
 // since ImplFontMetricData::mnWidth is only used for stretching/squeezing 
fonts
 // setting this width to the pixel height of the fontsize is good enough
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 i18npool/Library_i18npool.mk |9 -
 solenv/gbuild/CppunitTest.mk |   12 +---
 solenv/gbuild/Helper.mk  |2 +-
 solenv/gbuild/LinkTarget.mk  |5 +
 4 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit d311260c0d347b3c933706b8cac48b82a653e1c7
Author: Matúš Kukan 
Date:   Sat Apr 25 07:34:04 2015 +0200

--enable-mergelibs: Turns out we don't need to install sax

We are lucky, saxparser(expwrap) is only needed to build localedata* libs
which are only runtime dependencies, and can be built *after* libmerged.
So, simplify and move runtime deps to CppunitTest.

This reverts commits 59cea45ec247df1acb691308c940ff97673e4c48
and partially 5e45637568ceefee21fe329a5254881963fecd7a

Change-Id: I1a1fb4a48fd1a22a9b3a48f0eb0f123649c113b0

diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 3c60ace..f694be0 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -147,13 +147,4 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
$(if $(filter GCC,$(COM)),-Wno-unused-macros) \
 ))
 
-# i18npool dlopens localedata_* libraries.
-# This is runtime dependency to prevent tests
-# to be run sooner then localedata_* exists.
-$(call gb_Library_get_target,i18npool) : | \
-   $(call gb_Library_get_target,localedata_en) \
-   $(call gb_Library_get_target,localedata_es) \
-   $(call gb_Library_get_target,localedata_euro) \
-   $(call gb_Library_get_target,localedata_others) \
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a6eae56..a4e9fa9 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -40,11 +40,17 @@ gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind 
--dump-instr=yes --inst
 endif
 
 # defined by platform
-#  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunittester)
+gb_CppunitTest_RUNTIMEDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunittester)
 gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunittester)
 
+# i18npool dlopens localedata_* libraries.
+gb_CppunitTest_RUNTIMEDEPS += \
+   $(call gb_Library_get_target,localedata_en) \
+   $(call gb_Library_get_target,localedata_es) \
+   $(call gb_Library_get_target,localedata_euro) \
+   $(call gb_Library_get_target,localedata_others) \
+
 define gb_CppunitTest__make_args
 $(HEADLESS) \
 "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \
@@ -78,7 +84,7 @@ $(call gb_CppunitTest_get_clean_target,%) :
rm -f $(call gb_CppunitTest_get_target,$*) $(call 
gb_CppunitTest_get_target,$*).log)
 
 .PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
+$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
$(call gb_Output_announce,$*,$(true),CUT,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 028b7cb..253d6db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group 
for installed librarie
 endif
 $(call gb_Helper__register_libraries,$(1),$(3))
 
-gb_Library_MODULE_$(2) += $(filter-out $(filter-out sax,$(gb_MERGEDLIBS)),$(3))
+gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3))
 
 $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
gb_SdkLinkLibrary_MODULE_sdk += $(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 82c4739..b8c11f3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -836,10 +836,7 @@ gb_BUILD_HELPER_TOOLS := $(foreach exe,\
svidl \
unoidl-check \
unoidl-write \
-   , $(call gb_Executable__get_workdir_linktargetname,$(exe))) \
-   $(foreach lib,\
-   expwrap \
-   , $(call gb_Library__get_workdir_linktargetname,$(lib)))
+   , $(call gb_Executable__get_workdir_linktargetname,$(exe)))
 
 # call gb_LinkTarget__is_build_lib,linktargetname
 define gb_LinkTarget__is_build_lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-04-26

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ tdf#86619 - Create new table context menu submenus and reorganize entries
  in https://gerrit.libreoffice.org/15535 from Yousuf Philips
  about module sw
+ Fixed two strings in the context menu for consistency with other entries
  in https://gerrit.libreoffice.org/15537 from Yousuf Philips
  about module sw
+ Always show 'Bullets and Numbering' in context menu below 'Paragraph'
  in https://gerrit.libreoffice.org/15536 from Yousuf Philips
  about module sw
+ enhancement : tdf#90225 Cannot open compressed csv files from calc
  in https://gerrit.libreoffice.org/15108 from Dennis Francis
  about module build, config_host, filter, include, sc, tools
+ tdf#89790 -  DOCX: saving LO version number in correct tag in app.xml
  in https://gerrit.libreoffice.org/15151 from Ioan Radu
  about module include, oox, sw, unotools
+ tdf#90720 Textframe background was not transparent
  in https://gerrit.libreoffice.org/15390 from Sushil Shinde
  about module oox, sw
+ tdf#88314: fix uninitialized SvMemoryStream
  in https://gerrit.libreoffice.org/15526 from Andrew Savonichev
  about module unotools
 End of freshness 

+ OOXMLFactory can be purely static
  in https://gerrit.libreoffice.org/15532 from Noel Grandin
  about module writerfilter
+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
  about module UnoControls, chart2, drawinglayer, filter, include, offapi, oox, 
sc, sd, sfx2, svx, sw, toolkit, vbahelper, vcl, xmloff
+ expand and remove DECL_PTRHINT macro
  in https://gerrit.libreoffice.org/15531 from Noel Grandin
  about module include, svl
+ update to liborcus 0.9.0
  in https://gerrit.libreoffice.org/15453 from Markus Mohrhard
  about module build, external, sc
+ Add engineering notation to format list for all l10n
  in https://gerrit.libreoffice.org/15527 from Laurent BP
  about module i18npool


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

+ Do not filter out libsax from installation even if it's merged
  in https://gerrit.libreoffice.org/15447 from Matúš Kukan
+ tdf#90822: Descenders cropped
  in https://gerrit.libreoffice.org/15502 from Thorsten Wagner
+ tdf#90614 oups... I was too eager in replacing getAny() with makeAny()
  in https://gerrit.libreoffice.org/15529 from Lionel Elie Mamane
+ writerfilter: remove remaining doctok bits from TablePropertiesHandler
  in https://gerrit.libreoffice.org/15528 from Miklos Vajna
+ Add missing info of page number statusbar field in writer
  in https://gerrit.libreoffice.org/15525 from Yousuf Philips


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

None

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

+ add kde5 build of vcl
  in https://gerrit.libreoffice.org/15327 from Jonathan Riddell
+ added currency dropdown menu may have some erors
  in https://gerrit.libreoffice.org/15274 from rajat vijay
+ Remove compiler Warnings
  in https://gerrit.libreoffice.org/15260 from Delveri Chick
+ Init
  in https://gerrit.libreoffice.org/15259 from Delveri Chick
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
+ replace ScaList in scaddins with a std container tdf#90222
  in https://gerrit.libreoffice.org/15177 from Pieter Adriaensen
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind
  in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius
+ Upgrade firebird to 2.5.3 , a few patches are already applied upstream
  in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius
+ Fixed all  postfix operator++ and operator--
  in https://gerrit.libreoffice.org/14975 from Ahmad Samir
+ tdf#39468 Translate German Comments - sc/source/core/data/
  in https://gerrit.libreoffice.org/14866 from Christian M. Heller
+ tdf#49893: final fix for blank rectangle problem
  in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk
+ xmloff: convert xof.component to use constructor syntax
  in https://gerrit.libreoffice.org/14820 from Chris Sherlock
+ xmloff: use constructor syntax in xo.component
  in https://gerrit.libreoffice.org/14803 from Chris Sherlock
+ sd: use constructor syntax for rest of sd.component
  in https://gerrit.libreoffice.org/14689 from Chris Sherlock
+ embeddedobj: convert emboleobj.*.component to constructor syntax
  in https://gerrit.libreoffice.org/14687 from Chris Sherlock
+ sc: use constructor syntax in sc.component
  in https://gerrit.libreoffice.org/14750 from Chris Sherlock
+ Convert ScDocument to constructor syntax, remove sc_component_getFactory(
  in https://gerrit.libreoffice.org/14751 f