[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

2020-06-08 Thread Canberk TURAN (via logerrit) 
 sw/source/core/crsr/swcrsr.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 402f36efb215338ad545caa65d39fb8a39685ea1
Author: Canberk TURAN 
AuthorDate: Sun Jun 7 16:26:16 2020 +0300
Commit: Xisco Fauli 
CommitDate: Mon Jun 8 19:07:41 2020 +0200

tdf#131990 MACROS: fixes return value of UpDown Method

This patch fixes bRet return value of UpDown method in
sw/source/core/crsr/swcrsr.cxx. Before this patch UpDown method always 
returns true.

Change-Id: I5ebe4bef4e6b9d7ace4941c31e9d5a03c2023997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95669
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 1e5cf1b3ebf39aee01ed2a3bfd5be7ee6f44d18e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95811
Reviewed-by: Canberk TURAN 
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6067bfe414d4..9a7c84a44b9f 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2036,6 +2036,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 pFrame->GetModelPositionForViewPoint( GetPoint(), aPt, 
 );
 }
+bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 }
 else
 {
@@ -2047,12 +2048,17 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 //if cursor has already been at start or end of file,
 //Update cursor to change nUpDownX.
 if ( aOldPos.nContent.GetIndex() == nOffset )
+{
 GetDoc()->GetEditShell()->UpdateCursor();
-else
+bRet = false;
+}
+else{
 *GetPoint() = aPos; // just give a new position
+bRet = true;
+}
+
 }
 
-bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 DoSetBidiLevelUpDown(); // calculate cursor bidi level
 }
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Canberk TURAN (via logerrit) 
 sw/source/core/crsr/swcrsr.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 1e5cf1b3ebf39aee01ed2a3bfd5be7ee6f44d18e
Author: Canberk TURAN 
AuthorDate: Sun Jun 7 16:26:16 2020 +0300
Commit: Gülşah Köse 
CommitDate: Mon Jun 8 08:08:49 2020 +0200

tdf#131990 MACROS: fixes return value of UpDown Method

This patch fixes bRet return value of UpDown method in
sw/source/core/crsr/swcrsr.cxx. Before this patch UpDown method always 
returns true.

Change-Id: I5ebe4bef4e6b9d7ace4941c31e9d5a03c2023997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95669
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6067bfe414d4..9a7c84a44b9f 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2036,6 +2036,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 pFrame->GetModelPositionForViewPoint( GetPoint(), aPt, 
 );
 }
+bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 }
 else
 {
@@ -2047,12 +2048,17 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 //if cursor has already been at start or end of file,
 //Update cursor to change nUpDownX.
 if ( aOldPos.nContent.GetIndex() == nOffset )
+{
 GetDoc()->GetEditShell()->UpdateCursor();
-else
+bRet = false;
+}
+else{
 *GetPoint() = aPos; // just give a new position
+bRet = true;
+}
+
 }
 
-bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 DoSetBidiLevelUpDown(); // calculate cursor bidi level
 }
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-06 Thread Canberk TURAN (via logerrit) 
 sw/source/core/crsr/swcrsr.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 4c009d523f1017def872f0c69caafd7d1826c263
Author: Canberk TURAN 
AuthorDate: Thu Mar 5 00:37:18 2020 +0300
Commit: Gülşah Köse 
CommitDate: Fri Mar 6 13:44:01 2020 +0100

tdf#131134: Corrects the cursor column while moving with arrow keys.

After cursor jumped to start of first line or end of the last
line (with up/down arrow keys), when we clicked the arrow keys on
the same direction again, cursor movement column will be the
last or first column.

Change-Id: I9137adea14ce3fa7dd516a4e6fac5641df5a556b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90012
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index bc4a53f22583..049cf9212ede 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::i18n;
 
@@ -2031,7 +2032,13 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 SwNode& rNode = GetPoint()->nNode.GetNode();
 const sal_Int32 nOffset = bUp ? 0 : 
rNode.GetTextNode()->GetText().getLength();
 const SwPosition aPos(*GetContentNode(), nOffset);
-*GetPoint() = aPos;
+
+//if cursor has already been at start or end of file,
+//Update cursor to change nUpDownX.
+if ( aOldPos.nContent.GetIndex() == nOffset )
+GetDoc()->GetEditShell()->UpdateCursor();
+else
+*GetPoint() = aPos; // just give a new position
 }
 
 bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-26 Thread Canberk TURAN (via logerrit) 
 sw/source/core/crsr/swcrsr.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0aa0fda64057647219954480ac1bab86b0f0e433
Author: Canberk TURAN 
AuthorDate: Tue Feb 25 23:55:50 2020 +0300
Commit: Gülşah Köse 
CommitDate: Thu Feb 27 08:06:16 2020 +0100

tdf#81226: Cursor jumping fixed

Cursor to jump to end of line when pressing the down key

Change-Id: Ib9548d02039a17257ac7ed63221952abb7792590
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89533
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 96b77d8a8e71..bc4a53f22583 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2024,11 +2024,17 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 pFrame->GetModelPositionForViewPoint( GetPoint(), aPt, 
 );
 }
-bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 }
 else
-*GetPoint() = aOldPos;
+{
+// Jump to beginning or end of line when the cursor at first or 
last line.
+SwNode& rNode = GetPoint()->nNode.GetNode();
+const sal_Int32 nOffset = bUp ? 0 : 
rNode.GetTextNode()->GetText().getLength();
+const SwPosition aPos(*GetContentNode(), nOffset);
+*GetPoint() = aPos;
+}
 
+bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 DoSetBidiLevelUpDown(); // calculate cursor bidi level
 }
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-21 Thread Canberk TURAN (via logerrit) 
 svx/source/unodraw/UnoGraphicExporter.cxx |   12 ++--
 tools/source/zcodec/zcodec.cxx|4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9e0470da4a88a588a294856236d6adf1eefe22f6
Author: Canberk TURAN 
AuthorDate: Mon Jan 27 01:51:19 2020 +0300
Commit: Michael Stahl 
CommitDate: Fri Feb 21 10:27:50 2020 +0100

tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types

I fixed if-conditons in UnoGraphicExporter.cxx and I deleted extra slash 
character at start of zcodec.cxx file.

Change-Id: I464e7b0dcbfe835d04c5031bfbd6e46bccbb1216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87470
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 86710d02fa43..66b1974ffeb9 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -159,7 +159,7 @@ namespace {
 virtual sal_Bool SAL_CALL supportsMimeType( const OUString& 
MimeTypeName ) override;
 virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames(  ) 
override;
 
-VclPtr CreatePageVDev( SdrPage* pPage, sal_uIntPtr 
nWidthPixel, sal_uIntPtr nHeightPixel ) const;
+VclPtr CreatePageVDev( SdrPage* pPage, long 
nWidthPixel, long nHeightPixel ) const;
 
 DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
 
@@ -381,7 +381,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, 
EditFieldInfo*, pInfo, void)
 
 @return the returned VirtualDevice is owned by the caller
 */
-VclPtr GraphicExporter::CreatePageVDev( SdrPage* pPage, 
sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
+VclPtr GraphicExporter::CreatePageVDev( SdrPage* pPage, long 
nWidthPixel, long nHeightPixel ) const
 {
 VclPtr  pVDev = VclPtr::Create();
 MapMode aMM( MapUnit::Map100thMM );
@@ -390,9 +390,9 @@ VclPtr GraphicExporter::CreatePageVDev( 
SdrPage* pPage, sal_uIntP
 Size aPageSize(pPage->GetSize());
 
 // use scaling?
-if( nWidthPixel )
+if( nWidthPixel != 0 )
 {
-const Fraction aFrac( static_cast(nWidthPixel), 
pVDev->LogicToPixel( aPageSize, aMM ).Width() );
+const Fraction aFrac( nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM 
).Width() );
 
 aMM.SetScaleX( aFrac );
 
@@ -400,9 +400,9 @@ VclPtr GraphicExporter::CreatePageVDev( 
SdrPage* pPage, sal_uIntP
 aMM.SetScaleY( aFrac );
 }
 
-if( nHeightPixel )
+if( nHeightPixel != 0 )
 {
-const Fraction aFrac( static_cast(nHeightPixel), 
pVDev->LogicToPixel( aPageSize, aMM ).Height() );
+const Fraction aFrac( nHeightPixel, pVDev->LogicToPixel( aPageSize, 
aMM ).Height() );
 
 if( nWidthPixel == 0 )
 aMM.SetScaleX( aFrac );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 439e838bdc96..a29127be7232 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -287,9 +287,9 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* 
pData, sal_uInt32 nSize
 void ZCodec::ImplWriteBack()
 {
 auto pStream = static_cast(mpsC_Stream);
-sal_uIntPtr nAvail = mnOutBufSize - pStream->avail_out;
+size_t nAvail = mnOutBufSize - pStream->avail_out;
 
-if ( nAvail )
+if ( nAvail > 0 )
 {
 pStream->next_out = mpOutBuf;
 mpOStm->WriteBytes( mpOutBuf, nAvail );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Canberk TURAN (via logerrit) 
 xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx |4 
+--
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   11 
+-
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit a2c9b446243c153653537227da4731ebc945fb73
Author: Canberk TURAN 
AuthorDate: Mon Jan 27 11:01:25 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 1 10:20:28 2020 +0100

tdf#54938: Adapt supportsService implementations to cppu::supportsService

Change-Id: I82fa5528c879f288822fe9795d7d7da19f0abbee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87485
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx 
b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 586a8f70c7a1..de6cf54cd206 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
@@ -97,8 +98,7 @@ OUString SAL_CALL 
XMLSignatureTemplateImpl::getImplementationName() {
 
 /* XServiceInfo */
 sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& 
serviceName) {
-Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
-return comphelper::findValue(seqServiceNames, serviceName) != -1;
+return cppu::supportsService(this, serviceName);
 }
 
 /* XServiceInfo */
diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index e1e7b8d12760..d296d885e0f3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -34,7 +34,7 @@
 #include "x509certificate_mscryptimpl.hxx"
 #include 
 #include 
-
+#include 
 #include 
 #include "akmngr.hxx"
 
@@ -164,15 +164,8 @@ OUString SAL_CALL 
SecurityEnvironment_MSCryptImpl::getImplementationName() {
 
 /* XServiceInfo */
 sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const 
OUString& serviceName) {
-uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
-const OUString* pArray = seqServiceNames.getConstArray() ;
-for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
-if( *( pArray + i ) == serviceName )
-return true ;
-}
-return false ;
+return cppu::supportsService(this, serviceName);
 }
-
 /* XServiceInfo */
 uno::Sequence< OUString > SAL_CALL 
SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() {
 uno::Sequence seqServiceNames { 
"com.sun.star.xml.crypto.SecurityEnvironment" };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-29 Thread Canberk TURAN (via logerrit) 
 configmgr/source/configurationprovider.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a654caf5dbca9635d4e7f89eb6d125ea98626da3
Author: Canberk TURAN 
AuthorDate: Mon Jan 27 14:54:18 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Jan 29 22:10:18 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Changed to one-line return

Change-Id: I2ce55ff3c7f218823418ed623b03e6a4fcbc0d2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87515
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/configmgr/source/configurationprovider.cxx 
b/configmgr/source/configurationprovider.cxx
index 6cbde63f2000..467d73bfdc23 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -268,10 +268,7 @@ Service::createInstanceWithArguments(
 
 css::uno::Sequence< OUString > Service::getAvailableServiceNames()
 {
-css::uno::Sequence< OUString > names(2);
-names[0] = accessServiceName;
-names[1] = updateAccessServiceName;
-return names;
+return { accessServiceName, updateAccessServiceName };
 }
 
 void Service::refresh() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-27 Thread Canberk TURAN (via logerrit) 
 svx/source/svdraw/svdoole2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f78ec160d93c9765f3a27be54a4d986872e9a69
Author: Canberk TURAN 
AuthorDate: Sun Jan 26 17:03:11 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Jan 27 14:32:00 2020 +0100

tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types

Change-Id: I4e3e11a89e4f04d804cfb75e8eec53f59ad1cc89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87446
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 6f4ed4edcb8e..fe137647b01b 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -377,7 +377,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
 xParentFrame->setActiveFrame( xOwnFrame );
 
 OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
-const sal_uIntPtr nCount = rObjCache.size();
+const size_t nCount = rObjCache.size();
 for(sal_Int32 i = nCount-1 ; i >= 0;--i)
 {
 SdrOle2Obj* pObj = rObjCache[i];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-26 Thread Canberk TURAN (via logerrit) 
 connectivity/source/inc/calc/CTables.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e337f5b20430e52ef99923a475d05a1191506d21
Author: Canberk TURAN 
AuthorDate: Sat Jan 25 14:59:25 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Jan 26 20:32:26 2020 +0100

tdf#124176: Use pragma once instead of include guards

Change-Id: I138b35bab9f4844e6fe1cac9a5c74c2e55d6680b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87382
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/connectivity/source/inc/calc/CTables.hxx 
b/connectivity/source/inc/calc/CTables.hxx
index 94d28bdd5478..65c7135f0981 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLES_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLES_HXX
+#pragma once
 
 #include 
 
@@ -40,6 +39,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLES_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-25 Thread Canberk TURAN (via logerrit) 
 connectivity/source/inc/calc/CCatalog.hxx  |5 +
 connectivity/source/inc/calc/CConnection.hxx   |5 +
 connectivity/source/inc/calc/CDatabaseMetaData.hxx |5 +
 connectivity/source/inc/calc/CDriver.hxx   |5 +
 connectivity/source/inc/calc/CTable.hxx|5 +
 5 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 134507a663871d45951fdbd4291fa337ed70a1f4
Author: Canberk TURAN 
AuthorDate: Sat Jan 25 16:20:54 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Jan 25 19:06:43 2020 +0100

tdf#124176: Use pragma once instead of include guards

Change-Id: I7b32821caa1ade54ead49205aded36f4707b3e01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87400
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/connectivity/source/inc/calc/CCatalog.hxx 
b/connectivity/source/inc/calc/CCatalog.hxx
index 57051fe8e183..724b5fb129a0 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCATALOG_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCATALOG_HXX
+#pragma once
 
 #include 
 
@@ -38,6 +37,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCATALOG_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CConnection.hxx 
b/connectivity/source/inc/calc/CConnection.hxx
index cc8cc59702b9..3cd139635a2c 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCONNECTION_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCONNECTION_HXX
+#pragma once
 
 #include 
 #include 
@@ -148,6 +147,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCONNECTION_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx 
b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index 7cda0f1c8ef2..a46d09c14b1c 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
+#pragma once
 
 #include 
 
@@ -42,6 +41,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDriver.hxx 
b/connectivity/source/inc/calc/CDriver.hxx
index 89e92f4144c4..73b2f564c149 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDRIVER_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDRIVER_HXX
+#pragma once
 
 #include 
 
@@ -53,6 +52,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDRIVER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CTable.hxx 
b/connectivity/source/inc/calc/CTable.hxx
index 570a6bc87134..057ba2a2354d 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLE_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLE_HXX
+#pragma once
 
 #include 
 #include 
@@ -76,6 +75,4 @@ namespace connectivity
 }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits