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

[Caolán McNamara]

 svtools/source/misc/ehdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 401dfdc7f25cb112face662c3fa8aff7ec9c6ef1
Author: Caolán McNamara 
Date:   Thu Jun 23 09:41:40 2016 +0100

VclPtr: svtools error message dialog doesn't dispose

Change-Id: I83640cc60d5e0239d228c749c32f896df5e2d9f2
(cherry picked from commit d531743ca34232aedc0b437a9ff5807dea8d51ed)
Reviewed-on: https://gerrit.libreoffice.org/26588
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index c724871..876e992 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -137,6 +137,7 @@ static sal_uInt16 aWndFunc(
 SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
 break;
 }
+pBox.disposeAndClear();
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 svtools/source/control/ruler.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ef8c2b12949b33d3fe00018c32cb97a77d1c7388
Author: Tomaž Vajngerl 
Date:   Tue May 24 11:01:46 2016 +0900

ruler: close the polygon when drawing indent handle (gtk3, gl)

Change-Id: I9d1d20f889f73c73a1b861485a956a25f743e245
(cherry picked from commit 17e329e4092a2e49f47452d89fea51eb702d4fd2)
Reviewed-on: https://gerrit.libreoffice.org/25383
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 1a2d257..21a9cfb 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -801,7 +801,9 @@ void Ruler::ImplDrawIndent(vcl::RenderContext& 
rRenderContext, const tools::Poly
 
 rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
 rRenderContext.SetFillColor(bIsHit ? rStyleSettings.GetDarkShadowColor() : 
rStyleSettings.GetWorkspaceColor());
-rRenderContext.DrawPolygon(rPoly);
+tools::Polygon aPolygon(rPoly);
+aPolygon.Optimize(PolyOptimizeFlags::CLOSE);
+rRenderContext.DrawPolygon(aPolygon);
 }
 
 void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, 
long nMax, long nVirTop, long nVirBottom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfcache.cxx |2 +-
 svx/source/xoutdev/_xoutbmp.cxx |2 +-
 vcl/source/filter/graphicfilter.cxx |4 ++--
 vcl/source/gdi/impgraph.cxx |8 
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6d15196a2a8aea48dd50591abb06017a04f5122f
Author: Caolán McNamara 
Date:   Thu Jan 28 13:30:07 2016 +

Resolves: tdf#96580 Sequence::get doesn't return the start of the data

it returns the start of the underlying uno_Sequence

commit 78c83032b266fbb6fc20ddca86df80affaff7c24
Author: Caolán McNamara 
Date:   Wed Sep 30 09:40:16 2015 +0100

maSvgDataArray only populates a uno::Sequence, so use that instead

Change-Id: I335d5ee70e95e1a3b204d34f6df4cb62f3fb3cad

(cherry picked from commit ab60f6cb0f46cb71172e4248ed40e212f6ebb4da)

Change-Id: I8d2c07fec039e58d3644e4ab5eb074ee215f075e

diff --git a/svtools/source/graphic/grfcache.cxx 
b/svtools/source/graphic/grfcache.cxx
index fd30407..e8fdfe1 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -79,7 +79,7 @@ GraphicID::GraphicID( const GraphicObject& rObj )
 mnID1 |= rSvgDataPtr->getSvgDataArrayLength();
 mnID2 = basegfx::fround(rRange.getWidth());
 mnID3 = basegfx::fround(rRange.getHeight());
-mnID4 = vcl_get_checksum(0, 
rSvgDataPtr->getSvgDataArray().get(), rSvgDataPtr->getSvgDataArrayLength());
+mnID4 = vcl_get_checksum(0, 
rSvgDataPtr->getSvgDataArray().getConstArray(), 
rSvgDataPtr->getSvgDataArrayLength());
 }
 else if( rGraphic.IsAnimated() )
 {
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index e445b09..74c1f5b 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -161,7 +161,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& 
rGraphic, OUString& rFileNam
 
 if(pOStm)
 {
-pOStm->Write(aSvgDataPtr->getSvgDataArray().get(), 
aSvgDataPtr->getSvgDataArrayLength());
+pOStm->Write(aSvgDataPtr->getSvgDataArray().getConstArray(), 
aSvgDataPtr->getSvgDataArrayLength());
 aMedium.Commit();
 
 if(!aMedium.GetError())
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index c86d070..00bcb10 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2050,9 +2050,9 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString
 // do we have a native SVG RenderGraphic, whose data can be 
written directly?
 const SvgDataPtr aSvgDataPtr(rGraphic.getSvgData());
 
-if(aSvgDataPtr.get() && aSvgDataPtr->getSvgDataArrayLength())
+if (aSvgDataPtr.get() && aSvgDataPtr->getSvgDataArrayLength())
 {
-rOStm.Write(aSvgDataPtr->getSvgDataArray().get(), 
aSvgDataPtr->getSvgDataArrayLength());
+
rOStm.Write(aSvgDataPtr->getSvgDataArray().getConstArray(), 
aSvgDataPtr->getSvgDataArrayLength());
 
 if( rOStm.GetError() )
 {
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 9e4c78a..21d2119 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -290,8 +290,8 @@ bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic 
) const
 if(maSvgData->getSvgDataArrayLength() == 
rImpGraphic.maSvgData->getSvgDataArrayLength())
 {
 if(0 == memcmp(
-maSvgData->getSvgDataArray().get(),
-rImpGraphic.maSvgData->getSvgDataArray().get(),
+maSvgData->getSvgDataArray().getConstArray(),
+
rImpGraphic.maSvgData->getSvgDataArray().getConstArray(),
 maSvgData->getSvgDataArrayLength()))
 {
 bRet = true;
@@ -1545,7 +1545,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& 
rImpGraphic )
 {
 SvgDataArray aNewData(nSvgDataArrayLength);
 
-rIStm.Read(aNewData.begin(), 
nSvgDataArrayLength);
+rIStm.Read(aNewData.getArray(), 
nSvgDataArrayLength);
 OUString aPath = 
rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet());
 
 if (!rIStm.GetError())
@@ -1616,7 +1616,7 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const 
ImpGraphic& rImpGraphic )
 
 rOStm.WriteUInt32( nSvgMagic );
 

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

[Giuseppe Castagno]

 svtools/source/control/breadcrumb.cxx  |   11 ++-
 ucb/source/ucp/webdav-neon/NeonSession.cxx |1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 8369e7d511d5cc07b8fac31a05a5897f58b46740
Author: Giuseppe Castagno 
Date:   Sat Jan 2 16:03:20 2016 +0100

Related tdf#96833: breadcrumb: setting URL, host port gets lost.

At the same time added a log in WebDAV, useful to discover the
issue.

Change-Id: I3435f8d3da28f7d6b4c2e154cf2bb5ee33a9a690
Reviewed-on: https://gerrit.libreoffice.org/21047
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5c4de8f1991f1a9964e661717dc6b46f6a6a3608)
Reviewed-on: https://gerrit.libreoffice.org/21172
Reviewed-by: Giuseppe Castagno 
Reviewed-by: Katarina Behrens 

diff --git a/svtools/source/control/breadcrumb.cxx 
b/svtools/source/control/breadcrumb.cxx
index 2f7766e..b611a42 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -105,13 +105,22 @@ void Breadcrumb::SetURL( const OUString& rURL )
 m_aCurrentURL = rURL;
 INetURLObject aURL( rURL );
 aURL.setFinalSlash();
+//prepare the Host port
+OUString sHostPort;
+
+if( aURL.HasPort() )
+{
+sHostPort += ":";
+sHostPort += sHostPort.number( aURL.GetPort() );
+}
 
 OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
 OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
 OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() )
 + sUser
 + ( sUser.isEmpty() ? OUString() : "@" )
-+ aURL.GetHost();
++ aURL.GetHost()
++ sHostPort;
 
 int nSegments = aURL.getSegmentCount();
 unsigned int nPos = 0;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 2c3c60c..5bce365 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1746,6 +1746,7 @@ void NeonSession::HandleError( int nError,
 m_aProxyName, m_nProxyPort ) );
 
 case NE_CONNECT:  // Could not connect to server
+SAL_WARN( "ucb.ucp.webdav", "DAVException::DAV_HTTP_CONNECT" );
 throw DAVException( DAVException::DAV_HTTP_CONNECT,
 NeonUri::makeConnectionEndPointString(
 m_aHostName, m_nPort ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Giuseppe Castagno]

 svtools/source/dialogs/ServerDetailsControls.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2c6e8e4142493dd135003aff16a1709d6e3a29d0
Author: Giuseppe Castagno 
Date:   Tue Dec 29 10:22:13 2015 +0100

Related tdf#96833: fix behaviour of 'Remote Files' edit dialog.

Fixed:
- TCP port got lost/reset when editing a server;
- in Gtk widget disabled comma;
- secure protocol checkbox always unchecked when editing a
  server.

Change-Id: I358fc7375552b29e4840a3616e4e47b95b88ed2c
Reviewed-on: https://gerrit.libreoffice.org/21039
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 
(cherry picked from commit d373cb7e15ceca249c33be39583a0515b413e417)
Reviewed-on: https://gerrit.libreoffice.org/21143
Reviewed-by: Giuseppe Castagno 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx 
b/svtools/source/dialogs/ServerDetailsControls.cxx
index 3529de2..99eb2f5 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -42,6 +42,7 @@ DetailsContainer::DetailsContainer( VclBuilderContainer* 
pBuilder ) :
 pBuilder->get( m_pFTPort, "portLabel" );
 pBuilder->get( m_pEDRoot, "path" );
 pBuilder->get( m_pFTRoot, "pathLabel" );
+m_pEDPort->SetUseThousandSep( false );
 }
 
 DetailsContainer::~DetailsContainer( )
@@ -104,9 +105,12 @@ void HostDetailsContainer::show( bool bShow )
 
 if ( bShow )
 {
-m_pEDPort->SetValue( m_nDefaultPort );
+if ( m_pEDPort->GetValue( ) == 0 )
+m_pEDPort->SetValue( m_nDefaultPort );
 m_pEDHost->SetText( m_sHost );
 }
+else
+m_pEDPort->SetValue( 0 );
 }
 
 INetURLObject HostDetailsContainer::getUrl( )
@@ -163,10 +167,10 @@ void DavDetailsContainer::show( bool bShow )
 {
 HostDetailsContainer::show( bShow );
 
-m_pCBDavs->Show( bShow );
-
-if ( bShow )
+if ( !bShow )
 m_pCBDavs->Check( false );
+
+m_pCBDavs->Show( bShow );
 }
 
 bool DavDetailsContainer::verifyScheme( const OUString& rScheme )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 svtools/source/contnr/svimpbox.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ad70b07e728c726e50a909d06b057072e7a0f1f3
Author: Miklos Vajna 
Date:   Mon Dec 21 14:41:26 2015 +0100

tdf#96637 svtools: fix missing highlight of selected entry in list box

Regression from 87199d3829257420429057336283c55be6ae7481 (vcl:
re-introduce idle handling., 2015-11-24), this probably worked
previously as the idle repaint triggered SvImpLBox::Paint() multiple (at
least two) times, so in the first run it could mark the first entry in
the list box as selected/highlighted, and then the second run it could
paint accordingly.

Now it's called only once, so it's required that selecting the first
entry happens before the actual painting.

With this, the certificate selection dialog has the default signing
certificate pre-selected again.

(cherry picked from commit 171ca32e02976022858b9f0affb532a35c495833)

Change-Id: I0546bf673f44f4270e36b9bbf02bb723f23d6160
Reviewed-on: https://gerrit.libreoffice.org/20850
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 17b8c76..fbe6a32 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -937,6 +937,13 @@ void SvImpLBox::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle& rRect
 
 rRenderContext.SetClipRegion(aClipRegion);
 
+if (!pCursor && ((nExtendedWinBits & EWB_NO_AUTO_CURENTRY) == 0))
+{
+// do not select if multiselection or explicit set
+bool bNotSelect = (aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) 
|| ((m_nStyle & WB_NOINITIALSELECTION) == WB_NOINITIALSELECTION);
+SetCursor(pStartEntry, bNotSelect);
+}
+
 for(sal_uInt16 n=0; n< nCount && pEntry; n++)
 {
 /*long nMaxRight=*/
@@ -945,13 +952,6 @@ void SvImpLBox::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle& rRect
 pEntry = pView->NextVisible(pEntry);
 }
 
-if (!pCursor && ((nExtendedWinBits & EWB_NO_AUTO_CURENTRY) == 0))
-{
-// do not select if multiselection or explicit set
-bool bNotSelect = (aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) 
|| ((m_nStyle & WB_NOINITIALSELECTION) == WB_NOINITIALSELECTION);
-SetCursor(pStartEntry, bNotSelect);
-}
-
 nFlags &= (~F_DESEL_ALL);
 rRenderContext.SetClipRegion();
 if (!(nFlags & F_PAINTED))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aybuke Ozdemir]

 svtools/source/config/colorcfg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 52ac1a717b1869cb7d2ee710f50a15e216ced76c
Author: Aybuke Ozdemir 
Date:   Sat Oct 31 19:31:38 2015 +0200

tdf#87933 easier visibility of automatic page breaks

Change-Id: I1d81b740bf67402b7f59b572bbd8a9fbc4a989f2
Reviewed-on: https://gerrit.libreoffice.org/19706
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Julien Nabet 
(cherry picked from commit 22d4b98da59c9821e72cc1d4f9d94d57b7a12d51)
Reviewed-on: https://gerrit.libreoffice.org/20421
Tested-by: Adolfo Jayme Barrientos 

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index 8a1bd58..fcaf46a 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -437,10 +437,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry 
eEntry)
 COL_LIGHTGREEN, // HTMLCOMMENT
 COL_LIGHTRED, // HTMLKEYWORD
 COL_GRAY, // HTMLUNKNOWN
-COL_LIGHTGRAY, // CALCGRID
+0xcc, // CALCGRID
 COL_BLUE, //CALCPAGEBREAK
 0x2300dc, //CALCPAGEBREAKMANUAL
-COL_GRAY, //CALCPAGEBREAKAUTOMATIC
+0x66, //CALCPAGEBREAKAUTOMATIC
 COL_LIGHTBLUE, // CALCDETECTIVE
 COL_LIGHTRED, // CALCDETECTIVEERROR
 0xef0fff, // CALCREFERENCE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits