wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
Files
e4401ac1fa2c8dd42dcd61985ffebc8ea253b52b
loongoffice/sfx2/source/dialog
History
Rüdiger Timm d2fd9ad913 #i10000# Fix wrongly resolved merge conflict
2004-09-22 09:37:31 +00:00
..
about.cxx
INTEGRATION: CWS swqbugfixes05 (1.18.68); FILE MERGED
2004-09-20 14:17:57 +00:00
acccfg.cxx
INTEGRATION: CWS keyconfig01 (1.18.138); FILE MERGED
2004-09-20 09:14:18 +00:00
basedlgs.cxx
INTEGRATION: CWS swqbugfixes03 (1.16.64); FILE MERGED
2004-07-05 13:46:12 +00:00
cfg.cxx
INTEGRATION: CWS keyconfig01 (1.36.58); FILE MERGED
2004-09-20 10:24:02 +00:00
cfg.hrc
#i32850# wrong resource handling fixed
2004-08-13 12:43:47 +00:00
cfg.src
#i32850# wrong resource handling fixed
2004-08-13 12:43:47 +00:00
dialog.hrc
#i10000# Fix wrongly resolved merge conflict
2004-09-22 09:37:31 +00:00
dialog.src
INTEGRATION: CWS keyconfig01 (1.44.16); FILE MERGED
2004-09-20 09:14:44 +00:00
dinfdlg.cxx
INTEGRATION: CWS xmlsec05 (1.22.92); FILE MERGED
2004-08-31 11:33:50 +00:00
dinfdlg.hrc
INTEGRATION: CWS xmlsec05 (1.2.556); FILE MERGED
2004-08-31 11:34:02 +00:00
dinfdlg.src
INTEGRATION: CWS xmlsec05 (1.43.14); FILE MERGED
2004-08-31 11:34:14 +00:00
dinfedt.cxx
INTEGRATION: CWS ooo20040329 (1.2.464); FILE MERGED
2004-04-21 12:11:22 +00:00
dinfedt.hrc
fix: #88882# FixedLine instead of GroupBox
2001-06-28 12:44:05 +00:00
dinfedt.src
INTEGRATION: CWS mergebuild (1.17.54); FILE MERGED
2004-06-26 16:43:53 +00:00
dockwin.cxx
INTEGRATION: CWS gt01 (1.30.34); FILE MERGED
2004-09-20 14:14:50 +00:00
filedlghelper.cxx
INTEGRATION: CWS ooo20040704 (1.106.60); FILE MERGED
2004-09-08 14:40:18 +00:00
filedlghelper.src
INTEGRATION: CWS mergebuild (1.21.54); FILE MERGED
2004-06-26 16:44:24 +00:00
filedlgimpl.hxx
INTEGRATION: CWS fwkq1 (1.7.66); FILE MERGED
2003-09-19 06:59:22 +00:00
filtergrouping.cxx
INTEGRATION: CWS ooo20040704 (1.20.62); FILE MERGED
2004-09-08 14:40:33 +00:00
filtergrouping.hxx
INTEGRATION: CWS os12 (1.5.88); FILE MERGED
2004-04-29 15:41:33 +00:00
intro.cxx
INTEGRATION: CWS ooo20040329 (1.2.470); FILE MERGED
2004-04-21 12:11:56 +00:00
itemconnect.cxx
INTEGRATION: CWS dr14 (1.2.8); FILE MERGED
2004-08-02 15:26:36 +00:00
macropg.cxx
INTEGRATION: CWS fwk02ea (1.10.28); FILE MERGED
2004-06-10 12:30:31 +00:00
macropg.hrc
#101925# redesign of macro assign tabpage
2002-08-22 12:02:21 +00:00
macropg.src
INTEGRATION: CWS mergebuild (1.34.54); FILE MERGED
2004-06-26 16:44:52 +00:00
mailmodel.cxx
INTEGRATION: CWS defaultmailer (1.24.118); FILE MERGED
2004-06-17 14:56:23 +00:00
mailwindow.src
INTEGRATION: CWS mergebuild (1.31.54); FILE MERGED
2004-06-28 07:51:24 +00:00
makefile.mk
INTEGRATION: CWS keyconfig01 (1.20.74); FILE MERGED
2004-09-20 10:24:30 +00:00
mgetempl.cxx
INTEGRATION: CWS ooo20040329 (1.5.288); FILE MERGED
2004-04-21 12:12:26 +00:00
mgetempl.hrc
…
mgetempl.src
INTEGRATION: CWS mergebuild (1.27.54); FILE MERGED
2004-06-26 16:45:22 +00:00
navigat.cxx
INTEGRATION: CWS ooo20040329 (1.4.456); FILE MERGED
2004-04-21 12:12:44 +00:00
newstyle.cxx
INTEGRATION: CWS ooo20040329 (1.2.464); FILE MERGED
2004-04-21 12:12:59 +00:00
newstyle.hrc
fix: #88882# FixedLine instead of GroupBox
2001-06-28 06:54:44 +00:00
newstyle.src
INTEGRATION: CWS mergebuild (1.18.54); FILE MERGED
2004-06-26 16:45:34 +00:00
partwnd.cxx
INTEGRATION: CWS fwk07 (1.12.74); FILE MERGED
2003-06-27 08:11:35 +00:00
passwd.cxx
INTEGRATION: CWS ooo20040329 (1.1.1.1.480); FILE MERGED
2004-04-21 12:13:14 +00:00
passwd.hrc
…
passwd.src
INTEGRATION: CWS mergebuild (1.23.54); FILE MERGED
2004-06-26 16:45:45 +00:00
printopt.cxx
INTEGRATION: CWS swqbugfixes02 (1.7.62); FILE MERGED
2004-06-29 07:23:08 +00:00
printopt.hrc
#88896#: optimized GUI
2001-06-28 12:40:42 +00:00
printopt.src
INTEGRATION: CWS mergebuild (1.34.54); FILE MERGED
2004-06-26 16:45:56 +00:00
recfloat.cxx
INTEGRATION: CWS toolbars2 (1.6.444); FILE MERGED
2004-09-09 15:49:30 +00:00
recfloat.src
INTEGRATION: CWS toolbars2 (1.13.52); FILE MERGED
2004-09-09 15:49:43 +00:00
sfxdlg.cxx
INTEGRATION: CWS docking1 (1.2.32); FILE MERGED
2004-07-06 12:36:09 +00:00
sfxurl.cxx
INTEGRATION: CWS ooo20040704 (1.2.562); FILE MERGED
2004-09-08 14:40:54 +00:00
splitwin.cxx
INTEGRATION: CWS toolbars2 (1.11.198); FILE MERGED
2004-09-09 15:49:56 +00:00
srchdlg.cxx
INTEGRATION: CWS pbhelp02 (1.2.114); FILE MERGED
2004-08-11 13:05:29 +00:00
srchdlg.hrc
INTEGRATION: CWS pb1 (1.1.2); FILE ADDED
2004-02-26 10:04:02 +00:00
srchdlg.src
INTEGRATION: CWS mergebuild (1.2.60); FILE MERGED
2004-06-26 16:46:29 +00:00
styfitem.cxx
INTEGRATION: CWS ooo20040329 (1.2.444); FILE MERGED
2004-04-21 12:14:10 +00:00
styledlg.cxx
INTEGRATION: CWS ooo20040329 (1.1.1.1.480); FILE MERGED
2004-04-21 12:14:25 +00:00
tabdlg.cxx
INTEGRATION: CWS ooo20040704 (1.23.140); FILE MERGED
2004-09-08 14:41:22 +00:00
templdlg.cxx
INTEGRATION: CWS gt01 (1.37.12); FILE MERGED
2004-09-20 14:15:06 +00:00
templdlg.hrc
…
templdlg.src
INTEGRATION: CWS gt01 (1.30.42); FILE MERGED
2004-09-20 14:15:20 +00:00
tplcitem.cxx
INTEGRATION: CWS ooo20040704 (1.4.556); FILE MERGED
2004-09-08 14:41:50 +00:00
tplpitem.cxx
INTEGRATION: CWS ooo20040329 (1.4.24); FILE MERGED
2004-04-21 12:14:42 +00:00
versdlg.cxx
INTEGRATION: CWS ooo20040704 (1.6.540); FILE MERGED
2004-09-08 14:42:03 +00:00
versdlg.hrc
…
versdlg.src
INTEGRATION: CWS mergebuild (1.31.54); FILE MERGED
2004-06-26 16:46:51 +00:00