Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
b7388a74
Kaydet (Commit)
b7388a74
authored
Ock 18, 2017
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use rtl::Reference in RequestFilterOptions
Change-Id: I5d8aef57734e18d944b8e6dba0f69c5411f71062
üst
0c326db8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
15 deletions
+8
-15
appuno.cxx
sfx2/source/appl/appuno.cxx
+3
-7
fltoptint.hxx
sfx2/source/inc/fltoptint.hxx
+5
-8
No files found.
sfx2/source/appl/appuno.cxx
Dosyayı görüntüle @
b7388a74
...
...
@@ -1680,12 +1680,8 @@ RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > cons
m_aRequest
<<=
aOptionsRequest
;
m_pAbort
=
new
comphelper
::
OInteractionAbort
;
m_pOptions
=
new
FilterOptionsContinuation
;
m_lContinuations
.
realloc
(
2
);
m_lContinuations
[
0
].
set
(
m_pAbort
);
m_lContinuations
[
1
].
set
(
m_pOptions
);
m_xAbort
=
new
comphelper
::
OInteractionAbort
;
m_xOptions
=
new
FilterOptionsContinuation
;
}
uno
::
Any
SAL_CALL
RequestFilterOptions
::
getRequest
()
...
...
@@ -1698,7 +1694,7 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > >
SAL_CALL
RequestFilterOptions
::
getContinuations
()
throw
(
uno
::
RuntimeException
,
std
::
exception
)
{
return
m_lContinuations
;
return
{
m_xAbort
.
get
(),
m_xOptions
.
get
()
}
;
}
...
...
sfx2/source/inc/fltoptint.hxx
Dosyayı görüntüle @
b7388a74
...
...
@@ -23,6 +23,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/interaction.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
class
FilterOptionsContinuation
:
public
comphelper
::
OInteraction
<
css
::
document
::
XInteractionFilterOptions
>
{
...
...
@@ -37,22 +38,18 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper< css::task::XInteract
{
css
::
uno
::
Any
m_aRequest
;
css
::
uno
::
Sequence
<
css
::
uno
::
Reference
<
css
::
task
::
XInteractionContinuation
>
>
m_lContinuations
;
comphelper
::
OInteractionAbort
*
m_pAbort
;
FilterOptionsContinuation
*
m_pOptions
;
rtl
::
Reference
<
comphelper
::
OInteractionAbort
>
m_xAbort
;
rtl
::
Reference
<
FilterOptionsContinuation
>
m_xOptions
;
public
:
RequestFilterOptions
(
css
::
uno
::
Reference
<
css
::
frame
::
XModel
>
const
&
rModel
,
const
css
::
uno
::
Sequence
<
css
::
beans
::
PropertyValue
>&
rProperties
);
bool
isAbort
()
{
return
m_
p
Abort
->
wasSelected
();
}
bool
isAbort
()
{
return
m_
x
Abort
->
wasSelected
();
}
css
::
uno
::
Sequence
<
css
::
beans
::
PropertyValue
>
getFilterOptions
()
{
return
m_
p
Options
->
getFilterOptions
();
return
m_
x
Options
->
getFilterOptions
();
}
virtual
css
::
uno
::
Any
SAL_CALL
getRequest
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment