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
fdeaa040
Kaydet (Commit)
fdeaa040
authored
Kas 11, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: prefix members of SwFrmAddPage
Change-Id: Id4a5a5794ff03a88922df7fd1dcba75ed601dd59
üst
cd43da04
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
167 additions
and
167 deletions
+167
-167
frmpage.cxx
sw/source/ui/frmdlg/frmpage.cxx
+140
-140
frmpage.hxx
sw/source/uibase/inc/frmpage.hxx
+27
-27
No files found.
sw/source/ui/frmdlg/frmpage.cxx
Dosyayı görüntüle @
fdeaa040
...
@@ -2864,34 +2864,34 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void)
...
@@ -2864,34 +2864,34 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void)
SwFrmAddPage
::
SwFrmAddPage
(
vcl
::
Window
*
pParent
,
const
SfxItemSet
&
rSet
)
SwFrmAddPage
::
SwFrmAddPage
(
vcl
::
Window
*
pParent
,
const
SfxItemSet
&
rSet
)
:
SfxTabPage
(
pParent
,
"FrmAddPage"
,
"modules/swriter/ui/frmaddpage.ui"
,
&
rSet
)
:
SfxTabPage
(
pParent
,
"FrmAddPage"
,
"modules/swriter/ui/frmaddpage.ui"
,
&
rSet
)
,
pWrtSh
(
nullptr
)
,
m_
pWrtSh
(
nullptr
)
,
bHtmlMode
(
false
)
,
m_
bHtmlMode
(
false
)
,
bFormat
(
false
)
,
m_
bFormat
(
false
)
,
bNew
(
false
)
,
m_
bNew
(
false
)
{
{
get
(
pNameFrame
,
"nameframe"
);
get
(
m_
pNameFrame
,
"nameframe"
);
get
(
pNameFT
,
"name_label"
);
get
(
m_
pNameFT
,
"name_label"
);
get
(
pNameED
,
"name"
);
get
(
m_
pNameED
,
"name"
);
get
(
pAltNameFT
,
"altname_label"
);
get
(
m_
pAltNameFT
,
"altname_label"
);
get
(
pAltNameED
,
"altname"
);
get
(
m_
pAltNameED
,
"altname"
);
get
(
pPrevFT
,
"prev_label"
);
get
(
m_
pPrevFT
,
"prev_label"
);
get
(
pPrevLB
,
"prev"
);
get
(
m_
pPrevLB
,
"prev"
);
get
(
pNextFT
,
"next_label"
);
get
(
m_
pNextFT
,
"next_label"
);
get
(
pNextLB
,
"next"
);
get
(
m_
pNextLB
,
"next"
);
get
(
pProtectFrame
,
"protect"
);
get
(
m_
pProtectFrame
,
"protect"
);
get
(
pProtectContentCB
,
"protectcontent"
);
get
(
m_
pProtectContentCB
,
"protectcontent"
);
get
(
pProtectFrameCB
,
"protectframe"
);
get
(
m_
pProtectFrameCB
,
"protectframe"
);
get
(
pProtectSizeCB
,
"protectsize"
);
get
(
m_
pProtectSizeCB
,
"protectsize"
);
get
(
m_pContentAlignFrame
,
"contentalign"
);
get
(
m_pContentAlignFrame
,
"contentalign"
);
get
(
m_pVertAlignLB
,
"vertalign"
);
get
(
m_pVertAlignLB
,
"vertalign"
);
get
(
pPropertiesFrame
,
"properties"
);
get
(
m_
pPropertiesFrame
,
"properties"
);
get
(
pEditInReadonlyCB
,
"editinreadonly"
);
get
(
m_
pEditInReadonlyCB
,
"editinreadonly"
);
get
(
pPrintFrameCB
,
"printframe"
);
get
(
m_
pPrintFrameCB
,
"printframe"
);
get
(
pTextFlowFT
,
"textflow_label"
);
get
(
m_
pTextFlowFT
,
"textflow_label"
);
get
(
pTextFlowLB
,
"textflow"
);
get
(
m_
pTextFlowLB
,
"textflow"
);
}
}
...
@@ -2902,26 +2902,26 @@ SwFrmAddPage::~SwFrmAddPage()
...
@@ -2902,26 +2902,26 @@ SwFrmAddPage::~SwFrmAddPage()
void
SwFrmAddPage
::
dispose
()
void
SwFrmAddPage
::
dispose
()
{
{
pNameFrame
.
clear
();
m_
pNameFrame
.
clear
();
pNameFT
.
clear
();
m_
pNameFT
.
clear
();
pNameED
.
clear
();
m_
pNameED
.
clear
();
pAltNameFT
.
clear
();
m_
pAltNameFT
.
clear
();
pAltNameED
.
clear
();
m_
pAltNameED
.
clear
();
pPrevFT
.
clear
();
m_
pPrevFT
.
clear
();
pPrevLB
.
clear
();
m_
pPrevLB
.
clear
();
pNextFT
.
clear
();
m_
pNextFT
.
clear
();
pNextLB
.
clear
();
m_
pNextLB
.
clear
();
pProtectFrame
.
clear
();
m_
pProtectFrame
.
clear
();
pProtectContentCB
.
clear
();
m_
pProtectContentCB
.
clear
();
pProtectFrameCB
.
clear
();
m_
pProtectFrameCB
.
clear
();
pProtectSizeCB
.
clear
();
m_
pProtectSizeCB
.
clear
();
m_pContentAlignFrame
.
clear
();
m_pContentAlignFrame
.
clear
();
m_pVertAlignLB
.
clear
();
m_pVertAlignLB
.
clear
();
pPropertiesFrame
.
clear
();
m_
pPropertiesFrame
.
clear
();
pEditInReadonlyCB
.
clear
();
m_
pEditInReadonlyCB
.
clear
();
pPrintFrameCB
.
clear
();
m_
pPrintFrameCB
.
clear
();
pTextFlowFT
.
clear
();
m_
pTextFlowFT
.
clear
();
pTextFlowLB
.
clear
();
m_
pTextFlowLB
.
clear
();
SfxTabPage
::
dispose
();
SfxTabPage
::
dispose
();
}
}
...
@@ -2935,30 +2935,30 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
...
@@ -2935,30 +2935,30 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
{
{
const
SfxPoolItem
*
pItem
;
const
SfxPoolItem
*
pItem
;
sal_uInt16
nHtmlMode
=
::
GetHtmlMode
(
static_cast
<
const
SwDocShell
*>
(
SfxObjectShell
::
Current
()));
sal_uInt16
nHtmlMode
=
::
GetHtmlMode
(
static_cast
<
const
SwDocShell
*>
(
SfxObjectShell
::
Current
()));
bHtmlMode
=
(
nHtmlMode
&
HTMLMODE_ON
)
!=
0
;
m_
bHtmlMode
=
(
nHtmlMode
&
HTMLMODE_ON
)
!=
0
;
if
(
bHtmlMode
)
if
(
m_
bHtmlMode
)
{
{
pProtectFrame
->
Hide
();
m_
pProtectFrame
->
Hide
();
pEditInReadonlyCB
->
Hide
();
m_
pEditInReadonlyCB
->
Hide
();
pPrintFrameCB
->
Hide
();
m_
pPrintFrameCB
->
Hide
();
}
}
if
(
sDlgType
==
"PictureDialog"
||
sDlgType
==
"ObjectDialog"
)
if
(
m_sDlgType
==
"PictureDialog"
||
m_
sDlgType
==
"ObjectDialog"
)
{
{
pEditInReadonlyCB
->
Hide
();
m_
pEditInReadonlyCB
->
Hide
();
if
(
bHtmlMode
)
if
(
m_
bHtmlMode
)
{
{
pPropertiesFrame
->
Hide
();
m_
pPropertiesFrame
->
Hide
();
}
}
m_pContentAlignFrame
->
Hide
();
m_pContentAlignFrame
->
Hide
();
}
}
if
(
SfxItemState
::
SET
==
rSet
->
GetItemState
(
FN_SET_FRM_ALT_NAME
,
false
,
&
pItem
))
if
(
SfxItemState
::
SET
==
rSet
->
GetItemState
(
FN_SET_FRM_ALT_NAME
,
false
,
&
pItem
))
{
{
pAltNameED
->
SetText
(
static_cast
<
const
SfxStringItem
*>
(
pItem
)
->
GetValue
());
m_
pAltNameED
->
SetText
(
static_cast
<
const
SfxStringItem
*>
(
pItem
)
->
GetValue
());
pAltNameED
->
SaveValue
();
m_
pAltNameED
->
SaveValue
();
}
}
if
(
!
bFormat
)
if
(
!
m_
bFormat
)
{
{
// insert graphic - properties
// insert graphic - properties
// bNew is not set, so recognise by selection
// bNew is not set, so recognise by selection
...
@@ -2968,42 +2968,42 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
...
@@ -2968,42 +2968,42 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
aTmpName1
=
static_cast
<
const
SfxStringItem
*>
(
pItem
)
->
GetValue
();
aTmpName1
=
static_cast
<
const
SfxStringItem
*>
(
pItem
)
->
GetValue
();
}
}
OSL_ENSURE
(
pWrtSh
,
"keine Shell?"
);
OSL_ENSURE
(
m_
pWrtSh
,
"keine Shell?"
);
if
(
bNew
||
aTmpName1
.
isEmpty
()
)
if
(
m_
bNew
||
aTmpName1
.
isEmpty
()
)
{
{
if
(
sDlgType
==
"PictureDialog"
)
if
(
m_
sDlgType
==
"PictureDialog"
)
aTmpName1
=
pWrtSh
->
GetUniqueGrfName
();
aTmpName1
=
m_
pWrtSh
->
GetUniqueGrfName
();
else
if
(
sDlgType
==
"ObjectDialog"
)
else
if
(
m_
sDlgType
==
"ObjectDialog"
)
aTmpName1
=
pWrtSh
->
GetUniqueOLEName
();
aTmpName1
=
m_
pWrtSh
->
GetUniqueOLEName
();
else
else
aTmpName1
=
pWrtSh
->
GetUniqueFrameName
();
aTmpName1
=
m_
pWrtSh
->
GetUniqueFrameName
();
pWrtSh
->
SetFlyName
(
aTmpName1
);
m_
pWrtSh
->
SetFlyName
(
aTmpName1
);
}
}
pNameED
->
SetText
(
aTmpName1
);
m_
pNameED
->
SetText
(
aTmpName1
);
pNameED
->
SaveValue
();
m_
pNameED
->
SaveValue
();
}
}
else
else
{
{
pNameED
->
Enable
(
false
);
m_
pNameED
->
Enable
(
false
);
pAltNameED
->
Enable
(
false
);
m_
pAltNameED
->
Enable
(
false
);
pNameFT
->
Enable
(
false
);
m_
pNameFT
->
Enable
(
false
);
pAltNameFT
->
Enable
(
false
);
m_
pAltNameFT
->
Enable
(
false
);
}
}
if
(
sDlgType
==
"FrameDialog"
&&
pAltNameFT
->
IsVisible
())
if
(
m_sDlgType
==
"FrameDialog"
&&
m_
pAltNameFT
->
IsVisible
())
{
{
pAltNameFT
->
Hide
();
m_
pAltNameFT
->
Hide
();
pAltNameED
->
Hide
();
m_
pAltNameED
->
Hide
();
}
}
else
else
{
{
pNameED
->
SetModifyHdl
(
LINK
(
this
,
SwFrmAddPage
,
EditModifyHdl
));
m_
pNameED
->
SetModifyHdl
(
LINK
(
this
,
SwFrmAddPage
,
EditModifyHdl
));
}
}
if
(
!
bNew
)
if
(
!
m_
bNew
)
{
{
SwFrameFormat
*
pFormat
=
pWrtSh
->
GetFlyFrameFormat
();
SwFrameFormat
*
pFormat
=
m_
pWrtSh
->
GetFlyFrameFormat
();
if
(
pFormat
)
if
(
pFormat
)
{
{
...
@@ -3024,79 +3024,79 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
...
@@ -3024,79 +3024,79 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
::
std
::
vector
<
OUString
>
aThisPageFrames
;
::
std
::
vector
<
OUString
>
aThisPageFrames
;
::
std
::
vector
<
OUString
>
aNextPageFrames
;
::
std
::
vector
<
OUString
>
aNextPageFrames
;
::
std
::
vector
<
OUString
>
aRemainFrames
;
::
std
::
vector
<
OUString
>
aRemainFrames
;
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
sNextChain
,
false
,
m_
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
sNextChain
,
false
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
lcl_InsertVectors
(
*
pPrevLB
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
lcl_InsertVectors
(
*
m_
pPrevLB
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
if
(
!
sPrevChain
.
isEmpty
())
if
(
!
sPrevChain
.
isEmpty
())
{
{
if
(
LISTBOX_ENTRY_NOTFOUND
==
pPrevLB
->
GetEntryPos
(
sPrevChain
))
if
(
LISTBOX_ENTRY_NOTFOUND
==
m_
pPrevLB
->
GetEntryPos
(
sPrevChain
))
pPrevLB
->
InsertEntry
(
sPrevChain
,
1
);
m_
pPrevLB
->
InsertEntry
(
sPrevChain
,
1
);
pPrevLB
->
SelectEntry
(
sPrevChain
);
m_
pPrevLB
->
SelectEntry
(
sPrevChain
);
}
}
else
else
pPrevLB
->
SelectEntryPos
(
0
);
m_
pPrevLB
->
SelectEntryPos
(
0
);
aPrevPageFrames
.
erase
(
aPrevPageFrames
.
begin
(),
aPrevPageFrames
.
end
());
aPrevPageFrames
.
erase
(
aPrevPageFrames
.
begin
(),
aPrevPageFrames
.
end
());
aNextPageFrames
.
erase
(
aNextPageFrames
.
begin
(),
aNextPageFrames
.
end
());
aNextPageFrames
.
erase
(
aNextPageFrames
.
begin
(),
aNextPageFrames
.
end
());
aThisPageFrames
.
erase
(
aThisPageFrames
.
begin
(),
aThisPageFrames
.
end
());
aThisPageFrames
.
erase
(
aThisPageFrames
.
begin
(),
aThisPageFrames
.
end
());
aRemainFrames
.
erase
(
aRemainFrames
.
begin
(),
aRemainFrames
.
end
());
aRemainFrames
.
erase
(
aRemainFrames
.
begin
(),
aRemainFrames
.
end
());
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
sPrevChain
,
true
,
m_
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
sPrevChain
,
true
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
lcl_InsertVectors
(
*
pNextLB
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
lcl_InsertVectors
(
*
m_
pNextLB
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
if
(
!
sNextChain
.
isEmpty
())
if
(
!
sNextChain
.
isEmpty
())
{
{
if
(
LISTBOX_ENTRY_NOTFOUND
==
pNextLB
->
GetEntryPos
(
sNextChain
))
if
(
LISTBOX_ENTRY_NOTFOUND
==
m_
pNextLB
->
GetEntryPos
(
sNextChain
))
pNextLB
->
InsertEntry
(
sNextChain
,
1
);
m_
pNextLB
->
InsertEntry
(
sNextChain
,
1
);
pNextLB
->
SelectEntry
(
sNextChain
);
m_
pNextLB
->
SelectEntry
(
sNextChain
);
}
}
else
else
pNextLB
->
SelectEntryPos
(
0
);
m_
pNextLB
->
SelectEntryPos
(
0
);
Link
<
ListBox
&
,
void
>
aLink
(
LINK
(
this
,
SwFrmAddPage
,
ChainModifyHdl
));
Link
<
ListBox
&
,
void
>
aLink
(
LINK
(
this
,
SwFrmAddPage
,
ChainModifyHdl
));
pPrevLB
->
SetSelectHdl
(
aLink
);
m_
pPrevLB
->
SetSelectHdl
(
aLink
);
pNextLB
->
SetSelectHdl
(
aLink
);
m_
pNextLB
->
SetSelectHdl
(
aLink
);
}
}
}
}
// Pos Protected
// Pos Protected
const
SvxProtectItem
&
rProt
=
static_cast
<
const
SvxProtectItem
&
>
(
rSet
->
Get
(
RES_PROTECT
));
const
SvxProtectItem
&
rProt
=
static_cast
<
const
SvxProtectItem
&
>
(
rSet
->
Get
(
RES_PROTECT
));
pProtectFrameCB
->
Check
(
rProt
.
IsPosProtected
());
m_
pProtectFrameCB
->
Check
(
rProt
.
IsPosProtected
());
pProtectContentCB
->
Check
(
rProt
.
IsContentProtected
());
m_
pProtectContentCB
->
Check
(
rProt
.
IsContentProtected
());
pProtectSizeCB
->
Check
(
rProt
.
IsSizeProtected
());
m_
pProtectSizeCB
->
Check
(
rProt
.
IsSizeProtected
());
const
SwFormatEditInReadonly
&
rEdit
=
static_cast
<
const
SwFormatEditInReadonly
&
>
(
rSet
->
Get
(
RES_EDIT_IN_READONLY
));
const
SwFormatEditInReadonly
&
rEdit
=
static_cast
<
const
SwFormatEditInReadonly
&
>
(
rSet
->
Get
(
RES_EDIT_IN_READONLY
));
pEditInReadonlyCB
->
Check
(
rEdit
.
GetValue
());
pEditInReadonlyCB
->
SaveValue
();
m_pEditInReadonlyCB
->
Check
(
rEdit
.
GetValue
());
m_
pEditInReadonlyCB
->
SaveValue
();
// print
// print
const
SvxPrintItem
&
rPrt
=
static_cast
<
const
SvxPrintItem
&>
(
rSet
->
Get
(
RES_PRINT
));
const
SvxPrintItem
&
rPrt
=
static_cast
<
const
SvxPrintItem
&>
(
rSet
->
Get
(
RES_PRINT
));
pPrintFrameCB
->
Check
(
rPrt
.
GetValue
());
pPrintFrameCB
->
SaveValue
();
m_pPrintFrameCB
->
Check
(
rPrt
.
GetValue
());
m_
pPrintFrameCB
->
SaveValue
();
// textflow
// textflow
SfxItemState
eState
;
SfxItemState
eState
;
if
(
(
!
bHtmlMode
||
(
0
!=
(
nHtmlMode
&
HTMLMODE_SOME_STYLES
)))
if
(
(
!
m_
bHtmlMode
||
(
0
!=
(
nHtmlMode
&
HTMLMODE_SOME_STYLES
)))
&&
sDlgType
!=
"PictureDialog"
&&
sDlgType
!=
"ObjectDialog"
&&
&&
m_sDlgType
!=
"PictureDialog"
&&
m_
sDlgType
!=
"ObjectDialog"
&&
SfxItemState
::
UNKNOWN
!=
(
eState
=
rSet
->
GetItemState
(
SfxItemState
::
UNKNOWN
!=
(
eState
=
rSet
->
GetItemState
(
RES_FRAMEDIR
))
)
RES_FRAMEDIR
))
)
{
{
pTextFlowFT
->
Show
();
m_
pTextFlowFT
->
Show
();
pTextFlowLB
->
Show
();
m_
pTextFlowLB
->
Show
();
//vertical text flow is not possible in HTML
//vertical text flow is not possible in HTML
if
(
bHtmlMode
)
if
(
m_
bHtmlMode
)
{
{
sal_uLong
nData
=
FRMDIR_VERT_TOP_RIGHT
;
sal_uLong
nData
=
FRMDIR_VERT_TOP_RIGHT
;
pTextFlowLB
->
RemoveEntry
(
pTextFlowLB
->
GetEntryPos
(
reinterpret_cast
<
void
*>
(
nData
)));
m_pTextFlowLB
->
RemoveEntry
(
m_
pTextFlowLB
->
GetEntryPos
(
reinterpret_cast
<
void
*>
(
nData
)));
}
}
sal_uInt16
nVal
=
static_cast
<
const
SvxFrameDirectionItem
&>
(
rSet
->
Get
(
RES_FRAMEDIR
)).
GetValue
();
sal_uInt16
nVal
=
static_cast
<
const
SvxFrameDirectionItem
&>
(
rSet
->
Get
(
RES_FRAMEDIR
)).
GetValue
();
sal_Int32
nPos
;
sal_Int32
nPos
;
for
(
nPos
=
pTextFlowLB
->
GetEntryCount
();
nPos
;
)
for
(
nPos
=
m_
pTextFlowLB
->
GetEntryCount
();
nPos
;
)
if
(
(
sal_uInt16
)
reinterpret_cast
<
sal_IntPtr
>
(
pTextFlowLB
->
GetEntryData
(
--
nPos
))
==
nVal
)
if
(
(
sal_uInt16
)
reinterpret_cast
<
sal_IntPtr
>
(
m_
pTextFlowLB
->
GetEntryData
(
--
nPos
))
==
nVal
)
break
;
break
;
pTextFlowLB
->
SelectEntryPos
(
nPos
);
m_
pTextFlowLB
->
SelectEntryPos
(
nPos
);
pTextFlowLB
->
SaveValue
();
m_
pTextFlowLB
->
SaveValue
();
}
}
else
else
{
{
pTextFlowFT
->
Hide
();
m_
pTextFlowFT
->
Hide
();
pTextFlowLB
->
Hide
();
m_
pTextFlowLB
->
Hide
();
}
}
// Content alignment
// Content alignment
...
@@ -3119,47 +3119,47 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
...
@@ -3119,47 +3119,47 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
bool
SwFrmAddPage
::
FillItemSet
(
SfxItemSet
*
rSet
)
bool
SwFrmAddPage
::
FillItemSet
(
SfxItemSet
*
rSet
)
{
{
bool
bRet
=
false
;
bool
bRet
=
false
;
if
(
pNameED
->
IsValueChangedFromSaved
())
if
(
m_
pNameED
->
IsValueChangedFromSaved
())
bRet
|=
nullptr
!=
rSet
->
Put
(
SfxStringItem
(
FN_SET_FRM_NAME
,
pNameED
->
GetText
()));
bRet
|=
nullptr
!=
rSet
->
Put
(
SfxStringItem
(
FN_SET_FRM_NAME
,
m_
pNameED
->
GetText
()));
if
(
pAltNameED
->
IsValueChangedFromSaved
())
if
(
m_
pAltNameED
->
IsValueChangedFromSaved
())
bRet
|=
nullptr
!=
rSet
->
Put
(
SfxStringItem
(
FN_SET_FRM_ALT_NAME
,
pAltNameED
->
GetText
()));
bRet
|=
nullptr
!=
rSet
->
Put
(
SfxStringItem
(
FN_SET_FRM_ALT_NAME
,
m_
pAltNameED
->
GetText
()));
const
SfxPoolItem
*
pOldItem
;
const
SfxPoolItem
*
pOldItem
;
SvxProtectItem
aProt
(
static_cast
<
const
SvxProtectItem
&
>
(
GetItemSet
().
Get
(
RES_PROTECT
))
);
SvxProtectItem
aProt
(
static_cast
<
const
SvxProtectItem
&
>
(
GetItemSet
().
Get
(
RES_PROTECT
))
);
aProt
.
SetContentProtect
(
pProtectContentCB
->
IsChecked
()
);
aProt
.
SetContentProtect
(
m_
pProtectContentCB
->
IsChecked
()
);
aProt
.
SetSizeProtect
(
pProtectSizeCB
->
IsChecked
()
);
aProt
.
SetSizeProtect
(
m_
pProtectSizeCB
->
IsChecked
()
);
aProt
.
SetPosProtect
(
pProtectFrameCB
->
IsChecked
()
);
aProt
.
SetPosProtect
(
m_
pProtectFrameCB
->
IsChecked
()
);
if
(
nullptr
==
(
pOldItem
=
GetOldItem
(
*
rSet
,
FN_SET_PROTECT
))
||
if
(
nullptr
==
(
pOldItem
=
GetOldItem
(
*
rSet
,
FN_SET_PROTECT
))
||
aProt
!=
*
pOldItem
)
aProt
!=
*
pOldItem
)
bRet
|=
nullptr
!=
rSet
->
Put
(
aProt
);
bRet
|=
nullptr
!=
rSet
->
Put
(
aProt
);
if
(
pEditInReadonlyCB
->
IsValueChangedFromSaved
()
)
if
(
m_
pEditInReadonlyCB
->
IsValueChangedFromSaved
()
)
bRet
|=
nullptr
!=
rSet
->
Put
(
SwFormatEditInReadonly
(
RES_EDIT_IN_READONLY
,
pEditInReadonlyCB
->
IsChecked
()));
bRet
|=
nullptr
!=
rSet
->
Put
(
SwFormatEditInReadonly
(
RES_EDIT_IN_READONLY
,
m_
pEditInReadonlyCB
->
IsChecked
()));
if
(
pPrintFrameCB
->
IsValueChangedFromSaved
()
)
if
(
m_
pPrintFrameCB
->
IsValueChangedFromSaved
()
)
bRet
|=
nullptr
!=
rSet
->
Put
(
SvxPrintItem
(
RES_PRINT
,
pPrintFrameCB
->
IsChecked
()));
bRet
|=
nullptr
!=
rSet
->
Put
(
SvxPrintItem
(
RES_PRINT
,
m_
pPrintFrameCB
->
IsChecked
()));
// textflow
// textflow
if
(
pTextFlowLB
->
IsVisible
()
)
if
(
m_
pTextFlowLB
->
IsVisible
()
)
{
{
sal_Int32
nPos
=
pTextFlowLB
->
GetSelectEntryPos
();
sal_Int32
nPos
=
m_
pTextFlowLB
->
GetSelectEntryPos
();
if
(
pTextFlowLB
->
IsValueChangedFromSaved
()
)
if
(
m_
pTextFlowLB
->
IsValueChangedFromSaved
()
)
{
{
sal_uInt16
nData
=
(
sal_uInt16
)
reinterpret_cast
<
sal_IntPtr
>
(
pTextFlowLB
->
GetEntryData
(
nPos
));
sal_uInt16
nData
=
(
sal_uInt16
)
reinterpret_cast
<
sal_IntPtr
>
(
m_
pTextFlowLB
->
GetEntryData
(
nPos
));
bRet
|=
nullptr
!=
rSet
->
Put
(
SvxFrameDirectionItem
(
bRet
|=
nullptr
!=
rSet
->
Put
(
SvxFrameDirectionItem
(
(
SvxFrameDirection
)
nData
,
RES_FRAMEDIR
));
(
SvxFrameDirection
)
nData
,
RES_FRAMEDIR
));
}
}
}
}
if
(
pWrtSh
)
if
(
m_
pWrtSh
)
{
{
const
SwFrameFormat
*
pFormat
=
pWrtSh
->
GetFlyFrameFormat
();
const
SwFrameFormat
*
pFormat
=
m_
pWrtSh
->
GetFlyFrameFormat
();
if
(
pFormat
)
if
(
pFormat
)
{
{
OUString
sCurrentPrevChain
,
sCurrentNextChain
;
OUString
sCurrentPrevChain
,
sCurrentNextChain
;
if
(
pPrevLB
->
GetSelectEntryPos
())
if
(
m_
pPrevLB
->
GetSelectEntryPos
())
sCurrentPrevChain
=
pPrevLB
->
GetSelectEntry
();
sCurrentPrevChain
=
m_
pPrevLB
->
GetSelectEntry
();
if
(
pNextLB
->
GetSelectEntryPos
())
if
(
m_
pNextLB
->
GetSelectEntryPos
())
sCurrentNextChain
=
pNextLB
->
GetSelectEntry
();
sCurrentNextChain
=
m_
pNextLB
->
GetSelectEntry
();
const
SwFormatChain
&
rChain
=
pFormat
->
GetChain
();
const
SwFormatChain
&
rChain
=
pFormat
->
GetChain
();
const
SwFlyFrameFormat
*
pFlyFormat
;
const
SwFlyFrameFormat
*
pFlyFormat
;
OUString
sNextChain
,
sPrevChain
;
OUString
sNextChain
,
sPrevChain
;
...
@@ -3193,32 +3193,32 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
...
@@ -3193,32 +3193,32 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
IMPL_LINK_NOARG_TYPED
(
SwFrmAddPage
,
EditModifyHdl
,
Edit
&
,
void
)
IMPL_LINK_NOARG_TYPED
(
SwFrmAddPage
,
EditModifyHdl
,
Edit
&
,
void
)
{
{
bool
bEnable
=
!
pNameED
->
GetText
().
isEmpty
();
bool
bEnable
=
!
m_
pNameED
->
GetText
().
isEmpty
();
pAltNameED
->
Enable
(
bEnable
);
m_
pAltNameED
->
Enable
(
bEnable
);
pAltNameFT
->
Enable
(
bEnable
);
m_
pAltNameFT
->
Enable
(
bEnable
);
}
}
void
SwFrmAddPage
::
SetFormatUsed
(
bool
bFormatUsed
)
void
SwFrmAddPage
::
SetFormatUsed
(
bool
bFormatUsed
)
{
{
bFormat
=
bFormatUsed
;
m_
bFormat
=
bFormatUsed
;
if
(
bFormat
)
if
(
m_
bFormat
)
{
{
pNameFrame
->
Hide
();
m_
pNameFrame
->
Hide
();
}
}
}
}
IMPL_LINK_TYPED
(
SwFrmAddPage
,
ChainModifyHdl
,
ListBox
&
,
rBox
,
void
)
IMPL_LINK_TYPED
(
SwFrmAddPage
,
ChainModifyHdl
,
ListBox
&
,
rBox
,
void
)
{
{
OUString
sCurrentPrevChain
,
sCurrentNextChain
;
OUString
sCurrentPrevChain
,
sCurrentNextChain
;
if
(
pPrevLB
->
GetSelectEntryPos
())
if
(
m_
pPrevLB
->
GetSelectEntryPos
())
sCurrentPrevChain
=
pPrevLB
->
GetSelectEntry
();
sCurrentPrevChain
=
m_
pPrevLB
->
GetSelectEntry
();
if
(
pNextLB
->
GetSelectEntryPos
())
if
(
m_
pNextLB
->
GetSelectEntryPos
())
sCurrentNextChain
=
pNextLB
->
GetSelectEntry
();
sCurrentNextChain
=
m_
pNextLB
->
GetSelectEntry
();
SwFrameFormat
*
pFormat
=
pWrtSh
->
GetFlyFrameFormat
();
SwFrameFormat
*
pFormat
=
m_
pWrtSh
->
GetFlyFrameFormat
();
if
(
pFormat
)
if
(
pFormat
)
{
{
bool
bNextBox
=
pNextLB
==
&
rBox
;
bool
bNextBox
=
m_
pNextLB
==
&
rBox
;
ListBox
&
rChangeLB
=
bNextBox
?
*
pPrevLB
:
*
pNextLB
;
ListBox
&
rChangeLB
=
bNextBox
?
*
m_pPrevLB
:
*
m_
pNextLB
;
for
(
sal_Int32
nEntry
=
rChangeLB
.
GetEntryCount
();
nEntry
>
1
;
nEntry
--
)
for
(
sal_Int32
nEntry
=
rChangeLB
.
GetEntryCount
();
nEntry
>
1
;
nEntry
--
)
rChangeLB
.
RemoveEntry
(
nEntry
-
1
);
rChangeLB
.
RemoveEntry
(
nEntry
-
1
);
//determine chainable frames
//determine chainable frames
...
@@ -3226,7 +3226,7 @@ IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void)
...
@@ -3226,7 +3226,7 @@ IMPL_LINK_TYPED(SwFrmAddPage, ChainModifyHdl, ListBox&, rBox, void)
::
std
::
vector
<
OUString
>
aThisPageFrames
;
::
std
::
vector
<
OUString
>
aThisPageFrames
;
::
std
::
vector
<
OUString
>
aNextPageFrames
;
::
std
::
vector
<
OUString
>
aNextPageFrames
;
::
std
::
vector
<
OUString
>
aRemainFrames
;
::
std
::
vector
<
OUString
>
aRemainFrames
;
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
bNextBox
?
sCurrentNextChain
:
sCurrentPrevChain
,
!
bNextBox
,
m_
pWrtSh
->
GetConnectableFrameFormats
(
*
pFormat
,
bNextBox
?
sCurrentNextChain
:
sCurrentPrevChain
,
!
bNextBox
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
lcl_InsertVectors
(
rChangeLB
,
lcl_InsertVectors
(
rChangeLB
,
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
aPrevPageFrames
,
aThisPageFrames
,
aNextPageFrames
,
aRemainFrames
);
...
...
sw/source/uibase/inc/frmpage.hxx
Dosyayı görüntüle @
fdeaa040
...
@@ -273,36 +273,36 @@ public:
...
@@ -273,36 +273,36 @@ public:
class
SwFrmAddPage
:
public
SfxTabPage
class
SwFrmAddPage
:
public
SfxTabPage
{
{
VclPtr
<
VclContainer
>
pNameFrame
;
VclPtr
<
VclContainer
>
m_
pNameFrame
;
VclPtr
<
FixedText
>
pNameFT
;
VclPtr
<
FixedText
>
m_
pNameFT
;
VclPtr
<
Edit
>
pNameED
;
VclPtr
<
Edit
>
m_
pNameED
;
VclPtr
<
FixedText
>
pAltNameFT
;
VclPtr
<
FixedText
>
m_
pAltNameFT
;
VclPtr
<
Edit
>
pAltNameED
;
VclPtr
<
Edit
>
m_
pAltNameED
;
VclPtr
<
FixedText
>
pPrevFT
;
VclPtr
<
FixedText
>
m_
pPrevFT
;
VclPtr
<
ListBox
>
pPrevLB
;
VclPtr
<
ListBox
>
m_
pPrevLB
;
VclPtr
<
FixedText
>
pNextFT
;
VclPtr
<
FixedText
>
m_
pNextFT
;
VclPtr
<
ListBox
>
pNextLB
;
VclPtr
<
ListBox
>
m_
pNextLB
;
VclPtr
<
VclContainer
>
pProtectFrame
;
VclPtr
<
VclContainer
>
m_
pProtectFrame
;
VclPtr
<
CheckBox
>
pProtectContentCB
;
VclPtr
<
CheckBox
>
m_
pProtectContentCB
;
VclPtr
<
CheckBox
>
pProtectFrameCB
;
VclPtr
<
CheckBox
>
m_
pProtectFrameCB
;
VclPtr
<
CheckBox
>
pProtectSizeCB
;
VclPtr
<
CheckBox
>
m_
pProtectSizeCB
;
VclPtr
<
VclContainer
>
m_pContentAlignFrame
;
VclPtr
<
VclContainer
>
m_pContentAlignFrame
;
VclPtr
<
ListBox
>
m_pVertAlignLB
;
VclPtr
<
ListBox
>
m_pVertAlignLB
;
VclPtr
<
VclContainer
>
pPropertiesFrame
;
VclPtr
<
VclContainer
>
m_
pPropertiesFrame
;
VclPtr
<
CheckBox
>
pEditInReadonlyCB
;
VclPtr
<
CheckBox
>
m_
pEditInReadonlyCB
;
VclPtr
<
CheckBox
>
pPrintFrameCB
;
VclPtr
<
CheckBox
>
m_
pPrintFrameCB
;
VclPtr
<
FixedText
>
pTextFlowFT
;
VclPtr
<
FixedText
>
m_
pTextFlowFT
;
VclPtr
<
ListBox
>
pTextFlowLB
;
VclPtr
<
ListBox
>
m_
pTextFlowLB
;
SwWrtShell
*
pWrtSh
;
SwWrtShell
*
m_
pWrtSh
;
OUString
sDlgType
;
OUString
m_
sDlgType
;
bool
bHtmlMode
;
bool
m_
bHtmlMode
;
bool
bFormat
;
bool
m_
bFormat
;
bool
bNew
;
bool
m_
bNew
;
DECL_LINK_TYPED
(
EditModifyHdl
,
Edit
&
,
void
);
DECL_LINK_TYPED
(
EditModifyHdl
,
Edit
&
,
void
);
DECL_LINK_TYPED
(
ChainModifyHdl
,
ListBox
&
,
void
);
DECL_LINK_TYPED
(
ChainModifyHdl
,
ListBox
&
,
void
);
...
@@ -321,9 +321,9 @@ public:
...
@@ -321,9 +321,9 @@ public:
virtual
void
Reset
(
const
SfxItemSet
*
rSet
)
override
;
virtual
void
Reset
(
const
SfxItemSet
*
rSet
)
override
;
void
SetFormatUsed
(
bool
bFormat
);
void
SetFormatUsed
(
bool
bFormat
);
void
SetFrmType
(
const
OUString
&
rType
)
{
sDlgType
=
rType
;
}
void
SetFrmType
(
const
OUString
&
rType
)
{
m_
sDlgType
=
rType
;
}
void
SetNewFrame
(
bool
bNewFrame
)
{
bNew
=
bNewFrame
;
}
void
SetNewFrame
(
bool
bNewFrame
)
{
m_
bNew
=
bNewFrame
;
}
void
SetShell
(
SwWrtShell
*
pSh
)
{
pWrtSh
=
pSh
;
}
void
SetShell
(
SwWrtShell
*
pSh
)
{
m_
pWrtSh
=
pSh
;
}
};
};
...
...
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