mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63154 Remove some solar.h references

Browse Source 
Remove some solar.h from tools.
Replace sal_uLong by size_t, sal_uInt32 and sal_Int32.

Change-Id: I38961db046337a3ea4ef75d64afa424d81391f34
Reviewed-on: https://gerrit.libreoffice.org/8582
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Alexandre Vicenzi
2014-03-13 23:27:24 -03:00
committed by Norbert Thiebaud
parent 93e6291c29
commit 364ac5acf4
9 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
View File

@@ -36,7 +36,7 @@
#include <comphelper/accessibletexthelper.hxx> #include <comphelper/accessibletexthelper.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
// forward --------------------------------------------------------------- // forward
class SvxIconChoiceCtrlEntry; class SvxIconChoiceCtrlEntry;
class SvtIconChoiceCtrl; class SvtIconChoiceCtrl;
@@ -45,8 +45,7 @@ class SvtIconChoiceCtrl;
namespace accessibility namespace accessibility
{ {
// class AccessibleIconChoiceCtrlEntry
// class AccessibleIconChoiceCtrlEntry ------------------------------------------
typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible
, ::com::sun::star::accessibility::XAccessibleContext , ::com::sun::star::accessibility::XAccessibleContext
@@ -108,7 +107,7 @@ namespace accessibility
is our parent accessible object is our parent accessible object
*/ */
AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
sal_uLong _nPos, sal_Int32 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent ); const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
// XTypeProvider // XTypeProvider

4
accessibility/source/extended/accessibleiconchoicectrlentry.cxx
View File

@@ -54,7 +54,7 @@ namespace
namespace accessibility namespace accessibility
{ {
// class AccessibleIconChoiceCtrlEntry ----------------------------------------------------- // class AccessibleIconChoiceCtrlEntry
using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
@@ -65,7 +65,7 @@ namespace accessibility
// Ctor() and Dtor() // Ctor() and Dtor()
AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
sal_uLong _nPos, sal_Int32 _nPos,
const Reference< XAccessible >& _xParent ) : const Reference< XAccessible >& _xParent ) :
AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ), AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ),

7
editeng/source/editeng/editview.cxx
View File

@@ -72,8 +72,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
// static // static
LanguageType EditView::CheckLanguage( LanguageType EditView::CheckLanguage(
const OUString &rText, const OUString &rText,
@@ -153,8 +151,6 @@ LanguageType EditView::CheckLanguage(
return nLang; return nLang;
} }
// class EditView // class EditView
EditView::EditView( EditEngine* pEng, Window* pWindow ) EditView::EditView( EditEngine* pEng, Window* pWindow )
@@ -475,7 +471,7 @@ void EditView::Redo()
PIMPE->Redo( this ); PIMPE->Redo( this );
} }
sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) sal_uInt32 EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
{ {
EditSelection aOldSel( pImpEditView->GetEditSelection() ); EditSelection aOldSel( pImpEditView->GetEditSelection() );
pImpEditView->DrawSelection(); pImpEditView->DrawSelection();
@@ -708,7 +704,6 @@ EESpellState EditView::StartThesaurus()
return PIMPEE->StartThesaurus( this ); return PIMPEE->StartThesaurus( this );
} }
void EditView::StartTextConversion( void EditView::StartTextConversion(
LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ) sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )

2
include/editeng/editview.hxx
View File

@@ -163,7 +163,7 @@ public:
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 ); void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs = false ); void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs = false );
sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
void SetBackgroundColor( const Color& rColor ); void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const; Color GetBackgroundColor() const;

1
include/tools/contnr.hxx
View File

@@ -20,7 +20,6 @@
#define INCLUDED_TOOLS_CONTNR_HXX #define INCLUDED_TOOLS_CONTNR_HXX
#include <tools/toolsdllapi.h> #include <tools/toolsdllapi.h>
#include <tools/solar.h>
#include <limits.h> #include <limits.h>

1
include/tools/gen.hxx
View File

@@ -20,7 +20,6 @@
#define INCLUDED_TOOLS_GEN_HXX #define INCLUDED_TOOLS_GEN_HXX
#include <tools/toolsdllapi.h> #include <tools/toolsdllapi.h>
#include <tools/solar.h>
#include <limits.h> #include <limits.h>
#include <ostream> #include <ostream>

1
include/tools/wintypes.hxx
View File

@@ -19,7 +19,6 @@
#ifndef INCLUDED_TOOLS_WINTYPES_HXX #ifndef INCLUDED_TOOLS_WINTYPES_HXX
#define INCLUDED_TOOLS_WINTYPES_HXX #define INCLUDED_TOOLS_WINTYPES_HXX
#include <tools/solar.h>
#include <sal/types.h> #include <sal/types.h>
// Window-Types // Window-Types

2
sd/source/ui/inc/zoomlist.hxx
View File

@@ -42,7 +42,7 @@ public:
private: private:
ViewShell* mpViewShell; ViewShell* mpViewShell;
sal_uLong mnCurPos; sal_uInt32 mnCurPos;
std::vector<Rectangle> maRectangles; std::vector<Rectangle> maRectangles;
}; };

6
sd/source/ui/view/zoomlist.cxx
View File

@@ -39,7 +39,7 @@ ZoomList::ZoomList(ViewShell* pViewShell)
void ZoomList::InsertZoomRect(const Rectangle& rRect) void ZoomList::InsertZoomRect(const Rectangle& rRect)
{ {
sal_uLong nRectCount = maRectangles.size(); size_t nRectCount = maRectangles.size();
if (nRectCount >= MAX_ENTRYS) if (nRectCount >= MAX_ENTRYS)
maRectangles.erase(maRectangles.begin()); maRectangles.erase(maRectangles.begin());
@@ -58,7 +58,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
Rectangle ZoomList::GetNextZoomRect() Rectangle ZoomList::GetNextZoomRect()
{ {
mnCurPos++; mnCurPos++;
sal_uLong nRectCount = maRectangles.size(); size_t nRectCount = maRectangles.size();
if (nRectCount > 0 && mnCurPos > nRectCount - 1) if (nRectCount > 0 && mnCurPos > nRectCount - 1)
mnCurPos = nRectCount - 1; mnCurPos = nRectCount - 1;
@@ -84,7 +84,7 @@ Rectangle ZoomList::GetPreviousZoomRect()
sal_Bool ZoomList::IsNextPossible() const sal_Bool ZoomList::IsNextPossible() const
{ {
sal_uLong nRectCount = maRectangles.size(); size_t nRectCount = maRectangles.size();
return nRectCount > 0 && mnCurPos < nRectCount - 1; return nRectCount > 0 && mnCurPos < nRectCount - 1;
} }