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
ca68971f
Kaydet (Commit)
ca68971f
authored
Agu 26, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
ModalDialogs no longer loaded from resource files
Change-Id: I2d208c7cc5ff9bf26bff5ab2aa40e0bf57373342
üst
f1de58a6
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
0 additions
and
33 deletions
+0
-33
rcid.h
include/tools/rcid.h
+0
-1
dialog.hxx
include/vcl/dialog.hxx
+0
-1
rscdb.hxx
rsc/inc/rscdb.hxx
+0
-1
rscicpx.cxx
rsc/source/parser/rscicpx.cxx
+0
-16
rscinit.cxx
rsc/source/parser/rscinit.cxx
+0
-5
resmgr.cxx
tools/source/rc/resmgr.cxx
+0
-2
dialog.cxx
vcl/source/window/dialog.cxx
+0
-7
No files found.
include/tools/rcid.h
Dosyayı görüntüle @
ca68971f
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
#define RSC_MODALDIALOG (RSC_NOTYPE + 0x3c)
#define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
...
...
include/vcl/dialog.hxx
Dosyayı görüntüle @
ca68971f
...
@@ -161,7 +161,6 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
...
@@ -161,7 +161,6 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
public
:
public
:
explicit
ModalDialog
(
Window
*
pParent
,
WinBits
nStyle
=
WB_STDMODAL
);
explicit
ModalDialog
(
Window
*
pParent
,
WinBits
nStyle
=
WB_STDMODAL
);
explicit
ModalDialog
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
);
explicit
ModalDialog
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
);
explicit
ModalDialog
(
Window
*
pParent
,
const
ResId
&
rResId
);
protected
:
protected
:
using
Window
::
Show
;
using
Window
::
Show
;
...
...
rsc/inc/rscdb.hxx
Dosyayı görüntüle @
ca68971f
...
@@ -170,7 +170,6 @@ class RscTypCont
...
@@ -170,7 +170,6 @@ class RscTypCont
RscArray
*
pLangGeo
);
RscArray
*
pLangGeo
);
RscTop
*
InitClassSystemWindow
(
RscTop
*
pSuper
);
RscTop
*
InitClassSystemWindow
(
RscTop
*
pSuper
);
RscTop
*
InitClassWorkWindow
(
RscTop
*
pSuper
);
RscTop
*
InitClassWorkWindow
(
RscTop
*
pSuper
);
RscTop
*
InitClassModalDialog
(
RscTop
*
pSuper
);
RscTop
*
InitClassControl
(
RscTop
*
pSuper
);
RscTop
*
InitClassControl
(
RscTop
*
pSuper
);
RscTop
*
InitClassCheckBox
(
RscTop
*
pSuper
);
RscTop
*
InitClassCheckBox
(
RscTop
*
pSuper
);
RscTop
*
InitClassPushButton
(
RscTop
*
pSuper
);
RscTop
*
InitClassPushButton
(
RscTop
*
pSuper
);
...
...
rsc/source/parser/rscicpx.cxx
Dosyayı görüntüle @
ca68971f
...
@@ -357,22 +357,6 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
...
@@ -357,22 +357,6 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
return
pClassWorkWindow
;
return
pClassWorkWindow
;
}
}
RscTop
*
RscTypCont
::
InitClassModalDialog
(
RscTop
*
pSuper
)
{
Atom
nId
;
RscTop
*
pClassDialog
;
// Klasse anlegen
nId
=
pHS
->
getID
(
"ModalDialog"
);
pClassDialog
=
new
RscClass
(
nId
,
RSC_MODALDIALOG
,
pSuper
);
pClassDialog
->
SetCallPar
(
*
pWinPar1
,
*
pWinPar2
,
*
pWinParType
);
aNmTb
.
Put
(
nId
,
CLASSNAME
,
pClassDialog
);
InsWinBit
(
pClassDialog
,
"SysModal"
,
nSysmodalId
);
return
pClassDialog
;
}
RscTop
*
RscTypCont
::
InitClassControl
(
RscTop
*
pSuper
)
RscTop
*
RscTypCont
::
InitClassControl
(
RscTop
*
pSuper
)
{
{
Atom
nId
;
Atom
nId
;
...
...
rsc/source/parser/rscinit.cxx
Dosyayı görüntüle @
ca68971f
...
@@ -70,7 +70,6 @@ void RscTypCont::Init()
...
@@ -70,7 +70,6 @@ void RscTypCont::Init()
RscTop
*
pClassSystemWindow
;
RscTop
*
pClassSystemWindow
;
RscTop
*
pClassWorkWindow
;
RscTop
*
pClassWorkWindow
;
RscTop
*
pClassDialog
;
RscTop
*
pClassDialog
;
RscTop
*
pClassModalDialog
;
RscTop
*
pClassControl
;
RscTop
*
pClassControl
;
RscTop
*
pClassButton
;
RscTop
*
pClassButton
;
RscTop
*
pClassCheckBox
;
RscTop
*
pClassCheckBox
;
...
@@ -355,10 +354,6 @@ void RscTypCont::Init()
...
@@ -355,10 +354,6 @@ void RscTypCont::Init()
RSC_DIALOG
,
pClassSystemWindow
);
RSC_DIALOG
,
pClassSystemWindow
);
pClassDialog
->
SetCallPar
(
*
pWinPar1
,
*
pWinPar2
,
*
pWinParType
);
pClassDialog
->
SetCallPar
(
*
pWinPar1
,
*
pWinPar2
,
*
pWinParType
);
aBaseLst
.
push_back
(
pClassDialog
);
aBaseLst
.
push_back
(
pClassDialog
);
// Klasse anlegen
pClassModalDialog
=
InitClassModalDialog
(
pClassDialog
);
pRoot
->
Insert
(
pClassModalDialog
);
}
}
{
{
pClassControl
=
InitClassControl
(
pClassWindow
);
pClassControl
=
InitClassControl
(
pClassWindow
);
...
...
tools/source/rc/resmgr.cxx
Dosyayı görüntüle @
ca68971f
...
@@ -1461,7 +1461,6 @@ OString ResMgr::GetAutoHelpId()
...
@@ -1461,7 +1461,6 @@ OString ResMgr::GetAutoHelpId()
case
RSC_DOCKINGWINDOW
:
aHID
.
append
(
"DockingWindow"
);
break
;
case
RSC_DOCKINGWINDOW
:
aHID
.
append
(
"DockingWindow"
);
break
;
case
RSC_WORKWIN
:
aHID
.
append
(
"WorkWindow"
);
break
;
case
RSC_WORKWIN
:
aHID
.
append
(
"WorkWindow"
);
break
;
case
RSC_FLOATINGWINDOW
:
aHID
.
append
(
"FloatingWindow"
);
break
;
case
RSC_FLOATINGWINDOW
:
aHID
.
append
(
"FloatingWindow"
);
break
;
case
RSC_MODALDIALOG
:
aHID
.
append
(
"ModalDialog"
);
break
;
default
:
return
OString
();
default
:
return
OString
();
}
}
}
}
...
@@ -1473,7 +1472,6 @@ OString ResMgr::GetAutoHelpId()
...
@@ -1473,7 +1472,6 @@ OString ResMgr::GetAutoHelpId()
case
RSC_DOCKINGWINDOW
:
case
RSC_DOCKINGWINDOW
:
case
RSC_WORKWIN
:
case
RSC_WORKWIN
:
case
RSC_FLOATINGWINDOW
:
case
RSC_FLOATINGWINDOW
:
case
RSC_MODALDIALOG
:
// intentionally no breaks!
// intentionally no breaks!
// auto help ids for controls
// auto help ids for controls
switch
(
pRC
->
pResource
->
GetRT
()
)
{
switch
(
pRC
->
pResource
->
GetRT
()
)
{
...
...
vcl/source/window/dialog.cxx
Dosyayı görüntüle @
ca68971f
...
@@ -1291,13 +1291,6 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) :
...
@@ -1291,13 +1291,6 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) :
ImplInit
(
pParent
,
nStyle
);
ImplInit
(
pParent
,
nStyle
);
}
}
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
Dialog
(
WINDOW_MODALDIALOG
)
{
rResId
.
SetRT
(
RSC_MODALDIALOG
);
init
(
pParent
,
rResId
);
}
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
)
:
ModalDialog
::
ModalDialog
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
)
:
Dialog
(
pParent
,
rID
,
rUIXMLDescription
,
WINDOW_MODALDIALOG
)
Dialog
(
pParent
,
rID
,
rUIXMLDescription
,
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