Re: Fail to build on Windows 7 (32 bits)

2015-08-19 Thread julien2412
Michael Stahl-2 wrote
> ...
> can you patch in an echo around the CC_VERSION=`"${CC}" ... line to see
> what the value of $CC and $CC_VERSION is?

I'll give a try after my day time job but if I do this, it means I should
just run "make nss.build" and not "make nss.clean && make nss.build" since
the clean would remove the patch. Is it ok?


Michael Stahl-2 wrote
> did you do any changes from before when (presumably) the build worked,
> or is this broken since the NSS upgrade commit
> 6e7991dfd8c54a833f4a9795a0d57f4690e92e6b ?

I must recognize I don't remember, it's been some time.
In fact, some months ago, I had succeeeded in building with 32 bits. Then,
with the same sources but with a brand new cygwin, I had tried with 64bits,
it had failed.
Then weeks later, I wanted to revert to 32 bits (with a brand new Cygwin32
but still with same sources) since 64bits building on Windows seemed to be
on-progress work.
In brief, I wonder if there could be any remnants with 64bits tests and
finally if I shouldn't scratch the whole thing:cygwin, LO sources, Visual
Studio and reinstall/redownload all the things to be sure.

Anyway, I'll keep you informed of this test.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Fail-to-build-on-Windows-7-32-bits-tp4156056p4157666.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: cui/source

2015-08-19 Thread Noel Grandin
 cui/source/options/optsave.cxx |   26 +-
 cui/source/options/optsave.hxx |4 
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit 7f527276606f3b23c91f8c6ac00d744d6b9b3a06
Author: Noel Grandin 
Date:   Wed Aug 19 09:09:27 2015 +0200

replace hideous SfxSaveTabPage define

Change-Id: Ie0931d378c72ff5aaa5d50006141eaa651281ba7

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 2c049a5..8bb8838 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -80,7 +80,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
 
 // class SvxSaveTabPage --
 
-SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& 
rCoreSet ) :
+SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& 
rCoreSet ) :
 SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ),
 pImpl   ( new SvxSaveTabPage_Impl )
 {
@@ -118,7 +118,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const 
SfxItemSet& rCoreSet
 aDocTypeLB->SetEntryData(5, reinterpret_cast(APP_DRAW) );
 aDocTypeLB->SetEntryData(6, reinterpret_cast(APP_MATH) );
 
-Link<> aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
+Link<> aLink = LINK( this, SvxSaveTabPage, AutoClickHdl_Impl );
 aAutoSaveCB->SetClickHdl( aLink );
 aAutoSaveEdit->SetMaxTextLen( 2 );
 
@@ -186,9 +186,9 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const 
SfxItemSet& rCoreSet
 pImpl->aDefaultReadonlyArr[APP_WRITER_GLOBAL] = 
aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::WRITERGLOBAL);
 }
 
-aLink = LINK( this, SfxSaveTabPage, ODFVersionHdl_Impl );
+aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
 aODFVersionLB->SetSelectHdl( aLink );
-aLink = LINK( this, SfxSaveTabPage, FilterHdl_Impl );
+aLink = LINK( this, SvxSaveTabPage, FilterHdl_Impl );
 aDocTypeLB->SetSelectHdl( aLink );
 aSaveAsLB->SetSelectHdl( aLink );
 
@@ -197,7 +197,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const 
SfxItemSet& rCoreSet
 
 
 
-SfxSaveTabPage::~SfxSaveTabPage()
+SvxSaveTabPage::~SvxSaveTabPage()
 {
 disposeOnce();
 }
@@ -226,13 +226,13 @@ void SvxSaveTabPage::dispose()
 SfxTabPage::dispose();
 }
 
-VclPtr SfxSaveTabPage::Create( vcl::Window* pParent,
+VclPtr SvxSaveTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
 {
-return VclPtr::Create( pParent, *rAttrSet );
+return VclPtr::Create( pParent, *rAttrSet );
 }
 
-void SfxSaveTabPage::DetectHiddenControls()
+void SvxSaveTabPage::DetectHiddenControls()
 {
 SvtOptionsDialogOptions aOptionsDlgOpt;
 
@@ -258,7 +258,7 @@ void SfxSaveTabPage::DetectHiddenControls()
 
 }
 
-bool SfxSaveTabPage::FillItemSet( SfxItemSet* rSet )
+bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
 {
 bool bModified = false;
 SvtSaveOptions aSaveOpt;
@@ -397,7 +397,7 @@ bool isODFFormat( const OUString& sFilter )
 return bRet;
 }
 
-void SfxSaveTabPage::Reset( const SfxItemSet* )
+void SvxSaveTabPage::Reset( const SfxItemSet* )
 {
 SvtSaveOptions aSaveOpt;
 aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
@@ -515,7 +515,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet* )
 
 
 
-IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
+IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
 {
 if ( pBox == aAutoSaveCB )
 {
@@ -560,7 +560,7 @@ static OUString lcl_ExtracUIName(const 
Sequence &rProperties)
 return sName;
 }
 
-IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
+IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 {
 sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos();
 
@@ -624,7 +624,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 return 0;
 };
 
-IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
+IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl)
 {
 sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() );
 bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != 
SvtSaveOptions::ODFVER_LATEST;
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index f64dc0a..98ec868 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -31,10 +31,6 @@ namespace com { namespace sun { namespace star {
 struct PropertyValue;
 
 
-// define 
-
-#define SfxSaveTabPage SvxSaveTabPage
-
 // class SvxSaveTabPage --
 
 struct SvxSaveTabPage_Impl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/fixes7' - include/comphelper vcl/source

2015-08-19 Thread Tor Lillqvist
 include/comphelper/windowserrorstring.hxx |   46 +++
 vcl/source/gdi/pdfwriter_impl.cxx |   58 --
 2 files changed, 62 insertions(+), 42 deletions(-)

New commits:
commit 5ce86afa799f6d30b208133301b46df4576b8526
Author: Tor Lillqvist 
Date:   Thu Aug 13 13:22:28 2015 +0300

Add a globally usable WindowsErrorString function

Is comphelper the right place for this? Is having it as "inline" the right
way?

Change-Id: I973dbde108f89b6cab17e5d88db2390d6f18a672

diff --git a/include/comphelper/windowserrorstring.hxx 
b/include/comphelper/windowserrorstring.hxx
new file mode 100644
index 000..1da7e9c
--- /dev/null
+++ b/include/comphelper/windowserrorstring.hxx
@@ -0,0 +1,46 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_COMPHELPER_WINDOWSERRORSTRING_HXX
+#define INCLUDED_COMPHELPER_WINDOWSERRORSTRING_HXX
+
+#include 
+#include 
+#include 
+
+namespace {
+
+inline OUString WindowsErrorString(DWORD nErrorCode)
+{
+LPWSTR pMsgBuf;
+
+if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM,
+   NULL,
+   nErrorCode,
+   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+   (LPWSTR)&pMsgBuf,
+   0,
+   NULL) == 0)
+return OUString::number(nErrorCode, 16);
+
+if (pMsgBuf[wcslen(pMsgBuf)-1] == '\n')
+pMsgBuf[wcslen(pMsgBuf)-1] = '\0';
+
+OUString result(pMsgBuf);
+
+LocalFree(pMsgBuf);
+
+return result;
+}
+
+} // anonymous namespace
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index cdfccbb..2840fa0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -92,6 +92,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif
 
 #include 
@@ -6761,33 +6762,6 @@ typedef BOOL (WINAPI 
*PointerTo_CryptRetrieveTimeStamp)(LPCWSTR wszUrl,
 PCCERT_CONTEXT 
*ppTsSigner,
 HCERTSTORE phStore);
 
-namespace {
-
-OUString WindowsError(DWORD nErrorCode)
-{
-LPWSTR pMsgBuf;
-
-if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM,
-   NULL,
-   nErrorCode,
-   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-   (LPWSTR)&pMsgBuf,
-   0,
-   NULL) == 0)
-return OUString::number(nErrorCode, 16);
-
-if (pMsgBuf[wcslen(pMsgBuf)-1] == '\n')
-pMsgBuf[wcslen(pMsgBuf)-1] = '\0';
-
-OUString result(pMsgBuf);
-
-LocalFree(pMsgBuf);
-
-return result;
-}
-
-}
-
 #endif
 
 bool PDFWriterImpl::finalizeSignature()
@@ -7286,7 +7260,7 @@ bool PDFWriterImpl::finalizeSignature()
 PCCERT_CONTEXT pCertContext = 
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
reinterpret_cast(n_derArray), n_derLength);
 if (pCertContext == NULL)
 {
-SAL_WARN("vcl.pdfwriter", "CertCreateCertificateContext failed: " << 
WindowsError(GetLastError()));
+SAL_WARN("vcl.pdfwriter", "CertCreateCertificateContext failed: " << 
WindowsErrorString(GetLastError()));
 return false;
 }
 
@@ -7312,7 +7286,7 @@ bool PDFWriterImpl::finalizeSignature()
&nKeySpec,
&bFreeNeeded))
 {
-SAL_WARN("vcl.pdfwriter", "CryptAcquireCertificatePrivateKey failed: " 
<< WindowsError(GetLastError()));
+SAL_WARN("vcl.pdfwriter", "CryptAcquireCertificatePrivateKey failed: " 
<< WindowsErrorString(GetLastError()));
 CertFreeCertificateContext(pCertContext);
 return false;
 }
@@ -7350,7 +7324,7 @@ bool PDFWriterImpl::finalizeSignature()
   NULL,
   NULL)))
 {
-SAL_WARN("vcl.pdfwriter", "CryptMsgOpenToEncode failed: " << 
WindowsError(GetLastError()));
+SAL_WARN("vcl.pdfwriter", "CryptMsgOpenToEncode failed: " << 
WindowsErrorString(GetLastError()));
 CertFreeCertificateContext(pCertContext);
 return false;
 }
@@ -7358,7 +7332,7 @@ bool PDFWriterImpl::finalizeSignature()
 if (!CryptMsgUpdate(hMsg, (const BYTE *)buffer1.get(), bytesRead1, FALSE) 
||
 !CryptMsgUpdate(hMsg, (const BYTE *)buffer2.get(), bytesRead2, TRUE))
 {
-SAL_WARN("vcl.pdfwriter", "CryptMsgUpdate failed: " << 
WindowsError(GetLa

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

2015-08-19 Thread Stephan Bergmann
 filter/source/config/cache/typedetection.cxx  |2 +-
 include/unotools/localfilehelper.hxx  |2 +-
 sfx2/source/dialog/filedlghelper.cxx  |3 +--
 sfx2/source/doc/docfile.cxx   |   19 ++-
 sfx2/source/doc/objcont.cxx   |4 ++--
 unotools/source/ucbhelper/localfilehelper.cxx |5 ++---
 6 files changed, 17 insertions(+), 18 deletions(-)

New commits:
commit 6d64afb31eefcbd8f1413aa30d952338e35771e4
Author: Stephan Bergmann 
Date:   Wed Aug 19 09:06:21 2015 +0200

Replace utl::LocalFileHelper::IsLocalFile -> ...::IsFileUrl

...given that vnd.sun.star.wfs is long gone.  Note that the old code could 
have
behaved differently in that for one it could have worked for relative URL 
input
(as osl_getSystemPathFromFileURL is allowed to accept relative URLs) and for
another could have failed for some file URLs (for which
osl_getSystemPathFromFileURL would return something other than 
osl_File_E_None
for whatever reason), but it looks plausible to assume that what the call 
sites
are really interested in is whether a given URL is a file URL.

Simplifies those call sites that already have a INetURLObject instance even
further.

Change-Id: Iaee4595d933a760b8321e42414a9ef0865311833

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index af80416..42b609c 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1136,7 +1136,7 @@ void TypeDetection::impl_openStream(utl::MediaDescriptor& 
rDescriptor)
 bool bSuccess = false;
 OUString sURL = rDescriptor.getUnpackedValueOrDefault( 
utl::MediaDescriptor::PROP_URL(), OUString() );
 bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( 
utl::MediaDescriptor::PROP_READONLY(), false );
-if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( 
INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) )
+if ( utl::LocalFileHelper::IsFileUrl( sURL ) )
 {
 // OOo uses own file locking mechanics in case of local file
 bSuccess = rDescriptor.addInputStreamOwnLock();
diff --git a/include/unotools/localfilehelper.hxx 
b/include/unotools/localfilehelper.hxx
index 8d93bf0..d53115b 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -44,7 +44,7 @@ namespace utl
 */
 static bool ConvertURLToPhysicalName( const OUString& rName, OUString& 
rReturn );
 
-static bool IsLocalFile(const OUString& rName);
+static bool IsFileUrl(const OUString& rUrl);
 
 static  ::com::sun::star::uno::Sequence< OUString >
 GetFolderContents( const OUString& rFolder, 
bool bFolder );
diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 2ed3a4b..464b098 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1963,8 +1963,7 @@ void FileDialogHelper_Impl::saveConfig()
 if ( ! mbIsSaveDlg )
 {
 OUString aPath = getPath();
-if ( !aPath.isEmpty() &&
- utl::LocalFileHelper::IsLocalFile( aPath ) )
+if ( utl::LocalFileHelper::IsFileUrl( aPath ) )
 {
 SetToken( aUserData, 1, ' ', aPath );
 bWriteConfig = true;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 845ed0e..e04b3ce 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -383,7 +383,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& 
aInitDate )
 
 bool SfxMedium::DocNeedsFileDateCheck() const
 {
-return ( !IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( 
GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
+return !IsReadOnly() && GetURLObject().GetProtocol() == INetProtocol::File;
 }
 
 util::DateTime SfxMedium::GetInitFileDate( bool bIgnoreOldValue )
@@ -733,7 +733,7 @@ void SfxMedium::StorageBackup_Impl()
 
 bool bBasedOnOriginalFile = ( !pImp->pTempFile && !( 
!pImp->m_aLogicName.isEmpty() && pImp->m_bSalvageMode )
 && !GetURLObject().GetMainURL( INetURLObject::NO_DECODE ).isEmpty()
-&& ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) )
+&& GetURLObject().GetProtocol() == INetProtocol::File
 && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) ) );
 
 if ( bBasedOnOriginalFile && pImp->m_aBackupURL.isEmpty()
@@ -948,7 +948,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 
 try
 {
-if ( pImp->m_bLocked && bLoading && 
::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) ) )
+if ( pImp->m_bLocked && bLoading
+ && GetURLObject().GetProtocol() == INetProtoc

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

2015-08-19 Thread Miklos Vajna
 cui/source/inc/cuitabarea.hxx|   42 +-
 cui/source/tabpages/tpgradnt.cxx |  160 +++
 2 files changed, 101 insertions(+), 101 deletions(-)

New commits:
commit f1b0e36464a1b27cb7bdcea0e1c647f1e81b8d75
Author: Miklos Vajna 
Date:   Wed Aug 19 09:15:57 2015 +0200

cui: prefix members of SvxGradientTabPage

Change-Id: Id3d2e7b404c70307e2571072b12229265cf6

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2216fb8..b48eecb 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -401,22 +401,22 @@ private:
 VclPtr m_pBtnLoad;
 VclPtr m_pBtnSave;
 
-const SfxItemSet&   rOutAttrs;
+const SfxItemSet&   m_rOutAttrs;
 
-XColorListRef pColorList;
-XGradientListRef  pGradientList;
+XColorListRef m_pColorList;
+XGradientListRef  m_pGradientList;
 
-ChangeType* pnGradientListState;
-ChangeType* pnColorListState;
-sal_uInt16* pPageType;
-sal_uInt16  nDlgType;
-sal_Int32*  pPos;
-bool*   pbAreaTP;
+ChangeType* m_pnGradientListState;
+ChangeType* m_pnColorListState;
+sal_uInt16* m_pPageType;
+sal_uInt16  m_nDlgType;
+sal_Int32*  m_pPos;
+bool*   m_pbAreaTP;
 
-XFillStyleItem  aXFStyleItem;
-XFillGradientItem   aXGradientItem;
-XFillAttrSetItemaXFillAttr;
-SfxItemSet& rXFSet;
+XFillStyleItem  m_aXFStyleItem;
+XFillGradientItem   m_aXGradientItem;
+XFillAttrSetItemm_aXFillAttr;
+SfxItemSet& m_rXFSet;
 
 DECL_LINK( ClickAddHdl_Impl, void * );
 DECL_LINK( ClickModifyHdl_Impl, void * );
@@ -443,17 +443,17 @@ public:
 virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
 
-voidSetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
+voidSetColorList( XColorListRef pColorList ) { m_pColorList = 
pColorList; }
 voidSetGradientList( XGradientListRef pGrdLst)
-{ pGradientList = pGrdLst; }
+{ m_pGradientList = pGrdLst; }
 
-voidSetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-voidSetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-voidSetPos( sal_Int32* pInPos ) { pPos = pInPos; }
-voidSetAreaTP( bool* pIn ) { pbAreaTP = pIn; }
+voidSetPageType( sal_uInt16* pInType ) { m_pPageType = pInType; }
+voidSetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
+voidSetPos( sal_Int32* pInPos ) { m_pPos = pInPos; }
+voidSetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
 
-voidSetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
-voidSetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
+voidSetGrdChgd( ChangeType* pIn ) { m_pnGradientListState = pIn; }
+voidSetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
 };
 
 //
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f8c6085..c84dc61 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -51,19 +51,19 @@ SvxGradientTabPage::SvxGradientTabPage
 ) :
 SfxTabPage  ( pParent, "GradientPage", "cui/ui/gradientpage.ui", 
&rInAttrs ),
 
-rOutAttrs   ( rInAttrs ),
-
-pnGradientListState ( 0 ),
-pnColorListState( 0 ),
-pPageType   ( 0 ),
-nDlgType( 0 ),
-pPos( 0 ),
-pbAreaTP( 0 ),
-
-aXFStyleItem( drawing::FillStyle_GRADIENT ),
-aXGradientItem  ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
-aXFillAttr  ( rInAttrs.GetPool() ),
-rXFSet  ( aXFillAttr.GetItemSet() )
+m_rOutAttrs   ( rInAttrs ),
+
+m_pnGradientListState ( 0 ),
+m_pnColorListState( 0 ),
+m_pPageType   ( 0 ),
+m_nDlgType( 0 ),
+m_pPos( 0 ),
+m_pbAreaTP( 0 ),
+
+m_aXFStyleItem( drawing::FillStyle_GRADIENT ),
+m_aXGradientItem  ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
+m_aXFillAttr  ( rInAttrs.GetPool() ),
+m_rXFSet  ( m_aXFillAttr.GetItemSet() )
 {
 get(m_pLbGradientType, "gradienttypelb");
 get(m_pFtCenterX,  "centerxft");
@@ -103,9 +103,9 @@ SvxGradientTabPage::SvxGradientTabPage
 m_pMtrColorFrom->SetValue( 100 );
 
 // setting the output device
-rXFSet.Put( aXFStyleItem );
-rXFSet.Put( aXGradientItem );
-m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() );
+m_rXFSet.Put( m_aXFStyleItem );
+m_rXFSet.Put( m_aXGradientItem );
+m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItem

[Libreoffice-commits] core.git: vcl/README.vars

2015-08-19 Thread Miklos Vajna
 vcl/README.vars |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b83c4ea54c24e2ef8bfa899e3ba10c413bb0aa4a
Author: Miklos Vajna 
Date:   Wed Aug 19 09:35:45 2015 +0200

vcl: document VCL_DOUBLEBUFFERING_ENABLE

Change-Id: I209fbef9f2ee43031175b68bce86b51724dfeec7

diff --git a/vcl/README.vars b/vcl/README.vars
index 2749d869..b76b051 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -8,6 +8,7 @@ SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
 
 VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where 
we do direct painting
 VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
+VCL_DOUBLEBUFFERING_ENABLE - enable a safe subset of double buffered painting 
(currently in Writer, not in any other applications)
 
 VCL_HIDE_WINDOWS - don't draw windows
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Takeshi Abe
 io/qa/textinputstream.cxx   |4 ++--
 io/source/TextInputStream/TextInputStream.cxx   |4 ++--
 io/source/TextOutputStream/TextOutputStream.cxx |4 ++--
 io/source/acceptor/acc_pipe.cxx |4 ++--
 io/source/acceptor/acc_socket.cxx   |4 ++--
 io/source/acceptor/acceptor.cxx |4 ++--
 io/source/connector/connector.cxx   |4 ++--
 io/source/connector/connector.hxx   |7 +++
 io/source/stm/odata.cxx |   11 +--
 io/source/stm/omark.cxx |6 +++---
 io/source/stm/opipe.cxx |4 ++--
 io/source/stm/opump.cxx |4 ++--
 io/test/stm/datatest.cxx|7 +++
 io/test/stm/marktest.cxx|8 +++-
 io/test/stm/pipetest.cxx|4 ++--
 io/test/stm/pumptest.cxx|6 +++---
 16 files changed, 40 insertions(+), 45 deletions(-)

New commits:
commit e00d41f76d6cae3a93c112117af01287eb003e0e
Author: Takeshi Abe 
Date:   Wed Aug 19 10:15:06 2015 +0900

io: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: Iad03db6b729a785ab8b29a69943fa45f5a36b21b
Reviewed-on: https://gerrit.libreoffice.org/17849
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index 15a59bc..89fc320 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -23,7 +23,7 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include 
 #include "com/sun/star/uno/RuntimeException.hdl"
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -34,7 +34,7 @@
 
 namespace {
 
-class Input: public cppu::WeakImplHelper1 {
+class Input: public cppu::WeakImplHelper {
 public:
 Input(): open_(true), index_(0) {}
 
diff --git a/io/source/TextInputStream/TextInputStream.cxx 
b/io/source/TextInputStream/TextInputStream.cxx
index dfe601b..75e6871 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -23,7 +23,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -53,7 +53,7 @@ namespace io_TextInputStream
 #define INITIAL_UNICODE_BUFFER_CAPACITY 0x100
 #define READ_BYTE_COUNT 0x100
 
-class OTextInputStream : public WeakImplHelper2< XTextInputStream2, 
XServiceInfo >
+class OTextInputStream : public WeakImplHelper< XTextInputStream2, 
XServiceInfo >
 {
 Reference< XInputStream > mxStream;
 
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx 
b/io/source/TextOutputStream/TextOutputStream.cxx
index 846b595..2c9377e 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -23,7 +23,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -50,7 +50,7 @@ namespace io_TextOutputStream
 
 // Implementation XTextOutputStream
 
-class OTextOutputStream : public WeakImplHelper2< XTextOutputStream2, 
XServiceInfo >
+class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, 
XServiceInfo >
 {
 Reference< XOutputStream > mxStream;
 
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 1265d0e..8fb7505 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -23,7 +23,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 using namespace ::osl;
 using namespace ::cppu;
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::io;
 namespace io_acceptor
 {
 
-typedef WeakImplHelper1< XConnection > MyPipeConnection;
+typedef WeakImplHelper< XConnection > MyPipeConnection;
 
 class PipeConnection :
 public MyPipeConnection
diff --git a/io/source/acceptor/acc_socket.cxx 
b/io/source/acceptor/acc_socket.cxx
index aaecf3c..103b1dd 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using namespace ::osl;
 using namespace ::cppu;
@@ -63,7 +63,7 @@ namespace io_acceptor {
 XStreamListener_hash_set;
 
 
-class SocketConnection : public ::cppu::WeakImplHelper2<
+class SocketConnection : public ::cppu::WeakImplHelper<
 ::com::sun::star::connection::XConnection,
 ::com::sun::star::connection::XConnectionBroadcaster>
 
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index b6db1a5..1c4b2301 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -22,7 +22,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include "cppuhelper/unourl.hxx"
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::connection;
 
 namespace io_acceptor
 {
-class OAcceptor : public WeakImplHelper2< XAcceptor, XServiceInfo >
+class OAcceptor : public

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

2015-08-19 Thread Takeshi Abe
 lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx|5 ++---
 lingucomponent/source/languageguessing/guesslang.cxx |4 ++--
 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |5 ++---
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |5 ++---
 lingucomponent/source/thesaurus/libnth/nthesdta.hxx  |4 ++--
 lingucomponent/source/thesaurus/libnth/nthesimp.hxx  |5 ++---
 6 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit e87c08babed9e3ac34908771fc95cab5386f01a2
Author: Takeshi Abe 
Date:   Wed Aug 19 10:23:16 2015 +0900

lingucomponent: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

Change-Id: Ibe00b26512a4895a603a084f4e816c74b99894df
Reviewed-on: https://gerrit.libreoffice.org/17850
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx 
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index ad5db82..d7bb068 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX
 
-#include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +55,7 @@ struct HDInfo {
 };
 
 class Hyphenator :
-public cppu::WeakImplHelper6
+public cppu::WeakImplHelper
 <
 XHyphenator,
 XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx 
b/lingucomponent/source/languageguessing/guesslang.cxx
index 9c848cd..2b2da0e 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -74,7 +74,7 @@ static osl::Mutex &  GetLangGuessMutex()
 }
 
 class LangGuess_Impl :
-public ::cppu::WeakImplHelper2<
+public ::cppu::WeakImplHelper<
 XLanguageGuessing,
 XServiceInfo >,
 private boost::noncopyable
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index df566a8..5a53fd3 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
 
-#include 
-#include 
+#include 
 
 #ifdef MACOSX
 #include 
@@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
 class MacSpellChecker :
-public cppu::WeakImplHelper6
+public cppu::WeakImplHelper
 <
 XSpellChecker,
 XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 097471b..ffbff58 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
 
-#include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -45,7 +44,7 @@ using namespace ::com::sun::star::linguistic2;
 class Hunspell;
 
 class SpellChecker :
-public cppu::WeakImplHelper6
+public cppu::WeakImplHelper
 <
 XSpellChecker,
 XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx 
b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 9e676e2..28e2f2f 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -21,13 +21,13 @@
 #define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESDTA_HXX
 
 #include 
-#include 
+#include 
 
 namespace linguistic
 {
 
 class Meaning :
-public cppu::WeakImplHelper1
+public cppu::WeakImplHelper
 <
 ::com::sun::star::linguistic2::XMeaning
 >
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx 
b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 87ab6dd..f88dc28 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
 
-#include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -56,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace 
beans {
 
 
 class Thesaurus :
-public cppu::WeakImplHelper5
+public cppu::WeakImplHelper
 

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #29 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

io: tdf#88206 replace cppu::WeakImplHelper* etc.

It will be available in 5.1.0.

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

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


[Libreoffice-commits] core.git: Branch 'feature/gsoc15-online-update' - onlineupdate/Executable_mar.mk onlineupdate/source

2015-08-19 Thread Nathan Yee
 onlineupdate/Executable_mar.mk|5 -
 onlineupdate/source/libmar/sign/nss_secutil.c |4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7a736718069f8d88743ffc6f51b7f59558db54e9
Author: Nathan Yee 
Date:   Tue Aug 18 15:20:37 2015 -0700

Revert strdup to PL_strdup in nss_secutil.c

Change-Id: Iec4ae361831f9002cf4317c0bd4c2d365c20282a
Reviewed-on: https://gerrit.libreoffice.org/17847
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index 7a42b3c..6ac1af1 100644
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_Executable_add_libs,mar,\
 ))
 endif
 
-$(eval $(call gb_Executable_use_externals,mar,nss3))
+$(eval $(call gb_Executable_use_externals,mar,\
+   nss3 \
+   plc4 \
+))
 
 $(eval $(call gb_Executable_add_cobjects,mar,\
onlineupdate/source/libmar/src/mar_create \
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c 
b/onlineupdate/source/libmar/sign/nss_secutil.c
index ac8954c..1f89cbf 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -214,7 +214,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, 
void *arg)
*/
   pw = SECU_FilePasswd(slot, retry, pwdata->data);
   pwdata->source = PW_PLAINTEXT;
-  pwdata->data = strdup(pw);
+  pwdata->data = PL_strdup(pw);
   /* it's already been dup'ed */
   return pw;
 case PW_EXTERNAL:
@@ -228,7 +228,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, 
void *arg)
   }
   /* Fall Through */
 case PW_PLAINTEXT:
-  return strdup(pwdata->data);
+  return PL_strdup(pwdata->data);
 default:
   break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #30 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

lingucomponent: tdf#88206 replace cppu::WeakImplHelper*

It will be available in 5.1.0.

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

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


[Libreoffice-commits] core.git: avmedia/source connectivity/source cui/source dbaccess/source desktop/source editeng/source filter/source fpicker/source framework/source include/unotools lingucomponen

2015-08-19 Thread Stephan Bergmann
 avmedia/source/framework/modeltools.cxx  |3 -
 avmedia/source/vlc/vlcframegrabber.cxx   |4 +-
 avmedia/source/win/framegrabber.cxx  |5 +--
 connectivity/source/drivers/dbase/DIndex.cxx |7 ++--
 cui/source/dialogs/hldocntp.cxx  |1 
 cui/source/dialogs/hldoctp.cxx   |1 
 cui/source/dialogs/hltpbase.cxx  |3 +
 cui/source/dialogs/multipat.cxx  |3 +
 cui/source/options/optinet2.cxx  |9 +++--
 cui/source/tabpages/tpline.cxx   |5 +--
 dbaccess/source/ui/dlg/dbfindex.cxx  |3 +
 desktop/source/app/appinit.cxx   |9 +++--
 editeng/source/items/flditem.cxx |5 +--
 filter/source/msfilter/msdffimp.cxx  |8 ++---
 filter/source/pdf/pdfexport.cxx  |4 +-
 fpicker/source/office/iodlg.cxx  |   14 ++---
 framework/source/services/substitutepathvars.cxx |3 -
 include/unotools/localfilehelper.hxx |   15 -
 lingucomponent/source/languageguessing/guesslang.cxx |4 +-
 sc/source/core/data/globalx.cxx  |6 +--
 sc/source/ui/collab/sccollaboration.cxx  |3 -
 sc/source/ui/docshell/externalrefmgr.cxx |5 +--
 sd/source/filter/html/htmlex.cxx |3 -
 sd/source/filter/ppt/pptin.cxx   |   11 ---
 sd/source/ui/dlg/navigatr.cxx|6 ++-
 sd/source/ui/view/sdview4.cxx|4 +-
 sfx2/source/appl/appcfg.cxx  |   26 -
 sfx2/source/appl/linkmgr2.cxx|4 +-
 sfx2/source/doc/docfac.cxx   |3 -
 sfx2/source/doc/docfile.cxx  |   29 ---
 sfx2/source/doc/new.cxx  |4 +-
 sfx2/source/doc/objstor.cxx  |3 -
 sfx2/source/doc/objxtor.cxx  |4 +-
 sfx2/source/doc/printhelper.cxx  |1 
 sfx2/source/inet/inettbc.cxx |2 -
 sfx2/source/view/viewfrm.cxx |5 +--
 sot/source/sdstor/storage.cxx|5 +--
 svtools/source/control/inettbc.cxx   |8 +
 svtools/source/graphic/grfmgr.cxx|4 +-
 svtools/source/misc/openfiledroptargetlistener.cxx   |3 -
 svtools/source/misc/templatefoldercache.cxx  |6 ++-
 svx/source/dialog/docrecovery.cxx|3 -
 svx/source/gallery2/galtheme.cxx |6 +--
 svx/source/svdraw/svdotxln.cxx   |4 +-
 svx/source/unodraw/unoshap2.cxx  |4 +-
 sw/source/core/swg/SwXMLTextBlocks.cxx   |4 +-
 sw/source/filter/ww8/ww8par.cxx  |3 -
 unotools/source/config/defaultoptions.cxx|4 +-
 unotools/source/config/pathoptions.cxx   |   14 -
 unotools/source/ucbhelper/localfilehelper.cxx|   20 -
 unotools/source/ucbhelper/ucbhelper.cxx  |5 +--
 uui/source/fltdlg.cxx|1 
 vcl/source/filter/graphicfilter.cxx  |3 -
 53 files changed, 150 insertions(+), 172 deletions(-)

New commits:
commit 236714e86c1c517d84d38395efabaf6e3793d196
Author: Stephan Bergmann 
Date:   Wed Aug 19 10:43:19 2015 +0200

Clean up remaining utl::LocalFileHelper::Convert...

together with 58d68a1bc9146334376206ae7ba8b1a6594a1040
"ConvertURLToSystemPath->getSystemPathFromFileURL" and
28f3464a571a23a2c16bd0980e9021b95d011511
"ConvertSystemPathToURL->getFileURLFromSystemPath," this replaces all those
Convert... functionality with direct calls to the corresponding 
osl::FileBase
functions.

Change-Id: I2876171cd337a5eb939d25d8cf1e0c1253ff73a7

diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index c42e4c1..40d48a2 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -80,7 +79,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& 
o_rOutput)
 
 // Create a temporary folder for conversion
 OUString sOutput;
-
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
 sOutput);
+osl::FileBase::getFileURLFromSystemPath(::utl::TempFile::CreateTempName(), 
sOutput);
 // remove .tmp extension
 sOutput = sOutput.copy(0, sOutput.getLength()-4);
 
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx 
b/avmedia/source/vlc/vlcframegrabber.cxx
index bb100c2..e2634f9 100644
--- a/avmedia/source/

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

2015-08-19 Thread Stephan Bergmann
 framework/source/services/substitutepathvars.cxx |   25 +++
 1 file changed, 4 insertions(+), 21 deletions(-)

New commits:
commit d3d7cb989b8d3c7d8e9947511bf78e9aefedc490
Author: Stephan Bergmann 
Date:   Wed Aug 19 11:15:52 2015 +0200

Remove ConvertOSLtoUCBURL

"Not all OSL URL's can be mapped to UCB URL's" might have been true in the 
days
of vnd.sun.star.wfs, but I can't see any good reason for this functionality
today.

Change-Id: Ia887531ee9fa70092766406cee1fc8962576a8ac

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index 7a86ef6..8ab3796 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -260,7 +260,6 @@ public:
 
 protected:
 voidSetPredefinedPathVariables();
-OUString   ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const;
 
 // Special case (transient) values can change during runtime!
 // Don't store them in the pre defined struct
@@ -787,21 +786,6 @@ throw ( NoSuchElementException, RuntimeException, 
std::exception )
 return impl_getSubstituteVariableValue( aVariable );
 }
 
-OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& 
aOSLCompliantURL ) const
-{
-OUString aResult;
-OUString   aTemp;
-
-osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp );
-osl::FileBase::getFileURLFromSystemPath( aTemp, aResult );
-
-// Not all OSL URL's can be mapped to UCB URL's!
-if ( aResult.isEmpty() )
-return aOSLCompliantURL;
-else
-return aResult;
-}
-
 OUString SubstitutePathVariables::GetWorkPath() const
 {
 OUString aWorkPath;
@@ -826,7 +810,7 @@ OUString SubstitutePathVariables::GetWorkVariableValue() 
const
 }
 else
 aWorkPath = x.get();
-return ConvertOSLtoUCBURL( aWorkPath );
+return aWorkPath;
 }
 
 OUString SubstitutePathVariables::GetHomeVariableValue() const
@@ -835,7 +819,7 @@ OUString SubstitutePathVariables::GetHomeVariableValue() 
const
 OUString   aHomePath;
 
 aSecurity.getHomeDir( aHomePath );
-return ConvertOSLtoUCBURL( aHomePath );
+return aHomePath;
 }
 
 OUString SubstitutePathVariables::GetPathVariableValue() const
@@ -1086,7 +1070,6 @@ throw ( RuntimeException )
 OUString aTemp;
 if ( osl::FileBase::getFileURLFromSystemPath( rURL, aTemp ) == 
osl::FileBase::E_None )
 {
-aTemp = ConvertOSLtoUCBURL( aTemp );
 if ( !aTemp.isEmpty() )
 {
 aURL = INetURLObject( aTemp ).GetMainURL( 
INetURLObject::NO_DECODE );
@@ -1238,7 +1221,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables()
 // It's not possible to detect when an empty value would actually be used.
 // (note: getenv is a hack to detect if we're running in a unit test)
 if (aState == ::utl::Bootstrap::PATH_EXISTS || getenv("SRC_ROOT")) {
-m_aPreDefVars.m_FixedVar[ PREDEFVAR_USERPATH ] = ConvertOSLtoUCBURL( 
sVal );
+m_aPreDefVars.m_FixedVar[ PREDEFVAR_USERPATH ] = sVal;
 }
 
 // Set $(inst), $(instpath), $(insturl)
@@ -1297,7 +1280,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables()
 // Set $(temp)
 OUString aTmp;
 osl::FileBase::getTempDirURL( aTmp );
-m_aPreDefVars.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
+m_aPreDefVars.m_FixedVar[ PREDEFVAR_TEMP ] = aTmp;
 }
 
 struct Instance {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Stephan Bergmann
 framework/source/services/substitutepathvars.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 8894f3cfa0c9d39198a1ec18e3f46e40f76a955b
Author: Stephan Bergmann 
Date:   Wed Aug 19 11:20:52 2015 +0200

Remove redundant check

...became redundant with previous commit
d3d7cb989b8d3c7d8e9947511bf78e9aefedc490 "Remove ConvertOSLtoUCBURL."

Change-Id: I08c436dec8ed661eae60a17723fc63e6aafb1f86

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index 8ab3796..ad75eee 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1070,13 +1070,8 @@ throw ( RuntimeException )
 OUString aTemp;
 if ( osl::FileBase::getFileURLFromSystemPath( rURL, aTemp ) == 
osl::FileBase::E_None )
 {
-if ( !aTemp.isEmpty() )
-{
-aURL = INetURLObject( aTemp ).GetMainURL( 
INetURLObject::NO_DECODE );
-if( aURL.isEmpty() )
-return rURL;
-}
-else
+aURL = INetURLObject( aTemp ).GetMainURL( INetURLObject::NO_DECODE 
);
+if( aURL.isEmpty() )
 return rURL;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

2015-08-19 Thread Tor Lillqvist
 vcl/win/source/gdi/winlayout.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ef876630b9874dccb9a2fd10dabdd0acb2334d6c
Author: Tor Lillqvist 
Date:   Wed Aug 19 12:37:56 2015 +0300

Make the pixel greylevel debug output work as intended

Change-Id: I29cb771eb059f560b7cbd449257ffda581b40f11

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7f4c4a4..540a76b 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -114,7 +114,10 @@ char ColorFor(COLORREF aColor)
 {
 if (aColor == RGB(0xFF, 0xFF, 0xFF))
 return ' ';
-return '0' + 10*((GetRValue(aColor) + GetGValue(aColor) + 
GetBValue(aColor)) / (0xFF*3));
+else if (aColor == RGB(0x00, 0x00, 0x00))
+return 'X';
+
+return '0' + (10*(GetRValue(aColor) + GetGValue(aColor) + 
GetBValue(aColor))) / (0xFF*3);
 }
 
 OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC hDC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Tor Lillqvist
 vcl/win/source/gdi/winlayout.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2d59ef47560ef06ecaef008ac13e2fea83153516
Author: Tor Lillqvist 
Date:   Wed Aug 19 12:37:56 2015 +0300

Make the pixel greylevel debug output work as intended

Change-Id: I29cb771eb059f560b7cbd449257ffda581b40f11

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7f4c4a4..540a76b 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -114,7 +114,10 @@ char ColorFor(COLORREF aColor)
 {
 if (aColor == RGB(0xFF, 0xFF, 0xFF))
 return ' ';
-return '0' + 10*((GetRValue(aColor) + GetGValue(aColor) + 
GetBValue(aColor)) / (0xFF*3));
+else if (aColor == RGB(0x00, 0x00, 0x00))
+return 'X';
+
+return '0' + (10*(GetRValue(aColor) + GetGValue(aColor) + 
GetBValue(aColor))) / (0xFF*3);
 }
 
 OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC hDC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Pranav Kant
 libreofficekit/source/gtk/lokdocview.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 520053459aa6a34b6d9ad52d97704399e5138d3d
Author: Pranav Kant 
Date:   Sun Aug 16 15:17:15 2015 +0530

Fix incomplete g-i annotations

Change-Id: I2665a12251921523045f4071df88ca69ecd5a5c0

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 7f2dc73..41ec8f0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1810,7 +1810,10 @@ lok_doc_view_open_document_finish (LOKDocView* pDocView, 
GAsyncResult* res, GErr
 /**
  * lok_doc_view_open_document:
  * @pDocView: The #LOKDocView instance
- * @pPath: The path of the document that #LOKDocView widget should try to open
+ * @pPath: (transfer full): The path of the document that #LOKDocView widget 
should try to open
+ * @cancellable:
+ * @callback:
+ * @userdata:
  *
  * Returns: %TRUE if the document is loaded succesfully, %FALSE otherwise
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source desktop/source extensions/source filter/source include/comphelper include/unotools package/source sdext/Library_pdfim

2015-08-19 Thread Stephan Bergmann
 comphelper/Library_comphelper.mk  |1 
 comphelper/source/misc/fileurl.cxx|   29 
+++
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |3 
 desktop/source/app/app.cxx|3 
 extensions/source/plugin/base/context.cxx |3 
 extensions/source/plugin/base/manager.cxx |3 
 extensions/source/plugin/base/xplugin.cxx |5 -
 filter/source/config/cache/typedetection.cxx  |4 -
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx   |3 
 filter/source/xsltdialog/xmlfiltercommon.hxx  |6 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |5 -
 filter/source/xsltdialog/xmlfiltertabdialog.cxx   |7 +
 include/comphelper/fileurl.hxx|   37 
++
 include/unotools/localfilehelper.hxx  |2 
 package/source/zippackage/ZipPackage.cxx  |3 
 sdext/Library_pdfimport.mk|1 
 sdext/source/pdfimport/filterdet.cxx  |3 
 sfx2/source/dialog/filedlghelper.cxx  |5 -
 sfx2/source/doc/docfile.cxx   |6 -
 sfx2/source/doc/objcont.cxx   |6 -
 svl/source/fsstor/fsstorage.cxx   |   13 ---
 sw/source/ui/chrdlg/chardlg.cxx   |3 
 ucb/source/ucp/file/bc.cxx|3 
 unotools/source/ucbhelper/localfilehelper.cxx |5 -
 uui/source/iahndl-ioexceptions.cxx|5 -
 vcl/generic/print/genprnpsp.cxx   |3 
 vcl/osx/salframe.cxx  |3 
 xmlhelp/source/cxxhelp/provider/db.hxx|4 -
 28 files changed, 114 insertions(+), 60 deletions(-)

New commits:
commit 5da0dce19caaf87a6fe53750a7e9ea5d564d6a12
Author: Stephan Bergmann 
Date:   Wed Aug 19 12:24:37 2015 +0200

Consolidate isFileUrl checks

Change-Id: I1b74fdfaa09c4d0d6c296253958e83e78b546a9a

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 2192217..6f2cc4c 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/documentiologring \
 comphelper/source/misc/evtlistenerhlp \
 comphelper/source/misc/evtmethodhelper \
+comphelper/source/misc/fileurl \
 comphelper/source/misc/getexpandeduri \
 comphelper/source/misc/instancelocker \
 comphelper/source/misc/interaction \
diff --git a/comphelper/source/misc/fileurl.cxx 
b/comphelper/source/misc/fileurl.cxx
new file mode 100644
index 000..9abf1a9
--- /dev/null
+++ b/comphelper/source/misc/fileurl.cxx
@@ -0,0 +1,29 @@
+/* -*- 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 .
+ */
+
+#include 
+
+#include 
+#include 
+
+bool comphelper::isFileUrl(OUString const & url) {
+return url.startsWithIgnoreAsciiCase("file:");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx 
b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 044eeaa..7ba751c 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "officeinstallationdirectories.hxx"
 
@@ -46,7 +47,7 @@ using namespace comphelper;
 
 static bool makeCanonicalFileURL( OUString & rURL )
 {
-OSL_ENSURE(rURL.startsWithIgnoreAsciiCase("file:"), "File URL expected!");
+OSL_ENSURE(comphelper::isFileUrl(rURL), "File URL expected!");
 
 O

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

2015-08-19 Thread Katarina Behrens
 sc/source/filter/inc/worksheetbuffer.hxx  |5 ++--
 sc/source/filter/oox/pivotcachebuffer.cxx |2 -
 sc/source/filter/oox/workbookfragment.cxx |3 ++
 sc/source/filter/oox/worksheetbuffer.cxx  |   33 --
 4 files changed, 30 insertions(+), 13 deletions(-)

New commits:
commit 9528fb4a6adb2116a287653cfadc208e6c970fbc
Author: Katarina Behrens 
Date:   Mon Aug 17 15:42:35 2015 +0200

tdf#77431: Move setting sheet visibility to finalize phase

and thus fix xlsx-specific issue that 1st sheet can't be hidden.
Also kill some UNO in the process.

I'm not sure if guarding against all sheets being hidden (by having
at least active sheet visible) is absolutely necessary, but better
be safe than sorry.

Change-Id: I4ad21d223b2effe427ab1d5411c035886f6cc71c

diff --git a/sc/source/filter/inc/worksheetbuffer.hxx 
b/sc/source/filter/inc/worksheetbuffer.hxx
index 35e9c66..148f447 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -62,7 +62,7 @@ public:
 voidimportSheet( SequenceInputStream& rStrm );
 /** Inserts a new empty sheet into the document. Looks for an unused name.
  @return  Index of the new sheet in the Calc document. */
-sal_Int16   insertEmptySheet( const OUString& rPreferredName, bool 
bVisible );
+sal_Int16   insertEmptySheet( const OUString& rPreferredName );
 
 /** Returns the number of original sheets contained in the workbook. */
 sal_Int32   getWorksheetCount() const;
@@ -84,6 +84,7 @@ public:
 if sSheetNameRef doesn't start with '#' it is ignored and not modified
 */
 voidconvertSheetNameRef( OUString& sSheetNameRef ) const;
+void finalizeImport( sal_Int16 nActiveSheet );
 
 private:
 struct SheetInfo : public SheetInfoModel
@@ -98,7 +99,7 @@ private:
 typedef ::std::pair< sal_Int16, OUString > IndexNamePair;
 
 /** Creates a new sheet in the Calc document. Does not insert anything in 
the own lists. */
-IndexNamePair   createSheet( const OUString& rPreferredName, sal_Int32 
nSheetPos, bool bVisible );
+IndexNamePair   createSheet( const OUString& rPreferredName, sal_Int32 
nSheetPos );
 /** Creates a new sheet in the Calc document and inserts the related 
SheetInfo. */
 voidinsertSheet( const SheetInfoModel& rModel );
 
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx 
b/sc/source/filter/oox/pivotcachebuffer.cxx
index e35eaae..e7bad2d 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -1371,7 +1371,7 @@ void PivotCache::prepareSourceDataSheet()
 {
 maColSpans.insert( ValueRange( rRange.StartColumn, rRange.EndColumn ) 
);
 OUString aSheetName = "DPCache_" + maSheetSrcModel.maSheet;
-rRange.Sheet = getWorksheets().insertEmptySheet( aSheetName, false );
+rRange.Sheet = getWorksheets().insertEmptySheet( aSheetName );
 mbValidSource = mbDummySheet = rRange.Sheet >= 0;
 }
 }
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 06881c0..0560ad5 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -494,6 +494,9 @@ void WorkbookFragment::finalizeImport()
 aIt->first.reset();
 }
 
+sal_Int16 nActiveSheet = getViewSettings().getActiveCalcSheet();
+getWorksheets().finalizeImport( nActiveSheet );
+
 // final conversions, e.g. calculation settings and view settings
 finalizeWorkbookImport();
 
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx 
b/sc/source/filter/oox/worksheetbuffer.cxx
index 9d680dcc..e55ea42 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -34,6 +34,7 @@
 #include 
 #include "biffinputstream.hxx"
 #include "excelhandlers.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -76,9 +77,13 @@ void WorksheetBuffer::importSheet( SequenceInputStream& 
rStrm )
 insertSheet( aModel );
 }
 
-sal_Int16 WorksheetBuffer::insertEmptySheet( const OUString& rPreferredName, 
bool bVisible )
+sal_Int16 WorksheetBuffer::insertEmptySheet( const OUString& rPreferredName )
 {
-return createSheet( rPreferredName, SAL_MAX_INT32, bVisible ).first;
+IndexNamePair aIndexName = createSheet( rPreferredName, SAL_MAX_INT32 );
+ScDocument& rDoc = getScDocument();
+
+rDoc.SetVisible( aIndexName.first, false );
+return aIndexName.first;
 }
 
 sal_Int32 WorksheetBuffer::getWorksheetCount() const
@@ -170,7 +175,7 @@ WorksheetBuffer::SheetInfo::SheetInfo( const 
SheetInfoModel& rModel, sal_Int16 n
 {
 }
 
-WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& 
rPreferredName, sal_Int32 nSheetPos, bool bVisible )
+WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& 
r

[Libreoffice-commits] core.git: chart2/source comphelper/source dbaccess/source extensions/source forms/source include/comphelper include/svtools svtools/source svx/source

2015-08-19 Thread Stephan Bergmann
 chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |2 
 chart2/source/controller/inc/dlg_ChartType_UNO.hxx |2 
 comphelper/source/misc/types.cxx   |2 
 dbaccess/source/ui/browser/exsrcbrw.cxx|6 +-
 dbaccess/source/ui/browser/formadapter.cxx |2 
 dbaccess/source/ui/browser/sbagrid.cxx |2 
 dbaccess/source/ui/browser/unodatbr.cxx|6 +-
 dbaccess/source/ui/inc/exsrcbrw.hxx|2 
 dbaccess/source/ui/inc/sbagrid.hxx |2 
 dbaccess/source/ui/inc/unodatbr.hxx|2 
 dbaccess/source/ui/inc/unosqlmessage.hxx   |2 
 dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx |8 +--
 dbaccess/source/ui/uno/DBTypeWizDlg.cxx|6 +-
 dbaccess/source/ui/uno/DBTypeWizDlg.hxx|2 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx   |6 +-
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx   |2 
 dbaccess/source/ui/uno/TableFilterDlg.cxx  |6 +-
 dbaccess/source/ui/uno/TableFilterDlg.hxx  |2 
 dbaccess/source/ui/uno/UserSettingsDlg.cxx |6 +-
 dbaccess/source/ui/uno/UserSettingsDlg.hxx |2 
 dbaccess/source/ui/uno/admindlg.cxx|6 +-
 dbaccess/source/ui/uno/admindlg.hxx|2 
 dbaccess/source/ui/uno/copytablewizard.cxx |8 +--
 dbaccess/source/ui/uno/unosqlmessage.cxx   |6 +-
 extensions/source/abpilot/unodialogabp.cxx |6 +-
 extensions/source/abpilot/unodialogabp.hxx |2 
 extensions/source/dbpilots/unoautopilot.hxx|2 
 extensions/source/propctrlr/MasterDetailLinkDialog.cxx |6 +-
 extensions/source/propctrlr/MasterDetailLinkDialog.hxx |2 
 extensions/source/propctrlr/controlfontdialog.cxx  |6 +-
 extensions/source/propctrlr/controlfontdialog.hxx  |2 
 extensions/source/propctrlr/pcrunodialogs.cxx  |6 +-
 extensions/source/propctrlr/pcrunodialogs.hxx  |2 
 forms/source/component/Button.cxx  |8 +--
 forms/source/component/Button.hxx  |4 -
 forms/source/component/CheckBox.cxx|8 +--
 forms/source/component/CheckBox.hxx|4 -
 forms/source/component/Columns.cxx |9 +---
 forms/source/component/Columns.hxx |2 
 forms/source/component/ComboBox.cxx|   22 +-
 forms/source/component/ComboBox.hxx|6 +-
 forms/source/component/Currency.cxx|8 +--
 forms/source/component/Currency.hxx|4 -
 forms/source/component/DatabaseForm.cxx|   12 ++---
 forms/source/component/DatabaseForm.hxx|8 +--
 forms/source/component/Date.cxx|8 +--
 forms/source/component/Date.hxx|4 -
 forms/source/component/Edit.cxx|   12 ++---
 forms/source/component/Edit.hxx|4 -
 forms/source/component/EventThread.cxx |4 -
 forms/source/component/File.cxx|4 -
 forms/source/component/File.hxx|2 
 forms/source/component/FixedText.cxx   |4 -
 forms/source/component/FixedText.hxx   |2 
 forms/source/component/FormComponent.cxx   |2 
 forms/source/component/FormattedField.cxx  |   12 ++---
 forms/source/component/FormattedField.hxx  |4 -
 forms/source/component/FormattedFieldWrapper.cxx   |   10 ++--
 forms/source/component/FormattedFieldWrapper.hxx   |2 
 forms/source/component/FormsCollection.cxx |8 +--
 forms/source/component/FormsCollection.hxx |8 +--
 forms/source/component/Grid.cxx|   16 +++
 forms/source/component/Grid.hxx|   10 ++--
 forms/source/component/GroupBox.cxx|8 +--
 forms/source/component/GroupBox.hxx|4 -
 forms/source/component/Hidden.cxx  |2 
 forms/source/component/Hidden.hxx  |2 
 forms/source/component/ImageButton.cxx |8 +--
 forms/source/component/ImageButton.hxx |4 -
 forms/source/component/ImageControl.cxx|8 +--
 forms/source/component/ImageControl.hxx|4 -
 forms/source/component/ListBox.cxx |   20 -
 forms/source/component/ListBox.hxx |4 -
 forms/source/component/Numeric.cxx |8 +--
 forms/source/component/Numeric.hxx |4 -
 forms/source/component/Pattern.cxx |8 +--

[Bug 92018] Implement caching for native widget rendering for Mac / OpenGL rendering

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=92018

Michael Meeks  changed:

   What|Removed |Added

 Blocks||93529
Summary|Implement caching for   |Implement caching for
   |native widget rendering in  |native widget rendering for
   |OpenGL rendering|Mac / OpenGL rendering

--- Comment #3 from Michael Meeks  ---
commit dea885f80a80c6a5839ee5dbf8521487186a9522
Author: Tomaž Vajngerl 
Date:   Mon Aug 3 15:06:55 2015 +0900

opengl: cache native widget textures also for Windows

is the windows piece; I guess Mac is the last bit (?)

-- 
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 92019] Implement texture atlas for OpenGL

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=92019

Michael Meeks  changed:

   What|Removed |Added

 Blocks||93529

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

2015-08-19 Thread Katarina Behrens
 sc/qa/unit/data/xlsx/hidden_sheets.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx  |   14 ++
 2 files changed, 14 insertions(+)

New commits:
commit 7a57765241b8e9b57273f7548445ea57a1f44401
Author: Katarina Behrens 
Date:   Wed Aug 19 12:46:12 2015 +0200

Bugfix test for tdf#77431

Change-Id: I2120ed72c281d2078e387f7f3ae91004ad95822c
Reviewed-on: https://gerrit.libreoffice.org/17855
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sc/qa/unit/data/xlsx/hidden_sheets.xlsx 
b/sc/qa/unit/data/xlsx/hidden_sheets.xlsx
new file mode 100644
index 000..771de7f
Binary files /dev/null and b/sc/qa/unit/data/xlsx/hidden_sheets.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 51b83d0..98c80d3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -204,6 +204,7 @@ public:
 void testEmbeddedImageXLS();
 void testEditEngStrikeThroughXLSX();
 void testRefStringXLSX();
+void testHiddenSheetsXLSX();
 
 void testBnc762542();
 
@@ -304,6 +305,8 @@ public:
 
 CPPUNIT_TEST(testBnc762542);
 
+CPPUNIT_TEST(testHiddenSheetsXLSX);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3138,6 +3141,17 @@ void ScFiltersTest::testBnc762542()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testHiddenSheetsXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("hidden_sheets.", XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should be hidden", false, 
rDoc.IsVisible(0));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd sheet should be visible", true, 
rDoc.IsVisible(1));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("3rd sheet should be hidden", false, 
rDoc.IsVisible(2));
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: 6 commits - comphelper/source filter/source forms/source include/comphelper oox/source sc/source

2015-08-19 Thread Stephan Bergmann
 comphelper/source/misc/types.cxx  |   32 -
 filter/source/msfilter/escherex.cxx   |6 ++--
 forms/source/component/FormattedField.cxx |6 ++--
 forms/source/component/clickableimage.cxx |2 -
 include/comphelper/types.hxx  |   37 --
 oox/source/export/drawingml.cxx   |4 +--
 sc/source/filter/oox/worksheetbuffer.cxx  |2 -
 7 files changed, 20 insertions(+), 69 deletions(-)

New commits:
commit a8d3a1048f414424018f98a1c0342d57bcae
Author: Stephan Bergmann 
Date:   Wed Aug 19 14:29:45 2015 +0200

loplugin:literaltoboolconversion

Change-Id: Iad48cf4949cb4a398a8abee32febaf8e152dade5

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx 
b/sc/source/filter/oox/worksheetbuffer.cxx
index e55ea42..00d789c 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -233,7 +233,7 @@ void WorksheetBuffer::finalizeImport( sal_Int16 
nActiveSheet )
 if ( aSheetInfo->mnCalcSheet == nActiveSheet)
 rDoc.SetVisible( aSheetInfo->mnCalcSheet, true );
 else
-rDoc.SetVisible( aSheetInfo->mnCalcSheet, (aSheetInfo->mnState == 
XML_visible) ? 1 : 0 );
+rDoc.SetVisible( aSheetInfo->mnCalcSheet, aSheetInfo->mnState == 
XML_visible );
 }
 }
 
commit ef1556416adb5ee88b9560e430281e7ce480da32
Author: Stephan Bergmann 
Date:   Wed Aug 19 14:05:24 2015 +0200

Avoid css::uno::Sequence (which is not a proper UNO type)

Change-Id: I887c358161f7ac4032b9ad9166ff16aa0b19eaa1

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 5d01ec6..eb13752 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1447,8 +1447,8 @@ bool EscherPropertyContainer::CreateGraphicProperties(
 sal_uInt16 nAngle = 0;
 if ( rSource == "MetaFile" )
 {
-::com::sun::star::uno::Sequence aSeq = 
*static_cast const *>(aAny.getValue());
-const sal_uInt8*pAry = aSeq.getArray();
+::com::sun::star::uno::Sequence aSeq = 
*static_cast const *>(aAny.getValue());
+const sal_Int8*pAry = aSeq.getArray();
 sal_uInt32  nAryLen = aSeq.getLength();
 
 // the metafile is already rotated
@@ -1457,7 +1457,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
 if ( pAry && nAryLen )
 {
 Graphic aGraphic;
-SvMemoryStream  aTemp( const_cast(pAry), nAryLen, 
StreamMode::READ );
+SvMemoryStream  aTemp( const_cast(pAry), nAryLen, 
StreamMode::READ );
 sal_uInt32 nErrCode = GraphicConverter::Import( aTemp, 
aGraphic, ConvertDataFormat::WMF );
 if ( nErrCode == ERRCODE_NONE )
 {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fc48fae..52dc142e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1477,9 +1477,9 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 
 void DrawingML::GetUUID( OStringBuffer& rBuffer )
 {
-Sequence< sal_uInt8 > aSeq( 16 );
+sal_uInt8 aSeq[16];
 static const char cDigits[17] = "0123456789ABCDEF";
-rtl_createUuid( aSeq.getArray(), 0, true );
+rtl_createUuid( aSeq, 0, true );
 int i;
 
 rBuffer.append( '{' );
commit 63de6ba249a0e4349b66442821ad73aff71f25d8
Author: Stephan Bergmann 
Date:   Wed Aug 19 14:04:47 2015 +0200

There is no css::uno::Sequence in UNO

Change-Id: Ibf5095fea20314180a4e002295c89f570d66d45f

diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 06afb83..025000d 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -333,18 +333,6 @@ bool compare_impl(const Type& _rType, const void* pData, 
const Any& _rValue)
 memcmp(rLeftSeq.getConstArray(), 
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
 }
 }
-else if (_rType == cppu::UnoType>::get())
-{
-Sequence aTemp;
-bConversionSuccess = _rValue >>= aTemp;
-if (bConversionSuccess)
-{
-const Sequence& rLeftSeq = 
*static_cast*>(pData);
-const Sequence& rRightSeq = aTemp;
-bRes = rLeftSeq.getLength() == rRightSeq.getLength() &&
-memcmp(rLeftSeq.getConstArray(), 
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
-}
-}
 else if (_rType == cppu::UnoType>::get())
 {
 Sequence aTemp;
commit 39ce314c12e3570c074475c7809c3b37b2241c41
Author: Stephan Bergmann 
Date:   Wed Aug 19 13:53:34 2015 +0200


[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

2015-08-19 Thread Tor Lillqvist
 vcl/win/source/gdi/winlayout.cxx |   55 +++
 1 file changed, 45 insertions(+), 10 deletions(-)

New commits:
commit fe4208066fff7d74059e5eec18aea6dc594b0c14
Author: Tor Lillqvist 
Date:   Wed Aug 19 15:44:30 2015 +0300

Still more hacking on OpenGL glyph caching for Windows

Show the whole height of the cache bitmap after all (when SAL_LOG
contains vcl.gdi.opengl). The interesting pieces are often at the
bottom, like the tip of the hook of the "j" glyphs that used to bleed
over into the preceding glyphs, usually "i", when they were rendered
into the same chunk.

Add more space between glyphs and at top and bottom of the bitmap, for
anti-aliasing. The glyph ABC widths don't take expansions caused by
anti-aliasing into consideration and are misleading. Hopefully
anti-aliasing can expand the (partially) painted pixels of a glyph
just one column/row in each direction, but for safety use a two-pixel
border. (Defensive programming, eek?)

Some getWidth() instead of GetWidth() etc craziness. Using
 types truly is programming-by-coincidence as Thorsten
says.

In a dbgutil build, setting the environment variable
VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS causes the code to turn off
anti-aliasing for the fonts used. I used this to verify that it indeed
was anti-aliasing that made the ABC widths inconsistent with
reality. Not sure if it makes sense to keep this code in?

Anyway, now I don't see any leaked pixels in "i" glyphs any more,
touch wood.

Change-Id: If527343ff1dcdb1fa208cd5e7fa4d08f812d0d7b

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 540a76b..c1c2d7e 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -147,7 +147,7 @@ OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC 
hDC)
 }
 std::cerr << std::endl;
 
-for (long y = 0; y < std::min(20l, aBitmap.bmHeight); y++)
+for (long y = 0; y < aBitmap.bmHeight; y++)
 {
 for (long x = 0; x < std::min(75l, aBitmap.bmWidth); x++)
 std::cerr << ColorFor(GetPixel(hDC, x, y));
@@ -279,7 +279,10 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" << 
aABC[i].abcC << " ";
 std::cerr << std::endl;
 
-// Avoid kerning as we want to be able to use individual rectangles for 
each glyph
+// Try hard to avoid overlap as we want to be able to use
+// individual rectangles for each glyph. The ABC widths don't
+// take anti-alising into consideration. Let's hope that leaving
+// four pixels of "extra" space inbetween glyphs will help.
 std::vector aDX(nCount);
 int totWidth = 0;
 for (int i = 0; i < nCount; i++)
@@ -289,6 +292,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 aDX[0] += std::abs(aABC[0].abcA);
 if (i < nCount-1)
 aDX[i] += std::abs(aABC[i+1].abcA);
+aDX[i] += 4;
 totWidth += aDX[i];
 }
 
@@ -299,9 +303,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 if (!DeleteDC(hDC))
 SAL_WARN("vcl.gdi", "DeleteDC failed: " << 
WindowsErrorString(GetLastError()));
 
-OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
+// Leave two pixels of extra space also at top and bottom
+OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy + 4);
 
-hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
+HFONT hNonAntialiasedFont = NULL;
+
+#ifdef DBG_UTIL
+static bool bNoAntialias = 
(std::getenv("VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS") != NULL);
+if (bNoAntialias)
+{
+LOGFONTW aLogfont;
+if (!GetObjectW(rLayout.mhFont, sizeof(aLogfont), &aLogfont))
+{
+SAL_WARN("vcl.gdi", "GetObject failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+aLogfont.lfQuality = NONANTIALIASED_QUALITY;
+hNonAntialiasedFont = CreateFontIndirectW(&aLogfont);
+if (hNonAntialiasedFont == NULL)
+{
+SAL_WARN("vcl.gdi", "CreateFontIndirect failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+}
+#endif
+
+hOrigFont = SelectFont(aDC.getCompatibleHDC(), hNonAntialiasedFont != NULL 
? hNonAntialiasedFont : rLayout.mhFont);
 if (hOrigFont == NULL)
 {
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
@@ -311,9 +338,15 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
 SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
 
-if (!ExtTextOutW(aDC.getCompatibleHDC(), 0, 0, ETO_GLYPH_INDEX, NULL, 
aGlyphIndices.data(), nCount, a

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

2015-08-19 Thread Tor Lillqvist
 vcl/win/source/gdi/winlayout.cxx |   55 +++
 1 file changed, 45 insertions(+), 10 deletions(-)

New commits:
commit c5425d5005ae8d3078aa4fffb9216228dc2040fa
Author: Tor Lillqvist 
Date:   Wed Aug 19 15:44:30 2015 +0300

Still more hacking on OpenGL glyph caching for Windows

Show the whole height of the cache bitmap after all (when SAL_LOG
contains vcl.gdi.opengl). The interesting pieces are often at the
bottom, like the tip of the hook of the "j" glyphs that used to bleed
over into the preceding glyphs, usually "i", when they were rendered
into the same chunk.

Add more space between glyphs and at top and bottom of the bitmap, for
anti-aliasing. The glyph ABC widths don't take expansions caused by
anti-aliasing into consideration and are misleading. Hopefully
anti-aliasing can expand the (partially) painted pixels of a glyph
just one column/row in each direction, but for safety use a two-pixel
border. (Defensive programming, eek?)

Some getWidth() instead of GetWidth() etc craziness. Using
 types truly is programming-by-coincidence as Thorsten
says.

In a dbgutil build, setting the environment variable
VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS causes the code to turn off
anti-aliasing for the fonts used. I used this to verify that it indeed
was anti-aliasing that made the ABC widths inconsistent with
reality. Not sure if it makes sense to keep this code in?

Anyway, now I don't see any leaked pixels in "i" glyphs any more,
touch wood.

Change-Id: If527343ff1dcdb1fa208cd5e7fa4d08f812d0d7b

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 540a76b..c1c2d7e 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -147,7 +147,7 @@ OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC 
hDC)
 }
 std::cerr << std::endl;
 
-for (long y = 0; y < std::min(20l, aBitmap.bmHeight); y++)
+for (long y = 0; y < aBitmap.bmHeight; y++)
 {
 for (long x = 0; x < std::min(75l, aBitmap.bmWidth); x++)
 std::cerr << ColorFor(GetPixel(hDC, x, y));
@@ -279,7 +279,10 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" << 
aABC[i].abcC << " ";
 std::cerr << std::endl;
 
-// Avoid kerning as we want to be able to use individual rectangles for 
each glyph
+// Try hard to avoid overlap as we want to be able to use
+// individual rectangles for each glyph. The ABC widths don't
+// take anti-alising into consideration. Let's hope that leaving
+// four pixels of "extra" space inbetween glyphs will help.
 std::vector aDX(nCount);
 int totWidth = 0;
 for (int i = 0; i < nCount; i++)
@@ -289,6 +292,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 aDX[0] += std::abs(aABC[0].abcA);
 if (i < nCount-1)
 aDX[i] += std::abs(aABC[i+1].abcA);
+aDX[i] += 4;
 totWidth += aDX[i];
 }
 
@@ -299,9 +303,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 if (!DeleteDC(hDC))
 SAL_WARN("vcl.gdi", "DeleteDC failed: " << 
WindowsErrorString(GetLastError()));
 
-OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
+// Leave two pixels of extra space also at top and bottom
+OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy + 4);
 
-hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
+HFONT hNonAntialiasedFont = NULL;
+
+#ifdef DBG_UTIL
+static bool bNoAntialias = 
(std::getenv("VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS") != NULL);
+if (bNoAntialias)
+{
+LOGFONTW aLogfont;
+if (!GetObjectW(rLayout.mhFont, sizeof(aLogfont), &aLogfont))
+{
+SAL_WARN("vcl.gdi", "GetObject failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+aLogfont.lfQuality = NONANTIALIASED_QUALITY;
+hNonAntialiasedFont = CreateFontIndirectW(&aLogfont);
+if (hNonAntialiasedFont == NULL)
+{
+SAL_WARN("vcl.gdi", "CreateFontIndirect failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+}
+#endif
+
+hOrigFont = SelectFont(aDC.getCompatibleHDC(), hNonAntialiasedFont != NULL 
? hNonAntialiasedFont : rLayout.mhFont);
 if (hOrigFont == NULL)
 {
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
@@ -311,9 +338,15 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
 SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
 
-if (!ExtTextOutW(aDC.getCompatibleHDC(), 0, 0, ETO_GLYPH_INDEX, NULL, 
aGlyphIndices.data(), nCount, a

[Bug 92018] Implement caching for native widget rendering for Mac / OpenGL rendering

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=92018

--- Comment #4 from Markus Mohrhard (retired)  
---
(In reply to Michael Meeks from comment #3)
> commit dea885f80a80c6a5839ee5dbf8521487186a9522
> Author: Tomaž Vajngerl 
> Date:   Mon Aug 3 15:06:55 2015 +0900
> 
> opengl: cache native widget textures also for Windows
> 
> is the windows piece; I guess Mac is the last bit (?)

There is no OpenGL mac vcl backend. There is OpenGL support on mac and in
general it should be a lot easier to implement the backend as we use a OpenGL
enabled widget from the system. So we would just need to make sure that we only
generate these and render to them through OpenGL.

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


Re: unable to get latest stable build source code from git repository

2015-08-19 Thread Christian Lohmaier
Hi *,

On Tue, Aug 18, 2015 at 8:20 AM, Rachna Goel  wrote:
> hi thre,
>
> I am struggling to get latest stable source code of libreoffice on winows.
> when I use git clone , it fetches the latest updated branch.
> Kindly help me with the parameter that need to be used in order to fetch
> stable release source code (of LibreOffice 5.0)

Just use the checkout command to switch to the libreoffice-5-0 branch:

./g checkout libreoffice-5-0

(using the g script that's in the toplevel source-dir takes care of
updating the submodules and also ensures the githooks are  in place)

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


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

2015-08-19 Thread Maxim Monastirsky
 vcl/source/control/combobox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 086fe6f1e87c575ad5480c4ee9676aa2af6d489d
Author: Maxim Monastirsky 
Date:   Wed Aug 19 18:06:45 2015 +0300

tdf#93293 Fix inverted condition

Regression of ece8699f8f22f6bae137c601bc29b83b75dc3bf3

Change-Id: I1aac18dcb469b30de625c5cbfb5b0dd27fe33364

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f7409eb..9473edc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -889,7 +889,7 @@ void ComboBox::Modify()
 
 void ComboBox::Impl::ImplUpdateFloatSelection()
 {
-if (!m_pImplLB || m_pSubEdit)
+if (!m_pImplLB || !m_pSubEdit)
 return;
 
 // move text in the ListBox into the visible region
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Crash test update

2015-08-19 Thread Crashtest VM
New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/8ead1423f10dee87967c5fabb2f26046bbb8/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: 3 commits - connectivity/source dbaccess/source include/comphelper include/filter sc/inc sc/source sw/source xmloff/source

2015-08-19 Thread Michael Stahl
 connectivity/source/inc/file/fcode.hxx |2 +
 dbaccess/source/core/recovery/subcomponentrecovery.cxx |2 +
 include/comphelper/stl_types.hxx   |   16 +-
 include/filter/msfilter/msdffimp.hxx   |   12 ++--
 sc/inc/rangenam.hxx|3 --
 sc/source/core/tool/rangenam.cxx   |2 -
 sc/source/filter/inc/sheetdatabuffer.hxx   |2 +
 sc/source/ui/inc/namedlg.hxx   |1 
 sw/source/core/inc/blink.hxx   |   13 ++--
 sw/source/filter/html/wrthtml.hxx  |   13 ++--
 xmloff/source/forms/layerexport.cxx|1 
 xmloff/source/style/impastpl.hxx   |   25 -
 12 files changed, 40 insertions(+), 52 deletions(-)

New commits:
commit a4de770bab5e05af42dcd790b1e4a54fcc758e6c
Author: Michael Stahl 
Date:   Wed Aug 19 13:21:18 2015 +0200

comphelper: reduce copypasta with UniquePtrValueLess functor

Change-Id: Ib93b818eeebc2f370535d1b061beabf7e8c65257

diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 251137b..f5c58fd 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -86,6 +87,19 @@ public:
 }
 };
 
+/// by-value less functor for std::set>
+template struct UniquePtrValueLess
+: public ::std::binary_function, std::unique_ptr, 
bool>
+{
+bool operator()(std::unique_ptr const& lhs,
+std::unique_ptr const& rhs) const
+{
+assert(lhs.get());
+assert(rhs.get());
+return (*lhs) < (*rhs);
+}
+};
+
 /** STL-compliant structure for comparing Reference<  > 
instances
 */
 template < class IAFCE >
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 5c256e8..42328e0 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -266,15 +268,9 @@ private:
 SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) 
SAL_DELETED_FUNCTION;
 };
 
-struct MSDffImportRecords_Less
-{
-bool operator()(std::unique_ptr const& left,
-std::unique_ptr const& right) const
-{ return (*left) < (*right); }
-};
 /** list of all SvxMSDffImportRec instances of/for a group */
-typedef std::set, MSDffImportRecords_Less>
-MSDffImportRecords;
+typedef std::set,
+comphelper::UniquePtrValueLess> MSDffImportRecords;
 
 /** block of parameters for import/export for a single call of
 ImportObjAtCurrentStreamPos() */
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 6c14225..8b9fc5d 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -26,6 +26,7 @@ class SwTextFrm;
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -63,16 +64,8 @@ public:
 { return reinterpret_cast(pPor) == 
reinterpret_cast(rBlinkPortion.pPor); }
 };
 
-struct SwBlinkPortion_Less
-{
-bool operator()(std::unique_ptr const& lhs,
-std::unique_ptr const& rhs)
-{
-return (*lhs) < (*rhs);
-}
-};
-
-typedef std::set, SwBlinkPortion_Less> 
SwBlinkSet;
+typedef std::set,
+comphelper::UniquePtrValueLess> SwBlinkSet;
 
 class SwBlink
 {
diff --git a/sw/source/filter/html/wrthtml.hxx 
b/sw/source/filter/html/wrthtml.hxx
index df11e3e..f032329 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "shellio.hxx"
@@ -262,16 +263,8 @@ struct SwHTMLFormatInfo
 
 };
 
-struct SwHTMLFormatInfo_Less
-{
-bool operator()(std::unique_ptr const& lhs,
-std::unique_ptr const& rhs)
-{
-return (*lhs) < (*rhs);
-}
-};
-
-typedef std::set, SwHTMLFormatInfo_Less> 
SwHTMLFormatInfos;
+typedef std::set,
+comphelper::UniquePtrValueLess> SwHTMLFormatInfos;
 
 class IDocumentStylePoolAccess;
 
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 4dbce49..d7a8240 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -28,6 +28,9 @@
 #include 
 #include 
 #include 
+
+#include 
+
 #include 
 #include 
 
@@ -102,15 +105,8 @@ public:
 
 struct XMLAutoStyleFamily : boost::noncopyable
 {
-struct XMLAutoStylePoolParent_Less
-{
-bool operator()(std::unique_ptr const& lhs,
-std::unique_ptr const& rhs) 
const
-{
-return (*lhs) < (*rhs);
-}
-};
-typedef std::set, 
XMLAutoStylePoolParent_Less> ParentSetType;
+typedef std::set,
+comphelper::UniquePtrValueLess> ParentSetType;
 typ

[GSoC] More and Better Tests - Weekly Report #12 (Varun Dhall)

2015-08-19 Thread Varun Dhall
Hi all!


Twelfth week of GSoC was passed in writing more new tests.


Here are the changes made in last 7 days -

https://gerrit.libreoffice.org/#/c/17504/

https://gerrit.libreoffice.org/#/c/17654/

https://gerrit.libreoffice.org/#/c/17840/

https://gerrit.libreoffice.org/#/c/17843/


Currently I am working on a couple of new tests for regression bugs in Writer 
and they will be merged into the master soon (before hard pencil down date - 
21st Aug).

Future Goals- Adding more and better tests in the code-base to assist in 
finding regressions as early as possible.



Regards,

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


[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 388 commits - accessibility/source android/Bootstrap android/source avmedia/source basctl/inc basctl/source basctl/uiconfig base

2015-08-19 Thread Pranav Kant
Rebased ref, commits from common ancestor:
commit 252489446e0c9f5a60ab24a82d1b010a8820e16d
Author: Pranav Kant 
Date:   Thu Aug 20 00:23:58 2015 +0530

Mark gtk+ calls as critical section

Change-Id: I6166ccc76a574049031b8a8da2ea1a104612c5d1

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 41ec8f0..a2698af 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1249,7 +1249,9 @@ setEditInThread(gpointer data)
 }
 priv->m_bEdit = bEdit;
 g_signal_emit(pDocView, doc_view_signals[EDIT_CHANGED], 0, bWasEdit);
+gdk_threads_enter();
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+gdk_threads_leave();
 }
 
 static void
@@ -1305,7 +1307,9 @@ paintTileInThread (gpointer data)
 //create a mapping for it
 buffer.m_mTiles[index].setPixbuf(pPixBuf);
 buffer.m_mTiles[index].valid = true;
+gdk_threads_enter();
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+gdk_threads_leave();
 }
 
 
commit 3acab6705b478c0f4d3ca8c0b0ba2df1ad7b4893
Author: Pranav Kant 
Date:   Sat Aug 15 18:48:53 2015 +0530

create_tree.sh: Generate g-i files

Change-Id: I1749b5b02018cfe6f85a13aed8de4b31a09788e3

diff --git a/configure.ac b/configure.ac
index 5944d23..66453fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,11 @@ SRC_ROOT=`pwd`
 cd $BUILDDIR
 x_Cygwin=[\#]
 
+dnl ==
+dnl Required GObject introspection version
+dnl ==
+INTROSPECTION_REQUIRED_VERSION=1.32.0
+
 dnl ===
 dnl Search all the common names for GNU Make
 dnl ===
@@ -9987,6 +9992,7 @@ if test "x$enable_gtk3" = "xyes"; then
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
 if test "x$ENABLE_GTK3" = "xTRUE"; then
 R="gtk3"
+GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
 else
 AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not 
found])
 fi
diff --git a/m4/introspection.m4 b/m4/introspection.m4
new file mode 100644
index 000..aa7b3b4
--- /dev/null
+++ b/m4/introspection.m4
@@ -0,0 +1,96 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+dnl enable/disable introspection
+m4_if([$2], [require],
+[dnl
+enable_introspection=yes
+],[dnl
+AC_ARG_ENABLE(introspection,
+  
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+ [Enable introspection for this build]),,
+ [enable_introspection=auto])
+])dnl
+
+AC_MSG_CHECKING([for gobject-introspection])
+
+dnl presence/version checking
+AS_CASE([$enable_introspection],
+[no], [dnl
+found_introspection="no (disabled, use --enable-introspection to 
enable)"
+],dnl
+[yes],[dnl
+PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+ AC_MSG_ERROR([gobject-introspection-1.0 is not 
installed]))
+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+ found_introspection=yes,
+ AC_MSG_ERROR([You need to have gobject-introspection 
>= $1 installed to build AC_PACKAGE_NAME]))
+],dnl
+[auto],[dnl
+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], 
found_introspection=yes, found_introspection=no)
+   dnl Canonicalize enable_introspection
+   enable_introspection=$found_introspection
+],dnl
+[dnl
+AC_MSG_ERROR([invalid argument passed to --enable-introspection, 
should be one of @<:@no/auto/yes@:>@])
+])dnl
+
+AC_MSG_RESULT([$found_introspection])
+
+INTROSPECTION_SCANNER=
+INTROSPECTION_COMPILER=
+INTROSPECTION_GENERATE=
+INTROSPECTION_GIRDIR=
+INTROSPECTION_TYPELIBDIR=
+if test "x$found_introspection" = "xyes"; then
+   INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner 
gobject-introspection-1.0`
+   INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler 
gobject-introspection-1.0`
+   INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate 
gobject-introspection-1.0`
+   INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir 
gobject-introspection-1.0`
+   INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelib

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

2015-08-19 Thread Caolán McNamara
 chart2/source/view/main/VDataSeries.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b27417623835b1c82475783979a1fb9656b5155e
Author: Caolán McNamara 
Date:   Wed Aug 19 20:01:29 2015 +0100

crashtesting: failure on ooo82676-1.sxc import

regression from

commit b3abc191e24bd2e812836257024d14557a6238ce
Author: Laurent Balland-Poirier 
Date:   Wed Jun 17 15:15:07 2015 +0200

Change-Id: I44cfd85e9f7be65929281169fd297252e00c7317

diff --git a/chart2/source/view/main/VDataSeries.cxx 
b/chart2/source/view/main/VDataSeries.cxx
index 6667cbb..8512c19 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -521,7 +521,7 @@ void VDataSeries::getMinMaxXValue(double& fMin, double& 
fMax) const
 if(aValuesX.getLength() > 0)
 {
 sal_Int32 i = 0;
-while ( ::rtl::math::isNan( aValuesX[i] ) && i < aValuesX.getLength() )
+while ( i < aValuesX.getLength() && ::rtl::math::isNan(aValuesX[i]) )
 i++;
 if ( i < aValuesX.getLength() )
 fMax = fMin = aValuesX[i++];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Caolán McNamara
 framework/inc/services/desktop.hxx |2 -
 framework/source/services/desktop.cxx  |7 ++-
 vcl/source/app/settings.cxx|   25 -
 vcl/source/app/svapp.cxx   |   10 +++--
 vcl/source/font/PhysicalFontCollection.cxx |   11 +-
 vcl/source/outdev/font.cxx |   37 
 vcl/source/window/window.cxx   |   52 +++--
 7 files changed, 103 insertions(+), 41 deletions(-)

New commits:
commit f0e90c712b701b2d3b4f4725dfbed8c5ea924b0f
Author: Caolán McNamara 
Date:   Wed Aug 19 15:27:07 2015 +0100

for testing allow disabling configmgr for time critical paths

Change-Id: I83396e7c90d3b182f353a77c9bdf06fd17af92a1

diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index dc3d4d7..1d47522 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -409,7 +409,7 @@ class Desktop : private cppu::BaseMutex,
 css::uno::Reference< css::frame::XFrame >   
m_xLastFrame; /// last target of "loadComponentFromURL()"!
 css::uno::Any   
m_aInteractionRequest;
 bool
m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
-SvtCommandOptions   
m_aCommandOptions;/// ref counted class to support disabling commands 
defined by configuration file
+std::unique_ptr  
m_xCommandOptions;/// ref counted class to support disabling commands 
defined by configuration file
 OUString
m_sName;
 OUString
m_sTitle;
 css::uno::Reference< css::frame::XDispatchRecorderSupplier >
m_xDispatchRecorderSupplier;
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 32add3f..9c2eb1c 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -63,6 +63,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 namespace framework{
@@ -162,7 +163,6 @@ Desktop::Desktop( const css::uno::Reference< 
css::uno::XComponentContext >& xCon
 ,   m_xLastFrame(  
 )
 ,   m_aInteractionRequest   (  
 )
 ,   m_bSuspendQuickstartVeto( false
 )
-,   m_aCommandOptions   (  
 )
 ,   m_sName (  
 )
 ,   m_sTitle(  
 )
 ,   m_xDispatchRecorderSupplier(   
 )
@@ -646,8 +646,11 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL 
Desktop::queryDispatch( co
 if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") )
 aCommand = aURL.Path;
 
+if (!m_xCommandOptions && !utl::ConfigManager::IsAvoidConfig())
+m_xCommandOptions.reset(new SvtCommandOptions);
+
 // Make std::unordered_map lookup if the current URL is in the disabled 
list
-if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, 
aCommand ) )
+if (m_xCommandOptions && 
m_xCommandOptions->Lookup(SvtCommandOptions::CMDOPTION_DISABLED, aCommand))
 return css::uno::Reference< css::frame::XDispatch >();
 else
 {
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 33674f8..a8fb56a 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -50,6 +50,7 @@
 #include "unotools/localedatawrapper.hxx"
 #include "unotools/collatorwrapper.hxx"
 #include "unotools/confignode.hxx"
+#include "unotools/configmgr.hxx"
 #include "unotools/syslocaleoptions.hxx"
 
 using namespace ::com::sun::star;
@@ -687,7 +688,10 @@ void ImplStyleData::SetStandardStyles()
 vcl::Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
 aStdFont.SetCharSet( osl_getThreadTextEncoding() );
 aStdFont.SetWeight( WEIGHT_NORMAL );
-aStdFont.SetName( 
utl::DefaultFontConfiguration::get().getUserInterfaceFont( LanguageTag("en")) );
+if (!utl::ConfigManager::IsAvoidConfig())
+
aStdFont.SetName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en")));
+else
+aStdFont.SetName("Liberation Serif");
 maAppFont   = aStdFont;
 maHelpFont  = aStdFont;
 maMenuFont  = aStdFont;
@@ -2707,7 +2711,8 @@ ImplAllSettingsData::ImplAllSettingsData()
 mpUILocaleDataWrapper   = NULL;
 mpI18nHelper= NULL;
 mpUII18nHelper  = NULL;
-maMiscSettings.SetEnab

Re: Fail to build on Windows 7 (32 bits)

2015-08-19 Thread julien2412
After having added some traces, here's what I got:
$CC = cl
$CC_VERSION is empty



--
View this message in context: 
http://nabble.documentfoundation.org/Fail-to-build-on-Windows-7-32-bits-tp4156056p4157705.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: test/source

2015-08-19 Thread Michael Stahl
 test/source/bootstrapfixture.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 013efe75eba3d209a7bd072d608126dac6fa191c
Author: Michael Stahl 
Date:   Thu Aug 6 11:50:29 2015 +0200

test: hack to avoid VCLXToolkit calling CreateMainLoopThread

... for the PythonTest, similar to what vclbootstrapprotector does for
CppunitTest; actually no idea if this is a good idea or a bad idea.

Change-Id: Ia4e2e50fdc9c8deb9faf580a2f3f3308533265eb
Reviewed-on: https://gerrit.libreoffice.org/17540
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index b7ad99b..e9aefb8 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -83,6 +84,15 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
 }
 }
 
+struct InitHook {
+DECL_STATIC_LINK(InitHook, deinitHook, void*);
+};
+
+IMPL_STATIC_LINK_NOARG(InitHook, deinitHook) {
+// nothing to do for now
+return 0;
+}
+
 // this is called from pyuno
 SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory)
 {
@@ -105,6 +115,9 @@ SAL_DLLPUBLIC_EXPORT void 
test_init(lang::XMultiServiceFactory *pFactory)
 if (test::isHeadless())
 Application::EnableHeadlessMode(true);
 
+// avoid VCLXToolkit thinking that InitVCL hasn't been called
+Application::setDeInitHook(LINK(nullptr, InitHook, deinitHook));
+
 test_init_impl(false, true, pFactory);
 }
 catch (...) { abort(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-08-19 Thread Michael Stahl
 sc/inc/dbdata.hxx|   16 ++-
 sc/source/core/data/documen3.cxx |4 
 sc/source/core/data/document.cxx |4 
 sc/source/core/tool/dbdata.cxx   |  105 ++-
 sc/source/core/tool/rangeutl.cxx |2 
 sc/source/core/tool/tokenstringcontext.cxx   |2 
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |5 +
 sc/source/ui/app/inputwin.cxx|2 
 sc/source/ui/dbgui/dbnamdlg.cxx  |   10 +-
 sc/source/ui/docshell/dbdocfun.cxx   |   14 +--
 sc/source/ui/docshell/docsh4.cxx |2 
 sc/source/ui/navipi/content.cxx  |2 
 sc/source/ui/unoobj/datauno.cxx  |4 
 sc/source/ui/view/cellsh2.cxx|2 
 sc/source/ui/view/tabvwsh4.cxx   |3 
 15 files changed, 106 insertions(+), 71 deletions(-)

New commits:
commit b5ae7dbc871df57686a603dfa99e8179a0e3a4b8
Author: Michael Stahl 
Date:   Wed Aug 19 15:45:57 2015 +0200

sc: replace boost::ptr_set with std::set

Change-Id: I93bdb33a442a358b0067d57499b11d73bfbaa2d9
Reviewed-on: https://gerrit.libreoffice.org/17860
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index a5d6765..877a7fc 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -26,9 +26,11 @@
 #include "global.hxx"
 
 #include 
-#include 
 #include 
 
+#include 
+#include 
+
 class ScDocument;
 struct ScSortParam;
 struct ScQueryParam;
@@ -73,9 +75,9 @@ private:
 using ScRefreshTimer::operator==;
 
 public:
-struct less : public ::std::binary_function
+struct less : public ::std::binary_function, 
std::unique_ptr, bool>
 {
-bool operator() (const ScDBData& left, const ScDBData& right) const;
+bool operator() (const std::unique_ptr& left, const 
std::unique_ptr& right) const;
 };
 
 SC_DLLPUBLIC ScDBData(const OUString& rName,
@@ -185,12 +187,14 @@ public:
 {
 friend class ScDBCollection;
 
-typedef ::boost::ptr_set DBsType;
-DBsType maDBs;
+typedef ::std::set, ScDBData::less> DBsType;
+DBsType m_DBs;
 ScDBCollection& mrParent;
 ScDocument& mrDoc;
 NamedDBs(ScDBCollection& rParent, ScDocument& rDoc);
 NamedDBs(const NamedDBs& r);
+NamedDBs & operator=(NamedDBs const&) = delete;
+
 public:
 typedef DBsType::iterator iterator;
 typedef DBsType::const_iterator const_iterator;
@@ -201,10 +205,10 @@ public:
 const_iterator end() const;
 ScDBData* findByIndex(sal_uInt16 nIndex);
 ScDBData* findByUpperName(const OUString& rName);
+iterator findByUpperName2(const OUString& rName);
 // Takes ownership of p iff it returns true:
 SAL_WARN_UNUSED_RESULT bool insert(ScDBData* p);
 void erase(iterator itr);
-void erase(const ScDBData& r);
 bool empty() const;
 size_t size() const;
 bool operator== (const NamedDBs& r) const;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 5e6aa4d..2353e91 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -242,7 +242,7 @@ void ScDocument::SetDBCollection( ScDBCollection* 
pNewDBCollection, bool bRemove
 ScDBCollection::NamedDBs::const_iterator itr = rNamedDBs.begin(), 
itrEnd = rNamedDBs.end();
 for (; itr != itrEnd; ++itr)
 {
-const ScDBData& rOldData = *itr;
+const ScDBData& rOldData = **itr;
 if (!rOldData.HasAutoFilter())
 continue;
 
@@ -1591,7 +1591,7 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& 
rStrings )
 const ScDBCollection::NamedDBs& rDBs = pDBCollection->getNamedDBs();
 ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = 
rDBs.end();
 for (; itr != itrEnd; ++itr)
-rStrings.insert(ScTypedStrData(itr->GetName(), 0.0, 
ScTypedStrData::DbName));
+rStrings.insert(ScTypedStrData((*itr)->GetName(), 0.0, 
ScTypedStrData::DbName));
 }
 
 // Content of name ranges
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 976c63a..3570386 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5497,9 +5497,9 @@ bool ScDocument::RefreshAutoFilter( SCCOL nStartCol, 
SCROW nStartRow,
 ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = 
rDBs.end();
 for (; itr != itrEnd; ++itr)
 {
-if (itr->HasAutoFilter())
+if ((*itr)->HasAutoFilter())
 {
-itr->GetArea( nDBTab, nDBStartCol,nDBStartRow, nDBEndCol,nDBEndRow 
);
+(*itr)->GetArea(nDBTab, nDBStartCol,nDBStartRow, 
nDBEndCol,nDBEndRow);
 if ( nDBTab==nTab && nDBStartRow<=nEndRow && nDBEndRow>=nStartRow 

Re: Fail to build on Windows 7 (32 bits)

2015-08-19 Thread Michael Stahl
On 19.08.2015 21:35, julien2412 wrote:
> After having added some traces, here's what I got:
> $CC = cl
> $CC_VERSION is empty

oh okay... so what does the command
 "${CC}" -v
output when run from the configure script?

either it can't find cl in path or the regex in there is wrong...

does it help to set LC_ALL=C perhaps?


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


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

2015-08-19 Thread Michael Stahl
 sc/inc/dbdata.hxx  |   12 --
 sc/source/core/tool/dbdata.cxx |   81 -
 2 files changed, 50 insertions(+), 43 deletions(-)

New commits:
commit f15cbf2451d08ccddde9643c9f926a322f9f9917
Author: Michael Stahl 
Date:   Wed Aug 19 17:07:09 2015 +0200

sc: replace boost::ptr_vector with std::vector

Change-Id: I2a56ebf8edb30b5f16e09237f9480484a699170e
Reviewed-on: https://gerrit.libreoffice.org/17861
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 877a7fc..7508e0f 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -25,11 +25,11 @@
 #include "address.hxx"
 #include "global.hxx"
 
-#include 
 #include 
 
 #include 
 #include 
+#include 
 
 class ScDocument;
 struct ScSortParam;
@@ -219,9 +219,15 @@ public:
  */
 class AnonDBs
 {
-typedef ::boost::ptr_vector DBsType;
-DBsType maDBs;
+typedef ::std::vector> DBsType;
+DBsType m_DBs;
+
+AnonDBs& operator=(AnonDBs const&) = delete;
+
 public:
+AnonDBs();
+AnonDBs(AnonDBs const&);
+
 typedef DBsType::iterator iterator;
 typedef DBsType::const_iterator const_iterator;
 
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 4857b18..2c1f207 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -19,7 +19,6 @@
 
 #include 
 
-#include 
 #include 
 
 #include "dbdata.hxx"
@@ -656,16 +655,16 @@ sal_Int32 ScDBData::GetColumnNameOffset( const OUString& 
rName ) const
 
 namespace {
 
-class FindByTable : public unary_function
+class FindByTable : public unary_function, bool>
 {
 SCTAB mnTab;
 public:
 FindByTable(SCTAB nTab) : mnTab(nTab) {}
 
-bool operator() (const ScDBData& r) const
+bool operator() (std::unique_ptr const& p) const
 {
 ScRange aRange;
-r.GetArea(aRange);
+p->GetArea(aRange);
 return aRange.aStart.Tab() == mnTab;
 }
 };
@@ -694,10 +693,6 @@ public:
 mnCol2(nCol2), mnRow2(nRow2), mnTab2(nTab2),
 mnDx(nDx), mnDy(nDy), mnDz(nDz) {}
 
-void operator() (ScDBData& r)
-{
-r.UpdateReference(mpDoc, meMode, mnCol1, mnRow1, mnTab1, mnCol2, 
mnRow2, mnTab2, mnDx, mnDy, mnDz);
-}
 void operator() (std::unique_ptr const& p)
 {
 p->UpdateReference(mpDoc, meMode, mnCol1, mnRow1, mnTab1, mnCol2, 
mnRow2, mnTab2, mnDx, mnDy, mnDz);
@@ -710,10 +705,6 @@ class UpdateMoveTabFunc : public 
unary_function, void>
 SCTAB mnNewTab;
 public:
 UpdateMoveTabFunc(SCTAB nOld, SCTAB nNew) : mnOldTab(nOld), mnNewTab(nNew) 
{}
-void operator() (ScDBData& r)
-{
-r.UpdateMoveTab(mnOldTab, mnNewTab);
-}
 void operator() (std::unique_ptr const& p)
 {
 p->UpdateMoveTab(mnOldTab, mnNewTab);
@@ -730,10 +721,6 @@ public:
 FindByCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) :
 mnCol(nCol), mnRow(nRow), mnTab(nTab), mbStartOnly(bStartOnly) {}
 
-bool operator() (const ScDBData& r)
-{
-return r.IsDBAtCursor(mnCol, mnRow, mnTab, mbStartOnly);
-}
 bool operator() (std::unique_ptr const& p)
 {
 return p->IsDBAtCursor(mnCol, mnRow, mnTab, mbStartOnly);
@@ -746,11 +733,6 @@ class FindByRange : public 
unary_function, bool>
 public:
 FindByRange(const ScRange& rRange) : mrRange(rRange) {}
 
-bool operator() (const ScDBData& r)
-{
-return r.IsDBAtArea(
-mrRange.aStart.Tab(), mrRange.aStart.Col(), mrRange.aStart.Row(), 
mrRange.aEnd.Col(), mrRange.aEnd.Row());
-}
 bool operator() (std::unique_ptr const& p)
 {
 return p->IsDBAtArea(
@@ -780,14 +762,14 @@ public:
 }
 };
 
-class FindByPointer : public unary_function
+class FindByPointer : public unary_function, bool>
 {
 const ScDBData* mpDBData;
 public:
 FindByPointer(const ScDBData* pDBData) : mpDBData(pDBData) {}
-bool operator() (const ScDBData& r) const
+bool operator() (std::unique_ptr const& p) const
 {
-return &r == mpDBData;
+return p.get() == mpDBData;
 }
 };
 
@@ -884,42 +866,42 @@ bool ScDBCollection::NamedDBs::operator== (const 
NamedDBs& r) const
 
 ScDBCollection::AnonDBs::iterator ScDBCollection::AnonDBs::begin()
 {
-return maDBs.begin();
+return m_DBs.begin();
 }
 
 ScDBCollection::AnonDBs::iterator ScDBCollection::AnonDBs::end()
 {
-return maDBs.end();
+return m_DBs.end();
 }
 
 ScDBCollection::AnonDBs::const_iterator ScDBCollection::AnonDBs::begin() const
 {
-return maDBs.begin();
+return m_DBs.begin();
 }
 
 ScDBCollection::AnonDBs::const_iterator ScDBCollection::AnonDBs::end() const
 {
-return maDBs.end();
+return m_DBs.end();
 }
 
 const ScDBData* ScDBCollection::AnonDBs::findAtCursor(SCCOL nCol, SCROW nRow, 
SCTAB nTab, bool bStartOnly) const
 {
 DBsType::const_iterator itr = find_if(
-maDBs.begin(), maDB

Re: unable to get latest stable build source code from git repository

2015-08-19 Thread Anthonys Lists

On 18/08/2015 07:20, Rachna Goel wrote:

hi thre,
I am struggling to get latest stable source code of libreoffice on winows.
when I use /git clone/ , it fetches the latest updated branch.
Kindly help me with the parameter that need to be used in order to 
fetch stable release source code (of LibreOffice 5.0)


If you're struggling with git, I got a freebie on Kindle. Search for 
"Ry's Git Tutorial". Hopefully you can get it the same way and it's a 
very good basic introduction to how git works.


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


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

2015-08-19 Thread Michael Stahl
 sc/inc/conditio.hxx   |   11 ++-
 sc/qa/unit/helper/shared_test_impl.hxx|   16 ++---
 sc/qa/unit/ucalc.cxx  |2 
 sc/source/core/data/conditio.cxx  |   96 ++
 sc/source/core/data/table1.cxx|2 
 sc/source/core/data/table2.cxx|8 +-
 sc/source/filter/excel/xecontent.cxx  |2 
 sc/source/filter/excel/xestyle.cxx|4 -
 sc/source/filter/oox/condformatbuffer.cxx |6 -
 sc/source/filter/xml/xmlexprt.cxx |6 -
 sc/source/filter/xml/xmlstyli.cxx |6 -
 sc/source/ui/condformat/condformatmgr.cxx |4 -
 sc/source/ui/docshell/docfunc.cxx |4 -
 sc/source/ui/unoobj/condformatuno.cxx |2 
 14 files changed, 96 insertions(+), 73 deletions(-)

New commits:
commit 082a7faeedb03c790ba5fe03b466b7a45a822c35
Author: Michael Stahl 
Date:   Wed Aug 19 17:45:31 2015 +0200

sc: replace boost::ptr_set with std::set

Change-Id: I966069726fd7dbc57e03e93514bec62d8bbb2ba0
Reviewed-on: https://gerrit.libreoffice.org/17862
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index a694f97..335bd2b 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -26,13 +26,15 @@
 #include "scdllapi.h"
 #include "rangelst.hxx"
 
+#include 
+
 #include 
 #include 
 
 #include 
+#include 
 
 #include 
-#include 
 #include 
 #include 
 
@@ -431,7 +433,7 @@ public:
 
 boolMarkUsedExternalReferences() const;
 
-//  sorted (via boost::ptr_set) by Index
+//  sorted (via std::set) by Index
 //  operator== only for sorting
 bool operator ==( const ScConditionalFormat& r ) const  { return nKey == 
r.nKey; }
 bool operator < ( const ScConditionalFormat& r ) const  { return nKey <  
r.nKey; }
@@ -444,8 +446,9 @@ public:
 class SC_DLLPUBLIC ScConditionalFormatList
 {
 private:
-typedef boost::ptr_set ConditionalFormatContainer;
-ConditionalFormatContainer maConditionalFormats;
+typedef std::set,
+comphelper::UniquePtrValueLess> 
ConditionalFormatContainer;
+ConditionalFormatContainer m_ConditionalFormats;
 
 void operator =(ScConditionalFormatList const &) SAL_DELETED_FUNCTION;
 
diff --git a/sc/qa/unit/helper/shared_test_impl.hxx 
b/sc/qa/unit/helper/shared_test_impl.hxx
index 666be99..28b348b 100644
--- a/sc/qa/unit/helper/shared_test_impl.hxx
+++ b/sc/qa/unit/helper/shared_test_impl.hxx
@@ -20,9 +20,9 @@ struct FindCondFormatByEnclosingRange
 FindCondFormatByEnclosingRange(const ScRange& rRange):
 mrRange(rRange) {}
 
-bool operator()(const ScConditionalFormat& rFormat)
+bool operator()(const std::unique_ptr& pFormat)
 {
-if(rFormat.GetRange().Combine() == mrRange)
+if (pFormat->GetRange().Combine() == mrRange)
 return true;
 
 return false;
@@ -58,9 +58,9 @@ void testDataBar_Impl(ScDocument& rDoc)
 ScConditionalFormatList::const_iterator itr = 
std::find_if(pList->begin(),
 pList->end(), FindCondFormatByEnclosingRange(aData[i].aRange));
 CPPUNIT_ASSERT(itr != pList->end());
-CPPUNIT_ASSERT_EQUAL(size_t(1), itr->size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
 
-const ScFormatEntry* pFormatEntry = itr->GetEntry(0);
+const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
 CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::DATABAR);
 const ScDataBarFormat* pDataBar = static_cast(pFormatEntry);
 CPPUNIT_ASSERT(pDataBar);
@@ -95,9 +95,9 @@ void testColorScale2Entry_Impl(ScDocument& rDoc)
 ScConditionalFormatList::const_iterator itr = 
std::find_if(pList->begin(),
 pList->end(), 
FindCondFormatByEnclosingRange(aData2Entry[i].aRange));
 CPPUNIT_ASSERT(itr != pList->end());
-CPPUNIT_ASSERT_EQUAL(size_t(1), itr->size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
 
-const ScFormatEntry* pFormatEntry = itr->GetEntry(0);
+const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
 CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::COLORSCALE);
 const ScColorScaleFormat* pColFormat = static_cast(pFormatEntry);
 CPPUNIT_ASSERT_EQUAL(size_t(2), pColFormat->size());
@@ -134,9 +134,9 @@ void testColorScale3Entry_Impl(ScDocument& rDoc)
 ScConditionalFormatList::const_iterator itr = 
std::find_if(pList->begin(),
 pList->end(), 
FindCondFormatByEnclosingRange(aData3Entry[i].aRange));
 CPPUNIT_ASSERT(itr != pList->end());
-CPPUNIT_ASSERT_EQUAL(size_t(1), itr->size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
 
-const ScFormatEntry* pFormatEntry = itr->GetEntry(0);
+const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
 CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::COLORSCALE);
  

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

2015-08-19 Thread Daniel Robertson
 include/o3tl/cow_wrapper.hxx |   26 +++---
 1 file changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 6038ba92be0a4c821ffa29ed0512905e4b3cd8f8
Author: Daniel Robertson 
Date:   Tue Aug 18 17:08:48 2015 -0400

o3tl: cow_wrapper add move constructor/assignment

Add a move constructor and move assignment operator for
o3tl::cow_wrapper. Insubstantial gains for UnsafeRefCountingPolicy, no
atomic increment needed for ThreadSafeRefCountingPolicy's move-ctor.

Change-Id: Ia2de1ca78b1e0e5a0f30535e752f1dd858fdfef0
Reviewed-on: https://gerrit.libreoffice.org/17848
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index b7659c3..3f117a2b 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -121,7 +121,7 @@ public:
 int queryUnmodified() const;
 
 private:
-otl::cow_wrapper< cow_wrapper_client_impl > maImpl;
+o3tl::cow_wrapper< cow_wrapper_client_impl > maImpl;
 };
 
 and the implementation file would look like this:
@@ -187,8 +187,8 @@ int cow_wrapper_client::queryUnmodified() const
 
 void release()
 {
-if( !MTPolicy::decrementCount(m_pimpl->m_ref_count) )
-boost::checked_delete(m_pimpl), m_pimpl=0;
+if( m_pimpl && !MTPolicy::decrementCount(m_pimpl->m_ref_count) )
+boost::checked_delete(m_pimpl), m_pimpl = nullptr;
 }
 
 public:
@@ -219,6 +219,14 @@ int cow_wrapper_client::queryUnmodified() const
 MTPolicy::incrementCount( m_pimpl->m_ref_count );
 }
 
+/** Move-construct and steal rSrc shared resource
+ */
+explicit cow_wrapper( cow_wrapper&& rSrc ) :
+m_pimpl( rSrc.m_pimpl )
+{
+rSrc.m_pimpl = nullptr;
+}
+
 ~cow_wrapper() // nothrow, if ~T does not throw
 {
 release();
@@ -236,6 +244,18 @@ int cow_wrapper_client::queryUnmodified() const
 return *this;
 }
 
+/// stealing rSrc's resource
+cow_wrapper& operator=( cow_wrapper&& rSrc )
+{
+// self-movement guts ourself, see also 17.6.4.9
+release();
+m_pimpl = rSrc.m_pimpl;
+
+rSrc.m_pimpl = nullptr;
+
+return *this;
+}
+
 /// unshare with any other cow_wrapper instance
 value_type& make_unique()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: 2 commits - chart2/Library_chartcontroller.mk chart2/source include/sfx2 include/svx sfx2/source svx/source

2015-08-19 Thread Markus Mohrhard
 chart2/Library_chartcontroller.mk  |1 
 chart2/source/controller/sidebar/ChartAreaPanel.cxx|   17 ++
 chart2/source/controller/sidebar/ChartAreaPanel.hxx|3 
 chart2/source/controller/sidebar/ChartColorWrapper.cxx |  101 +
 chart2/source/controller/sidebar/ChartColorWrapper.hxx |   47 +++
 include/sfx2/sidebar/SidebarToolBox.hxx|2 
 include/svx/PaletteManager.hxx |5 
 include/svx/sidebar/AreaPropertyPanelBase.hxx  |3 
 include/svx/tbcontrl.hxx   |4 
 sfx2/source/sidebar/SidebarToolBox.cxx |8 +
 svx/source/tbxctrls/PaletteManager.cxx |   10 +
 svx/source/tbxctrls/colorwindow.hxx|7 +
 svx/source/tbxctrls/tbcontrl.cxx   |   24 ++--
 13 files changed, 220 insertions(+), 12 deletions(-)

New commits:
commit acd818d9735a6fa4e38016b16ba7efc880058714
Author: Markus Mohrhard 
Date:   Thu Aug 20 00:13:19 2015 +0200

update the color button when we select an object

Change-Id: Ib45a02248819c35844ef83435c33ab1c82f5c4dc

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index dbf9a68..6377e64 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -25,6 +25,13 @@ namespace chart { namespace sidebar {
 
 namespace {
 
+SvxColorToolBoxControl* getColorToolBoxControl(sfx2::sidebar::SidebarToolBox* 
pToolBoxColor)
+{
+css::uno::Reference xController = 
pToolBoxColor->GetFirstController();
+SvxColorToolBoxControl* pToolBoxColorControl = 
dynamic_cast(xController.get());
+return pToolBoxColorControl;
+}
+
 OUString getCID(css::uno::Reference xModel)
 {
 css::uno::Reference 
xController(xModel->getCurrentController());
@@ -240,7 +247,7 @@ ChartAreaPanel::ChartAreaPanel(vcl::Window* pParent,
 mxSelectionListener(new ChartSidebarSelectionListener(this)),
 mbUpdate(true),
 mbModelValid(true),
-maFillColorWrapper(mxModel)
+maFillColorWrapper(mxModel, getColorToolBoxControl(mpToolBoxColor.get()))
 {
 std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
@@ -273,8 +280,7 @@ void ChartAreaPanel::Initialize()
 if (xSelectionSupplier.is())
 
xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
 
-css::uno::Reference xController = 
mpToolBoxColor->GetFirstController();
-SvxColorToolBoxControl* pToolBoxColor = 
dynamic_cast(xController.get());
+SvxColorToolBoxControl* pToolBoxColor = 
getColorToolBoxControl(mpToolBoxColor.get());
 pToolBoxColor->setColorSelectFunction(maFillColorWrapper);
 
 updateData();
@@ -427,6 +433,8 @@ void ChartAreaPanel::updateData()
 xPropSet->getPropertyValue("FillTransparenceGradientName") >>= 
aFillFloatTransparenceName;
 XFillFloatTransparenceItem aFillFloatTransparenceItem = 
getXTransparencyGradientForName(mxModel, aFillFloatTransparenceName);
 updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem);
+
+maFillColorWrapper.updateData();
 }
 
 void ChartAreaPanel::modelInvalid()
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index d8a8f87..beeb85d 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -11,6 +11,10 @@
 
 #include "ChartController.hxx"
 
+#include 
+#include 
+#include 
+
 namespace chart { namespace sidebar {
 
 namespace {
@@ -56,13 +60,15 @@ css::uno::Reference getPropSet(
 }
 
 ChartColorWrapper::ChartColorWrapper(
-css::uno::Reference xModel):
+css::uno::Reference xModel,
+SvxColorToolBoxControl* pControl):
 mxModel(xModel),
+mpControl(pControl),
 maPropertyName("FillColor")
 {
 }
 
-void ChartColorWrapper::operator()(const OUString& rCommand, const Color& 
rColor)
+void ChartColorWrapper::operator()(const OUString& , const Color& rColor)
 {
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
 assert(xPropSet.is());
@@ -75,6 +81,21 @@ void 
ChartColorWrapper::updateModel(css::uno::Reference xMod
 mxModel = xModel;
 }
 
+void ChartColorWrapper::updateData()
+{
+css::uno::Reference xPropSet = 
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
+css::uno::Any aAny = xPropSet->getPropertyValue(maPropertyName);
+sal_uInt32 nColor = 0;
+aAny >>= nColor;
+Color aColor(nColor);
+
+SvxColorItem aItem(aColor, SID_ATTR_FILL_COLOR);
+mpControl->StateChanged(SID_ATTR_FILL_COLOR, SfxItemState::SET, &aItem);
+}
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/sidebar/ChartColorWrap

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

2015-08-19 Thread Michael Stahl
 svtools/source/config/menuoptions.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce0bba5fc1090caa7fb80f1bcc6ce64f67f11238
Author: Michael Stahl 
Date:   Thu Aug 20 00:25:31 2015 +0200

tdf#93451: svtools: don't commit SvtMenuOptions too early

Surprisingly SvtMenuOptions_Impl::ImplCommit() does not actually write
m_eMenuIcons for "ShowIconsInMenues" but something read out of
Application::Settings(), which appears to be deliberate (i#95318).
Whatever sets that does it after SetMenuIconsState() is called,
so keep the SvtMenuOptions modified by not calling Commit().

(regression from 765f6211b1371c1e40de386e715de6b3d1a8df86)

Change-Id: I368b65589d16753d80a1b9e9cc7d7df59c0f53da

diff --git a/svtools/source/config/menuoptions.cxx 
b/svtools/source/config/menuoptions.cxx
index 22dc5e6..32d54b2 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -128,7 +128,7 @@ class SvtMenuOptions_Impl : public ConfigItem
 SetModified();
 for ( ::std::list>::const_iterator iter = 
aList.begin(); iter != aList.end(); ++iter )
 iter->Call( this );
-Commit();
+// tdf#93451: don't Commit() here, it's too early
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: need help to fetch stable LibreOffice 5.0 code

2015-08-19 Thread Madhura Ravindra Palsule
Hello ,
Thanks for reply, after clone command
git clone http://anongit.freedesktop.org/git/libreoffice/core.git local-folder ,
next command to be used is

git checkout 

how can I get the  exact  for stable source code for Libre office
5.0


Thanks
Madhura

On August 19, 2015 at 3:02 AM Ashod Nakashian  wrote:

>  Hi Madhura,
> 
>  Please see my response to the same question to Rachna on this list.
> 
>  On Tue, Aug 18, 2015 at 7:11 AM, Madhura Ravindra Palsule   > wrote:
>> >Dear Sir/Madam,
> > 
> >I am newbie to libre office compilation, I want to fetch the stable
> > release branch of libre office. I am trying to build LibreOffice on windows.
> >when I use  git clone , it fetches the latest updated branch.
> >Kindly help me with the parameter that need to be used in order to fetch
> > particular stable release source code (of LibreOffice 5.0)
> > 
> >Thanks & Regards,
> >Madhura
> > 
> > 
> >   
> > ---
> >[ C-DAC is on Social-Media too. Kindly follow us at:
> >Facebook: https://www.facebook.com/CDACINDIA
> >  & Twitter: @cdacindia ]
> > 
> >This e-mail is for the sole use of the intended recipient(s) and may
> >contain confidential and privileged information. If you are not the
> >intended recipient, please contact the sender by reply e-mail and destroy
> >all copies and the original message. Any unauthorized review, use,
> >disclosure, dissemination, forwarding, printing or copying of this email
> >is strictly prohibited and appropriate legal action will be taken.
> > 
> >   
> > ---
> > 
> >___
> >LibreOffice mailing list
> >LibreOffice@lists.freedesktop.org
> > 
> >http://lists.freedesktop.org/mailman/listinfo/libreoffice
> > 
> >  > 

---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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


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

2015-08-19 Thread Markus Mohrhard
 chart2/source/controller/sidebar/ChartAreaPanel.cxx |5 +
 sfx2/source/sidebar/SidebarController.cxx   |2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 15fcf82a116288a98460647786f603b30f0123bb
Author: Markus Mohrhard 
Date:   Thu Aug 20 02:14:17 2015 +0200

also need to call updateFillColor to get the UI in order

Change-Id: I689d84ef58faeb4b36159c6370b5e97a13d39736

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 6377e64..9ff480a 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -435,6 +435,11 @@ void ChartAreaPanel::updateData()
 updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem);
 
 maFillColorWrapper.updateData();
+
+sal_uInt32 nFillColor;
+xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+XFillColorItem aFillColorItem("", Color(nFillColor));
+updateFillColor(true, &aFillColorItem);
 }
 
 void ChartAreaPanel::modelInvalid()
commit 89c03990a8be2101632b872a5d21b276f316a457
Author: Markus Mohrhard 
Date:   Thu Aug 20 00:15:33 2015 +0200

better warning message for failed panel creation

Change-Id: I631120903f15256997e082e0d079da7c5ee9944b

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index f99be6c..afb8449 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -816,7 +816,7 @@ Reference 
SidebarController::CreateUIElement (
 }
 catch(const Exception& rException)
 {
-SAL_WARN("sfx.sidebar", "Cannot create panel: " << rException.Message);
+SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL 
<< ": " << rException.Message);
 return NULL;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: need help to fetch stable LibreOffice 5.0 code

2015-08-19 Thread Daniel
Hi Madhura and welcome!

You could try something like the following after you navigate to the
directory you cloned LibreOffice to

git fetch
git checkout origin/branch-name

e.g.

git checkout origin/libreoffice-5-0-0

You can think of the word origin as an alias for
http://anongit.freedesktop.org/git/libreoffice/core.git, so by executing "git
checkout origin/libreoffice-5-0-0" you are in effect saying "I want the
libreoffice-5-0-0 branch from the url that origin is an alias for".

If you'd like to learn more about git, I'd suggest
https://git-scm.com/book/en/v2.

Hope that helps! Let me know if it doesn't make sense.

Best,

Daniel


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2015-08-19 Thread Markus Mohrhard
 chart2/source/controller/sidebar/ChartAreaPanel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e56be085eaf7e3a8e94bea0537ad6f2ae1ba6034
Author: Markus Mohrhard 
Date:   Thu Aug 20 02:22:26 2015 +0200

WaE: -Werror=maybe-uninitialized

Change-Id: Ibf62ffa133aa4cde1836f7b7e735559c02ffb588

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 9ff480a..28bad2f 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -436,7 +436,7 @@ void ChartAreaPanel::updateData()
 
 maFillColorWrapper.updateData();
 
-sal_uInt32 nFillColor;
+sal_uInt32 nFillColor = 0;
 xPropSet->getPropertyValue("FillColor") >>= nFillColor;
 XFillColorItem aFillColorItem("", Color(nFillColor));
 updateFillColor(true, &aFillColorItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[no subject]

2015-08-19 Thread Job
Gud

Sent from my iPad
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2015-08-19 Thread Markus Mohrhard
 chart2/source/controller/sidebar/ChartAreaPanel.cxx|2 -
 chart2/source/controller/sidebar/ChartColorWrapper.cxx |5 ++--
 chart2/source/controller/sidebar/ChartColorWrapper.hxx |3 +-
 chart2/source/controller/sidebar/ChartLinePanel.cxx|   20 -
 chart2/source/controller/sidebar/ChartLinePanel.hxx|2 +
 chart2/source/model/main/DataPointProperties.cxx   |9 +++
 include/svx/sidebar/LinePropertyPanelBase.hxx  |   10 
 svx/source/sidebar/line/LinePropertyPanelBase.cxx  |2 +
 8 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 00754461516416f8ee59ec97632bff84f4d9b155
Author: Markus Mohrhard 
Date:   Thu Aug 20 03:14:08 2015 +0200

make color button work in chart line sidebar panel

Change-Id: I2148fd9953b283945d2a1bcf24dbc47964b659ae

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 28bad2f..294bcc5 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -247,7 +247,7 @@ ChartAreaPanel::ChartAreaPanel(vcl::Window* pParent,
 mxSelectionListener(new ChartSidebarSelectionListener(this)),
 mbUpdate(true),
 mbModelValid(true),
-maFillColorWrapper(mxModel, getColorToolBoxControl(mpToolBoxColor.get()))
+maFillColorWrapper(mxModel, getColorToolBoxControl(mpToolBoxColor.get()), 
"FillColor")
 {
 std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index beeb85d..bd5fd67 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -61,10 +61,11 @@ css::uno::Reference getPropSet(
 
 ChartColorWrapper::ChartColorWrapper(
 css::uno::Reference xModel,
-SvxColorToolBoxControl* pControl):
+SvxColorToolBoxControl* pControl,
+const OUString& rName):
 mxModel(xModel),
 mpControl(pControl),
-maPropertyName("FillColor")
+maPropertyName(rName)
 {
 }
 
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
index b0f9071..045f947 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
@@ -23,7 +23,8 @@ private:
 
 public:
 ChartColorWrapper(css::uno::Reference xModel,
-SvxColorToolBoxControl* pControl);
+SvxColorToolBoxControl* pControl,
+const OUString& rPropertyName);
 
 void operator()(const OUString& rCommand, const Color& rColor);
 
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index d025c5e..55753bd 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -18,12 +18,22 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include 
 
 namespace chart { namespace sidebar {
 
 namespace {
 
+SvxColorToolBoxControl* getColorToolBoxControl(sfx2::sidebar::SidebarToolBox* 
pToolBoxColor)
+{
+css::uno::Reference xController = 
pToolBoxColor->GetFirstController();
+SvxColorToolBoxControl* pToolBoxColorControl = 
dynamic_cast(xController.get());
+return pToolBoxColorControl;
+}
+
 OUString getCID(css::uno::Reference xModel)
 {
 css::uno::Reference 
xController(xModel->getCurrentController());
@@ -122,7 +132,8 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
 mxListener(new ChartSidebarModifyListener(this)),
 mxSelectionListener(new ChartSidebarSelectionListener(this)),
 mbUpdate(true),
-mbModelValid(true)
+mbModelValid(true),
+maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), 
"LineColor")
 {
 std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
@@ -155,6 +166,9 @@ void ChartLinePanel::Initialize()
 if (xSelectionSupplier.is())
 
xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get());
 
+SvxColorToolBoxControl* pToolBoxColor = 
getColorToolBoxControl(mpTBColor.get());
+pToolBoxColor->setColorSelectFunction(maLineColorWrapper);
+
 setMapUnit(SFX_MAPUNIT_100TH_MM);
 updateData();
 }
@@ -185,6 +199,8 @@ void ChartLinePanel::updateData()
 XLineDashItem aDashItem;
 aDashItem.PutValue(aLineDash, MID_LINEDASH);
 updateLineDash(false, true, &aDashItem);
+
+maLineColorWrapper.updateData();
 }
 
 void ChartLinePanel::modelInvalid()
@@ -214,6 +230,8 @@ void ChartLinePanel::updateModel(
 mxModel = xModel;
   

[Bug 93240] replace boost::ptr_container with std::container

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=93240

--- Comment #1 from derrick rocha  ---
I am quite interested in investigating this bug. Can you please fill me in on
where to start? This is my first time doing open source contribution, and I am
a senior of Computer Science at New Mexico Highlands University.

Thanks!
Derrick Rocha

-- 
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 93240] replace boost::ptr_container with std::container

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=93240

--- Comment #2 from Ryan McCoskrie  ---
(In reply to derrick rocha from comment #1)
> I am quite interested in investigating this bug. Can you please fill me in
> on where to start? This is my first time doing open source contribution, and
> I am a senior of Computer Science at New Mexico Highlands University.
> 
> Thanks!
> Derrick Rocha

First make sure that you are set up for using gerrit. Check out the LO wiki on
that matter.

After that (assuming you run a *nix system) pick a directory you want to work
with and run 'grep -rn ptr_container dirname'. From there it is a simple matter
of editing declarations and function calls a little.

-- 
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 93240] replace boost::ptr_container with std::container

2015-08-19 Thread bugzilla-daemon
https://bugs.documentfoundation.org/show_bug.cgi?id=93240

Matthew Francis  changed:

   What|Removed |Added

 CC||fdb...@neosheffield.co.uk

--- Comment #3 from Matthew Francis  ---
(In reply to Ryan McCoskrie from comment #2)
> After that (assuming you run a *nix system) pick a directory you want to
> work with and run 'grep -rn ptr_container dirname'. From there it is a
> simple matter of editing declarations and function calls a little.

Better to use "git grep" from within the checked-out source directory rather
than plain grep - it will be faster, and will skip build artifacts and other
irrelevant files

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