[Libreoffice-commits] core.git: dbaccess/source editeng/source

2020-03-20 Thread Bugra (via logerrit) 
 dbaccess/source/ui/app/AppIconControl.cxx |4 ++--
 editeng/source/editeng/editobj.cxx|2 +-
 editeng/source/editeng/editobj2.hxx   |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 337049d4642be4349dd8af3021e05165572d0bfa
Author: Bugra 
AuthorDate: Wed Mar 4 15:36:04 2020 +0300
Commit: Michael Stahl 
CommitDate: Fri Mar 20 17:57:09 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

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

diff --git a/dbaccess/source/ui/app/AppIconControl.cxx 
b/dbaccess/source/ui/app/AppIconControl.cxx
index 2eb3b6c4ce38..831d20cf4a1f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -65,8 +65,8 @@ OApplicationIconControl::~OApplicationIconControl()
 
 void OApplicationIconControl::dispose()
 {
-sal_uLong nCount = GetEntryCount();
-for ( sal_uLong i = 0; i < nCount; ++i )
+sal_Int32 nCount = GetEntryCount();
+for ( sal_Int32 i = 0; i < nCount; ++i )
 {
 SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
 if ( pEntry )
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index a0f46f0329ee..ec4e964f83fd 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -79,7 +79,7 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
 }
 
 XParaPortionList::XParaPortionList(
-OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 
_nStretchY)
+OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 
_nStretchY)
 : pRefDevPtr(pRefDev)
 , nStretchX(_nStretchX)
 , nStretchY(_nStretchY)
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index b7d045d459f4..41bbc5404e50 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -97,16 +97,16 @@ class XParaPortionList
 VclPtr pRefDevPtr;
 sal_uInt16  nStretchX;
 sal_uInt16  nStretchY;
-sal_uLong   nPaperWidth;
+sal_uInt32  nPaperWidth;
 
 public:
-XParaPortionList(OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 
_nStretchX, sal_uInt16 _nStretchY);
+XParaPortionList(OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 
_nStretchX, sal_uInt16 _nStretchY);
 
 void push_back(XParaPortion* p);
 const XParaPortion& operator[](size_t i) const;
 
 OutputDevice*   GetRefDevPtr() const{ return pRefDevPtr; }
-sal_uLong   GetPaperWidth() const   { return nPaperWidth; }
+sal_uInt32  GetPaperWidth() const   { return nPaperWidth; }
 boolRefDevIsVirtual() const {return 
pRefDevPtr->IsVirtual();}
 const MapMode&  GetRefMapMode() const   { return 
pRefDevPtr->GetMapMode(); }
 sal_uInt16  GetStretchX() const { return nStretchX; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-11 Thread Bugra (via logerrit) 
 idl/inc/lex.hxx |   18 +-
 idl/source/cmptools/lex.cxx |4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ad53c996205c290b88fd7acc9fa5c42c3eb5862b
Author: Bugra 
AuthorDate: Sun Mar 8 20:13:52 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Mar 11 17:36:44 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

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

diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 977cc2b50a36..b7aa9336d82f 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -35,12 +35,12 @@ enum class SVTOKENTYPE { Empty,  Comment,
 class SvToken
 {
 friend class SvTokenStream;
-sal_uLong   nLine, nColumn;
+sal_uInt64  nLine, nColumn;
 SVTOKENTYPE nType;
 OString aString;
 union
 {
-sal_uInt64   nLong;
+sal_uInt64  nLong;
 boolbBool;
 charcChar;
 SvStringHashEntry * pHash;
@@ -53,11 +53,11 @@ public:
 
 OString GetTokenAsString() const;
 
-voidSetLine( sal_uLong nLineP ) { nLine = nLineP;   }
-sal_uLong   GetLine() const { return nLine; }
+voidSetLine( sal_uInt64 nLineP ) { nLine = nLineP;   }
+sal_uInt64  GetLine() const { return nLine; }
 
-voidSetColumn( sal_uLong nColumnP ) { nColumn = nColumnP;   }
-sal_uLong   GetColumn() const   { return nColumn;   }
+voidSetColumn( sal_uInt64 nColumnP ) { nColumn = nColumnP;   }
+sal_uInt64  GetColumn() const   { return nColumn;   }
 
 boolIsComment() const   { return nType == SVTOKENTYPE::Comment; }
 boolIsInteger() const   { return nType == SVTOKENTYPE::Integer; }
@@ -98,13 +98,13 @@ inline SvToken::SvToken()
 
 class SvTokenStream
 {
-sal_uLong   nLine, nColumn;
+sal_uInt64  nLine, nColumn;
 sal_Int32   nBufPos;
 charc;  // next character
 static const sal_uInt16 nTabSize = 4;   // length of tabulator
 OString aStrTrue;
 OString aStrFalse;
-sal_uLong   nMaxPos;
+sal_uInt32  nMaxPos;
 
 std::unique_ptr  pInStream;
 OUString   aFileName;
@@ -129,7 +129,7 @@ class SvTokenStream
 boolIsEof() const { return pInStream->eof(); }
 voidSetMax()
 {
-sal_uLong n = Tell();
+sal_uInt32 n = Tell();
 if( n > nMaxPos )
 nMaxPos = n;
 }
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index f479bea4c4b7..eb9ad11703a2 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -204,8 +204,8 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 }
 while( 0 == c && !IsEof() && ( ERRCODE_NONE == pInStream->GetError() ) );
 
-sal_uLong nLastLine = nLine;
-sal_uLong nLastColumn   = nColumn;
+sal_uInt64 nLastLine = nLine;
+sal_uInt64 nLastColumn   = nColumn;
 // comment
 if( '/' == c )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-11 Thread Bugra (via logerrit) 
 dbaccess/source/ui/app/AppSwapWindow.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cdc16e5d67ad4668cfa457fc277a796b413228a9
Author: Bugra 
AuthorDate: Wed Mar 4 15:20:06 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Mar 11 16:42:55 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

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

diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx 
b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 05100e13c102..29cdef2b79e5 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -164,9 +164,9 @@ IMPL_LINK_NOARG(OApplicationSwapWindow, 
ChangeToLastSelected, void*, void)
 
 void OApplicationSwapWindow::selectContainer(ElementType _eType)
 {
-sal_uLong nCount = m_aIconControl->GetEntryCount();
+sal_Int32 nCount = m_aIconControl->GetEntryCount();
 SvxIconChoiceCtrlEntry* pEntry = nullptr;
-for (sal_uLong i=0; i < nCount; ++i)
+for (sal_Int32 i=0; i < nCount; ++i)
 {
 pEntry = m_aIconControl->GetEntry(i);
 if ( pEntry && *static_cast(pEntry->GetUserData()) == 
_eType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-04 Thread Bugra (via logerrit) 
 basctl/source/basicide/baside2.cxx |6 +++---
 basctl/source/basicide/baside2.hxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3e0c5113a298d3ded705706193f8b6b909027b2f
Author: Bugra 
AuthorDate: Sat Feb 29 15:40:32 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Mar 4 11:21:28 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

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

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 57351c678409..f9e8b2674eba 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -505,7 +505,7 @@ void ModulWindow::ImportDialog()
 implImportDialog(GetFrameWeld(), m_sCurPath, rDocument, aLibName);
 }
 
-void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
+void ModulWindow::ToggleBreakPoint( sal_uInt16 nLine )
 {
 DBG_ASSERT( XModule().is(), "No Module!" );
 
@@ -520,12 +520,12 @@ void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nLine );
 if ( pBrk ) // remove
 {
-m_xModule->ClearBP( static_cast(nLine) );
+m_xModule->ClearBP( nLine );
 GetBreakPoints().remove( pBrk );
 }
 else // create one
 {
-if ( m_xModule->SetBP( static_cast(nLine)) )
+if ( m_xModule->SetBP( nLine ))
 {
 GetBreakPoints().InsertSorted( BreakPoint( nLine ) );
 if ( StarBASIC::IsRunning() )
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 0a476a7f9ad5..342397cd66a2 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -341,7 +341,7 @@ public:
 
 voidEditMacro( const OUString& rMacroName );
 
-voidToggleBreakPoint( sal_uLong nLine );
+voidToggleBreakPoint( sal_uInt16 nLine );
 
 BasicStatus&GetBasicStatus() { return m_aStatus; }
 
___
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-29 Thread Bugra (via logerrit) 
 sw/source/core/access/acccell.hxx |5 +
 sw/source/core/access/acccontext.hxx  |5 +
 sw/source/core/access/accdoc.hxx  |5 +
 sw/source/core/access/accembedded.hxx |5 +
 sw/source/core/access/accfootnote.hxx |5 +
 5 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 6800a6dd9a60603badffb7b5bcbef22eee2134cb
Author: Bugra 
AuthorDate: Sat Feb 29 13:52:36 2020 +0300
Commit: Jens Carl 
CommitDate: Sat Feb 29 20:19:31 2020 +0100

tdf#124176: Use pragma once instead of include guards

Change-Id: I7ab74181ba68ad722929b6022736179327ac909f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89754
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sw/source/core/access/acccell.hxx 
b/sw/source/core/access/acccell.hxx
index 64fbd3a86893..4caa25cad5d4 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
-#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
+#pragma once
 
 #include "acccontext.hxx"
 #include 
@@ -133,6 +132,4 @@ public:
 virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acccontext.hxx 
b/sw/source/core/access/acccontext.hxx
index a42c0f569fb2..8550430e69bf 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
-#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
+#pragma once
 
 #include "accframe.hxx"
 #include 
@@ -358,6 +357,4 @@ public:
 const OUString *pArg2 = nullptr);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 6f117c825b7e..eb4ec56bd499 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
-#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
+#pragma once
 
 #include "acccontext.hxx"
 #include 
@@ -176,6 +175,4 @@ public:
 SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) 
override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accembedded.hxx 
b/sw/source/core/access/accembedded.hxx
index 5506838fa64f..86fdcc9cd5e5 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
-#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
+#pragma once
 
 #include "accnotextframe.hxx"
 
@@ -70,6 +69,4 @@ public:
 virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfootnote.hxx 
b/sw/source/core/access/accfootnote.hxx
index 30a42d0f2452..ecc852cd5816 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
+#pragma once
 
 #include 
 #include "acccontext.hxx"
@@ -63,6 +62,4 @@ public:
 static bool IsEndnote( const SwFootnoteFrame *pFrame );
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits