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
8a71eace
Kaydet (Commit)
8a71eace
authored
Ara 20, 2016
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Don't use 'this' in ctor
Change-Id: I405160743609aae92a37b2359bea5aa42ee66519
üst
d0c3dba8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
9 deletions
+22
-9
SidebarController.hxx
include/sfx2/sidebar/SidebarController.hxx
+4
-1
SidebarController.cxx
sfx2/source/sidebar/SidebarController.cxx
+17
-7
SidebarDockingWindow.cxx
sfx2/source/sidebar/SidebarDockingWindow.cxx
+1
-1
No files found.
include/sfx2/sidebar/SidebarController.hxx
Dosyayı görüntüle @
8a71eace
...
@@ -65,7 +65,7 @@ class SFX2_DLLPUBLIC SidebarController
...
@@ -65,7 +65,7 @@ class SFX2_DLLPUBLIC SidebarController
public
SidebarControllerInterfaceBase
public
SidebarControllerInterfaceBase
{
{
public
:
public
:
SidebarController
(
static
rtl
::
Reference
<
SidebarController
>
create
(
SidebarDockingWindow
*
pParentWindow
,
SidebarDockingWindow
*
pParentWindow
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
rxFrame
);
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
rxFrame
);
virtual
~
SidebarController
()
override
;
virtual
~
SidebarController
()
override
;
...
@@ -163,6 +163,9 @@ public:
...
@@ -163,6 +163,9 @@ public:
void
FadeOut
();
void
FadeOut
();
private
:
private
:
SidebarController
(
SidebarDockingWindow
*
pParentWindow
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
rxFrame
);
VclPtr
<
Deck
>
mpCurrentDeck
;
VclPtr
<
Deck
>
mpCurrentDeck
;
VclPtr
<
SidebarDockingWindow
>
mpParentWindow
;
VclPtr
<
SidebarDockingWindow
>
mpParentWindow
;
...
...
sfx2/source/sidebar/SidebarController.cxx
Dosyayı görüntüle @
8a71eace
...
@@ -116,24 +116,34 @@ SidebarController::SidebarController (
...
@@ -116,24 +116,34 @@ SidebarController::SidebarController (
{
{
// Decks and panel collections for this sidebar
// Decks and panel collections for this sidebar
mpResourceManager
=
o3tl
::
make_unique
<
ResourceManager
>
();
mpResourceManager
=
o3tl
::
make_unique
<
ResourceManager
>
();
}
rtl
::
Reference
<
SidebarController
>
SidebarController
::
create
(
SidebarDockingWindow
*
pParentWindow
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
rxFrame
)
{
rtl
::
Reference
<
SidebarController
>
instance
(
new
SidebarController
(
pParentWindow
,
rxFrame
));
registerSidebarForFrame
(
this
,
m
xFrame
->
getController
());
registerSidebarForFrame
(
instance
.
get
(),
r
xFrame
->
getController
());
// Listen for window events.
// Listen for window events.
mpParentWindow
->
AddEventListener
(
LINK
(
this
,
SidebarController
,
WindowEventHandler
));
instance
->
mpParentWindow
->
AddEventListener
(
LINK
(
instance
.
get
()
,
SidebarController
,
WindowEventHandler
));
// Listen for theme property changes.
// Listen for theme property changes.
Theme
::
GetPropertySet
()
->
addPropertyChangeListener
(
Theme
::
GetPropertySet
()
->
addPropertyChangeListener
(
""
,
""
,
static_cast
<
css
::
beans
::
XPropertyChangeListener
*>
(
this
));
static_cast
<
css
::
beans
::
XPropertyChangeListener
*>
(
instance
.
get
()
));
// Get the dispatch object as preparation to listen for changes of
// Get the dispatch object as preparation to listen for changes of
// the read-only state.
// the read-only state.
const
util
::
URL
aURL
(
Tools
::
GetURL
(
gsReadOnlyCommandName
));
const
util
::
URL
aURL
(
Tools
::
GetURL
(
gsReadOnlyCommandName
));
mxReadOnlyModeDispatch
=
Tools
::
GetDispatch
(
m
xFrame
,
aURL
);
instance
->
mxReadOnlyModeDispatch
=
Tools
::
GetDispatch
(
r
xFrame
,
aURL
);
if
(
mxReadOnlyModeDispatch
.
is
())
if
(
instance
->
mxReadOnlyModeDispatch
.
is
())
mxReadOnlyModeDispatch
->
addStatusListener
(
this
,
aURL
);
instance
->
mxReadOnlyModeDispatch
->
addStatusListener
(
instance
.
get
()
,
aURL
);
SwitchToDeck
(
gsDefaultDeckId
);
instance
->
SwitchToDeck
(
gsDefaultDeckId
);
return
instance
;
}
}
SidebarController
::~
SidebarController
()
SidebarController
::~
SidebarController
()
...
...
sfx2/source/sidebar/SidebarDockingWindow.cxx
Dosyayı görüntüle @
8a71eace
...
@@ -44,7 +44,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi
...
@@ -44,7 +44,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi
{
{
const
SfxViewFrame
*
pViewFrame
=
pSfxBindings
->
GetDispatcher
()
->
GetFrame
();
const
SfxViewFrame
*
pViewFrame
=
pSfxBindings
->
GetDispatcher
()
->
GetFrame
();
const
SfxFrame
&
rFrame
=
pViewFrame
->
GetFrame
();
const
SfxFrame
&
rFrame
=
pViewFrame
->
GetFrame
();
mpSidebarController
.
set
(
new
sfx2
::
sidebar
::
SidebarController
(
this
,
rFrame
.
GetFrameInterface
()
));
mpSidebarController
.
set
(
sfx2
::
sidebar
::
SidebarController
::
create
(
this
,
rFrame
.
GetFrameInterface
()).
get
(
));
}
}
}
}
...
...
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