summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx2
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/inc/macroloader.hxx2
-rw-r--r--sfx2/source/inc/templdgi.hxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 154f742b1fc2..33c7ed012f40 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2401,7 +2401,7 @@ void FileDialogHelper::StartExecuteModal( const Link<FileDialogHelper*,void>& rE
mpImpl->implStartExecute();
}
-short FileDialogHelper::GetDialogType() const { return mpImpl ? mpImpl->m_nDialogType : 0; }
+sal_Int16 FileDialogHelper::GetDialogType() const { return mpImpl ? mpImpl->m_nDialogType : 0; }
bool FileDialogHelper::IsPasswordEnabled() const
{
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 57f73d5c79e3..b3de82cbe6a5 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -167,7 +167,7 @@ namespace sfx2
// Own methods
FileDialogHelper_Impl(
FileDialogHelper* _pAntiImpl,
- const short nDialogType,
+ const sal_Int16 nDialogType,
FileDialogFlags nFlags,
sal_Int16 nDialog,
weld::Window* pFrameWeld,
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c638c8be836a..f3d4fb3024fc 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -437,7 +437,7 @@ bool StyleTreeListBox_Impl::EventNotify( NotifyEvent& rNEvt )
TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
- sal_uIntPtr& lPos)
+ sal_uLong& lPos)
{
if(!pTarget || !pEntry)
return TRISTATE_FALSE;
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 54decff36a37..9e1dfba18ed0 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -68,7 +68,7 @@ public:
virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(
const css::util::URL& aURL, const OUString& sTargetFrameName,
- FrameSearchFlags eSearchFlags ) override;
+ sal_Int32 eSearchFlags ) override;
virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) override;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index c371fb74e8fd..9ab64b0262a7 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -104,7 +104,7 @@ protected:
virtual void ExpandedHdl() override;
virtual TriState NotifyMoving(
SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent, sal_uIntPtr& rNewChildPos) override;
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) override;
public:
StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle);