include/svx/galtheme.hxx | 62 +++++++++++++++++++--------------------
svx/inc/galbrws2.hxx | 2 -
svx/source/gallery2/galbrws2.cxx | 22 ++++++-------
svx/source/gallery2/galctrl.cxx | 2 -
svx/source/gallery2/galtheme.cxx | 52 ++++++++++++++++----------------
svx/source/gengal/gengal.cxx | 2 -
6 files changed, 71 insertions(+), 71 deletions(-)
New commits:
commit d91d2400a56d98c8bd0cacd5d75a4081f7a4bd75
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Dec 13 15:40:22 2017 +0200
sal_uIntPtr->sal_Int32 in GalleryTheme
Change-Id: I3489d2152b104d173676e683c416603dbddbd1bc
Reviewed-on: https://gerrit.libreoffice.org/46396
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 5b258c305c22..4089dcdba47f 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -85,29 +85,29 @@ private:
GalleryThemeEntry* pThm;
sal_uInt32 mnThemeLockCount;
sal_uInt32 mnBroadcasterLockCount;
- sal_uIntPtr nDragPos;
+ sal_Int32 nDragPos;
bool bDragging;
bool bAbortActualize;
SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
SgaObject* ImplReadSgaObject( GalleryObject const *
pEntry );
- SAL_DLLPRIVATE bool ImplWriteSgaObject( const SgaObject& rObj,
size_t nPos, GalleryObject* pExistentEntry );
+ SAL_DLLPRIVATE bool ImplWriteSgaObject( const SgaObject& rObj,
sal_Int32 nPos, GalleryObject* pExistentEntry );
SAL_DLLPRIVATE void ImplWrite();
- SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( size_t nPos )
const
- { return ( nPos < aObjectList.size() ) ?
aObjectList[ nPos ] : nullptr; }
+ SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( sal_Int32 nPos )
const
+ { return ( nPos <
sal_Int32(aObjectList.size()) ) ? aObjectList[ nPos ] : nullptr; }
const GalleryObject* ImplGetGalleryObject( const INetURLObject&
rURL );
- SAL_DLLPRIVATE size_t ImplGetGalleryObjectPos( const GalleryObject*
pObj ) const
+ SAL_DLLPRIVATE sal_Int32 ImplGetGalleryObjectPos( const
GalleryObject* pObj ) const
{
for ( size_t i = 0, n =
aObjectList.size(); i < n; ++i )
if ( pObj == aObjectList[ i ] )
return i;
- return size_t(-1);
+ return -1;
}
SAL_DLLPRIVATE static INetURLObject ImplGetURL( const GalleryObject*
pObject );
SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind,
ConvertDataFormat nFormat = ConvertDataFormat::Unknown );
SAL_DLLPRIVATE void ImplSetModified( bool bModified );
- SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos );
+ SAL_DLLPRIVATE void ImplBroadcast( sal_Int32 nUpdatePos );
SAL_DLLPRIVATE GalleryTheme( Gallery* pGallery,
GalleryThemeEntry* pThemeEntry );
@@ -120,14 +120,14 @@ public:
SAL_DLLPRIVATE static GalleryThemeEntry* CreateThemeEntry( const
INetURLObject& rURL, bool bReadOnly );
- SAL_DLLPRIVATE size_t GetObjectCount() const { return
aObjectList.size(); }
+ SAL_DLLPRIVATE sal_Int32 GetObjectCount() const { return
aObjectList.size(); }
- SgaObject* AcquireObject( size_t nPos );
+ SgaObject* AcquireObject( sal_Int32 nPos );
static void ReleaseObject( SgaObject* pObj );
- bool InsertObject( const SgaObject& rObj,
sal_uIntPtr nPos = CONTAINER_APPEND );
- bool RemoveObject( size_t nPos );
- SAL_DLLPRIVATE bool ChangeObjectPos( size_t nOldPos, size_t
nNewPos );
+ bool InsertObject( const SgaObject& rObj, sal_Int32
nPos = SAL_MAX_INT32 );
+ bool RemoveObject( sal_Int32 nPos );
+ SAL_DLLPRIVATE bool ChangeObjectPos( sal_Int32 nOldPos, sal_Int32
nNewPos );
const OUString& GetName() const;
@@ -152,8 +152,8 @@ public:
void UnlockBroadcaster();
SAL_DLLPRIVATE bool IsBroadcasterLocked() const { return
mnBroadcasterLockCount > 0; }
- SAL_DLLPRIVATE void SetDragPos( sal_uIntPtr nPos ) { nDragPos =
nPos; }
- SAL_DLLPRIVATE sal_uIntPtr GetDragPos() const { return nDragPos; }
+ SAL_DLLPRIVATE void SetDragPos( sal_Int32 nPos ) { nDragPos =
nPos; }
+ SAL_DLLPRIVATE sal_Int32 GetDragPos() const { return nDragPos; }
SAL_DLLPRIVATE bool IsThemeNameFromResource() const;
@@ -168,38 +168,38 @@ public:
public:
- SAL_DLLPRIVATE SgaObjKind GetObjectKind( sal_uIntPtr nPos ) const
+ SAL_DLLPRIVATE SgaObjKind GetObjectKind( sal_Int32 nPos ) const
{
DBG_ASSERT( nPos < GetObjectCount(),
"Position out of range" );
return ImplGetGalleryObject( nPos
)->eObjKind;
}
- SAL_DLLPRIVATE const INetURLObject& GetObjectURL( sal_uIntPtr nPos ) const
+ SAL_DLLPRIVATE const INetURLObject& GetObjectURL( sal_Int32 nPos ) const
{
DBG_ASSERT( nPos < GetObjectCount(),
"Position out of range" );
return ImplGetGalleryObject( nPos )->aURL;
}
- SAL_DLLPRIVATE bool GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp );
+ SAL_DLLPRIVATE bool GetThumb( sal_Int32 nPos, BitmapEx& rBmp );
- bool GetGraphic( sal_uIntPtr nPos, Graphic&
rGraphic, bool bProgress = false );
- bool InsertGraphic( const Graphic& rGraphic,
sal_uIntPtr nInsertPos );
+ bool GetGraphic( sal_Int32 nPos, Graphic& rGraphic,
bool bProgress = false );
+ bool InsertGraphic( const Graphic& rGraphic,
sal_Int32 nInsertPos );
- bool GetModel( sal_uIntPtr nPos, SdrModel& rModel );
- bool InsertModel( const FmFormModel& rModel,
sal_uIntPtr nInsertPos );
+ bool GetModel( sal_Int32 nPos, SdrModel& rModel );
+ bool InsertModel( const FmFormModel& rModel,
sal_Int32 nInsertPos );
- SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos,
tools::SvRef<SotStorageStream> const & rModelStreamRef );
- SAL_DLLPRIVATE bool InsertModelStream( const
tools::SvRef<SotStorageStream>& rModelStream, sal_uIntPtr nInsertPos );
+ SAL_DLLPRIVATE bool GetModelStream( sal_Int32 nPos,
tools::SvRef<SotStorageStream> const & rModelStreamRef );
+ SAL_DLLPRIVATE bool InsertModelStream( const
tools::SvRef<SotStorageStream>& rModelStream, sal_Int32 nInsertPos );
- SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL
);
- bool InsertURL( const INetURLObject& rURL,
sal_uIntPtr nInsertPos = CONTAINER_APPEND );
- SAL_DLLPRIVATE bool InsertFileOrDirURL( const INetURLObject&
rFileOrDirURL, sal_uIntPtr nInsertPos );
+ SAL_DLLPRIVATE bool GetURL( sal_Int32 nPos, INetURLObject& rURL );
+ bool InsertURL( const INetURLObject& rURL,
sal_Int32 nInsertPos = SAL_MAX_INT32 );
+ SAL_DLLPRIVATE bool InsertFileOrDirURL( const INetURLObject&
rFileOrDirURL, sal_Int32 nInsertPos );
- SAL_DLLPRIVATE bool InsertTransferable( const css::uno::Reference<
css::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
+ SAL_DLLPRIVATE bool InsertTransferable( const css::uno::Reference<
css::datatransfer::XTransferable >& rxTransferable, sal_Int32 nInsertPos );
- SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow,
sal_uIntPtr nPos );
- SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_uIntPtr
nPos );
+ SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow,
sal_Int32 nPos );
+ SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_Int32
nPos );
public:
@@ -208,8 +208,8 @@ public:
static void InsertAllThemes( ListBox& rListBox );
// for buffering PreviewBitmaps and strings for object and path
- SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_uIntPtr nPos,
BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const;
- SAL_DLLPRIVATE void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const
BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString&
rPath);
+ SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_Int32 nPos, BitmapEx&
rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const;
+ SAL_DLLPRIVATE void SetPreviewBitmapExAndStrings(sal_Int32 nPos, const
BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString&
rPath);
};
SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme );
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 422a9c76cd25..01c7f1e6f708 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -111,7 +111,7 @@ private:
void ImplUpdateViews( sal_uInt16 nSelectionId );
void ImplUpdateInfoBar();
- sal_uIntPtr ImplGetSelectedItemId( const Point*
pSelPosPixel, Point& rSelPos );
+ sal_Int32 ImplGetSelectedItemId( const Point* pSelPosPixel,
Point& rSelPos );
void ImplSelectItemId( sal_uIntPtr nItemId );
// Control
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index b6feefd016ad..a3c96fbb5095 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -559,7 +559,7 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( const
ExecuteDropEvent& rEvt )
if( mpCurTheme )
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel,
aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel,
aSelPos );
const sal_uIntPtr nInsertPos = (nItemId ? (nItemId - 1) :
mpCurTheme->GetObjectCount());
if( mpCurTheme->IsDragging() )
@@ -576,7 +576,7 @@ void GalleryBrowser2::StartDrag( const Point* pDragPoint )
if( mpCurTheme )
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos
);
+ const sal_Int32 nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
if( nItemId )
mpCurTheme->StartDrag( this, nItemId - 1 );
@@ -592,7 +592,7 @@ void GalleryBrowser2::TogglePreview()
void GalleryBrowser2::ShowContextMenu( const Point* pContextPoint )
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos
);
+ const sal_Int32 nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) )
{
@@ -616,7 +616,7 @@ void GalleryBrowser2::ShowContextMenu( const Point*
pContextPoint )
bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window*
/*pWindow*/ )
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
bool bRet = false;
svx::sidebar::GalleryControl* pParentControl =
dynamic_cast<svx::sidebar::GalleryControl*>(GetParent());
if (pParentControl != nullptr)
@@ -781,7 +781,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
{
Graphic aGraphic;
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr,
aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( nullptr,
aSelPos );
if( nItemId )
{
@@ -835,11 +835,11 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel
eTravel )
if( mpCurTheme )
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
if( nItemId )
{
- sal_uIntPtr nNewItemId = nItemId;
+ sal_Int32 nNewItemId = nItemId;
switch( eTravel )
{
@@ -918,10 +918,10 @@ void GalleryBrowser2::ImplUpdateInfoBar()
maInfoBar->SetText( mpCurTheme->GetName() );
}
-sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos,
Point& rSelPos )
+sal_Int32 GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
rSelPos )
{
const Size aOutputSizePixel( GetOutputSizePixel() );
- sal_uIntPtr nRet = 0;
+ sal_Int32 nRet = 0;
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
@@ -999,7 +999,7 @@ void GalleryBrowser2::DispatchAdd(
const css::util::URL &rURL)
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
if( !mpCurTheme || !nItemId )
return;
@@ -1089,7 +1089,7 @@ void GalleryBrowser2::DispatchAdd(
void GalleryBrowser2::Execute(const OString &rIdent)
{
Point aSelPos;
- const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+ const sal_Int32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
if( mpCurTheme && nItemId )
{
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index f23085fb65c2..dd84637954e7 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -488,7 +488,7 @@ void GalleryListView::PaintField(vcl::RenderContext& rDev,
const tools::Rectangl
rDev.Push( PushFlags::CLIPREGION );
rDev.IntersectClipRegion( rRect );
- if( mpTheme && ( static_cast<size_t>(mnCurRow) < mpTheme->GetObjectCount()
) )
+ if( mpTheme && ( mnCurRow < mpTheme->GetObjectCount() ) )
{
const Size aSize(rRect.GetHeight(), rRect.GetHeight());
BitmapEx aBitmapEx;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 54cbf46abb7c..5e060adefd3a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -106,7 +106,7 @@ void GalleryTheme::ImplCreateSvDrawStorage()
}
}
-bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos,
GalleryObject* pExistentEntry )
+bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_Int32 nPos,
GalleryObject* pExistentEntry )
{
std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream(
GetSdgURL().GetMainURL( INetURLObject::DecodeMechanism::NONE ),
StreamMode::WRITE ));
bool bRet = false;
@@ -124,7 +124,7 @@ bool GalleryTheme::ImplWriteSgaObject( const SgaObject&
rObj, size_t nPos, Galle
if( !pExistentEntry )
{
pEntry = new GalleryObject;
- if ( nPos < aObjectList.size() )
+ if ( nPos < sal_Int32(aObjectList.size()) )
{
GalleryObjectList::iterator it = aObjectList.begin();
::std::advance( it, nPos );
@@ -330,7 +330,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind
eObjKind, ConvertDat
return aNewURL;
}
-void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
+void GalleryTheme::ImplBroadcast( sal_Int32 nUpdatePos )
{
if( !IsBroadcasterLocked() )
{
@@ -364,7 +364,7 @@ void GalleryTheme::UnlockBroadcaster()
ImplBroadcast( 0 );
}
-bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos
)
+bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_Int32 nInsertPos )
{
if (!rObj.IsValid())
return false;
@@ -409,14 +409,14 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj,
sal_uIntPtr nInsertPos )
return true;
}
-SgaObject* GalleryTheme::AcquireObject( size_t nPos )
+SgaObject* GalleryTheme::AcquireObject( sal_Int32 nPos )
{
return ImplReadSgaObject( aObjectList[ nPos ] );
}
-void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx&
rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const
+void GalleryTheme::GetPreviewBitmapExAndStrings(sal_Int32 nPos, BitmapEx&
rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const
{
- const GalleryObject* pGalleryObject = nPos < aObjectList.size() ?
aObjectList[ nPos ] : nullptr;
+ const GalleryObject* pGalleryObject = nPos < sal_Int32(aObjectList.size())
? aObjectList[ nPos ] : nullptr;
if(pGalleryObject)
{
@@ -431,9 +431,9 @@ void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr
nPos, BitmapEx& rBit
}
}
-void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const
BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString&
rPath)
+void GalleryTheme::SetPreviewBitmapExAndStrings(sal_Int32 nPos, const
BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString&
rPath)
{
- GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[
nPos ] : nullptr;
+ GalleryObject* pGalleryObject = nPos < sal_Int32(aObjectList.size()) ?
aObjectList[ nPos ] : nullptr;
if(pGalleryObject)
{
@@ -453,10 +453,10 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject )
delete pObject;
}
-bool GalleryTheme::RemoveObject( size_t nPos )
+bool GalleryTheme::RemoveObject( sal_Int32 nPos )
{
GalleryObject* pEntry = nullptr;
- if ( nPos < aObjectList.size() )
+ if ( nPos < sal_Int32(aObjectList.size()) )
{
GalleryObjectList::iterator it = aObjectList.begin();
::std::advance( it, nPos );
@@ -484,9 +484,9 @@ bool GalleryTheme::RemoveObject( size_t nPos )
return( pEntry != nullptr );
}
-bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
+bool GalleryTheme::ChangeObjectPos( sal_Int32 nOldPos, sal_Int32 nNewPos )
{
- if (nOldPos == nNewPos || nOldPos >= aObjectList.size())
+ if (nOldPos == nNewPos || nOldPos >= sal_Int32(aObjectList.size()))
return false;
GalleryObject* pEntry = aObjectList[nOldPos];
@@ -753,7 +753,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const
INetURLObject& rURL, bo
return pRet;
}
-bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp )
+bool GalleryTheme::GetThumb( sal_Int32 nPos, BitmapEx& rBmp )
{
SgaObject* pObj = AcquireObject( nPos );
bool bRet = false;
@@ -768,7 +768,7 @@ bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx&
rBmp )
return bRet;
}
-bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool
bProgress )
+bool GalleryTheme::GetGraphic( sal_Int32 nPos, Graphic& rGraphic, bool
bProgress )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false;
@@ -841,7 +841,7 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic&
rGraphic, bool bProgre
return bRet;
}
-bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr
nInsertPos )
+bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_Int32
nInsertPos )
{
bool bRet = false;
@@ -923,7 +923,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic,
sal_uIntPtr nInsertPo
return bRet;
}
-bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel )
+bool GalleryTheme::GetModel( sal_Int32 nPos, SdrModel& rModel )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false;
@@ -950,7 +950,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel&
rModel )
return bRet;
}
-bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr
nInsertPos )
+bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_Int32
nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SgaObjKind::SvDraw ) );
tools::SvRef<SotStorage> xStor( GetSvDrawStorage() );
@@ -995,7 +995,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel,
sal_uIntPtr nInsertPo
return bRet;
}
-bool GalleryTheme::GetModelStream( sal_uIntPtr nPos,
tools::SvRef<SotStorageStream> const & rxModelStream )
+bool GalleryTheme::GetModelStream( sal_Int32 nPos,
tools::SvRef<SotStorageStream> const & rxModelStream )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false;
@@ -1046,7 +1046,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos,
tools::SvRef<SotStorageStre
return bRet;
}
-bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>&
rxModelStream, sal_uIntPtr nInsertPos )
+bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>&
rxModelStream, sal_Int32 nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SgaObjKind::SvDraw ) );
tools::SvRef<SotStorage> xStor( GetSvDrawStorage() );
@@ -1080,7 +1080,7 @@ bool GalleryTheme::InsertModelStream( const
tools::SvRef<SotStorageStream>& rxMo
return bRet;
}
-bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL )
+bool GalleryTheme::GetURL( sal_Int32 nPos, INetURLObject& rURL )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false;
@@ -1094,7 +1094,7 @@ bool GalleryTheme::GetURL( sal_uIntPtr nPos,
INetURLObject& rURL )
return bRet;
}
-bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr
nInsertPos )
+bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_Int32 nInsertPos )
{
Graphic aGraphic;
OUString aFormat;
@@ -1119,7 +1119,7 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL,
sal_uIntPtr nInsertPos
return bRet;
}
-bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL,
sal_uIntPtr nInsertPos )
+bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL,
sal_Int32 nInsertPos )
{
INetURLObject aURL;
::std::vector< INetURLObject > aURLVector;
@@ -1167,7 +1167,7 @@ bool GalleryTheme::InsertFileOrDirURL( const
INetURLObject& rFileOrDirURL, sal_u
return bRet;
}
-bool GalleryTheme::InsertTransferable( const uno::Reference<
datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos )
+bool GalleryTheme::InsertTransferable( const uno::Reference<
datatransfer::XTransferable >& rxTransferable, sal_Int32 nInsertPos )
{
bool bRet = false;
@@ -1264,13 +1264,13 @@ bool GalleryTheme::InsertTransferable( const
uno::Reference< datatransfer::XTran
return bRet;
}
-void GalleryTheme::CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos )
+void GalleryTheme::CopyToClipboard( vcl::Window* pWindow, sal_Int32 nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos,
false );
pTransferable->CopyToClipboard( pWindow );
}
-void GalleryTheme::StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos )
+void GalleryTheme::StartDrag( vcl::Window* pWindow, sal_Int32 nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos,
true );
pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK );
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index fb338de91096..430899ef9643 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -122,7 +122,7 @@ static void createTheme( const OUString& aThemeName, const
OUString& aGalleryURL
fprintf( stderr, "Failed to import '%s'\n",
OUStringToOString(
aIter->GetMainURL(INetURLObject::DecodeMechanism::NONE), RTL_TEXTENCODING_UTF8
).getStr() );
else
- fprintf( stderr, "Imported file '%s' (%" SAL_PRI_SIZET "u)\n",
+ fprintf( stderr, "Imported file '%s' (%" SAL_PRIdINT32 "u)\n",
OUStringToOString(
aIter->GetMainURL(INetURLObject::DecodeMechanism::NONE), RTL_TEXTENCODING_UTF8
).getStr(),
pGalTheme->GetObjectCount() );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
