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
b987b103
Kaydet (Commit)
b987b103
authored
Mar 20, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
Mar 20, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove whitespace
Change-Id: I93caedfece5120c87d82ac4fa0c1e287cdc54edd
üst
299810dd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
68 deletions
+0
-68
dialog.cxx
vcl/source/window/dialog.cxx
+0
-68
No files found.
vcl/source/window/dialog.cxx
Dosyayı görüntüle @
b987b103
...
@@ -53,8 +53,6 @@
...
@@ -53,8 +53,6 @@
#include <touch/touch.h>
#include <touch/touch.h>
#endif
#endif
static
OString
ImplGetDialogText
(
Dialog
*
pDialog
)
static
OString
ImplGetDialogText
(
Dialog
*
pDialog
)
{
{
OStringBuffer
aErrorStr
(
OUStringToOString
(
OStringBuffer
aErrorStr
(
OUStringToOString
(
...
@@ -72,8 +70,6 @@ static OString ImplGetDialogText( Dialog* pDialog )
...
@@ -72,8 +70,6 @@ static OString ImplGetDialogText( Dialog* pDialog )
return
aErrorStr
.
makeStringAndClear
();
return
aErrorStr
.
makeStringAndClear
();
}
}
static
bool
ImplIsMnemonicCtrl
(
Window
*
pWindow
)
static
bool
ImplIsMnemonicCtrl
(
Window
*
pWindow
)
{
{
if
(
!
pWindow
->
GetSettings
().
GetStyleSettings
().
GetAutoMnemonic
()
)
if
(
!
pWindow
->
GetSettings
().
GetStyleSettings
().
GetAutoMnemonic
()
)
...
@@ -113,8 +109,6 @@ static bool ImplIsMnemonicCtrl( Window* pWindow )
...
@@ -113,8 +109,6 @@ static bool ImplIsMnemonicCtrl( Window* pWindow )
return
false
;
return
false
;
}
}
// Called by native error dialog popup implementations
// Called by native error dialog popup implementations
void
ImplHideSplash
()
void
ImplHideSplash
()
{
{
...
@@ -187,8 +181,6 @@ Window * firstLogicalChildOfParent(Window *pTopLevel)
...
@@ -187,8 +181,6 @@ Window * firstLogicalChildOfParent(Window *pTopLevel)
return
pChild
;
return
pChild
;
}
}
void
ImplWindowAutoMnemonic
(
Window
*
pWindow
)
void
ImplWindowAutoMnemonic
(
Window
*
pWindow
)
{
{
MnemonicGenerator
aMnemonicGenerator
;
MnemonicGenerator
aMnemonicGenerator
;
...
@@ -266,8 +258,6 @@ static Window* getActionAreaButtonList(Dialog *pDialog)
...
@@ -266,8 +258,6 @@ static Window* getActionAreaButtonList(Dialog *pDialog)
return
pDialog
->
GetWindow
(
WINDOW_FIRSTCHILD
);
return
pDialog
->
GetWindow
(
WINDOW_FIRSTCHILD
);
}
}
static
PushButton
*
ImplGetDefaultButton
(
Dialog
*
pDialog
)
static
PushButton
*
ImplGetDefaultButton
(
Dialog
*
pDialog
)
{
{
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
...
@@ -286,8 +276,6 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog )
...
@@ -286,8 +276,6 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog )
return
NULL
;
return
NULL
;
}
}
static
PushButton
*
ImplGetOKButton
(
Dialog
*
pDialog
)
static
PushButton
*
ImplGetOKButton
(
Dialog
*
pDialog
)
{
{
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
...
@@ -302,8 +290,6 @@ static PushButton* ImplGetOKButton( Dialog* pDialog )
...
@@ -302,8 +290,6 @@ static PushButton* ImplGetOKButton( Dialog* pDialog )
return
NULL
;
return
NULL
;
}
}
static
PushButton
*
ImplGetCancelButton
(
Dialog
*
pDialog
)
static
PushButton
*
ImplGetCancelButton
(
Dialog
*
pDialog
)
{
{
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
Window
*
pChild
=
getActionAreaButtonList
(
pDialog
);
...
@@ -319,8 +305,6 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog )
...
@@ -319,8 +305,6 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog )
return
NULL
;
return
NULL
;
}
}
static
void
ImplMouseAutoPos
(
Dialog
*
pDialog
)
static
void
ImplMouseAutoPos
(
Dialog
*
pDialog
)
{
{
sal_uLong
nMouseOptions
=
pDialog
->
GetSettings
().
GetMouseSettings
().
GetOptions
();
sal_uLong
nMouseOptions
=
pDialog
->
GetSettings
().
GetMouseSettings
().
GetOptions
();
...
@@ -343,8 +327,6 @@ static void ImplMouseAutoPos( Dialog* pDialog )
...
@@ -343,8 +327,6 @@ static void ImplMouseAutoPos( Dialog* pDialog )
}
}
}
}
struct
DialogImpl
struct
DialogImpl
{
{
long
mnResult
;
long
mnResult
;
...
@@ -354,8 +336,6 @@ struct DialogImpl
...
@@ -354,8 +336,6 @@ struct DialogImpl
DialogImpl
()
:
mnResult
(
-
1
),
mbStartedModal
(
false
)
{}
DialogImpl
()
:
mnResult
(
-
1
),
mbStartedModal
(
false
)
{}
};
};
void
Dialog
::
ImplInitDialogData
()
void
Dialog
::
ImplInitDialogData
()
{
{
mpWindowImpl
->
mbDialog
=
true
;
mpWindowImpl
->
mbDialog
=
true
;
...
@@ -376,8 +356,6 @@ void Dialog::ImplInitDialogData()
...
@@ -376,8 +356,6 @@ void Dialog::ImplInitDialogData()
maLayoutTimer
.
SetTimeoutHdl
(
LINK
(
this
,
Dialog
,
ImplHandleLayoutTimerHdl
)
);
maLayoutTimer
.
SetTimeoutHdl
(
LINK
(
this
,
Dialog
,
ImplHandleLayoutTimerHdl
)
);
}
}
void
Dialog
::
ImplInit
(
Window
*
pParent
,
WinBits
nStyle
)
void
Dialog
::
ImplInit
(
Window
*
pParent
,
WinBits
nStyle
)
{
{
sal_uInt16
nSysWinMode
=
Application
::
GetSystemWindowMode
();
sal_uInt16
nSysWinMode
=
Application
::
GetSystemWindowMode
();
...
@@ -461,8 +439,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
...
@@ -461,8 +439,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings
();
ImplInitSettings
();
}
}
void
Dialog
::
ImplInitSettings
()
void
Dialog
::
ImplInitSettings
()
{
{
// user override
// user override
...
@@ -479,8 +455,6 @@ void Dialog::ImplInitSettings()
...
@@ -479,8 +455,6 @@ void Dialog::ImplInitSettings()
SetBackground
(
GetSettings
().
GetStyleSettings
().
GetDialogColor
()
);
SetBackground
(
GetSettings
().
GetStyleSettings
().
GetDialogColor
()
);
}
}
Dialog
::
Dialog
(
WindowType
nType
)
Dialog
::
Dialog
(
WindowType
nType
)
:
SystemWindow
(
nType
)
:
SystemWindow
(
nType
)
,
mbIsDefferedInit
(
false
)
,
mbIsDefferedInit
(
false
)
...
@@ -541,9 +515,6 @@ Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescri
...
@@ -541,9 +515,6 @@ Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescri
m_pUIBuilder
=
new
VclBuilder
(
this
,
getUIRootDir
(),
rUIXMLDescription
,
rID
);
m_pUIBuilder
=
new
VclBuilder
(
this
,
getUIRootDir
(),
rUIXMLDescription
,
rID
);
}
}
Dialog
::
Dialog
(
Window
*
pParent
,
WinBits
nStyle
)
Dialog
::
Dialog
(
Window
*
pParent
,
WinBits
nStyle
)
:
SystemWindow
(
WINDOW_DIALOG
)
:
SystemWindow
(
WINDOW_DIALOG
)
,
mbIsDefferedInit
(
false
)
,
mbIsDefferedInit
(
false
)
...
@@ -582,8 +553,6 @@ void Dialog::set_content_area(VclBox* pContentArea)
...
@@ -582,8 +553,6 @@ void Dialog::set_content_area(VclBox* pContentArea)
mpContentArea
=
pContentArea
;
mpContentArea
=
pContentArea
;
}
}
Dialog
::~
Dialog
()
Dialog
::~
Dialog
()
{
{
maLayoutTimer
.
Stop
();
maLayoutTimer
.
Stop
();
...
@@ -591,16 +560,12 @@ Dialog::~Dialog()
...
@@ -591,16 +560,12 @@ Dialog::~Dialog()
mpDialogImpl
=
NULL
;
mpDialogImpl
=
NULL
;
}
}
IMPL_LINK_NOARG
(
Dialog
,
ImplAsyncCloseHdl
)
IMPL_LINK_NOARG
(
Dialog
,
ImplAsyncCloseHdl
)
{
{
Close
();
Close
();
return
0
;
return
0
;
}
}
bool
Dialog
::
Notify
(
NotifyEvent
&
rNEvt
)
bool
Dialog
::
Notify
(
NotifyEvent
&
rNEvt
)
{
{
// first call the base class due to Tab control
// first call the base class due to Tab control
...
@@ -703,8 +668,6 @@ void Dialog::setOptimalLayoutSize()
...
@@ -703,8 +668,6 @@ void Dialog::setOptimalLayoutSize()
setPosSizeOnContainee
(
aSize
,
*
pBox
);
setPosSizeOnContainee
(
aSize
,
*
pBox
);
}
}
void
Dialog
::
StateChanged
(
StateChangedType
nType
)
void
Dialog
::
StateChanged
(
StateChangedType
nType
)
{
{
SystemWindow
::
StateChanged
(
nType
);
SystemWindow
::
StateChanged
(
nType
);
...
@@ -742,8 +705,6 @@ void Dialog::StateChanged( StateChangedType nType )
...
@@ -742,8 +705,6 @@ void Dialog::StateChanged( StateChangedType nType )
}
}
}
}
void
Dialog
::
DataChanged
(
const
DataChangedEvent
&
rDCEvt
)
void
Dialog
::
DataChanged
(
const
DataChangedEvent
&
rDCEvt
)
{
{
SystemWindow
::
DataChanged
(
rDCEvt
);
SystemWindow
::
DataChanged
(
rDCEvt
);
...
@@ -756,8 +717,6 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
...
@@ -756,8 +717,6 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
}
}
}
}
bool
Dialog
::
Close
()
bool
Dialog
::
Close
()
{
{
ImplDelData
aDelData
;
ImplDelData
aDelData
;
...
@@ -806,8 +765,6 @@ bool Dialog::Close()
...
@@ -806,8 +765,6 @@ bool Dialog::Close()
}
}
}
}
bool
Dialog
::
ImplStartExecuteModal
()
bool
Dialog
::
ImplStartExecuteModal
()
{
{
if
(
mbInExecute
)
if
(
mbInExecute
)
...
@@ -885,16 +842,12 @@ bool Dialog::ImplStartExecuteModal()
...
@@ -885,16 +842,12 @@ bool Dialog::ImplStartExecuteModal()
return
true
;
return
true
;
}
}
void
Dialog
::
ImplEndExecuteModal
()
void
Dialog
::
ImplEndExecuteModal
()
{
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
pSVData
->
maAppData
.
mnModalMode
--
;
pSVData
->
maAppData
.
mnModalMode
--
;
}
}
short
Dialog
::
Execute
()
short
Dialog
::
Execute
()
{
{
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP
...
@@ -994,8 +947,6 @@ short Dialog::Execute()
...
@@ -994,8 +947,6 @@ short Dialog::Execute()
#endif
#endif
}
}
// virtual
// virtual
void
Dialog
::
StartExecuteModal
(
const
Link
&
rEndDialogHdl
)
void
Dialog
::
StartExecuteModal
(
const
Link
&
rEndDialogHdl
)
{
{
...
@@ -1006,8 +957,6 @@ void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
...
@@ -1006,8 +957,6 @@ void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
mpDialogImpl
->
mbStartedModal
=
true
;
mpDialogImpl
->
mbStartedModal
=
true
;
}
}
void
Dialog
::
EndDialog
(
long
nResult
)
void
Dialog
::
EndDialog
(
long
nResult
)
{
{
if
(
mbInExecute
)
if
(
mbInExecute
)
...
@@ -1064,15 +1013,11 @@ void Dialog::EndDialog( long nResult )
...
@@ -1064,15 +1013,11 @@ void Dialog::EndDialog( long nResult )
}
}
}
}
long
Dialog
::
GetResult
()
const
long
Dialog
::
GetResult
()
const
{
{
return
mpDialogImpl
->
mnResult
;
return
mpDialogImpl
->
mnResult
;
}
}
void
Dialog
::
EndAllDialogs
(
Window
*
pParent
)
void
Dialog
::
EndAllDialogs
(
Window
*
pParent
)
{
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
...
@@ -1090,8 +1035,6 @@ void Dialog::EndAllDialogs( Window* pParent )
...
@@ -1090,8 +1035,6 @@ void Dialog::EndAllDialogs( Window* pParent )
}
}
}
}
void
Dialog
::
SetModalInputMode
(
bool
bModal
)
void
Dialog
::
SetModalInputMode
(
bool
bModal
)
{
{
if
(
bModal
==
mbModalMode
)
if
(
bModal
==
mbModalMode
)
...
@@ -1158,8 +1101,6 @@ void Dialog::SetModalInputMode( bool bModal )
...
@@ -1158,8 +1101,6 @@ void Dialog::SetModalInputMode( bool bModal )
}
}
}
}
void
Dialog
::
SetModalInputMode
(
bool
bModal
,
bool
bSubModalDialogs
)
void
Dialog
::
SetModalInputMode
(
bool
bModal
,
bool
bSubModalDialogs
)
{
{
if
(
bSubModalDialogs
)
if
(
bSubModalDialogs
)
...
@@ -1177,8 +1118,6 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs )
...
@@ -1177,8 +1118,6 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs )
SetModalInputMode
(
bModal
);
SetModalInputMode
(
bModal
);
}
}
void
Dialog
::
GrabFocusToFirstControl
()
void
Dialog
::
GrabFocusToFirstControl
()
{
{
Window
*
pFocusControl
;
Window
*
pFocusControl
;
...
@@ -1215,7 +1154,6 @@ void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
...
@@ -1215,7 +1154,6 @@ void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
aImplWin
.
GetBorder
(
rLeftBorder
,
rTopBorder
,
rRightBorder
,
rBottomBorder
);
aImplWin
.
GetBorder
(
rLeftBorder
,
rTopBorder
,
rRightBorder
,
rBottomBorder
);
}
}
void
Dialog
::
Draw
(
OutputDevice
*
pDev
,
const
Point
&
rPos
,
const
Size
&
rSize
,
sal_uLong
)
void
Dialog
::
Draw
(
OutputDevice
*
pDev
,
const
Point
&
rPos
,
const
Size
&
rSize
,
sal_uLong
)
{
{
Point
aPos
=
pDev
->
LogicToPixel
(
rPos
);
Point
aPos
=
pDev
->
LogicToPixel
(
rPos
);
...
@@ -1350,8 +1288,6 @@ VclBuilderContainer::~VclBuilderContainer()
...
@@ -1350,8 +1288,6 @@ VclBuilderContainer::~VclBuilderContainer()
delete
m_pUIBuilder
;
delete
m_pUIBuilder
;
}
}
ModelessDialog
::
ModelessDialog
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
ModelessDialog
::
ModelessDialog
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
Dialog
(
WINDOW_MODELESSDIALOG
)
Dialog
(
WINDOW_MODELESSDIALOG
)
{
{
...
@@ -1368,16 +1304,12 @@ ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUStr
...
@@ -1368,16 +1304,12 @@ ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUStr
{
{
}
}
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
WinBits
nStyle
)
:
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
WinBits
nStyle
)
:
Dialog
(
WINDOW_MODALDIALOG
)
Dialog
(
WINDOW_MODALDIALOG
)
{
{
ImplInit
(
pParent
,
nStyle
);
ImplInit
(
pParent
,
nStyle
);
}
}
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
Dialog
(
WINDOW_MODALDIALOG
)
Dialog
(
WINDOW_MODALDIALOG
)
{
{
...
...
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