summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--UnoControls/source/base/basecontainercontrol.cxx3
-rw-r--r--UnoControls/source/base/basecontrol.cxx3
-rw-r--r--UnoControls/source/base/multiplexer.cxx23
-rw-r--r--UnoControls/source/base/registercontrols.cxx3
-rw-r--r--UnoControls/source/controls/OConnectionPointContainerHelper.cxx3
-rw-r--r--UnoControls/source/controls/OConnectionPointHelper.cxx3
-rw-r--r--UnoControls/source/controls/framecontrol.cxx9
-rw-r--r--UnoControls/source/controls/progressbar.cxx3
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx3
-rw-r--r--UnoControls/source/controls/statusindicator.cxx3
-rw-r--r--accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx9
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx2
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControl.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx0
-rw-r--r--[-rwxr-xr-x]accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx0
-rw-r--r--accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx2
-rw-r--r--accessibility/inc/accessibility/helper/accresmgr.hxx2
-rw-r--r--accessibility/inc/accessibility/helper/characterattributeshelper.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx4
-rw-r--r--accessibility/inc/pch/precompiled_accessibility.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBox.cxx16
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxBase.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxTable.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx3
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControl.cxx3
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlBase.cxx2
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlHeader.cxx2
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlHeaderCell.cxx2
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlTable.cxx2
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlTableBase.cxx2
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlTableCell.cxx3
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleToolPanelDeck.cxx3
-rw-r--r--accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx3
-rw-r--r--accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx3
-rw-r--r--accessibility/source/extended/accessiblebrowseboxcell.cxx2
-rw-r--r--accessibility/source/extended/accessibleeditbrowseboxcell.cxx3
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrl.cxx2
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx2
-rw-r--r--accessibility/source/extended/accessiblelistbox.cxx4
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx2
-rw-r--r--accessibility/source/extended/accessibletabbar.cxx3
-rw-r--r--accessibility/source/extended/accessibletabbarbase.cxx2
-rw-r--r--accessibility/source/extended/accessibletabbarpage.cxx3
-rw-r--r--accessibility/source/extended/accessibletabbarpagelist.cxx3
-rw-r--r--accessibility/source/extended/accessibletablistbox.cxx4
-rw-r--r--accessibility/source/extended/accessibletablistboxtable.cxx4
-rw-r--r--accessibility/source/extended/listboxaccessible.cxx3
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx6
-rw-r--r--[-rwxr-xr-x]accessibility/source/helper/acc_factory.cxx3
-rw-r--r--accessibility/source/helper/accresmgr.cxx5
-rw-r--r--accessibility/source/helper/characterattributeshelper.cxx3
-rw-r--r--accessibility/source/inc/floatingwindowaccessible.hxx2
-rw-r--r--accessibility/source/standard/accessiblemenubasecomponent.cxx3
-rw-r--r--accessibility/source/standard/accessiblemenucomponent.cxx3
-rw-r--r--accessibility/source/standard/accessiblemenuitemcomponent.cxx3
-rw-r--r--accessibility/source/standard/floatingwindowaccessible.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblebox.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessiblebutton.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblecheckbox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblecombobox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibledropdowncombobox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibledropdownlistbox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibleedit.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblefixedtext.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblelist.cxx9
-rw-r--r--accessibility/source/standard/vclxaccessiblelistbox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblelistitem.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblemenu.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblemenubar.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblemenuitem.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblemenuseparator.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblepopupmenu.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibleradiobutton.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblescrollbar.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblestatusbar.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessiblestatusbaritem.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletabcontrol.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletabpage.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletabpagewindow.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletextcomponent.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletextfield.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletoolbox.cxx3
-rw-r--r--accessibility/source/standard/vclxaccessibletoolboxitem.cxx16
-rw-r--r--automation/inc/automation/communi.hxx12
-rw-r--r--automation/inc/automation/simplecm.hxx18
-rw-r--r--automation/inc/pch/precompiled_automation.cxx2
-rw-r--r--automation/source/app/testbasi.cxx19
-rw-r--r--automation/source/communi/communi.cxx41
-rw-r--r--automation/source/miniapp/editwin.cxx4
-rw-r--r--automation/source/miniapp/editwin.hxx2
-rw-r--r--automation/source/miniapp/servres.cxx2
-rw-r--r--automation/source/miniapp/servres.hxx18
-rw-r--r--automation/source/miniapp/testapp.cxx4
-rw-r--r--automation/source/miniapp/testapp.hxx18
-rw-r--r--automation/source/server/XMLParser.cxx4
-rw-r--r--automation/source/server/cmdbasestream.cxx2
-rw-r--r--automation/source/server/editwin.cxx2
-rw-r--r--automation/source/server/editwin.hxx4
-rw-r--r--automation/source/server/prof_nul.cxx2
-rw-r--r--automation/source/server/prof_usl.cxx2
-rw-r--r--automation/source/server/profiler.cxx4
-rw-r--r--automation/source/server/recorder.cxx2
-rw-r--r--automation/source/server/retstrm.cxx2
-rw-r--r--automation/source/server/scmdstrm.cxx2
-rw-r--r--automation/source/server/server.cxx10
-rw-r--r--automation/source/server/server.hxx2
-rw-r--r--automation/source/server/sta_list.cxx6
-rw-r--r--automation/source/server/statemnt.cxx28
-rw-r--r--automation/source/server/statemnt.hxx3
-rw-r--r--automation/source/server/svcommstream.cxx3
-rw-r--r--automation/source/simplecm/packethandler.cxx3
-rw-r--r--automation/source/simplecm/simplecm.cxx68
-rw-r--r--automation/source/simplecm/tcpio.cxx5
-rw-r--r--automation/source/simplecm/tcpio.hxx8
-rw-r--r--automation/source/testtool/cmdstrm.cxx4
-rw-r--r--automation/source/testtool/comm_bas.cxx6
-rw-r--r--automation/source/testtool/comm_bas.hxx2
-rw-r--r--automation/source/testtool/cretstrm.cxx4
-rw-r--r--automation/source/testtool/httprequest.cxx18
-rw-r--r--automation/source/testtool/httprequest.hxx10
-rw-r--r--automation/source/testtool/objtest.cxx26
-rw-r--r--automation/source/testtool/registry_win.cxx3
-rw-r--r--automation/source/testtool/sysdir_win.cxx2
-rw-r--r--automation/source/testtool/tcommuni.cxx5
-rw-r--r--automation/source/testtool/tcommuni.hxx2
-rw-r--r--basctl/inc/pch/precompiled_basctl.cxx2
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx2
-rw-r--r--basctl/source/accessibility/accessibledialogcontrolshape.cxx2
-rw-r--r--basctl/source/accessibility/accessibledialogwindow.cxx3
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--basctl/source/basicide/basicbox.cxx2
-rw-r--r--basctl/source/basicide/basicrenderable.cxx2
-rw-r--r--basctl/source/basicide/baside2.cxx32
-rw-r--r--basctl/source/basicide/baside2.hxx2
-rw-r--r--basctl/source/basicide/baside2b.cxx7
-rw-r--r--basctl/source/basicide/baside3.cxx16
-rw-r--r--basctl/source/basicide/basidectrlr.cxx5
-rw-r--r--basctl/source/basicide/basides1.cxx2
-rw-r--r--basctl/source/basicide/basides2.cxx6
-rw-r--r--basctl/source/basicide/basides3.cxx4
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/basobj2.cxx3
-rw-r--r--basctl/source/basicide/basobj3.cxx5
-rw-r--r--basctl/source/basicide/bastype2.cxx3
-rw-r--r--basctl/source/basicide/bastype3.cxx3
-rw-r--r--basctl/source/basicide/bastypes.cxx6
-rw-r--r--basctl/source/basicide/brkdlg.cxx2
-rw-r--r--basctl/source/basicide/brkdlg.hxx2
-rw-r--r--basctl/source/basicide/doceventnotifier.cxx6
-rw-r--r--basctl/source/basicide/docsignature.cxx3
-rw-r--r--basctl/source/basicide/documentenumeration.cxx3
-rw-r--r--basctl/source/basicide/ide_pch.cxx2
-rw-r--r--basctl/source/basicide/iderdll.cxx2
-rw-r--r--basctl/source/basicide/localizationmgr.cxx2
-rw-r--r--basctl/source/basicide/macrodlg.cxx4
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--basctl/source/basicide/moduldl2.cxx4
-rw-r--r--basctl/source/basicide/moduldlg.cxx10
-rw-r--r--basctl/source/basicide/moduldlg.hxx2
-rw-r--r--basctl/source/basicide/objdlg.cxx9
-rw-r--r--basctl/source/basicide/register.cxx2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx13
-rw-r--r--basctl/source/basicide/tbxctl.cxx2
-rw-r--r--basctl/source/basicide/unomodel.cxx2
-rw-r--r--basctl/source/dlged/dlged.cxx14
-rw-r--r--basctl/source/dlged/dlgedclip.cxx2
-rw-r--r--basctl/source/dlged/dlgedfac.cxx2
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx5
-rw-r--r--basctl/source/dlged/dlgedlist.cxx3
-rw-r--r--basctl/source/dlged/dlgedmod.cxx8
-rw-r--r--basctl/source/dlged/dlgedobj.cxx32
-rw-r--r--basctl/source/dlged/dlgedpage.cxx5
-rw-r--r--basctl/source/dlged/dlgedview.cxx5
-rw-r--r--basctl/source/dlged/managelang.cxx7
-rw-r--r--basctl/source/dlged/propbrw.cxx14
-rw-r--r--basctl/source/inc/baside3.hxx6
-rw-r--r--basctl/source/inc/basidesh.hxx8
-rw-r--r--basctl/source/inc/basobj.hxx2
-rw-r--r--basctl/source/inc/dlged.hxx5
-rw-r--r--basctl/source/inc/dlgedmod.hxx4
-rw-r--r--basctl/source/inc/dlgedobj.hxx4
-rw-r--r--basctl/source/inc/dlgedpage.hxx2
-rw-r--r--basctl/source/inc/managelang.hxx6
-rw-r--r--basctl/uiconfig/basicide/menubar/menubar.xml3
-rw-r--r--basctl/util/hidother.src1
-rw-r--r--[-rwxr-xr-x]crashrep/source/unx/main.cxx7
-rw-r--r--[-rwxr-xr-x]crashrep/source/win32/base64.cpp3
-rwxr-xr-xcrashrep/source/win32/rcheader.txt22
-rw-r--r--[-rwxr-xr-x]crashrep/source/win32/soreport.cpp190
-rw-r--r--cui/inc/pch/precompiled_cui.cxx2
-rw-r--r--cui/source/customize/acccfg.cxx24
-rw-r--r--cui/source/customize/cfg.cxx21
-rw-r--r--cui/source/customize/cfgutil.cxx7
-rw-r--r--cui/source/customize/eventdlg.cxx2
-rw-r--r--cui/source/customize/macropg.cxx3
-rw-r--r--cui/source/customize/selector.cxx3
-rw-r--r--cui/source/dialogs/SpellAttrib.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/SpellDialog.cxx3
-rw-r--r--cui/source/dialogs/commonlingui.cxx10
-rw-r--r--cui/source/dialogs/commonlingui.hxx2
-rw-r--r--cui/source/dialogs/cuicharmap.cxx5
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx22
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx5
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx277
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx3
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx3
-rw-r--r--cui/source/dialogs/cuitbxform.cxx3
-rw-r--r--cui/source/dialogs/dlgname.cxx7
-rw-r--r--cui/source/dialogs/grfflt.src8
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx3
-rw-r--r--cui/source/dialogs/hldocntp.cxx2
-rw-r--r--cui/source/dialogs/hldoctp.cxx5
-rw-r--r--cui/source/dialogs/hlinettp.cxx5
-rw-r--r--cui/source/dialogs/hlmailtp.cxx2
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx135
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/hyphen.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx5
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/dialogs/insrc.cxx2
-rw-r--r--cui/source/dialogs/linkdlg.cxx4
-rw-r--r--cui/source/dialogs/multifil.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx2
-rw-r--r--cui/source/dialogs/newtabledlg.cxx3
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/passwdomdlg.cxx2
-rw-r--r--cui/source/dialogs/pastedlg.cxx2
-rw-r--r--cui/source/dialogs/plfilter.cxx2
-rw-r--r--cui/source/dialogs/postdlg.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx3
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx3
-rw-r--r--cui/source/dialogs/showcols.cxx6
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx3
-rw-r--r--cui/source/dialogs/srchxtra.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/thesdlg.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/thesdlg_impl.hxx0
-rw-r--r--cui/source/dialogs/winpluginlib.cpp3
-rw-r--r--cui/source/dialogs/zoom.cxx2
-rw-r--r--cui/source/factory/cuiexp.cxx3
-rw-r--r--cui/source/factory/cuiresmgr.cxx3
-rw-r--r--[-rwxr-xr-x]cui/source/factory/dlgfact.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/factory/dlgfact.hxx0
-rw-r--r--cui/source/factory/init.cxx3
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/inc/align.hxx3
-rw-r--r--cui/source/inc/autocdlg.hxx5
-rw-r--r--cui/source/inc/backgrnd.hxx4
-rw-r--r--cui/source/inc/cuifmsearch.hxx8
-rw-r--r--cui/source/inc/cuigaldlg.hxx6
-rw-r--r--cui/source/inc/cuigrfflt.hxx2
-rwxr-xr-xcui/source/inc/cuires.hrc3
-rw-r--r--cui/source/inc/cuitbxform.hxx2
-rw-r--r--cui/source/inc/dlgname.hxx8
-rw-r--r--cui/source/inc/grfpage.hxx6
-rw-r--r--cui/source/inc/hlmarkwn.hxx2
-rw-r--r--[-rwxr-xr-x]cui/source/inc/hyphen.hxx0
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx6
-rw-r--r--cui/source/inc/linkdlg.hxx2
-rw-r--r--cui/source/inc/macropg.hxx2
-rw-r--r--cui/source/inc/multipat.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx7
-rw-r--r--cui/source/inc/numpages.hxx8
-rw-r--r--cui/source/inc/optasian.hxx2
-rw-r--r--cui/source/inc/optdict.hxx2
-rw-r--r--cui/source/inc/optpath.hxx6
-rw-r--r--cui/source/inc/page.hxx4
-rw-r--r--[-rwxr-xr-x]cui/source/inc/passwdomdlg.hxx0
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/inc/postdlg.hxx6
-rw-r--r--cui/source/inc/showcols.hxx2
-rw-r--r--cui/source/inc/textattr.hxx4
-rw-r--r--[-rwxr-xr-x]cui/source/inc/thesdlg.hxx0
-rw-r--r--cui/source/inc/transfrm.hxx2
-rw-r--r--cui/source/inc/zoom.hxx22
-rw-r--r--cui/source/options/cfgchart.cxx3
-rw-r--r--cui/source/options/connpoolconfig.cxx2
-rw-r--r--cui/source/options/connpooloptions.cxx2
-rw-r--r--cui/source/options/connpoolsettings.cxx2
-rw-r--r--cui/source/options/cuisrchdlg.cxx3
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx5
-rw-r--r--cui/source/options/dbregistersettings.cxx2
-rw-r--r--cui/source/options/doclinkdialog.cxx2
-rw-r--r--cui/source/options/doclinkdialog.hxx2
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/internationaloptions.cxx2
-rw-r--r--cui/source/options/optHeaderTabListbox.cxx3
-rw-r--r--cui/source/options/optaccessibility.cxx3
-rw-r--r--cui/source/options/optasian.cxx3
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optchart.hxx2
-rw-r--r--cui/source/options/optcolor.cxx116
-rw-r--r--cui/source/options/optctl.cxx2
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--[-rwxr-xr-x]cui/source/options/optdict.cxx2
-rw-r--r--cui/source/options/optfltr.cxx15
-rw-r--r--cui/source/options/optfltr.hrc1
-rw-r--r--cui/source/options/optfltr.hxx6
-rw-r--r--cui/source/options/optfltr.src17
-rw-r--r--cui/source/options/optgdlg.cxx90
-rw-r--r--cui/source/options/optgdlg.hrc10
-rw-r--r--cui/source/options/optgdlg.hxx5
-rw-r--r--cui/source/options/optgdlg.src27
-rw-r--r--cui/source/options/optgenrl.cxx4
-rw-r--r--cui/source/options/opthtml.cxx2
-rw-r--r--cui/source/options/optimprove.cxx2
-rw-r--r--cui/source/options/optimprove2.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/options/optinet2.cxx19
-rw-r--r--[-rwxr-xr-x]cui/source/options/optinet2.hxx0
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optjsearch.cxx2
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optlingu.cxx18
-rw-r--r--cui/source/options/optmemory.cxx2
-rw-r--r--cui/source/options/optpath.cxx6
-rw-r--r--cui/source/options/optsave.cxx2
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/radiobtnbox.cxx2
-rw-r--r--cui/source/options/readonlyimage.cxx3
-rw-r--r--cui/source/options/sdbcdriverenum.cxx2
-rw-r--r--cui/source/options/securityoptions.cxx2
-rw-r--r--cui/source/options/treeopt.cxx6
-rw-r--r--cui/source/options/treeopt.src2
-rw-r--r--cui/source/options/webconninfo.cxx5
-rw-r--r--cui/source/tabpages/align.cxx116
-rw-r--r--cui/source/tabpages/align.hrc11
-rw-r--r--cui/source/tabpages/align.src3
-rw-r--r--cui/source/tabpages/autocdlg.cxx31
-rw-r--r--cui/source/tabpages/autocdlg.hrc1
-rw-r--r--cui/source/tabpages/autocdlg.src4
-rw-r--r--cui/source/tabpages/backgrnd.cxx13
-rw-r--r--cui/source/tabpages/bbdlg.cxx2
-rw-r--r--cui/source/tabpages/border.cxx43
-rw-r--r--cui/source/tabpages/borderconn.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx174
-rw-r--r--cui/source/tabpages/connect.cxx8
-rw-r--r--cui/source/tabpages/dstribut.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/labdlg.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx8
-rw-r--r--cui/source/tabpages/numfmt.cxx11
-rw-r--r--cui/source/tabpages/numpages.cxx131
-rw-r--r--cui/source/tabpages/page.cxx15
-rw-r--r--cui/source/tabpages/paragrph.cxx156
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx7
-rw-r--r--cui/source/tabpages/tabarea.cxx32
-rw-r--r--cui/source/tabpages/tabline.cxx4
-rw-r--r--cui/source/tabpages/tabline.src6
-rw-r--r--cui/source/tabpages/tabstpge.cxx12
-rw-r--r--cui/source/tabpages/textanim.cxx2
-rw-r--r--cui/source/tabpages/textanim.src2
-rw-r--r--cui/source/tabpages/textattr.cxx11
-rw-r--r--cui/source/tabpages/tparea.cxx112
-rw-r--r--cui/source/tabpages/tpbitmap.cxx34
-rw-r--r--cui/source/tabpages/tpcolor.cxx33
-rw-r--r--cui/source/tabpages/tpgradnt.cxx28
-rw-r--r--cui/source/tabpages/tphatch.cxx28
-rw-r--r--cui/source/tabpages/tpline.cxx124
-rw-r--r--cui/source/tabpages/tplnedef.cxx28
-rw-r--r--cui/source/tabpages/tplneend.cxx12
-rw-r--r--cui/source/tabpages/tpshadow.cxx19
-rw-r--r--cui/source/tabpages/transfrm.cxx3
-rw-r--r--cui/util/makefile.mk2
-rw-r--r--embedserv/source/embed/docholder.cxx7
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/ed_idataobj.cxx5
-rw-r--r--embedserv/source/embed/ed_iinplace.cxx3
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/ed_ioleobject.cxx2
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/ed_ipersiststr.cxx2
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/esdll.cxx4
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/guid.cxx3
-rw-r--r--embedserv/source/embed/iipaobj.cxx3
-rw-r--r--embedserv/source/embed/intercept.cxx3
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/register.cxx4
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/servprov.cxx3
-rw-r--r--[-rwxr-xr-x]embedserv/source/embed/stdafx.cpp2
-rw-r--r--embedserv/source/embed/syswinwrapper.cxx3
-rw-r--r--embedserv/source/embed/tracker.cxx3
-rw-r--r--embedserv/source/embed/xwin.cxx3
-rw-r--r--[-rwxr-xr-x]embedserv/source/inc/embeddoc.hxx2
-rw-r--r--[-rwxr-xr-x]embedserv/source/inc/servprov.hxx2
-rw-r--r--embedserv/source/inprocserv/advisesink.cxx2
-rw-r--r--embedserv/source/inprocserv/dllentry.cxx2
-rw-r--r--embedserv/source/inprocserv/inprocembobj.cxx2
-rw-r--r--extensions/inc/appsettings.hxx2
-rw-r--r--extensions/inc/pch/precompiled_extensions.cxx2
-rw-r--r--extensions/inc/pch/precompiled_extensions.hxx3
-rw-r--r--extensions/inc/propctrlr.hrc3
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/abpservices.cxx2
-rw-r--r--extensions/source/abpilot/abspage.cxx2
-rw-r--r--extensions/source/abpilot/abspage.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx9
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx6
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx11
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx2
-rw-r--r--extensions/source/abpilot/moduleabp.cxx2
-rw-r--r--extensions/source/abpilot/tableselectionpage.cxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx2
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx2
-rw-r--r--extensions/source/activex/main/SOActionsApproval.cpp2
-rw-r--r--extensions/source/activex/main/SOActiveX.cpp2
-rw-r--r--extensions/source/activex/main/SOComWindowPeer.cpp2
-rw-r--r--extensions/source/activex/main/SODispatchInterceptor.cpp2
-rw-r--r--extensions/source/activex/main/StdAfx2.cpp3
-rw-r--r--extensions/source/activex/main/so_activex.cpp2
-rw-r--r--extensions/source/bibliography/bibbeam.cxx5
-rw-r--r--extensions/source/bibliography/bibconfig.cxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx3
-rw-r--r--extensions/source/bibliography/bibload.cxx6
-rw-r--r--extensions/source/bibliography/bibmod.cxx3
-rw-r--r--extensions/source/bibliography/bibview.cxx5
-rw-r--r--extensions/source/bibliography/datman.cxx5
-rw-r--r--extensions/source/bibliography/formcontrolcontainer.cxx2
-rw-r--r--extensions/source/bibliography/framectr.cxx2
-rw-r--r--extensions/source/bibliography/general.cxx3
-rw-r--r--extensions/source/bibliography/general.hxx5
-rw-r--r--extensions/source/bibliography/loadlisteneradapter.cxx2
-rw-r--r--extensions/source/bibliography/toolbar.cxx7
-rw-r--r--extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml2
-rw-r--r--extensions/source/config/ldap/componentdef.cxx3
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx2
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.cxx4
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx6
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx2
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx4
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx2
-rw-r--r--extensions/source/dbpilots/dbptools.cxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx2
-rw-r--r--extensions/source/dbpilots/moduledbp.cxx2
-rw-r--r--extensions/source/dbpilots/optiongrouplayouter.cxx2
-rw-r--r--extensions/source/dbpilots/wizardservices.cxx4
-rw-r--r--extensions/source/inc/componentmodule.cxx4
-rw-r--r--extensions/source/logging/consolehandler.cxx3
-rw-r--r--extensions/source/logging/csvformatter.cxx11
-rw-r--r--extensions/source/logging/filehandler.cxx3
-rw-r--r--extensions/source/logging/log_module.cxx2
-rw-r--r--extensions/source/logging/log_services.cxx2
-rw-r--r--extensions/source/logging/logger.cxx2
-rw-r--r--extensions/source/logging/loggerconfig.cxx6
-rw-r--r--extensions/source/logging/loghandler.cxx4
-rw-r--r--extensions/source/logging/logrecord.cxx2
-rw-r--r--extensions/source/logging/plaintextformatter.cxx3
-rw-r--r--extensions/source/nsplugin/source/npshell.cxx7
-rw-r--r--extensions/source/nsplugin/source/nsp_windows.cxx3
-rw-r--r--extensions/source/nsplugin/source/so_closelistener.cxx2
-rw-r--r--extensions/source/nsplugin/source/so_env.cxx2
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx3
-rw-r--r--extensions/source/nsplugin/source/so_main.cxx3
-rw-r--r--extensions/source/ole/jscriptclasses.cxx3
-rw-r--r--extensions/source/ole/jscriptclasses.hxx1
-rw-r--r--extensions/source/ole/ole2uno.cxx3
-rw-r--r--extensions/source/ole/oledll.cxx2
-rw-r--r--[-rwxr-xr-x]extensions/source/ole/oleobjw.cxx197
-rw-r--r--extensions/source/ole/oleobjw.hxx15
-rw-r--r--extensions/source/ole/olethread.cxx8
-rw-r--r--extensions/source/ole/servprov.cxx3
-rw-r--r--extensions/source/ole/servprov.hxx2
-rw-r--r--extensions/source/ole/servreg.cxx3
-rw-r--r--extensions/source/ole/unoobjw.cxx5
-rw-r--r--extensions/source/ole/unotypewrapper.cxx2
-rw-r--r--extensions/source/ole/unotypewrapper.hxx1
-rw-r--r--extensions/source/ole/windata.cxx2
-rw-r--r--extensions/source/oooimprovecore/core.cxx3
-rw-r--r--extensions/source/oooimprovecore/oooimprovecore_module.cxx2
-rw-r--r--extensions/source/oooimprovecore/oooimprovecore_services.cxx3
-rw-r--r--extensions/source/oooimprovement/config.cxx3
-rw-r--r--extensions/source/oooimprovement/corecontroller.cxx3
-rw-r--r--extensions/source/oooimprovement/errormail.cxx3
-rw-r--r--extensions/source/oooimprovement/invite_job.cxx3
-rw-r--r--extensions/source/oooimprovement/logpacker.cxx3
-rw-r--r--extensions/source/oooimprovement/logstorage.cxx3
-rw-r--r--extensions/source/oooimprovement/myconfigurationhelper.cxx3
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx3
-rw-r--r--extensions/source/oooimprovement/oooimprovement_exports.cxx3
-rw-r--r--extensions/source/oooimprovement/soaprequest.cxx3
-rw-r--r--extensions/source/oooimprovement/soapsender.cxx3
-rw-r--r--extensions/source/plugin/aqua/macmgr.cxx2
-rw-r--r--extensions/source/plugin/aqua/sysplug.cxx2
-rw-r--r--extensions/source/plugin/base/context.cxx11
-rw-r--r--extensions/source/plugin/base/evtlstnr.cxx9
-rw-r--r--extensions/source/plugin/base/manager.cxx8
-rw-r--r--extensions/source/plugin/base/multiplx.cxx9
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx9
-rw-r--r--extensions/source/plugin/base/plcom.cxx8
-rw-r--r--extensions/source/plugin/base/plctrl.cxx2
-rw-r--r--extensions/source/plugin/base/plmodel.cxx3
-rw-r--r--extensions/source/plugin/base/service.cxx9
-rw-r--r--extensions/source/plugin/base/xplugin.cxx7
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx4
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx6
-rw-r--r--extensions/source/plugin/unx/makefile.mk2
-rw-r--r--extensions/source/plugin/unx/mediator.cxx3
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx9
-rw-r--r--extensions/source/plugin/unx/nppapi.cxx9
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx9
-rw-r--r--extensions/source/plugin/unx/plugcon.cxx10
-rw-r--r--extensions/source/plugin/unx/sysplug.cxx10
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx10
-rw-r--r--extensions/source/plugin/win/sysplug.cxx3
-rw-r--r--extensions/source/plugin/win/winmgr.cxx2
-rw-r--r--extensions/source/preload/modulepreload.cxx2
-rw-r--r--extensions/source/preload/oemwiz.cxx6
-rw-r--r--extensions/source/preload/oemwiz.hxx2
-rw-r--r--extensions/source/preload/preloadservices.cxx2
-rw-r--r--extensions/source/preload/services.cxx2
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.cxx3
-rw-r--r--extensions/source/propctrlr/browserline.cxx2
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx4
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx4
-rw-r--r--extensions/source/propctrlr/browserpage.cxx2
-rw-r--r--extensions/source/propctrlr/browserview.cxx2
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.cxx2
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.cxx3
-rw-r--r--extensions/source/propctrlr/cellbindinghelper.cxx3
-rw-r--r--extensions/source/propctrlr/commoncontrol.cxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx2
-rw-r--r--extensions/source/propctrlr/controlfontdialog.cxx4
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx15
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx3
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx6
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx40
-rw-r--r--extensions/source/propctrlr/formbrowsertools.cxx6
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx11
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx5
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx3
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx7
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx7
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx3
-rw-r--r--extensions/source/propctrlr/formres.src4
-rw-r--r--extensions/source/propctrlr/formresid.hrc1
-rw-r--r--extensions/source/propctrlr/formstrings.cxx2
-rw-r--r--extensions/source/propctrlr/formstrings.hxx1
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx7
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx4
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.cxx3
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx9
-rw-r--r--extensions/source/propctrlr/listselectiondlg.hxx2
-rw-r--r--extensions/source/propctrlr/modulepcr.cxx7
-rw-r--r--extensions/source/propctrlr/newdatatype.cxx8
-rw-r--r--extensions/source/propctrlr/newdatatype.hxx2
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx3
-rw-r--r--extensions/source/propctrlr/pcrcommon.cxx6
-rw-r--r--extensions/source/propctrlr/pcrcomponentcontext.cxx2
-rw-r--r--extensions/source/propctrlr/pcrservices.cxx4
-rw-r--r--extensions/source/propctrlr/pcrstrings.cxx2
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx13
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.cxx2
-rw-r--r--extensions/source/propctrlr/propertycontrolextender.cxx5
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.hxx2
-rw-r--r--extensions/source/propctrlr/propeventtranslation.cxx2
-rw-r--r--extensions/source/propctrlr/pushbuttonnavigation.cxx3
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx4
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.hxx4
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx6
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx6
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx8
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx2
-rw-r--r--extensions/source/propctrlr/taborder.cxx9
-rw-r--r--extensions/source/propctrlr/taborder.hxx8
-rw-r--r--extensions/source/propctrlr/unourl.cxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx2
-rw-r--r--extensions/source/propctrlr/xsddatatypes.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx5
-rw-r--r--extensions/source/resource/oooresourceloader.cxx3
-rw-r--r--extensions/source/resource/res_services.cxx3
-rw-r--r--extensions/source/resource/resource.cxx2
-rw-r--r--extensions/source/scanner/grid.cxx3
-rw-r--r--extensions/source/scanner/grid.hxx2
-rw-r--r--extensions/source/scanner/sane.cxx6
-rw-r--r--extensions/source/scanner/sanedlg.cxx10
-rw-r--r--extensions/source/scanner/sanedlg.hxx2
-rw-r--r--extensions/source/scanner/scanner.cxx6
-rw-r--r--extensions/source/scanner/scanner.hxx11
-rw-r--r--extensions/source/scanner/scanunx.cxx108
-rw-r--r--extensions/source/scanner/scanwin.cxx15
-rw-r--r--extensions/source/scanner/scnserv.cxx3
-rw-r--r--extensions/source/scanner/twain.cxx3
-rw-r--r--extensions/source/svg/svgaction.cxx3
-rw-r--r--extensions/source/svg/svgcom.hxx8
-rw-r--r--extensions/source/svg/svgprinter.cxx3
-rw-r--r--extensions/source/svg/svguno.cxx3
-rw-r--r--extensions/source/svg/svgwriter.cxx3
-rw-r--r--extensions/source/unoactivex/main/initwindowpeer.cxx2
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/download.cxx3
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/updatecheck.cxx5
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/updatecheckconfig.cxx4
-rw-r--r--extensions/source/update/check/updatecheckjob.cxx3
-rw-r--r--extensions/source/update/check/updatehdl.cxx3
-rw-r--r--extensions/source/update/check/updatehdl.hxx2
-rw-r--r--extensions/source/update/check/updateprotocol.cxx5
-rw-r--r--extensions/source/update/check/updateprotocoltest.cxx3
-rw-r--r--extensions/source/update/feed/test/updatefeedtest.cxx3
-rw-r--r--extensions/source/update/feed/updatefeed.cxx2
-rw-r--r--extensions/source/update/tools/ztool.cxx3
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx2
-rw-r--r--extensions/source/xmlextract/xmxcom.hxx2
-rw-r--r--extensions/source/xmlextract/xmxtrct.cxx3
-rw-r--r--extensions/source/xmlextract/xmxuno.cxx3
-rw-r--r--extensions/test/ole/AxTestComponents/AxTestComponents.cpp7
-rw-r--r--extensions/test/ole/AxTestComponents/Basic.cpp6
-rw-r--r--extensions/test/ole/AxTestComponents/Basic.h3
-rw-r--r--extensions/test/ole/AxTestComponents/Foo.cpp6
-rw-r--r--extensions/test/ole/AxTestComponents/Foo.h3
-rw-r--r--extensions/test/ole/AxTestComponents/StdAfx.cpp4
-rw-r--r--extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp2
-rw-r--r--extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp4
-rw-r--r--extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp3
-rw-r--r--extensions/test/ole/MfcControl/MfcControl.cpp3
-rw-r--r--extensions/test/ole/MfcControl/MfcControlCtl.cpp3
-rw-r--r--extensions/test/ole/MfcControl/MfcControlPpg.cpp3
-rw-r--r--extensions/test/ole/MfcControl/StdAfx.cpp3
-rw-r--r--extensions/test/ole/OleClient/axhost.cxx2
-rw-r--r--extensions/test/ole/OleClient/axhost.hxx1
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx3
-rw-r--r--extensions/test/ole/OleClient/funcs.cxx3
-rw-r--r--extensions/test/ole/OleConverterVar1/convTest.cxx2
-rw-r--r--extensions/test/ole/cpnt/cpnt.cxx4
-rw-r--r--extensions/test/ole/cppToUno/testcppuno.cxx3
-rw-r--r--extensions/test/ole/cpptest/cpptest.cxx3
-rw-r--r--extensions/test/ole/unloading/unloadTest.cxx3
-rw-r--r--extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp2
-rw-r--r--extensions/test/ole/unoTocomCalls/Test/Test.cpp3
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp2
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp2
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp2
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp2
-rw-r--r--extensions/test/sax/testsax.cxx4
-rw-r--r--extensions/test/sax/testwriter.cxx5
-rw-r--r--extensions/test/stm/datatest.cxx4
-rw-r--r--extensions/test/stm/marktest.cxx5
-rw-r--r--extensions/test/stm/pipetest.cxx9
-rw-r--r--extensions/test/stm/testfactreg.cxx2
-rw-r--r--extensions/util/hidother.src1
-rw-r--r--extensions/workben/pythonautotest.cxx4
-rw-r--r--extensions/workben/pythontest.cxx4
-rw-r--r--extensions/workben/testcomponent.cxx6
-rw-r--r--extensions/workben/testframecontrol.cxx4
-rw-r--r--extensions/workben/testpgp.cxx7
-rw-r--r--extensions/workben/testresource.cxx10
-rw-r--r--forms/inc/pch/precompiled_forms.cxx2
-rw-r--r--forms/inc/pch/precompiled_forms.hxx2
-rw-r--r--forms/source/component/Button.cxx4
-rw-r--r--forms/source/component/Button.hxx2
-rw-r--r--forms/source/component/CheckBox.cxx4
-rw-r--r--forms/source/component/Columns.cxx6
-rw-r--r--forms/source/component/ComboBox.cxx2
-rw-r--r--forms/source/component/Currency.cxx5
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/DatabaseForm.hxx2
-rw-r--r--forms/source/component/Date.cxx2
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/component/EditBase.cxx6
-rw-r--r--forms/source/component/EventThread.cxx5
-rw-r--r--forms/source/component/EventThread.hxx8
-rw-r--r--forms/source/component/File.cxx4
-rw-r--r--forms/source/component/Filter.cxx3
-rw-r--r--forms/source/component/FixedText.cxx4
-rw-r--r--forms/source/component/FormComponent.cxx6
-rw-r--r--forms/source/component/FormattedField.cxx3
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx2
-rw-r--r--forms/source/component/FormsCollection.cxx2
-rw-r--r--forms/source/component/Grid.cxx2
-rw-r--r--forms/source/component/GroupBox.cxx4
-rw-r--r--forms/source/component/GroupManager.cxx52
-rw-r--r--forms/source/component/GroupManager.hxx2
-rw-r--r--forms/source/component/Hidden.cxx4
-rw-r--r--forms/source/component/ImageButton.cxx2
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/component/ListBox.cxx6
-rw-r--r--forms/source/component/Numeric.cxx2
-rw-r--r--forms/source/component/Pattern.cxx2
-rw-r--r--forms/source/component/RadioButton.cxx111
-rw-r--r--forms/source/component/RadioButton.hxx2
-rw-r--r--forms/source/component/Time.cxx2
-rw-r--r--forms/source/component/cachedrowset.cxx3
-rw-r--r--forms/source/component/clickableimage.cxx2
-rw-r--r--forms/source/component/cloneable.cxx2
-rw-r--r--forms/source/component/entrylisthelper.cxx3
-rw-r--r--forms/source/component/errorbroadcaster.cxx2
-rw-r--r--forms/source/component/findpos.cxx3
-rw-r--r--forms/source/component/formcontrolfont.cxx5
-rw-r--r--forms/source/component/imgprod.cxx5
-rw-r--r--forms/source/component/navigationbar.cxx3
-rw-r--r--forms/source/component/propertybaghelper.cxx2
-rw-r--r--forms/source/component/refvaluecomponent.cxx2
-rw-r--r--forms/source/component/scrollbar.cxx3
-rw-r--r--forms/source/component/spinbutton.cxx3
-rw-r--r--forms/source/helper/commanddescriptionprovider.cxx3
-rw-r--r--forms/source/helper/commandimageprovider.cxx3
-rw-r--r--forms/source/helper/controlfeatureinterception.cxx2
-rw-r--r--forms/source/helper/formnavigation.cxx3
-rw-r--r--forms/source/helper/resettable.cxx3
-rw-r--r--forms/source/helper/urltransformer.cxx3
-rw-r--r--forms/source/helper/windowstateguard.cxx2
-rw-r--r--forms/source/inc/frm_strings.hxx1
-rw-r--r--forms/source/inc/property.hrc2
-rw-r--r--forms/source/misc/InterfaceContainer.cxx11
-rw-r--r--forms/source/misc/componenttools.cxx2
-rw-r--r--forms/source/misc/frm_module.cxx2
-rw-r--r--forms/source/misc/frm_strings.cxx2
-rw-r--r--forms/source/misc/ids.cxx2
-rw-r--r--forms/source/misc/limitedformats.cxx2
-rw-r--r--forms/source/misc/listenercontainers.cxx4
-rw-r--r--forms/source/misc/property.cxx4
-rw-r--r--forms/source/misc/services.cxx3
-rw-r--r--forms/source/resource/frm_resource.cxx4
-rw-r--r--forms/source/richtext/attributedispatcher.cxx3
-rw-r--r--forms/source/richtext/clipboarddispatcher.cxx2
-rw-r--r--forms/source/richtext/featuredispatcher.cxx3
-rw-r--r--forms/source/richtext/parametrizedattributedispatcher.cxx5
-rw-r--r--forms/source/richtext/richtextcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextengine.cxx3
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextmodel.cxx3
-rw-r--r--forms/source/richtext/richtextunowrapper.cxx2
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx6
-rw-r--r--forms/source/richtext/richtextvclcontrol.hxx2
-rw-r--r--forms/source/richtext/richtextviewport.cxx3
-rw-r--r--forms/source/richtext/rtattributehandler.cxx5
-rw-r--r--forms/source/richtext/specialdispatchers.cxx4
-rw-r--r--forms/source/runtime/formoperations.cxx6
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx3
-rw-r--r--forms/source/solar/control/navtoolbar.cxx6
-rw-r--r--forms/source/xforms/binding.cxx3
-rw-r--r--forms/source/xforms/boolexpression.cxx2
-rw-r--r--forms/source/xforms/computedexpression.cxx3
-rw-r--r--forms/source/xforms/convert.cxx3
-rw-r--r--forms/source/xforms/datatyperepository.cxx8
-rw-r--r--forms/source/xforms/datatypes.cxx4
-rw-r--r--forms/source/xforms/enumeration.cxx3
-rw-r--r--forms/source/xforms/mip.cxx3
-rw-r--r--forms/source/xforms/model.cxx3
-rw-r--r--forms/source/xforms/model_ui.cxx3
-rw-r--r--forms/source/xforms/pathexpression.cxx3
-rw-r--r--forms/source/xforms/propertysetbase.cxx3
-rw-r--r--forms/source/xforms/resourcehelper.cxx3
-rw-r--r--forms/source/xforms/submission.cxx2
-rw-r--r--forms/source/xforms/submission/replace.cxx2
-rw-r--r--forms/source/xforms/submission/serialization_app_xml.cxx3
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.cxx2
-rw-r--r--forms/source/xforms/submission/submission_get.cxx2
-rw-r--r--forms/source/xforms/submission/submission_post.cxx2
-rw-r--r--forms/source/xforms/submission/submission_put.cxx2
-rw-r--r--forms/source/xforms/unohelper.cxx3
-rw-r--r--forms/source/xforms/xforms_services.cxx3
-rw-r--r--forms/source/xforms/xformsevent.cxx3
-rw-r--r--forms/source/xforms/xmlhelper.cxx2
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx3
-rw-r--r--forms/source/xforms/xpathlib/xpathlib.cxx3
-rw-r--r--lingucomponent/inc/pch/precompiled_lingucomponent.cxx2
-rw-r--r--lingucomponent/prj/build.lst2
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx2
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx6
-rw-r--r--lingucomponent/source/languageguessing/altstrfunc.cxx2
-rw-r--r--lingucomponent/source/languageguessing/guess.cxx3
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx9
-rw-r--r--lingucomponent/source/languageguessing/simpleguesser.cxx3
-rw-r--r--lingucomponent/source/lingutil/lingutil.cxx6
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macreg.cxx2
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx5
-rw-r--r--lingucomponent/source/spellcheck/spell/sreg.cxx2
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx5
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.cxx5
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx3
-rw-r--r--lingucomponent/source/thesaurus/libnth/ntreg.cxx2
-rw-r--r--package/inc/ZipFile.hxx2
-rw-r--r--package/inc/ZipOutputStream.hxx4
-rw-r--r--package/inc/ZipPackage.hxx2
-rw-r--r--package/inc/ZipPackageBuffer.hxx2
-rw-r--r--package/inc/ZipPackageFolder.hxx7
-rw-r--r--package/inc/pch/precompiled_package.cxx2
-rw-r--r--package/source/manifest/Base64Codec.cxx3
-rw-r--r--package/source/manifest/ManifestExport.cxx11
-rw-r--r--package/source/manifest/ManifestImport.cxx4
-rw-r--r--package/source/manifest/ManifestImport.hxx2
-rw-r--r--package/source/manifest/ManifestReader.cxx13
-rw-r--r--package/source/manifest/ManifestReader.hxx4
-rw-r--r--package/source/manifest/ManifestWriter.cxx13
-rw-r--r--package/source/manifest/ManifestWriter.hxx4
-rw-r--r--package/source/manifest/UnoRegister.cxx6
-rw-r--r--package/source/xstor/disposelistener.cxx2
-rw-r--r--package/source/xstor/ocompinstream.cxx2
-rw-r--r--package/source/xstor/ohierarchyholder.cxx2
-rw-r--r--package/source/xstor/oseekinstream.cxx2
-rw-r--r--package/source/xstor/owriteablestream.cxx22
-rw-r--r--package/source/xstor/register.cxx2
-rw-r--r--package/source/xstor/selfterminatefilestream.cxx2
-rw-r--r--package/source/xstor/switchpersistencestream.cxx2
-rw-r--r--package/source/xstor/xfactory.cxx2
-rw-r--r--package/source/xstor/xstorage.cxx22
-rw-r--r--package/source/zipapi/ByteChucker.cxx3
-rw-r--r--package/source/zipapi/ByteGrabber.cxx3
-rw-r--r--package/source/zipapi/CRC32.cxx3
-rw-r--r--package/source/zipapi/Deflater.cxx3
-rw-r--r--package/source/zipapi/EntryInputStream.cxx3
-rw-r--r--package/source/zipapi/EntryInputStream.hxx4
-rw-r--r--package/source/zipapi/Inflater.cxx2
-rw-r--r--package/source/zipapi/XFileStream.cxx3
-rw-r--r--package/source/zipapi/XFileStream.hxx4
-rw-r--r--package/source/zipapi/XMemoryStream.cxx3
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx3
-rw-r--r--package/source/zipapi/ZipEnumeration.cxx3
-rw-r--r--package/source/zipapi/ZipFile.cxx4
-rw-r--r--package/source/zipapi/ZipOutputStream.cxx3
-rw-r--r--package/source/zippackage/ContentInfo.hxx2
-rw-r--r--package/source/zippackage/ZipPackage.cxx23
-rw-r--r--package/source/zippackage/ZipPackageBuffer.cxx3
-rw-r--r--package/source/zippackage/ZipPackageEntry.cxx3
-rw-r--r--package/source/zippackage/ZipPackageEntry.hxx2
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx44
-rw-r--r--package/source/zippackage/ZipPackageFolderEnumeration.cxx3
-rw-r--r--package/source/zippackage/ZipPackageFolderEnumeration.hxx4
-rw-r--r--package/source/zippackage/ZipPackageSink.cxx3
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx27
-rw-r--r--package/source/zippackage/ZipPackageStream.hxx10
-rw-r--r--package/source/zippackage/wrapstreamforshare.cxx2
-rw-r--r--package/source/zippackage/zipfileaccess.cxx4
-rw-r--r--setup_native/prj/build.lst1
-rw-r--r--setup_native/scripts/linuxpatchscript.sh4
-rw-r--r--setup_native/scripts/update.sh2
-rw-r--r--setup_native/scripts/userland.txt2
-rw-r--r--setup_native/source/mac/ooo/DS_Storebin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo/osxdndinstall.pngbin14278 -> 20535 bytes
-rw-r--r--setup_native/source/mac/ooo/osxdndinstall_nologo.pngbin12672 -> 20535 bytes
-rw-r--r--setup_native/source/packinfo/package_names.txt83
-rw-r--r--setup_native/source/packinfo/package_names_ext.txt2
-rw-r--r--setup_native/source/packinfo/packinfo_brand.txt4
-rw-r--r--setup_native/source/packinfo/packinfo_extensions.txt258
-rwxr-xr-xsetup_native/source/packinfo/packinfo_office.txt180
-rwxr-xr-xsetup_native/source/packinfo/packinfo_office_lang.txt152
-rwxr-xr-xsetup_native/source/packinfo/packinfo_sdkoo.txt6
-rwxr-xr-xsetup_native/source/packinfo/packinfo_ure.txt16
-rw-r--r--setup_native/source/packinfo/shellscripts_brand.txt8
-rw-r--r--setup_native/source/packinfo/shellscripts_core01.txt17
-rw-r--r--setup_native/source/packinfo/spellchecker_selection.txt1
-rw-r--r--setup_native/source/ulfconv/ulfconv.cxx3
-rw-r--r--setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx2
-rw-r--r--setup_native/source/win32/customactions/javafilter/jfregca.cxx4
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx9
-rw-r--r--setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx2
-rw-r--r--setup_native/source/win32/customactions/languagepacks/respintest.cxx14
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/patch/swappatchfiles.cxx12
-rw-r--r--setup_native/source/win32/customactions/quickstarter/quickstarter.cxx2
-rw-r--r--setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx3
-rw-r--r--setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx2
-rw-r--r--setup_native/source/win32/customactions/rebase/rebase.cxx7
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx5
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/register.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/register.hxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrar.cxx5
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrar.hxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registry.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx3
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/reg64/reg64.cxx12
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx3
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx2
-rw-r--r--setup_native/source/win32/customactions/relnotes/relnotes.cxx4
-rw-r--r--setup_native/source/win32/customactions/sellang/exports.dxp1
-rw-r--r--setup_native/source/win32/customactions/sellang/makefile.mk79
-rw-r--r--setup_native/source/win32/customactions/sellang/sellang.cxx351
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkpatches.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx9
-rw-r--r--setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/iconcache.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/layerlinks.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/postuninstall.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx3
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/shellextensions.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/upgrade.cxx3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx3
-rw-r--r--setup_native/source/win32/customactions/tools/checkversion.cxx2
-rw-r--r--setup_native/source/win32/customactions/tools/seterror.cxx2
-rw-r--r--setup_native/source/win32/nsis/downloadtemplate.nsi4
-rw-r--r--setup_native/source/win32/nsis/ooobanner.bmpbin9044 -> 6274 bytes
-rw-r--r--setup_native/source/win32/nsis/ooobitmap.bmpbin52576 -> 52242 bytes
-rw-r--r--setup_native/source/win32/nsis/ooosdkbanner.bmpbin9044 -> 7106 bytes
-rw-r--r--setup_native/source/win32/nsis/ooosdkbitmap.bmpbin154544 -> 52242 bytes
-rw-r--r--[-rwxr-xr-x]setup_native/source/win32/nsis/ooosetup.icobin295606 -> 4286 bytes
-rw-r--r--setup_native/source/win32/nsis/urebanner.bmpbin25818 -> 7106 bytes
-rwxr-xr-xsetup_native/source/win32/nsis/urebitmap.bmpbin154544 -> 52242 bytes
-rw-r--r--setup_native/source/win32/stwrapper/resource.rc33
-rw-r--r--setup_native/source/win32/stwrapper/stwrapper.cxx20
-rw-r--r--wizards/source/euro/AutoPilotRun.xba31
-rw-r--r--xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/biginteger.hxx2
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx2
-rw-r--r--xmlsecurity/source/component/certificatecontainer.hxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx2
-rw-r--r--xmlsecurity/source/component/registerservices.cxx2
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx2
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx2
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx2
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx26
-rw-r--r--xmlsecurity/source/dialogs/warnings.cxx2
-rw-r--r--xmlsecurity/source/framework/buffernode.cxx3
-rw-r--r--xmlsecurity/source/framework/decryptorimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/elementcollector.cxx2
-rw-r--r--xmlsecurity/source/framework/elementmark.cxx2
-rw-r--r--xmlsecurity/source/framework/encryptionengine.cxx2
-rw-r--r--xmlsecurity/source/framework/encryptorimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/encryptorimpl.hxx2
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/securityengine.cxx2
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/signatureengine.cxx3
-rw-r--r--xmlsecurity/source/framework/signatureengine.hxx2
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx4
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx4
-rw-r--r--xmlsecurity/source/framework/xsec_framework.cxx2
-rw-r--r--xmlsecurity/source/helper/documentsignaturehelper.cxx3
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx7
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx2
-rw-r--r--xmlsecurity/source/helper/xsecctl.cxx3
-rw-r--r--xmlsecurity/source/helper/xsecparser.cxx3
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx2
-rw-r--r--xmlsecurity/source/helper/xsecverify.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/biginteger.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/certvalidity.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/diagnose.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/errorcallback.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/errorcallback.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx5
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx8
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx5
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx8
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/nss/certerrors.h12
-rw-r--r--xmlsecurity/source/xmlsec/nss/secerror.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx24
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx8
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx5
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xsec_nss.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/saxhelper.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx8
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.cxx2
-rw-r--r--xmlsecurity/tools/demo/mozprofile.cxx2
-rw-r--r--xmlsecurity/tools/demo/multisigdemo.cxx3
-rw-r--r--xmlsecurity/tools/demo/performance.cxx11
-rw-r--r--xmlsecurity/tools/demo/signdemo.cxx2
-rw-r--r--xmlsecurity/tools/demo/util.cxx3
-rw-r--r--xmlsecurity/tools/demo/util2.cxx9
-rw-r--r--xmlsecurity/tools/demo/verifydemo.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/certmngr.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/decrypter.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/encrypter.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/helper.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/signer.cxx2
-rw-r--r--xmlsecurity/tools/standalone/csfit/verifier.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/certmngr.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/decrypter.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/encrypter.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/helper.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/signer.cxx2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/verifier.cxx2
-rw-r--r--xmlsecurity/workben/signaturetest.cxx3
1042 files changed, 4684 insertions, 3172 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..50784a43df04
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsci??
+/*/wntmsci??.pro
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 68ed6287c2b4..8709f3c3f331 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -640,3 +641,5 @@ void BaseContainerControl::impl_cleanMemory ()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 030f19d6d452..bea92783dcde 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1017,3 +1018,5 @@ OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 0c1ded49694e..3fe037c4d6d0 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,24 +25,10 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-//____________________________________________________________________________________________________________
-// my own include
-//____________________________________________________________________________________________________________
#include "multiplexer.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-#include <vos/diagnose.hxx>
-
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
-// namespaces
-//____________________________________________________________________________________________________________
+#include <osl/diagnose.h>
using namespace ::cppu ;
using namespace ::osl ;
@@ -538,7 +525,7 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWind
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
@@ -570,8 +557,10 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer( const Reference< X
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 686c7578b88d..ffe3a6eac1d6 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -320,3 +321,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementat
// Return with result of this operation.
return pReturn ;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index 56f336124a7d..c5bd8cfce1e9 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,3 +186,5 @@ OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMul
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index 24b08f6a4937..71ff451b28b6 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -269,3 +270,5 @@ void OConnectionPointHelper::impl_UnlockContainer()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 2ae0e27dc56c..9987478b7b56 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
//______________________________________________________________________________________________________________
// include of my own project
@@ -376,7 +377,7 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan
case PROPERTYHANDLE_LOADERARGUMENTS : rValue >>= m_seqLoaderArguments ;
break ;
- default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+ default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
}
}
@@ -400,7 +401,7 @@ void FrameControl::getFastPropertyValue( Any& rRet ,
case PROPERTYHANDLE_FRAME : rRet <<= m_xFrame ;
break ;
- default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+ default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
}
}
@@ -602,3 +603,5 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 842affed16da..4c33127925b0 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -556,3 +557,5 @@ void ProgressBar::impl_recalcRange ()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 39bf4d84f8b9..6cc8acdde3f0 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1064,3 +1065,5 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sa
#endif // #ifdef DBG_UTIL
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 5dd5bd647017..8dbd6f2d03f7 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -556,3 +557,5 @@ void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
#endif // #if OSL_DEBUG_LEVEL > 1
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index a281b3aa51a1..581e5dc71790 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
#include <rtl/process.h>
#include <tools/link.hxx>
-#ifndef _SVAPP_HXX
#include <vcl/svapp.hxx>
-#endif
#include <vcl/window.hxx>
#include <vcl/sysdata.hxx>
#include <uno/current_context.hxx>
@@ -51,13 +50,9 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-#ifndef _JVMACCESS_UNOVIRTUALMACHINE_HXX_
#include "jvmaccess/unovirtualmachine.hxx"
-#endif
-#ifndef _JVMACCESS_VIRTUALMACHINE_HXX_
#include "jvmaccess/virtualmachine.hxx"
-#endif
#include <osl/diagnose.h>
@@ -315,3 +310,5 @@ long VCLEventListenerLinkFunc(void *, void * pData)
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 5ab160535aa0..bbf796198270 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
#include "accessibility/extended/accessiblebrowseboxcell.hxx"
-#endif
#include <cppuhelper/implbase2.hxx>
#include <vcl/wintypes.hxx>
// ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index cb2c4f6628c8..cb2c4f6628c8 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index c6a26d8c4548..c6a26d8c4548 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index 90306435bd4b..90306435bd4b 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
index 0672ca28a151..0672ca28a151 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index bee42d85e2a2..bee42d85e2a2 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
index dd44927d7fc1..dd44927d7fc1 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index 10c6520b6a3d..10c6520b6a3d 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
index a38877d5aeae..5be82c0009e1 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -27,9 +27,7 @@
#ifndef ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
#define ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
-#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
#include "accessiblebrowseboxcell.hxx"
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
index add0aaced7e3..934f6d2a72de 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_HELPER_TKARESMGR_HXX
#define ACCESSIBILITY_HELPER_TKARESMGR_HXX
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
class SimpleResMgr;
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
index 25fb3ac121b3..880b328a402e 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
#define ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX
#include <com/sun/star/uno/Sequence.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/font.hxx>
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
index 4555c91ebf75..cd098584ab54 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
#include <tools/link.hxx>
#include <vector>
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
index 8450be8f3a49..7a69b68ca3af 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
@@ -30,9 +30,7 @@
#include <accessibility/standard/accessiblemenubasecomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index 123016f070bd..29e0a130db8d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -30,13 +30,9 @@
#include <map>
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
index 76e8b3da9343..e4e4468ff6c7 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
index a876a236455c..f1ec85215fcc 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
index ce62ea845b5c..773f78278376 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
@@ -30,12 +30,8 @@
#include <map>
#include <accessibility/standard/vclxaccessiblebox.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
/** The accessible combobox has two children. The first is the text field
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
index 6f54ede32d21..aad46a93fe5d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
@@ -29,17 +29,11 @@
#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
#include <accessibility/standard/vclxaccessiblebox.hxx>
-#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTEDIT_HXX
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAKREF_HXX
#include <cppuhelper/weakref.hxx>
-#endif
/** The accessible drop down combobox has two children. The first is the
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
index 72289f210aa2..bed9ddfa7351 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
@@ -31,12 +31,8 @@
#include <accessibility/standard/vclxaccessiblebox.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAKREF_HXX
#include <cppuhelper/weakref.hxx>
-#endif
/** The accessible drop down combobox has two children. The first is the
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
index 1e5bb36ec03d..f3eecfe51d8c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
@@ -30,13 +30,9 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index dfebec17b4e9..ec7677457e15 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -32,15 +32,11 @@
#include <functional>
#include "accessibility/standard/vclxaccessiblelistitem.hxx"
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
typedef ::cppu::ImplHelper2<
::com::sun::star::accessibility::XAccessible,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
index 9a266d78bb05..543b48b39d6d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
@@ -31,15 +31,9 @@
#include <accessibility/standard/vclxaccessiblelist.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX
#include <comphelper/broadcasthelper.hxx>
-#endif
-#ifndef _COMPHELPER_UNO3_HXX
#include <comphelper/uno3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleSelection
> VCLXAccessibleListBoxList_BASE;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
index ec07745bb0d4..b0cb55bf4efb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -35,12 +35,8 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_COMPBASE6_HXX
#include <cppuhelper/compbase6.hxx>
-#endif
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX
#include <comphelper/broadcasthelper.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
// forward ---------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
index 35851788853b..19f186708f26 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
@@ -31,9 +31,7 @@
#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
index e2e430d9300b..b579f8a4879d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
#include <cppuhelper/implbase3.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
index 615ed08ca2da..24123a2ec71b 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
index 063204214a19..de5fe8754d08 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
@@ -30,14 +30,10 @@
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
index 442645c6d88f..f9fdecdc3406 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessibletexthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
class StatusBar;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
index ed47ce9f0e94..8b61adcc0c55 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessibletexthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
class TabControl;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
index 70d35acb305a..ee88528545ef 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
@@ -30,9 +30,7 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
typedef ::cppu::ImplHelper1<
::com::sun::star::accessibility::XAccessible
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 4e2073a47a89..5c4dd8939465 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -28,9 +28,7 @@
#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
@@ -38,9 +36,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_IMPLBASE4_HXX
#include <cppuhelper/implbase4.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
#include <tools/solar.h>
diff --git a/accessibility/inc/pch/precompiled_accessibility.cxx b/accessibility/inc/pch/precompiled_accessibility.cxx
index de6282ce69cb..291aae11e94a 100644
--- a/accessibility/inc/pch/precompiled_accessibility.cxx
+++ b/accessibility/inc/pch/precompiled_accessibility.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_accessibility.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 677c15513d7a..7413395ef0e4 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -167,15 +168,6 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
throw lang::IndexOutOfBoundsException();
return xRet;
}
-// -----------------------------------------------------------------------------
-
-//sal_Int16 SAL_CALL AccessibleBrowseBox::getAccessibleRole()
-// throw ( uno::RuntimeException )
-//{
-// ensureIsAlive();
-// return AccessibleRole::PANEL;
-//}
-// -----------------------------------------------------------------------------
// XAccessibleComponent -------------------------------------------------------
@@ -379,8 +371,8 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl
DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ),
"accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" );
- // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens),
- // then reset an re-create.
+ // if the context died meanwhile (there is no listener, so it won't tell us explicitily when this happens),
+ // then reset and re-create.
if ( m_pContext && !m_pContext->isAlive() )
m_xContext = m_pContext = NULL;
@@ -399,3 +391,5 @@ bool AccessibleBrowseBoxAccess::isContextAlive() const
// ============================================================================
} // namespace accessibility
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index f8b43ecdced2..ba44b3c19164 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -656,3 +657,4 @@ BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( )
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 560878b544f3..2353a25007aa 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,3 +171,4 @@ namespace accessibility
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index e801a6cf2c20..2d3eec46e190 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -417,3 +418,4 @@ void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex )
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 9e9f63ec72c8..d05c18f5025f 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,3 +172,4 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 00a095a104d7..7173837b7a1e 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -276,3 +277,4 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 7a7aed644f5c..f3b28f92176b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -353,3 +354,4 @@ void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index fe79593e5613..4994722cd4e3 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -352,3 +353,5 @@ namespace accessibility
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index f0aa406b62bf..2547742e22db 100755..100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -370,3 +371,5 @@ bool AccessibleGridControlAccess::isContextAlive() const
// ============================================================================
} // namespace accessibility
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index ea81bd350426..6a5107abad7b 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -533,3 +534,4 @@ GridControlAccessibleElement::~GridControlAccessibleElement( )
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 1870eebc8e3e..c9db53a0fe67 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -282,3 +283,4 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 485c57c40ae1..07942f2e137e 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,4 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 461e776f1392..f974c32498e2 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -376,3 +377,4 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index f6d1147ad309..b3fce3b37ac5 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -286,3 +287,4 @@ void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
// ============================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 43b9400e9050..f9be586f72af 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -368,3 +369,5 @@ namespace accessibility
return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 6976b221a8b5..d3d12c40209e 100755..100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -410,3 +411,5 @@ namespace accessibility
//......................................................................................................................
} // namespace accessibility
//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 7e97e3714172..8a633101efd0 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -457,3 +458,5 @@ namespace accessibility
//......................................................................................................................
} // namespace accessibility
//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 0cdfd8480457..de459ae8cdb9 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -453,3 +454,5 @@ namespace accessibility
//......................................................................................................................
} // namespace accessibility
//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 1c7aca77e603..addbcaaa7cf8 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,4 @@ namespace accessibility
// .................................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 5f5472d04050..5312717034ee 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -271,3 +272,5 @@ namespace accessibility
// .................................................................................
} // namespace accessibility
// .................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 397161fd6ac0..dddb38fcbea1 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -370,3 +371,4 @@ namespace accessibility
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 19e809bcc6ea..1b8b8ca2527d 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -754,3 +755,4 @@ throw(RuntimeException)
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 0468cce97d94..95e52056e1da 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,7 +131,7 @@ namespace accessibility
}
break;
- // --> OD 2009-04-01 #i92103#
+ // #i92103#
case VCLEVENT_ITEM_EXPANDED :
case VCLEVENT_ITEM_COLLAPSED :
{
@@ -430,3 +431,4 @@ namespace accessibility
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 5ce10cbc81b3..66c3d76bfc51 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -968,3 +969,4 @@ namespace accessibility
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index fc1fb578bd21..88a04c5584bc 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -552,3 +553,5 @@ namespace accessibility
//.........................................................................
} // namespace accessibility
//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index 5c26185f6b03..4fa22f9bc602 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,4 @@ void AccessibleTabBarBase::ClearTabBarPointer()
} // namespace accessibility
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 32dfb591a3ad..898d2435b10a 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -509,3 +510,5 @@ namespace accessibility
//.........................................................................
} // namespace accessibility
//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 51c86003b0c2..60589218ae47 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -803,3 +804,5 @@ namespace accessibility
//.........................................................................
} // namespace accessibility
//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index aed68e55e482..8d873544f7e1 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX_
#include "accessibility/extended/accessibletablistbox.hxx"
-#endif
#include "accessibility/extended/accessibletablistboxtable.hxx"
#include <svtools/svtabbx.hxx>
#include <comphelper/sequence.hxx>
@@ -144,3 +143,4 @@ namespace accessibility
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 59408a31fe84..f93d20edd2bc 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX_
#include "accessibility/extended/accessibletablistboxtable.hxx"
-#endif
#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
#include "accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx"
#include <svtools/svtabbx.hxx>
@@ -381,3 +380,4 @@ namespace accessibility
}// namespace accessibility
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index 8600003c2bff..ff7fc77d4069 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,5 @@ namespace accessibility
//........................................................................
} // namespace accessibility
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 8af1b240343e..f8462e144633 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
#include <accessibility/extended/textwindowaccessibility.hxx>
-#endif
#include "comphelper/accessibleeventnotifier.hxx"
#include "unotools/accessiblerelationsethelper.hxx"
#include <unotools/accessiblestatesethelper.hxx>
@@ -2101,7 +2100,7 @@ void Document::handleSelectionChangeNotification()
}
else if ( aOldTextStart == aOldTextEnd && aNewTextStart == aNewTextEnd )
{
- // old an new selection empty => no events
+ // old and new selection empty => no events
nFirst1 = 0;
nLast1 = 0;
nFirst2 = 0;
@@ -2252,3 +2251,4 @@ void Document::disposeParagraphs()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 7279b5e2ff60..3707209228ed 100755..100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -550,3 +551,5 @@ extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory()
pFactory->acquire();
return pFactory;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index 41647837df4e..c2e5516d6a88 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "precompiled_accessibility.hxx"
#include <accessibility/helper/accresmgr.hxx>
-#ifndef _TOOLS_SIMPLERESMGR_HXX
#include <tools/simplerm.hxx>
-#endif
#include <vcl/svapp.hxx>
@@ -82,3 +81,5 @@ void TkResMgr::ensureImplExists()
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index 6444925dfbac..fe06e78dc7a3 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes( con
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx
index 2d5e0e603f5a..750c104083c8 100644
--- a/accessibility/source/inc/floatingwindowaccessible.hxx
+++ b/accessibility/source/inc/floatingwindowaccessible.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
#define ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#endif
class FloatingWindowAccessible : public VCLXAccessibleComponent
{
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index cb1f425b08cf..ab02caaa322c 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -781,3 +782,5 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 05ba722a9453..973fae780d3f 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -469,3 +470,5 @@ void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex )
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 6bc7f59b75d9..0b34e2efa800 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -501,3 +502,5 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
index 5286bfd387ba..af8a89122e32 100644
--- a/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelation
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 784588938bb8..176ae364bbe1 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,7 +150,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
{
// Selection is handled by VCLXAccessibleList which operates on
// the same VCL object as this box does. In case of the
- // combobox, however, we have to help the list with providing
+ // combobox, however, we have to help by providing the list with
// the text of the currently selected item.
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
if (pList != NULL && m_xText.is())
@@ -372,3 +373,4 @@ void SAL_CALL VCLXAccessibleBox::disposing (void)
VCLXAccessibleComponent::disposing();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 690babdf5c41..de220dea6f08 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -324,3 +325,5 @@ Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 18a7be8bf810..98698adb7285 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -359,3 +360,5 @@ Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index 9ac9a13591e1..3da67a703e22 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (vo
"com.sun.star.accessibility.AccessibleComboBox" );
return aNames;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index f396ff422947..370bf2fe70ea 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceN
"com.sun.star.accessibility.AccessibleDropDownComboBox" );
return aNames;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 4d08d40245fb..340567eb967a 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNa
"com.sun.star.accessibility.AccessibleDropDownListBox" );
return aNames;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 07378c0ea42f..e522ce081435 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -624,3 +625,5 @@ sal_Bool VCLXAccessibleEdit::setText( const ::rtl::OUString& sText ) throw (Runt
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index 90218e629669..d23d92065807 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,4 @@ uno::Sequence< ::rtl::OUString > VCLXAccessibleFixedHyperlink::getSupportedServi
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index ca89fa0417ab..6077efa65e87 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleFixedText::getSupportedServiceNames()
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 6d287a02f0e9..bb1b9a9fcbec 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,7 +72,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
m_bVisible ( true ),
m_xParent ( _xParent )
{
- // Because combo boxes and list boxes have the no common interface for
+ // Because combo boxes and list boxes don't have a common interface for
// methods with identical signature we have to write down twice the
// same code.
switch (m_aBoxType)
@@ -125,10 +126,6 @@ void SAL_CALL VCLXAccessibleList::disposing (void)
void VCLXAccessibleList::clearItems()
{
-// ListItems::iterator aEnd = m_aAccessibleChildren.end();
-// for (ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != aEnd; ++aIter)
-// ::comphelper::disposeComponent(*aIter);
-
// Clear the list itself and delete all the rest.
ListItems().swap(m_aAccessibleChildren); // clear and minimize
}
@@ -790,7 +787,6 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
UpdateSelection_Impl();
}
// -----------------------------------------------------------------------------
-// accessibility::XAccessibleComponent
awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
{
awt::Rectangle aBounds ( 0, 0, 0, 0 );
@@ -852,3 +848,4 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept
}
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 7645d2067c1a..07aa685aac27 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (voi
"com.sun.star.accessibility.AccessibleListBox" );
return aNames;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 56bcf14f1980..5c2635b6053b 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -672,3 +673,5 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void)
return COL_WHITE;
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index f7e77f3fb8e2..2d66d98c9563 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,3 +254,5 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 825e5990e783..64eee8741f09 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -209,3 +210,5 @@ sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 7332386e4303..a8b48a8baedc 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -605,3 +606,5 @@ Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 07c8c0f2a3d4..70130243e54e 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeExcep
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 328e015c60e5..073ebd80f844 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 76940967fcce..5ad9053e9ea5 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,3 +313,5 @@ Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 9bd9cf45f94b..2d9a6dd6bebc 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -278,3 +279,5 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException)
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 5dd35a699b27..9a3fb29b7b31 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -364,3 +365,5 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index c3badc50bdbf..5f6cca43ca9a 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -627,3 +628,5 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index ac6aca77dda0..417fcf03daf8 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -513,3 +514,5 @@ void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex )
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 6b871fced829..5bb372884591 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -700,3 +701,5 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 93fc1b3da2ff..9353c9801991 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,3 +140,5 @@ sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (Run
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index c6bbaddf6426..9613234eb732 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -360,3 +361,5 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index e77d203d443a..afc28d3e9e43 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,3 +153,5 @@ Sequence< ::rtl::OUString > VCLXAccessibleTextField::getSupportedServiceNames (v
"com.sun.star.accessibility.AccessibleTextField");
return aNames;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index ce796af77ab4..1b22fddc95fa 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -880,3 +881,5 @@ void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) thr
clearAccessibleSelection(); // a toolbox can only have (n)one selected child
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 7580d1a3ae2c..05807cc4317d 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,17 +138,6 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) )
{
sRet = m_pToolBox->GetItemText( m_nItemId );
-//OJ #108243# we only read the name of the toolboxitem
-//
-// Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
-// if ( pItemWindow && pItemWindow->GetAccessible().is() &&
-// pItemWindow->GetAccessible()->getAccessibleContext().is() )
-// {
-// ::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
-// if ( ( sRet.getLength() > 0 ) && ( sWinText.getLength() > 0 ) )
-// sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) );
-// sRet += sWinText;
-// }
}
return sRet;
}
@@ -270,11 +260,10 @@ void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_In
IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE )
Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException)
{
- // --> PB 2004-09-03 #i33611# - toolbox buttons without text don't support XAccessibleText
+ // #i33611# - toolbox buttons without text don't support XAccessibleText
if ( _rType == ::getCppuType( ( const Reference< XAccessibleText >* ) 0 )
&& ( !m_pToolBox || m_pToolBox->GetButtonType() == BUTTON_SYMBOL ) )
return Any();
- // <--
::com::sun::star::uno::Any aReturn = AccessibleTextHelper_BASE::queryInterface( _rType );
if ( !aReturn.hasValue() )
@@ -716,3 +705,4 @@ Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException)
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 36a6660f1a6d..df33a87c2192 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -29,7 +29,7 @@
#define _COMMUNI_HXX
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
@@ -76,10 +76,10 @@ public:
CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread)
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
{
public:
- CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+ CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket );
virtual ~CommunicationLinkViaSocket();
virtual BOOL IsCommunicationError();
@@ -133,7 +133,7 @@ private:
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread)
+class CommunicationManagerServerAcceptThread: public osl::Thread
{
public:
CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
@@ -145,7 +145,7 @@ protected:
private:
CommunicationManagerServerViaSocket* pMyServer;
- NAMESPACE_VOS(OAcceptorSocket) *pAcceptorSocket;
+ osl::AcceptorSocket* pAcceptorSocket;
ULONG nPortToListen;
USHORT nMaxConnections;
ULONG nAddConnectionEventId;
@@ -174,7 +174,7 @@ private:
ByteString aHostToTalk;
ULONG nPortToTalk;
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
};
#endif
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index 018fdceba7d7..6e8cfaec0277 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -30,7 +30,7 @@
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <tools/stream.hxx>
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
#include <tools/debug.hxx>
#include <tools/datetime.hxx>
@@ -337,19 +337,19 @@ private:
ByteString aMyName;
TCPIO* pTCPIO;
- NAMESPACE_VOS(OStreamSocket) *pStreamSocket;
+ osl::StreamSocket* pStreamSocket;
protected:
- SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+ SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket );
virtual ~SimpleCommunicationLinkViaSocket();
- NAMESPACE_VOS(OStreamSocket)* GetStreamSocket() { return pStreamSocket; }
- void SetStreamSocket( NAMESPACE_VOS(OStreamSocket)* pSocket );
+ osl::StreamSocket* GetStreamSocket() { return pStreamSocket; }
+ void SetStreamSocket( osl::StreamSocket* pSocket );
SvStream *pReceiveStream;
BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket
virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL);
- void SetFinalRecieveTimeout();
+ bool IsReceiveReady();
BOOL bIsRequestShutdownPending;
virtual void WaitForShutdown()=0;
void SetNewPacketAsCurrent();
@@ -358,7 +358,7 @@ protected:
class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
{
public:
- SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+ SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket );
~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
virtual BOOL ReceiveDataStream();
protected:
@@ -371,7 +371,7 @@ class CommonSocketFunctions
public:
BOOL DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort );
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS )=0;
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS )=0;
};
class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
@@ -387,7 +387,7 @@ private:
ByteString aHostToTalk;
ULONG nPortToTalk;
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
};
#endif
diff --git a/automation/inc/pch/precompiled_automation.cxx b/automation/inc/pch/precompiled_automation.cxx
index 9ceb299f199c..e07b325283d8 100644
--- a/automation/inc/pch/precompiled_automation.cxx
+++ b/automation/inc/pch/precompiled_automation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_automation.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
index 292cd70b34a4..101d72b3471b 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,29 +30,13 @@
#include "precompiled_automation.hxx"
#include <basic/sbx.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <basic/testtool.hxx>
#include "testbasi.hxx"
-//#include "app.hxx"
-//#include "basic.hrc"
-//#include "appbased.hxx"
#define P_FEHLERLISTE TestToolObj::pFehlerListe
-//#include "status.hxx"
-//#include "basic.hrc"
-
-//#include "object.hxx"
-
#include <testapp.hxx>
#include <testtool.hxx>
-#ifndef _SB_INTERN_HXX
-//#include "sbintern.hxx"
-#endif
-
-//#include "comm_bas.hxx"
-//#include "processw.hxx"
TYPEINIT1(TTBasic,MyBasic)
@@ -159,3 +144,5 @@ void TTBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
{
((TestToolObj*)pTestObject)->DebugFindNoErrors( bDebugFindNoErrors );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index e62e060ba89c..7c32484d4807 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
#endif
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
#include <tools/stream.hxx>
#include <vcl/timer.hxx>
#include <tools/fsys.hxx>
@@ -68,7 +69,7 @@ SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* );
NAMESPACE_VOS(OMutex) *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest
-CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket )
+CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket )
: SimpleCommunicationLinkViaSocket( pMan, pSocket )
, nConnectionClosedEventId( 0 )
, nDataReceivedEventId( 0 )
@@ -132,7 +133,7 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication()
join();
- NAMESPACE_VOS(OStreamSocket) *pTempSocket = GetStreamSocket();
+ osl::StreamSocket* pTempSocket = GetStreamSocket();
SetStreamSocket( NULL );
delete pTempSocket;
@@ -205,7 +206,7 @@ void CommunicationLinkViaSocket::run()
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
SetNewPacketAsCurrent();
StartCallback();
{
@@ -216,7 +217,7 @@ void CommunicationLinkViaSocket::run()
}
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
StartCallback();
{
@@ -500,11 +501,11 @@ void CommunicationManagerServerAcceptThread::run()
if ( !nPortToListen )
return;
- pAcceptorSocket = new NAMESPACE_VOS(OAcceptorSocket)();
- NAMESPACE_VOS(OInetSocketAddr) Addr;
+ pAcceptorSocket = new osl::AcceptorSocket();
+ osl::SocketAddr Addr;
Addr.setPort( nPortToListen );
- pAcceptorSocket->setReuseAddr( 1 );
- if ( !pAcceptorSocket->bind( Addr ) )
+ pAcceptorSocket->setOption( osl_Socket_OptionReuseAddr, 1 );
+ if ( !pAcceptorSocket->bind( Addr ) )
{
return;
}
@@ -514,20 +515,20 @@ void CommunicationManagerServerAcceptThread::run()
}
- NAMESPACE_VOS(OStreamSocket) *pStreamSocket = NULL;
+ osl::StreamSocket* pStreamSocket = NULL;
while ( schedule() )
{
- pStreamSocket = new NAMESPACE_VOS(OStreamSocket);
+ pStreamSocket = new osl::StreamSocket;
switch ( pAcceptorSocket->acceptConnection( *pStreamSocket ) )
{
- case NAMESPACE_VOS(ISocketTypes::TResult_Ok):
+ case osl_Socket_Ok:
{
- pStreamSocket->setTcpNoDelay( 1 );
+ pStreamSocket->setOption( osl_Socket_OptionTcpNoDelay, 1 );
TimeValue sNochEins = {0, 100};
while ( schedule() && xmNewConnection.Is() ) // Solange die letzte Connection nicht abgeholt wurde warten wir
- sleep( sNochEins );
+ wait( sNochEins );
xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
xmNewConnection->StartCallback();
{
@@ -537,18 +538,19 @@ void CommunicationManagerServerAcceptThread::run()
}
}
break;
- case NAMESPACE_VOS(ISocketTypes::TResult_TimedOut):
+ case osl_Socket_TimedOut:
delete pStreamSocket;
pStreamSocket = NULL;
break;
- case NAMESPACE_VOS(ISocketTypes::TResult_Error):
+ case osl_Socket_Error:
delete pStreamSocket;
pStreamSocket = NULL;
break;
- case NAMESPACE_VOS(ISocketTypes::TResult_Interrupted):
- case NAMESPACE_VOS(ISocketTypes::TResult_InProgress):
- break; // -Wall not handled...
+ case osl_Socket_Interrupted:
+ case osl_Socket_InProgress:
+ default:
+ break;
}
}
}
@@ -594,3 +596,4 @@ CommunicationManagerClientViaSocket::~CommunicationManagerClientViaSocket()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index f00917e6d2e5..5568b5152320 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "editwin.hxx"
#include <tools/stream.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
BOOL GHEditWindow::Close()
@@ -125,3 +124,4 @@ BOOL EditFileWindow::Close()
return GHEditWindow::Close();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx
index 8fbf04227382..2252fc244661 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -27,9 +27,7 @@
#ifndef _editwin
#define _editwin
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <vcl/floatwin.hxx>
#include <svtools/svmedit.hxx>
diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx
index a708e026a2a6..3cbb4bf3c80c 100644
--- a/automation/source/miniapp/servres.cxx
+++ b/automation/source/miniapp/servres.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, BOOL )
// No subresources, automatic free resource
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index 848779a39fa7..70c44ce45632 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -25,33 +25,15 @@
*
************************************************************************/
#include <svtools/svmedit.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
class ModalDialogGROSSER_TEST_DLG : public ModalDialog
{
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 0a29fcc7e6e1..539f4851b8e3 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "precompiled_automation.hxx"
#include <svtools/filedlg.hxx>
#include <stdio.h>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <tools/debug.hxx>
#include <svtools/testtool.hxx>
#include <svtools/ttprops.hxx>
@@ -348,3 +347,4 @@ void MyApp::Main()
Execute();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index 31a480a0173e..908633e0c73f 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -28,33 +28,15 @@
#define _TESTAPP_HXX
#include <vcl/svapp.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
#include <svl/poolitem.hxx>
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 6e6c3dc859a7..0ea7f3c0eb26 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include "retstrm.hxx"
#include <basic/svtmsg.hrc>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
@@ -693,3 +692,4 @@ void StatementCommand::HandleSAXParser()
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 718bc52dad70..1e670a6e4d6a 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -299,3 +300,4 @@ void CmdBaseStream::Write( SmartId* pId )
DBG_ERROR("Write( SmartId* pId ) Not Implemented");
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/editwin.cxx b/automation/source/server/editwin.cxx
index 0bcb35a8b306..5d3e1502b187 100644
--- a/automation/source/server/editwin.cxx
+++ b/automation/source/server/editwin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,4 @@ void EditWindow::AddText( const String &rNew )
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx
index 021982333d39..9b6aba1e715d 100644
--- a/automation/source/server/editwin.hxx
+++ b/automation/source/server/editwin.hxx
@@ -29,13 +29,9 @@
#if OSL_DEBUG_LEVEL > 1
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <svtools/svmedit.hxx>
-#endif
class ImpWorkWindow;
diff --git a/automation/source/server/prof_nul.cxx b/automation/source/server/prof_nul.cxx
index c8f70eb06821..3fb9d92a7597 100644
--- a/automation/source/server/prof_nul.cxx
+++ b/automation/source/server/prof_nul.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,4 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *, SysdepProfileS
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/prof_usl.cxx b/automation/source/server/prof_usl.cxx
index 91048e0c6c75..a20e81606d7b 100644
--- a/automation/source/server/prof_usl.cxx
+++ b/automation/source/server/prof_usl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,4 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepPr
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx
index 150b0d1ec5ef..95d7c00a6b7e 100644
--- a/automation/source/server/profiler.cxx
+++ b/automation/source/server/profiler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <tools/string.hxx>
#include <unotools/localedatawrapper.hxx>
#include <vcl/svapp.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "profiler.hxx"
@@ -262,3 +261,4 @@ String TTProfiler::Pad( const String aS, xub_StrLen nLen )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 6c941032f104..ba730491f672 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1093,3 +1094,4 @@ BOOL MacroRecorder::HasMacroRecorder()
return pMacroRecorder != NULL;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 13a9e9b72258..1e89d1826ddd 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,3 +121,4 @@ void RetStream::Reset ()
// SetCommStream( pCommStream );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 0c4485f46a6b..977236cc5a3f 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,3 +214,4 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
#endif
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index e4e59251dd63..66f6f95ae783 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,15 +41,12 @@
#include <vcl/wrkwin.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
+#include <osl/socket.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <tools/stream.hxx>
#include <tools/config.hxx>
-#include <vos/socket.hxx>
-
#if 1
#include <svtools/ttprops.hxx>
#include <basic/ttstrhlp.hxx>
@@ -59,9 +57,6 @@
#include <vcl/bitmap.hxx>
// Hat keinen Includeschutz
#include <svtools/svtdata.hxx>
-//#ifndef _DTRANS_HXX //autogen
-//#include <so2/dtrans.hxx>
-//#endif
#endif // 1
#include <rtl/textenc.h>
#include <rtl/uri.h>
@@ -976,3 +971,4 @@ extern "C" void DestroyEventLogger()
MacroRecorder::GetMacroRecorder()->SetActionLog( FALSE ); // Will delete MacroRecorder if necessary
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 099973bee6bb..357bbe04364a 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -27,7 +27,7 @@
#ifndef _SERVER_HXX
#define _SERVER_HXX
-/*#include <vos/thread.hxx>
+/*#include <osl/thread.hxx>
#ifndef _STD_NO_NAMESPACE
namespace vos
{
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index c0abcb057f8b..756cfa980114 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,14 +31,10 @@
#include <tools/time.hxx>
#include <vcl/splitwin.hxx>
#include <vcl/wrkwin.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "statemnt.hxx"
-#ifndef _RETSRTM_HXX
#include "retstrm.hxx"
-#endif
#include "rcontrol.hxx"
#if OSL_DEBUG_LEVEL > 1
@@ -1224,3 +1221,4 @@ void ImplCommand( Window* pWin, CommandEvent &aCmdEvnt )
CALL_EVENT_WITH_NOTIFY( EVENT_COMMAND, aCmdEvnt, pWin, Command )
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index bfe6c30364ad..893dbd6710e3 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,39 +36,19 @@
#include <comphelper/uieventslogger.hxx>
#include <vcl/wintypes.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/menubtn.hxx>
#include <svtools/svtreebx.hxx>
#include <svtools/brwbox.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _DOCKWIN_HXX //autogen
#include <vcl/dockwin.hxx>
-#endif
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/menu.hxx>
@@ -93,12 +74,9 @@
#include <tools/fsys.hxx>
#include <svl/stritem.hxx>
#include <svtools/ttprops.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <basic/dispdefs.hxx>
#include <basic/sbuno.hxx>
-#include <vos/socket.hxx>
#include <svl/pickerhistory.hxx>
#include <com/sun/star/util/XCancellable.hpp>
@@ -107,9 +85,7 @@
#include "statemnt.hxx"
#include "scmdstrm.hxx"
-#ifndef _RETSRTM_HXX
#include "retstrm.hxx"
-#endif
#if OSL_DEBUG_LEVEL > 1
#include "editwin.hxx"
@@ -6780,3 +6756,5 @@ protected:
#define FINISH_SAME
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index 4e580a09749c..9f7b43137fbf 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -44,9 +44,6 @@
#include <tools/string.hxx>
#include <tools/debug.hxx>
#include <tools/time.hxx>
-#ifndef _SV_DRAG_HXX //autogen
-//#include <vcl/drag.hxx>
-#endif
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <tools/fsys.hxx>
diff --git a/automation/source/server/svcommstream.cxx b/automation/source/server/svcommstream.cxx
index 7ff77b30d242..c689f9137a3f 100644
--- a/automation/source/server/svcommstream.cxx
+++ b/automation/source/server/svcommstream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ comm_ULONG SvCommStream::Write( const void* pData, comm_ULONG nSize ) { return p
comm_BOOL SvCommStream::IsEof() const { return pStream->IsEof(); }
comm_ULONG SvCommStream::SeekRel( long nPos ) { return pStream->SeekRel( nPos ); }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index 91f787fbff2f..034143d2cba6 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/automation/source/simplecm/packethandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -332,3 +333,5 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void
return !bWasError;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index 92642e8cd7c5..26c8d6af0585 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,7 +137,7 @@ void CommunicationLink::SetApplication( const ByteString& aApp )
}
-SimpleCommunicationLinkViaSocket::SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket )
+SimpleCommunicationLinkViaSocket::SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket )
: CommunicationLink( pMan )
, aCommunicationPartner()
, aMyName()
@@ -158,7 +159,7 @@ SimpleCommunicationLinkViaSocket::~SimpleCommunicationLinkViaSocket()
pStreamSocket = NULL;
}
-void SimpleCommunicationLinkViaSocket::SetStreamSocket( NAMESPACE_VOS(OStreamSocket)* pSocket )
+void SimpleCommunicationLinkViaSocket::SetStreamSocket( osl::StreamSocket* pSocket )
{
if ( pTCPIO )
pTCPIO->SetStreamSocket( pSocket );
@@ -179,15 +180,6 @@ BOOL SimpleCommunicationLinkViaSocket::StopCommunication()
return TRUE;
}
-void SimpleCommunicationLinkViaSocket::SetFinalRecieveTimeout()
-{
- if ( !IsCommunicationError() )
- {
- TimeValue aTime = {30, 0}; // 30 seconds
- pStreamSocket->setRecvTimeout( &aTime );
- }
-}
-
BOOL SimpleCommunicationLinkViaSocket::IsCommunicationError()
{
return !pStreamSocket;
@@ -202,9 +194,9 @@ ByteString SimpleCommunicationLinkViaSocket::GetCommunicationPartner( CM_NameTyp
case CM_DOTTED:
{
rtl::OUString aDotted;
- NAMESPACE_VOS(OSocketAddr) *pPeerAdr = new NAMESPACE_VOS(OSocketAddr);
+ osl::SocketAddr* pPeerAdr = new osl::SocketAddr;
pStreamSocket->getPeerAddr( *pPeerAdr );
- ((NAMESPACE_VOS(OInetSocketAddr*))pPeerAdr)->getDottedAddr( aDotted );
+ osl_getDottedInetAddrOfSocketAddr( pPeerAdr->getHandle(), &aDotted.pData);
delete pPeerAdr;
return ByteString( UniString(aDotted), RTL_TEXTENCODING_UTF8 );
}
@@ -213,8 +205,7 @@ ByteString SimpleCommunicationLinkViaSocket::GetCommunicationPartner( CM_NameTyp
{
if ( !aCommunicationPartner.Len() )
{
- rtl::OUString aFQDN;
- pStreamSocket->getPeerHost( aFQDN );
+ rtl::OUString aFQDN( pStreamSocket->getPeerHost());
aCommunicationPartner = ByteString( UniString(aFQDN), RTL_TEXTENCODING_UTF8 );
}
return aCommunicationPartner;
@@ -234,9 +225,9 @@ ByteString SimpleCommunicationLinkViaSocket::GetMyName( CM_NameType eType )
case CM_DOTTED:
{
rtl::OUString aDotted;
- NAMESPACE_VOS(OSocketAddr) *pPeerAdr = new NAMESPACE_VOS(OSocketAddr);
- pStreamSocket->getLocalAddr( *pPeerAdr );
- ((NAMESPACE_VOS(OInetSocketAddr*))pPeerAdr)->getDottedAddr( aDotted );
+ osl::SocketAddr* pPeerAdr = new osl::SocketAddr;
+ pStreamSocket->getPeerAddr( *pPeerAdr );
+ osl_getDottedInetAddrOfSocketAddr( pPeerAdr->getHandle(), &aDotted.pData);
delete pPeerAdr;
return ByteString( UniString(aDotted), RTL_TEXTENCODING_UTF8 );
}
@@ -245,8 +236,7 @@ ByteString SimpleCommunicationLinkViaSocket::GetMyName( CM_NameType eType )
{
if ( !aMyName.Len() )
{
- rtl::OUString aFQDN;
- pStreamSocket->getLocalHost( aFQDN );
+ rtl::OUString aFQDN(pStreamSocket->getLocalHost());
aMyName = ByteString( UniString(aFQDN), RTL_TEXTENCODING_UTF8 );
}
return aMyName;
@@ -352,7 +342,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy
return !bWasError;
}
-SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket )
+SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket )
: SimpleCommunicationLinkViaSocket( pMan, pSocket )
{
}
@@ -363,11 +353,22 @@ SimpleCommunicationLinkViaSocketWithReceiveCallbacks::~SimpleCommunicationLinkVi
StopCommunication();
}
+bool SimpleCommunicationLinkViaSocket::IsReceiveReady()
+{
+ if ( !IsCommunicationError() )
+ {
+ TimeValue aTime = {30, 0}; // 30 seconds
+ return pStreamSocket->isRecvReady( &aTime );
+ }
+
+ return false;
+}
+
void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown()
{
CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method
- SetFinalRecieveTimeout();
- while ( pMyManager && !IsCommunicationError() )
+
+ while( pMyManager && !IsCommunicationError() && IsReceiveReady())
ReceiveDataStream();
}
@@ -396,7 +397,7 @@ BOOL SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication
if ( GetStreamSocket() )
GetStreamSocket()->close();
- NAMESPACE_VOS(OStreamSocket) *pTempSocket = GetStreamSocket();
+ osl::StreamSocket* pTempSocket = GetStreamSocket();
SetStreamSocket( NULL );
delete pTempSocket;
@@ -436,8 +437,7 @@ BOOL CommunicationManager::StartCommunication( ByteString aHost, ULONG nPort )
ByteString CommunicationManager::GetMyName( CM_NameType )
{
- rtl::OUString aHostname;
- NAMESPACE_VOS(OSocketAddr)::getLocalHostname( aHostname );
+ rtl::OUString aHostname( osl::SocketAddr::getLocalHostname());
return ByteString( UniString(aHostname), RTL_TEXTENCODING_UTF8 );
}
@@ -672,23 +672,20 @@ SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSo
BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort )
{
- NAMESPACE_VOS(OInetSocketAddr) Addr;
- NAMESPACE_VOS(OConnectorSocket) *pConnSocket;
+ osl::SocketAddr Addr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ), nPort );
+ osl::ConnectorSocket *pConnSocket;
- Addr.setAddr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ) );
- Addr.setPort( nPort );
TimeValue aTV;
aTV.Seconds = 10; // Warte 10 Sekunden
aTV.Nanosec = 0;
do
{
- pConnSocket = new NAMESPACE_VOS(OConnectorSocket)();
- pConnSocket->setTcpNoDelay( 1 );
- if ( pConnSocket->connect( Addr, &aTV ) == NAMESPACE_VOS(ISocketTypes::TResult_Ok) )
+ pConnSocket = new osl::ConnectorSocket();
+ pConnSocket->setOption( osl_Socket_OptionTcpNoDelay, 1 );
+ if ( pConnSocket->connect( Addr, &aTV ) == osl_Socket_Ok )
{
- pConnSocket->setTcpNoDelay( 1 );
-
+ pConnSocket->setOption( osl_Socket_OptionTcpNoDelay, 1 );
pCM->CallConnectionOpened( CreateCommunicationLink( pCM, pConnSocket ) );
return TRUE;
}
@@ -700,3 +697,4 @@ BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICo
return FALSE;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/simplecm/tcpio.cxx b/automation/source/simplecm/tcpio.cxx
index 5498e3a69774..2906c04d2de0 100644
--- a/automation/source/simplecm/tcpio.cxx
+++ b/automation/source/simplecm/tcpio.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,9 +64,11 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
// helper
-void TCPIO::SetStreamSocket( NAMESPACE_VOS(OStreamSocket) *pSocket )
+void TCPIO::SetStreamSocket( osl::StreamSocket* pSocket )
{
vos::OGuard aRGuard( aMSocketReadAccess );
vos::OGuard aWGuard( aMSocketWriteAccess );
pStreamSocket = pSocket;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/simplecm/tcpio.hxx b/automation/source/simplecm/tcpio.hxx
index 626f164ba0f5..c5a3e5cd77d6 100644
--- a/automation/source/simplecm/tcpio.hxx
+++ b/automation/source/simplecm/tcpio.hxx
@@ -28,7 +28,7 @@
#ifndef TCPIO_HXX
#define TCPIO_HXX
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
#include <vos/mutex.hxx>
#include "communiio.hxx"
@@ -36,14 +36,14 @@
class TCPIO : public ITransmiter, public IReceiver
{
private:
- NAMESPACE_VOS(OStreamSocket) *pStreamSocket;
+ osl::StreamSocket* pStreamSocket;
vos::OMutex aMSocketReadAccess;
vos::OMutex aMSocketWriteAccess;
public:
///
- TCPIO( NAMESPACE_VOS(OStreamSocket) *pSocket ):pStreamSocket( pSocket ){}
+ TCPIO( osl::StreamSocket* pSocket ):pStreamSocket( pSocket ){}
virtual ~TCPIO(){}
@@ -54,7 +54,7 @@ public:
virtual comm_USHORT ReceiveBytes( void* pBuffer, comm_UINT32 nLen );
// helper
- void SetStreamSocket( NAMESPACE_VOS(OStreamSocket) *pSocket );
+ void SetStreamSocket( osl::StreamSocket* pSocket );
};
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 4f6d413f4280..a860948c6b04 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#ifndef _KEYCOD_HXX //autogen
#include <vcl/keycod.hxx>
-#endif
#include <basic/sbx.hxx>
#include <tools/stream.hxx>
@@ -468,3 +467,4 @@ void CmdStream::Reset( comm_ULONG nSequence )
GenCmdFlow (F_Sequence,nSequence);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index e35448c012c5..8c206b108926 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,14 +33,10 @@
#include <tools/errcode.hxx>
#include <basic/sbxobj.hxx>
#include <basic/sbx.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
#include <basic/sbxvar.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <automation/communi.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
// Der CommunicationManager hat folgende Elemente:
// 1) Properties:
@@ -440,3 +437,4 @@ SbxObject* CommunicationFactory::CreateObject( const String& rClass )
return NULL;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index d39f0895eefd..9f72c479612a 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -29,9 +29,7 @@
#define _COMM_BAS_HXX
#include <basic/sbxfac.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
#include <basic/sbxvar.hxx>
-#endif
#include <basic/sbxobj.hxx>
class CommunicationManagerClientViaSocket;
diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx
index a6850b1c2cc4..0f9781c73970 100644
--- a/automation/source/testtool/cretstrm.cxx
+++ b/automation/source/testtool/cretstrm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#ifndef _CRetStream_HXX
#include "cretstrm.hxx"
-#endif
#include <tools/debug.hxx>
#include "rcontrol.hxx"
#include "svcommstream.hxx"
@@ -71,3 +70,4 @@ void CRetStream::Read( SbxValue &aValue )
aValue = *PTR_CAST( SbxValue, &xBase );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index 1e45fd1fc976..beb8f4c4d0d7 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
#include <stdio.h>
#include "httprequest.hxx"
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
#include <tools/debug.hxx>
@@ -78,25 +79,23 @@ BOOL HttpRequest::Execute()
Init();
// Open channel to standard redir host
- NAMESPACE_VOS(OInetSocketAddr) aConnectAddr;
+ osl::SocketAddr aConnectAddr;
if ( aProxyHost.Len() )
{
- aConnectAddr.setAddr( rtl::OUString( UniString( aProxyHost, RTL_TEXTENCODING_UTF8 ) ) );
- aConnectAddr.setPort( nProxyPort );
+ aConnectAddr = osl::SocketAddr( rtl::OUString( UniString( aProxyHost, RTL_TEXTENCODING_UTF8 ) ), nProxyPort );
}
else
{
- aConnectAddr.setAddr( rtl::OUString( UniString( aRequestHost, RTL_TEXTENCODING_UTF8 ) ) );
- aConnectAddr.setPort( nRequestPort );
+ aConnectAddr = osl::SocketAddr( rtl::OUString( UniString( aRequestHost, RTL_TEXTENCODING_UTF8 ) ), nRequestPort );
}
TimeValue aTV;
aTV.Seconds = 10; // Warte 10 Sekunden
aTV.Nanosec = 0;
- pOutSocket = new NAMESPACE_VOS(OConnectorSocket)();
- if ( pOutSocket->connect( aConnectAddr, &aTV ) == NAMESPACE_VOS(ISocketTypes::TResult_Ok) )
+ pOutSocket = new osl::ConnectorSocket();
+ if ( pOutSocket->connect( aConnectAddr, &aTV ) == osl_Socket_Ok )
{
// pOutSocket->setTcpNoDelay( 1 );
}
@@ -202,7 +201,7 @@ Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0; Linux
Connection: close
Content-Type: text/xml; charset=ISO-8859-1
*/
-void HttpRequest::SendString( vos::OStreamSocket* pSocket , ByteString aText )
+void HttpRequest::SendString( osl::StreamSocket* pSocket , ByteString aText )
{
if ( nStatus == HTTP_REQUEST_PENDING )
pSocket->write( aText.GetBuffer(), aText.Len() );
@@ -237,3 +236,4 @@ USHORT HttpRequest::GetStatus()
return nStatus;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index 44234239b81f..7864414cfa4c 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -37,10 +37,10 @@
#include <tools/string.hxx>
#include <tools/stream.hxx>
-namespace vos
+namespace osl
{
- class OStreamSocket;
- class OConnectorSocket;
+ class StreamSocket;
+ class ConnectorSocket;
}
class HttpRequest
@@ -52,14 +52,14 @@ class HttpRequest
USHORT nProxyPort;
USHORT nStatus;
- vos::OConnectorSocket *pOutSocket;
+ osl::ConnectorSocket *pOutSocket;
ByteString aHeader;
USHORT nResultId;
ByteString aContentType;
SvMemoryStream* pStream;
- void SendString( vos::OStreamSocket* pSocket, ByteString aText );
+ void SendString( osl::StreamSocket* pSocket, ByteString aText );
BOOL IsItem( ByteString aItem, ByteString aLine );
void Init();
public:
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 2361361f277f..968af92ba880 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,41 +29,26 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-/*#include <com/sun/star/devtools/XIServerProxy.hpp>
-#include <com/sun/star/devtools/XInformationClient.hpp>
-using namespace com::sun::star::devtools;
-*/
#ifdef OS2
#define INCL_DOS
-//#include <vcl/sysdep.hxx>
-#ifndef _SVPM_H
#include <svpm.h>
#endif
-#endif
#include "sysdir_win.hxx"
#include "registry_win.hxx"
#include "sttresid.hxx"
#include <osl/file.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _SOUND_HXX //autogen
#include <vcl/sound.hxx>
-#endif
#include <tools/config.hxx>
-#ifndef _APP_HXX //autogen
#include <vcl/svapp.hxx>
-#endif
#include <svtools/stringtransfer.hxx>
#include <svl/brdcst.hxx>
//#ifndef _SBXCLASS_HXX //autogen
#include <basic/sbx.hxx>
//#endif
#include <com/sun/star/uno/Any.hxx>
-#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HXX_
#include <com/sun/star/frame/XDesktop.hpp>
-#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/bridge/XBridgeFactory.hpp>
#include <com/sun/star/connection/XConnector.hpp>
@@ -90,11 +76,8 @@ using namespace rtl;
#include <basic/sbuno.hxx>
-//#include <basic/basrid.hxx>
#include <basic/basicrt.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "tcommuni.hxx"
#include "comm_bas.hxx"
#include <cretstrm.hxx>
@@ -500,8 +483,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
abGP.Append( "12" );
#elif defined LINUX && defined PPC
abGP.Append( "13" );
-#elif defined NETBSD
- abGP.Append( "14" );
+#elif defined NETBSD && defined INTEL
+ abGP.Append( "14" ); // NetBSD/i386
#elif defined LINUX && defined X86_64
abGP.Append( "15" ); // Linux x86-64
#elif defined LINUX && defined SPARC
@@ -520,6 +503,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
abGP.Append( "22" ); // Linux PA-RISC
#elif defined LINUX && defined AXP
abGP.Append( "23" ); // Linux ALPHA
+#elif defined NETBSD && defined X86_64
+ abGP.Append( "24" ); // NetBSD/amd64
#else
#error ("unknown platform. please request an ID for your platform on qa/dev")
#endif
@@ -4266,3 +4251,4 @@ String TTFormat::ms2s( ULONG nMilliSeconds )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index d0b1c0a0aa1b..264a68aae257 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,6 @@
// #undef IS_ERROR
#endif
-//#include <tchar.h>
#include "registry_win.hxx"
#include <osl/thread.h>
@@ -87,3 +87,4 @@ String ReadRegistry( String aKey, String aValueName )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx
index ec87c65cfb4a..44cb8bef2fe1 100644
--- a/automation/source/testtool/sysdir_win.cxx
+++ b/automation/source/testtool/sysdir_win.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,4 @@ String _SHGetSpecialFolder_COMMON_APPDATA()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index 97684cfba2cf..bc0e94f76728 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
#include <tools/debug.hxx>
#include <vcl/timer.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "rcontrol.hxx"
#include "tcommuni.hxx"
@@ -198,3 +197,5 @@ ULONG GetUnoPortConfig()
GETSET( abPortToTalk, "UnoPort", ByteString::CreateFromInt32( UNO_DEFAULT_PORT ) );
return (ULONG)abPortToTalk.ToInt64();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4374edfd7fc9..51d666489ee4 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -29,7 +29,7 @@
#include <tools/link.hxx>
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#ifndef _STRING_LIST
DECLARE_LIST( StringList, String * )
diff --git a/basctl/inc/pch/precompiled_basctl.cxx b/basctl/inc/pch/precompiled_basctl.cxx
index 6058cef5d832..5f74ede5c895 100644
--- a/basctl/inc/pch/precompiled_basctl.cxx
+++ b/basctl/inc/pch/precompiled_basctl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_basctl.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index bb44f8d15f7e..f2cacc96beb2 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -42,9 +42,7 @@
#include "com/sun/star/resource/XStringResourcePersistence.hpp"
#include "com/sun/star/script/XLibraryContainer.hpp"
#include "com/sun/star/script/XLibraryContainerPassword.hpp"
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include "com/sun/star/script/XLibraryContainer2.hpp"
-#endif
#include "com/sun/star/task/XStatusIndicator.hpp"
#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index a73d51c79990..b2b20e105b4e 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -617,3 +618,4 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index c774f2d166eb..b8c43e4daa37 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1121,3 +1122,5 @@ void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) th
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index cdf4c58015ba..83d2d10e1256 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,4 @@ void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, Str
void BasicDocShell::Draw( OutputDevice *, const JobSetup &, USHORT )
{}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 4ab42fbe97a7..9ac79df53864 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -544,3 +545,4 @@ void BasicLanguageBox::Update( const SfxStringItem* pItem )
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index e2042d49876c..889e09b7f633 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,3 +193,4 @@ void SAL_CALL BasicRenderable::render (
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d0a8ca1a6ddb..ef1289736106 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <toolkit/helper/vclunohelper.hxx>
@@ -65,10 +64,6 @@
#include <vcl/sound.hxx>
-//#ifndef _TXTCMP_HXX //autogen
-//#include <svtools/txtcmp.hxx>
-//#endif
-
#include <unotools/textsearch.hxx>
#include <tools/diagnose_ex.h>
@@ -348,8 +343,8 @@ BOOL ModulWindow::BasicExecute()
AddStatus( BASWIN_RUNNINGBASIC );
USHORT nStart, nEnd, nCurMethodStart = 0;
TextSelection aSel = GetEditView()->GetSelection();
- if ( aDocument.isInVBAMode() )
- nCurMethodStart = ( aSel.GetStart().GetPara() + 1 );
+ // Init cursor to top
+ nCurMethodStart = ( aSel.GetStart().GetPara() + 1 );
SbMethod* pMethod = 0;
// erstes Macro, sonst blind "Main" (ExtSearch?)
for ( USHORT nMacro = 0; nMacro < xModule->GetMethods()->Count(); nMacro++ )
@@ -357,26 +352,17 @@ BOOL ModulWindow::BasicExecute()
SbMethod* pM = (SbMethod*)xModule->GetMethods()->Get( nMacro );
DBG_ASSERT( pM, "Method?" );
pM->GetLineRange( nStart, nEnd );
- if ( aDocument.isInVBAMode() )
- {
- if ( nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
- {
- pMethod = pM;
- break;
- }
- }
- else if ( !pMethod || ( nStart < nCurMethodStart && !pM->IsHidden() ) )
+ if ( nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
{
+ // matched a method to the cursor position
pMethod = pM;
- nCurMethodStart = nStart;
+ break;
}
}
if ( !pMethod )
{
- if ( aDocument.isInVBAMode() )
- return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), FALSE, rtl::OUString() ).getLength() > 0 ) ? TRUE : FALSE;
- else
- pMethod = (SbMethod*)xModule->Find( String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ), SbxCLASS_METHOD );
+ // If not in a method then prompt the user
+ return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), FALSE, rtl::OUString() ).getLength() > 0 ) ? TRUE : FALSE;
}
if ( pMethod )
{
@@ -1769,3 +1755,5 @@ Image ModulWindowLayout::getImage(USHORT nId, bool bHighContrastMode) const
return (bHighContrastMode ? m_aImagesHighContrast : m_aImagesNormal).
GetImage(nId);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 280bb6ee3ab6..12a510aea1b8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -40,9 +40,7 @@ class SvxSearchItem;
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <basic/sbmod.hxx>
#include <vcl/split.hxx>
#include "svl/lstner.hxx"
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b6b4accb7dd6..2fa67b22fb48 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,14 +57,9 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/help.hxx>
-//#ifndef _SFX_HELP_HXX //autogen
-//#include <sfx2/sfxhelp.hxx>
-//#endif
#include <unotools/sourceviewconfig.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <comphelper/processfactory.hxx>
@@ -2318,3 +2314,4 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
setBasicWatchMode( false );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index f4a3c1d48fc7..244440823169 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,9 +69,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <svtools/ehdl.hxx>
#include <svtools/langtab.hxx>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
@@ -82,6 +81,7 @@
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <com/sun/star/resource/StringResourceWithLocation.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/script/vba/XVBACompatibility.hpp>
using namespace comphelper;
using namespace ::com::sun::star;
@@ -112,7 +112,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
{
InitSettings( TRUE, TRUE, TRUE );
- pEditor = new DlgEditor();
+ pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
pEditor->SetWindow( this );
pEditor->SetDialog( xDialogModel );
@@ -728,7 +728,7 @@ BOOL DialogWindow::SaveDialog()
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
Reference< XInputStream > xInput( xISP->createInputStream() );
Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
@@ -1010,7 +1010,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
String aXmlDlgName;
Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
@@ -1236,7 +1236,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
}
}
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
if( bSuccess )
{
@@ -1346,7 +1346,7 @@ void DialogWindow::StoreData()
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
}
}
@@ -1411,3 +1411,5 @@ void DialogWindow::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
{
return (::com::sun::star::accessibility::XAccessible*) new AccessibleDialogWindow( this );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index cc354f826aa1..9bce6c13c294 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-#ifndef _BASCTL_BASIDECTRLR_HXX_
#include <basidectrlr.hxx>
-#endif
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -150,3 +149,5 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 351186325b09..80928ca87ec5 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1439,3 +1440,4 @@ IMPL_LINK( BasicIDEShell, AccelSelectHdl, Accelerator*, pAccel )
return bDone;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 3a3a162f5b5e..4092529a5e17 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -328,10 +329,10 @@ void __EXPORT BasicIDEShell::Move()
((ModulWindow*)pCurWin)->FrameWindowMoved();
}
-void __EXPORT BasicIDEShell::ShowCursor( FASTBOOL bOn )
+void __EXPORT BasicIDEShell::ShowCursor( bool bOn )
{
if ( pCurWin && pCurWin->ISA( ModulWindow ) )
- ((ModulWindow*)pCurWin)->ShowCursor( (BOOL)bOn );
+ ((ModulWindow*)pCurWin)->ShowCursor( bOn );
}
// Hack for #101048
@@ -349,3 +350,4 @@ void __EXPORT BasicIDEShell::ExecuteBasic( SfxRequest& rReq )
CheckWindows();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 22fbdc4a9c7b..3825eaef11bf 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,7 +97,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel );
// new dialog window
@@ -175,3 +176,4 @@ void __EXPORT BasicIDEShell::ExecuteDialog( SfxRequest& rReq )
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 55dec2566205..9b5d01636047 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1061,3 +1062,4 @@ void BasicIDEShell::ImplStartListening( StarBASIC* pBasic )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 9604a8bd9933..a5b441cdb1ab 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -411,3 +412,5 @@ BOOL HasMethod( const ScriptDocument& rDocument, const String& rLibName, const S
}
} //namespace BasicIDE
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 8d04320ec010..35c4eafbebf1 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,9 +52,7 @@
#include "dlged.hxx"
#include <dlgeddef.hxx>
#include <comphelper/processfactory.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_
#include <com/sun/star/script/XLibraryContainer.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
@@ -526,3 +525,5 @@ SfxBindings* GetBindingsPtr()
} //namespace BasicIDE
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 79f3cdb84c6b..4fb2679cbc9f 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -898,3 +899,5 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc )
SetCurEntry( pCurEntry );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index de9eff56ca24..3f114b190587 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -504,3 +505,5 @@ String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName )
aName += rLibName;
return aName;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 150e10a5a76f..5faaf7988313 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,13 +50,9 @@
#include <sbxitem.hxx>
#include <iderdll.hxx>
-#ifndef _PASSWD_HXX //autogen
#include <sfx2/passwd.hxx>
-#endif
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/script/ModuleType.hpp>
@@ -1022,3 +1019,4 @@ BOOL QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
return bOK;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 6d126784cac0..34a1f8f62c94 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -278,3 +279,4 @@ BreakPoint* BreakPointDialog::GetSelectedBreakPoint()
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 8e8f6cb2f9e4..c6e1d4f07354 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -32,9 +32,7 @@
#include <bastypes.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 1635232c95ae..e69f542c618e 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,6 +44,7 @@
#include <comphelper/processfactory.hxx>
#include <vos/mutex.hxx>
+#include <sal/macros.h>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -165,7 +167,7 @@ namespace basctl
{ "OnModeChanged", &DocumentEventListener::onDocumentModeChanged }
};
- for ( size_t i=0; i < sizeof( aEvents ) / sizeof( aEvents[0] ); ++i )
+ for ( size_t i=0; i < SAL_N_ELEMENTS( aEvents ); ++i )
{
if ( !_rEvent.EventName.equalsAscii( aEvents[i].pEventName ) )
continue;
@@ -274,3 +276,5 @@ namespace basctl
//........................................................................
} // namespace basctl
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index 2acf2a332be4..19cf14004612 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ namespace basctl
//........................................................................
} // namespace basctl
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 7044dbde9382..e9cfa14b1ee0 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -201,3 +202,5 @@ namespace basctl { namespace docs {
//........................................................................
} } // namespace basctl::docs
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/ide_pch.cxx b/basctl/source/basicide/ide_pch.cxx
index f19c0c8dac67..44937011dc2f 100644
--- a/basctl/source/basicide/ide_pch.cxx
+++ b/basctl/source/basicide/ide_pch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,3 +30,4 @@
#include "precompiled_basctl.hxx"
#include <ide_pch.hxx>
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index a15bed689b6f..dd06ff421860 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,3 +229,4 @@ IMPL_LINK( BasicIDEData, ExecuteMacroEvent, void *, pData )
return 0;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 95c27c65acdb..bd0259fe0637 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1224,3 +1225,4 @@ Reference< XStringResourceManager > LocalizationMgr::getStringResourceFromDialog
return xStringResourceManager;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 24bc5beacb30..e3f21bba669a 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,9 +53,7 @@
#include <sbxitem.hxx>
#include <sfx2/minfitem.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/document/MacroExecMode.hpp>
using namespace ::com::sun::star;
@@ -921,3 +920,4 @@ String MacroChooser::GetInfo( SbxVariable* pVar )
return aComment;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index b610b2041b50..14fdeef1f7c9 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -35,9 +35,7 @@
#include <sfx2/basedlgs.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#define MACRO_CLOSE 10
#define MACRO_OK_RUN 11
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 714fc6656941..b66d6b3510d9 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,9 +61,7 @@
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/script/XLibraryContainerExport.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -1726,3 +1725,4 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
//----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0f66a6ebe120..fcc2858670d1 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,12 +45,8 @@
#include <sbxitem.hxx>
#include <iderdll.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/resource/XStringResourceManager.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -312,7 +309,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() );
if( xDialogModel.is() )
{
@@ -329,7 +326,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
{
LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
}
- io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+ io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
}
}
@@ -1068,3 +1065,4 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index f9efa779357e..69e6aad39d60 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -33,9 +33,7 @@
#include <bastype2.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/tabdlg.hxx>
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index ac7a2c28531d..f3998287a2b8 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include <basic/sbx.hxx>
-#ifndef _SV_CMDEVT_HXX
#include <vcl/cmdevt.hxx>
-#endif
#include <vcl/taskpanelist.hxx>
#include <vcl/sound.hxx>
#include <objdlg.hrc>
@@ -46,10 +45,6 @@
#include <iderdll2.hxx>
#include <sbxitem.hxx>
-//#ifndef _SFX_HELP_HXX //autogen
-//#include <sfx2/sfxhelp.hxx>
-//#endif
-
ObjectTreeListBox::ObjectTreeListBox( Window* pParent, const ResId& rRes )
: BasicTreeListBox( pParent, rRes )
@@ -304,3 +299,5 @@ void ObjectCatalogToolBox_Impl::setImages()
m_bHighContrast = bHC;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 0ee179dc1aa6..612a3dc1f303 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,4 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 6b16316d889c..1f277b3da112 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -453,14 +454,12 @@ namespace basctl
bool ScriptDocument_Impl::isInVBAMode() const
{
bool bResult = false;
-#ifdef FUTURE_VBA_CWS
if ( !isApplication() )
{
Reference< XVBACompatibility > xVBACompat( getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
if ( xVBACompat.is() )
bResult = xVBACompat->getVBACompatibilityMode();
}
-#endif
return bResult;
}
@@ -678,7 +677,7 @@ namespace basctl
if ( !_rxExistingDialogModel.is() )
{
Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext() );
+ ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
}
// set new name as property
@@ -686,12 +685,12 @@ namespace basctl
xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
// export dialog model
- xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
+ xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
aElement <<= xISP;
}
// insert element by new name in container
- else if ( _eType == E_SCRIPTS )
+ if ( _eType == E_SCRIPTS )
{
Reference< XVBAModuleInfo > xVBAModuleInfo( xLib, UNO_QUERY );
if ( xVBAModuleInfo->hasModuleInfo( _rOldName ) )
@@ -798,7 +797,7 @@ namespace basctl
xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
// export dialog model
- _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
+ _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
// insert dialog into library
xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
@@ -1628,3 +1627,5 @@ namespace basctl
//........................................................................
} // namespace basctl
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 8a7afc6b64c2..3f3968524245 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -239,3 +240,4 @@ SfxPopupWindow* TbxControls::CreatePopupWindow()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 71342582fead..f72628db8e2a 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,4 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
return uno::Reference< uno::XInterface >( pShell->GetModel() );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 326098976d87..324d7d829153 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,9 +47,7 @@
#include <svl/itempool.hxx>
#include <sfx2/viewfrm.hxx>
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <svx/svdpagv.hxx>
#include <xmlscript/xml_helper.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
@@ -205,7 +204,7 @@ BOOL DlgEditor::RemarkDialog()
//----------------------------------------------------------------------------
-DlgEditor::DlgEditor()
+DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel )
:pHScroll(NULL)
,pVScroll(NULL)
,pDlgEdModel(NULL)
@@ -227,6 +226,7 @@ DlgEditor::DlgEditor()
,bCreateOK(TRUE)
,bDialogModelChanged(FALSE)
,mnPaintGuard(0)
+ ,m_xDocument( xModel )
{
pDlgEdModel = new DlgEdModel();
pDlgEdModel->GetItemPool().FreezeIdRanges();
@@ -835,7 +835,7 @@ void DlgEditor::Copy()
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
Reference< XInputStream > xStream( xISP->createInputStream() );
Sequence< sal_Int8 > DialogModelBytes;
implCopyStreamToByteSequence( xStream, DialogModelBytes );
@@ -868,7 +868,7 @@ void DlgEditor::Copy()
uno::Reference< resource::XStringResourceManager >
xStringResourceManager( xStringResourcePersistence, uno::UNO_QUERY );
LocalizationMgr::resetResourceForDialog( xClipDialogModel, xStringResourceManager );
- Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
+ Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
Reference< XInputStream > xStream2( xISP2->createInputStream() );
Sequence< sal_Int8 > NoResourceDialogModelBytes;
implCopyStreamToByteSequence( xStream2, NoResourceDialogModelBytes );
@@ -1014,7 +1014,7 @@ void DlgEditor::Paste()
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext );
+ ::xmlscript::importDialogModel( ::xmlscript::createInputStream( rtl::ByteSequence(DialogModelBytes.getArray(), DialogModelBytes.getLength()) ) , xClipDialogModel, xContext, m_xDocument );
}
// get control models from clipboard dialog model
@@ -1421,3 +1421,5 @@ bool DlgEditor::AdjustPageSize()
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 14720dee58f8..c7f1b2fa65a3 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,4 @@ void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard
m_SeqData = Sequence< Any >();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 892e04e5cab8..27bae6fbb8c7 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -266,3 +267,4 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
//----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 576fd4cab99d..9ef46deb69c0 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -302,7 +303,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
if ( pView->IsDragObj() )
{
- FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
+ bool bWasNoSnap = rDragStat.IsNoSnap();
BOOL bWasSnapEnabled = pView->IsSnapEnabled();
// switch snapping off
@@ -635,3 +636,5 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index a980a6403534..41fa01b262c8 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::c
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 5e3bb6b42656..ceb5555a1bc2 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,7 +56,7 @@ DlgEdModel::~DlgEdModel()
//----------------------------------------------------------------------------
-SdrPage* DlgEdModel::AllocPage(FASTBOOL bMasterPage)
+SdrPage* DlgEdModel::AllocPage(bool bMasterPage)
{
DBG_CHKTHIS(DlgEdModel, 0);
return new DlgEdPage(*this, bMasterPage);
@@ -63,9 +64,9 @@ SdrPage* DlgEdModel::AllocPage(FASTBOOL bMasterPage)
//----------------------------------------------------------------------------
-void DlgEdModel::DlgEdModelChanged( FASTBOOL bChanged )
+void DlgEdModel::DlgEdModelChanged(bool bChanged )
{
- SetChanged( static_cast< sal_Bool > ( bChanged ) );
+ SetChanged( bChanged );
}
//----------------------------------------------------------------------------
@@ -77,3 +78,4 @@ Window* DlgEdModel::GetCurDocViewWin()
//----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 5af7519f85f0..769290fe0690 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
#include <iderid.hxx>
#include <localizationmgr.hxx>
-#ifndef _BASCTL_DLGRESID_HRC
#include <dlgresid.hrc>
-#endif
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
#include <unotools/sharedunocomponent.hxx>
@@ -194,8 +193,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
}
// convert pixel to logic units
- aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
- aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
+ aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT );
+ aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT );
// set out parameters
nXOut = aPos.Width();
@@ -242,10 +241,9 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
}
-
// convert pixel to logic units
- aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
- aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
+ aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT );
+ aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT );
// set out parameters
nXOut = aPos.Width();
@@ -287,9 +285,9 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
if ( !pDevice )
return false;
- aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
- aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
- aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MAP_APPFONT ) );
+ aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT );
+ aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT );
+ aFormPos = pDevice->LogicToPixel( aFormPos, MAP_APPFONT );
// add form position
aPos.Width() += aFormPos.Width();
@@ -333,14 +331,15 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
DBG_ASSERT( pDevice, "DlgEdObj::TransformFormToSdrCoordinates: missing default device!" );
if ( !pDevice )
return false;
- aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
- aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
// take window borders into account
DlgEdForm* pForm = NULL;
if ( !lcl_getDlgEdForm( this, pForm ) )
return false;
+ aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT );
+ aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT );
+
// take window borders into account
Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
DBG_ASSERT( xPSetForm.is(), "DlgEdObj::TransformFormToSdrCoordinates: no form property set!" );
@@ -1051,9 +1050,9 @@ void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
//----------------------------------------------------------------------------
-FASTBOOL DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- FASTBOOL bResult = SdrUnoObj::EndCreate(rStat, eCmd);
+ bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
SetDefaults();
StartListening();
@@ -1827,9 +1826,9 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
//----------------------------------------------------------------------------
-FASTBOOL DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- FASTBOOL bResult = SdrUnoObj::EndCreate(rStat, eCmd);
+ bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
// stop listening
EndListening(sal_False);
@@ -1894,3 +1893,4 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const
//----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index eaabbfef0ff2..58fe333dfac3 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@ TYPEINIT1( DlgEdPage, SdrPage );
//----------------------------------------------------------------------------
-DlgEdPage::DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage )
+DlgEdPage::DlgEdPage( DlgEdModel& rModel, bool bMasterPage )
:SdrPage( rModel, bMasterPage )
{
}
@@ -84,3 +85,5 @@ SdrObject* DlgEdPage::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index da8bbc638a1e..d98967a3e776 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include "dlged.hxx"
#include <dlgedpage.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <sfx2/viewfrm.hxx>
#include <basidesh.hxx>
@@ -214,3 +213,5 @@ SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, Sd
//----------------------------------------------------------------------------
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 41c86699203b..e33e68c3dd67 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,17 +40,12 @@
#include "dlgresid.hrc"
#include "helpid.hrc"
-#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
#include <com/sun/star/i18n/XBreakIterator.hpp>
-#endif
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/resource/XStringResourceManager.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/unohelp.hxx>
-#ifndef _VCL_I18NHELP_HXX
-//#include <vcl/i18nhelp.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/localedatawrapper.hxx>
@@ -428,3 +424,4 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
return aLocaleSeq;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 52e29c12e1c8..d210482a8ef5 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,25 +29,21 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
+#include <sal/macros.h>
#include "propbrw.hxx"
#include "dlgedobj.hxx"
#include "basidesh.hxx"
#include <iderid.hxx>
-#ifndef _BASCTL_DLGRESID_HRC
#include <dlgresid.hrc>
-#endif
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/bindings.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/objitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <tools/shl.hxx>
#include <vcl/stdtext.hxx>
#include <svx/svdview.hxx>
@@ -55,9 +52,7 @@
#include <svx/svditer.hxx>
#include <sfx2/viewsh.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
-#endif
#include <comphelper/property.hxx>
#include <comphelper/composedprops.hxx>
#include <comphelper/stl_types.hxx>
@@ -209,8 +204,7 @@ void PropBrw::ImplReCreateController()
::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_xContextDocument ) )
};
Reference< XComponentContext > xInspectorContext(
- ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
- xOwnContext ) );
+ ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
// create a property browser controller
Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW );
@@ -626,3 +620,5 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
}
//----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index c55e5bd721d5..6c69c66d546b 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -28,10 +28,6 @@
#ifndef _BASIDE3_HXX
#define _BASIDE3_HXX
-#ifndef _SVHEADER_HXX
-//#include <svheader.hxx>
-#endif
-
#include <bastypes.hxx>
#include <svl/undo.hxx>
#include <vcl/dialog.hxx>
@@ -39,9 +35,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_
#include <com/sun/star/script/XLibraryContainer.hpp>
-#endif
class Printer;
class StarBASIC;
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 07bc2dfa3149..0ad7f91923f7 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -33,18 +33,12 @@
#include "doceventnotifier.hxx"
#include <sfx2/viewfac.hxx>
#include <sfx2/shell.hxx>
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <sfx2/viewsh.hxx>
#include <svx/ifaceids.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
#include <com/sun/star/container/XContainerListener.hpp>
@@ -157,7 +151,7 @@ protected:
virtual void Deactivate(BOOL bMDI);
virtual void Move();
- virtual void ShowCursor( FASTBOOL bOn = TRUE );
+ virtual void ShowCursor( bool bOn = true );
void CreateModulWindowLayout();
void DestroyModulWindowLayout();
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index d4fa39fcb67d..b3c4a6c4e293 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -31,9 +31,7 @@
#include <tools/string.hxx>
#include <svl/lstner.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 1444bab59c65..f49d684cbe80 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -32,6 +32,7 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <vcl/timer.hxx>
@@ -128,9 +129,11 @@ protected:
BOOL bDialogModelChanged;
Timer aMarkTimer;
long mnPaintGuard;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
+ DlgEditor(); // not implemented
public:
- DlgEditor();
+ DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
~DlgEditor();
void SetWindow( Window* pWindow );
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 5a0118fe25eb..060c534b92a0 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -54,9 +54,9 @@ public:
DlgEdModel();
virtual ~DlgEdModel();
- virtual void DlgEdModelChanged( FASTBOOL bChanged = TRUE );
+ virtual void DlgEdModelChanged( bool bChanged = true );
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(bool bMasterPage);
virtual Window* GetCurDocViewWin();
};
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index a2e817c78055..d9fb9e6e293c 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -68,7 +68,7 @@ protected:
virtual void NbcMove( const Size& rSize );
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
DECL_LINK(OnCreate, void* );
@@ -160,7 +160,7 @@ protected:
virtual void NbcMove( const Size& rSize );
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
public:
TYPEINFO();
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index ec1f7d10600b..bb017c91e039 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -45,7 +45,7 @@ private:
public:
TYPEINFO();
- DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage=FALSE );
+ DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
DlgEdPage( const DlgEdPage& );
virtual ~DlgEdPage();
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 9f1a4d389dc1..3d2f1f3317e7 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -29,15 +29,9 @@
#define _BASCTL_MANAGELANG_HXX
#include <vcl/dialog.hxx>
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svx/langbox.hxx>
#include <svx/checklbx.hxx>
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 2079c29e6646..1c2421688329 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -81,8 +81,7 @@
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src
index cd8fe7b26bf5..ce2607b3296d 100644
--- a/basctl/util/hidother.src
+++ b/basctl/util/hidother.src
@@ -25,7 +25,6 @@
*
************************************************************************/
#include "../inc/helpid.hrc" // HID_XXX
-//#include "hidother.hrc"
hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; };
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index afdba0afeebc..91bc98a96f17 100755..100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,12 +130,12 @@ static string trim_string( const string& rString )
{
string temp = rString;
- while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' )
+ while ( temp.length() && (temp[0] == ' ' || temp[0] == '\t') )
temp.erase( 0, 1 );
string::size_type len = temp.length();
- while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' )
+ while ( len && (temp[len-1] == ' ' || temp[len-1] == '\t') )
{
temp.erase( len - 1, 1 );
len = temp.length();
@@ -1120,3 +1121,5 @@ int main( int argc, char** argv )
return -1;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/crashrep/source/win32/base64.cpp b/crashrep/source/win32/base64.cpp
index dd30ce4d5d16..82d54fb4e16d 100755..100644
--- a/crashrep/source/win32/base64.cpp
+++ b/crashrep/source/win32/base64.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ extern "C" size_t base64_encode( FILE *fin, FILE *fout )
return nBytesWritten;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index afecc9cda681..22821e5f9a6b 100755
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -65,28 +65,11 @@ VS_VERSION_INFO versioninfo
VS_FF_PRERELEASE |
#endif
0
-#ifndef WIN32
- fileos VOS_DOS_WINDOWS16
-#else
fileos VOS_NT_WINDOWS32
-#endif
filetype VFT_APP
{
block "StringFileInfo"
{
-#ifdef LG_D
- block "040704E4"
- {
- // German StringTable
- value "CompanyName", "OpenOffice.org\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", "SOREPORT.EXE\0"
- value "InternalName", "CrashReport\0"
- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
-#else
block "040904E4"
{
// International StringTable
@@ -98,16 +81,11 @@ VS_VERSION_INFO versioninfo
value "InternalName", "CrashReport\0"
value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
}
-#endif
}
block "VarFileInfo"
{
-#ifdef LG_D
- value "Translation", 0x0407, 1252
-#else
value "Translation", 0x0409, 1252
-#endif
}
}
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f3d19ca98790..f9b4e7ce3223 100755..100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -154,7 +155,7 @@ static FILE *_tmpfile(void)
TCHAR szTempPath[MAX_PATH];
- if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+ if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
{
TCHAR szFileName[MAX_PATH];
@@ -396,27 +397,27 @@ void CrashReportParams::ReadFromEnvironment()
{
TCHAR szBuffer[2048];
- DWORD dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYSERVER"), szBuffer, elementsof(szBuffer) );
+ DWORD dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYSERVER"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sProxyServer = szBuffer;
- dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYPORT"), szBuffer, elementsof(szBuffer) );
+ dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYPORT"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sProxyPort = szBuffer;
- dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_RETURNADDRESS"), szBuffer, elementsof(szBuffer) );
+ dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_RETURNADDRESS"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
sEmail = szBuffer;
// fAllowContact = TRUE;
}
- dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPCONNECTIONTYPE"), szBuffer, elementsof(szBuffer) );
+ dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPCONNECTIONTYPE"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
if ( 0 == _tcsicmp( szBuffer, _T("DIRECT") ) )
uInternetConnection = 1;
@@ -426,15 +427,15 @@ void CrashReportParams::ReadFromEnvironment()
uInternetConnection = 0;
}
- dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_SUBJECT"), szBuffer, elementsof(szBuffer) );
+ dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_SUBJECT"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sTitle = szBuffer;
- dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_BODYFILE"), szBuffer, elementsof(szBuffer) );
+ dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_BODYFILE"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
- if ( dwResult && dwResult < elementsof(szBuffer) )
+ if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
FILE *fp = _xfopen( szBuffer, _T("rb") );
@@ -445,11 +446,11 @@ void CrashReportParams::ReadFromEnvironment()
sComment = TEXT("");
- while ( 0 != (nBytesRead = fread( aUTF8Buffer, sizeof(aUTF8Buffer[0]), elementsof(aUTF8Buffer), fp )) )
+ while ( 0 != (nBytesRead = fread( aUTF8Buffer, sizeof(aUTF8Buffer[0]), SAL_N_ELEMENTS(aUTF8Buffer), fp )) )
{
TCHAR aBuffer[256+1];
- DWORD dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, elementsof(aBuffer) - 1 );
+ DWORD dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, SAL_N_ELEMENTS(aBuffer) - 1 );
aBuffer[dwCharacters] = 0;
sComment += aBuffer;
}
@@ -512,7 +513,7 @@ static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer,
TCHAR szBuffer[FORMATBUFSIZE];
TCHAR szBuffer2[FORMATBUFSIZE];
- LoadString( hInstance, uID, szBuffer, elementsof(szBuffer) );
+ LoadString( hInstance, uID, szBuffer, SAL_N_ELEMENTS(szBuffer) );
LPCTSTR src;
LPTSTR dest;
@@ -621,7 +622,7 @@ static string GetModuleDirectory( HMODULE hModule )
CHAR szModuleNameUTF8[MAX_PATH] = "";
- WideCharToMultiByte( CP_UTF8, 0, szModuleName, -1, szModuleNameUTF8, elementsof(szModuleNameUTF8), NULL, NULL );
+ WideCharToMultiByte( CP_UTF8, 0, szModuleName, -1, szModuleNameUTF8, SAL_N_ELEMENTS(szModuleNameUTF8), NULL, NULL );
return string( szModuleNameUTF8 );
}
@@ -660,7 +661,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
BOOL fSuccess = FALSE;
TCHAR szTempPath[MAX_PATH];
- if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+ if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
{
TCHAR szFileName[MAX_PATH];
@@ -899,10 +900,10 @@ BOOL CALLBACK PreviewDialogProc(
HINSTANCE hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
HWND hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
- GetWindowText( hwndParent, szBuffer, elementsof(szBuffer) );
+ GetWindowText( hwndParent, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( hwndDlg, szBuffer );
- LoadAndFormatString( hInstance, IDS_OK_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_OK_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDOK), szBuffer );
basic_string<TCHAR> aString;
@@ -918,11 +919,11 @@ BOOL CALLBACK PreviewDialogProc(
{
char buf[1024];
- while ( fgets( buf, elementsof(buf), fp ) != NULL )
+ while ( fgets( buf, SAL_N_ELEMENTS(buf), fp ) != NULL )
{
WCHAR bufW[1024];
- MultiByteToWideChar( CP_UTF8, 0, buf, -1, bufW, elementsof(bufW) );
+ MultiByteToWideChar( CP_UTF8, 0, buf, -1, bufW, SAL_N_ELEMENTS(bufW) );
aString.append( bufW );
}
@@ -943,16 +944,16 @@ BOOL CALLBACK PreviewDialogProc(
{
int i;
- count = fread( buf, sizeof(buf[0]), sizeof(buf)/sizeof(buf[0]), fp );
+ count = fread( buf, sizeof(buf[0]), SAL_N_ELEMENTS(buf), fp );
for ( i = 0; i < count; i++ )
{
TCHAR output[16];
- _sntprintf( output, elementsof(output), _T("%02X\x20"), buf[i] );
+ _sntprintf( output, SAL_N_ELEMENTS(output), _T("%02X\x20"), buf[i] );
aString.append( output );
}
- for ( ; i < elementsof(buf); i++ )
+ for ( ; i < SAL_N_ELEMENTS(buf); i++ )
{
aString.append( _T("\x20\x20\x20") );
}
@@ -1051,31 +1052,31 @@ BOOL CALLBACK OptionsDialogProc(
pParams = (CrashReportParams *)lParam;
- LoadAndFormatString( hInstance, IDS_OPTIONS_CAPTION, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_OPTIONS_CAPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( hwndDlg, szBuffer );
- LoadAndFormatString( hInstance, IDS_PROXY_SETTINGS_HEADER, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_PROXY_SETTINGS_HEADER, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_PROXY_SETTINGS), szBuffer );
- LoadAndFormatString( hInstance, IDS_PROXY_SYSTEM, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_PROXY_SYSTEM, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_RADIO_SYSTEM), szBuffer );
- LoadAndFormatString( hInstance, IDS_PROXY_DIRECT, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_PROXY_DIRECT, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_RADIO_DIRECT), szBuffer );
- LoadAndFormatString( hInstance, IDS_PROXY_MANUAL, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_PROXY_MANUAL, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_RADIO_MANUAL), szBuffer );
- LoadAndFormatString( hInstance, IDS_LABEL_PROXYSERVER, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_LABEL_PROXYSERVER, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_LABEL_PROXYSERVER), szBuffer );
- LoadAndFormatString( hInstance, IDS_LABEL_PROXYPORT, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_LABEL_PROXYPORT, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_LABEL_PROXYPORT), szBuffer );
- LoadAndFormatString( hInstance, IDS_OK_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_OK_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDOK), szBuffer );
- LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDCANCEL), szBuffer );
Edit_SetText( GetDlgItem(hwndDlg, IDC_EDIT_PROXYSERVER), pParams->sProxyServer.c_str() );
@@ -1088,7 +1089,7 @@ BOOL CALLBACK OptionsDialogProc(
EM_SETBKGNDCOLOR,
(WPARAM)FALSE,
GetSysColor( COLOR_3DFACE ) );
- LoadAndFormatString( hInstance, IDS_PROXY_DESCRIPTION, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_PROXY_DESCRIPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Edit_SetText( GetDlgItem(hwndDlg, IDC_PROXY_DESCRIPTION), szBuffer );
UpdateOptionsDialogControls( hwndDlg );
@@ -1107,10 +1108,10 @@ BOOL CALLBACK OptionsDialogProc(
{
TCHAR szBuffer[1024];
- Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_PROXYSERVER), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_PROXYSERVER), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sProxyServer = szBuffer;
- Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_PROXYPORT), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_PROXYPORT), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sProxyPort = szBuffer;
if ( Button_GetCheck( GetDlgItem(hwndDlg, IDC_RADIO_DIRECT) ) & BST_CHECKED )
@@ -1177,21 +1178,21 @@ BOOL CALLBACK ReportDialogProc(
HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
TCHAR szBuffer[FORMATBUFSIZE];
- LoadAndFormatString( hInstance, IDS_REPORT_INTRO, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_REPORT_INTRO, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_REPORT_INTRO), szBuffer );
Edit_SetText( GetDlgItem(hwndDlg, IDC_EDIT3), szBuffer );
- LoadAndFormatString( hInstance, IDS_ENTER_TITLE, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_ENTER_TITLE, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_ENTER_TITLE), szBuffer );
- LoadAndFormatString( hInstance, IDS_ENTER_DESCRIPTION, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_ENTER_DESCRIPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_ENTER_DESCRIPTION), szBuffer );
- LoadAndFormatString( hInstance, IDS_SHOW_REPORT_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_SHOW_REPORT_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_SHOW_REPORT), szBuffer );
- LoadAndFormatString( hInstance, IDS_SAVE_REPORT_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_SAVE_REPORT_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_SAVE_REPORT), szBuffer );
const char *pszUserType = getenv( "STAROFFICE_USERTYPE" );
@@ -1200,14 +1201,14 @@ BOOL CALLBACK ReportDialogProc(
else
ShowWindow( GetDlgItem(hwndDlg, IDC_SAVE_REPORT), SW_HIDE );
- LoadAndFormatString( hInstance, IDS_OPTIONS_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_OPTIONS_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_OPTIONS), szBuffer );
- LoadAndFormatString( hInstance, IDS_ALLOW_CONTACT, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_ALLOW_CONTACT, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT), szBuffer );
Button_SetCheck( GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT), pParams->fAllowContact ? BST_CHECKED : BST_UNCHECKED );
- LoadAndFormatString( hInstance, IDS_LABEL_EMAIL, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_LABEL_EMAIL, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDC_LABEL_EMAIL), szBuffer );
Edit_SetText( GetDlgItem(hwndDlg, IDC_EDIT_EMAIL), pParams->sEmail.c_str() );
@@ -1222,13 +1223,13 @@ BOOL CALLBACK ReportDialogProc(
CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
TCHAR szBuffer[FORMATBUFSIZE];
- LoadAndFormatString( hInstance, IDS_REPORT_CAPTION, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_REPORT_CAPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( GetParent(hwndDlg), szBuffer );
- LoadAndFormatString( hInstance, IDS_REPORT_HEADER, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_REPORT_HEADER, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( GetDlgItem(GetParent(hwndDlg), IDC_HEADER), szBuffer );
- LoadAndFormatString( hInstance, IDS_DONOT_SEND_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_DONOT_SEND_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(GetParent(hwndDlg), IDCANCEL), szBuffer );
@@ -1259,13 +1260,13 @@ BOOL CALLBACK ReportDialogProc(
pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
- Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_TITLE), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_TITLE), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sTitle = szBuffer;
- Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_DESCRIPTION), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_DESCRIPTION), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sComment = szBuffer;
- Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_EMAIL), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndDlg, IDC_EDIT_EMAIL), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sEmail = szBuffer;
PreviewReport( GetParent(hwndDlg), pParams );
@@ -1316,16 +1317,16 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
SendMessage( hwndRichEdit, EM_SETEVENTMASK, 0, ENM_LINK );
SendMessage( hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0 );
- LoadAndFormatString( hInstance, IDS_WELCOME_BODY1, szBuffer, elementsof(szBuffer) );
- LoadAndFormatString( hInstance, IDS_WELCOME_BODY2, szBuffer2, elementsof(szBuffer2) );
- _tcsncat( szBuffer, szBuffer2, elementsof(szBuffer) );
- LoadAndFormatString( hInstance, IDS_WELCOME_BODY3, szBuffer2, elementsof(szBuffer2) );
- _tcsncat( szBuffer, szBuffer2, elementsof(szBuffer) );
- LoadString( hInstance, IDS_PRIVACY_URL, szURL, elementsof(szURL) );
- _tcsncat( szBuffer, szURL, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_BODY1, szBuffer, SAL_N_ELEMENTS(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_BODY2, szBuffer2, SAL_N_ELEMENTS(szBuffer2) );
+ _tcsncat( szBuffer, szBuffer2, SAL_N_ELEMENTS(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_BODY3, szBuffer2, SAL_N_ELEMENTS(szBuffer2) );
+ _tcsncat( szBuffer, szBuffer2, SAL_N_ELEMENTS(szBuffer) );
+ LoadString( hInstance, IDS_PRIVACY_URL, szURL, SAL_N_ELEMENTS(szURL) );
+ _tcsncat( szBuffer, szURL, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( hwndRichEdit, szBuffer );
- LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szCaption, elementsof(szCaption) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szCaption, SAL_N_ELEMENTS(szCaption) );
SetWindowText( GetParent(hwndDlg), szCaption );
}
@@ -1336,13 +1337,13 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
TCHAR szBuffer[FORMATBUFSIZE];
- LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( GetParent(hwndDlg), szBuffer );
- LoadAndFormatString( hInstance, IDS_WELCOME_HEADER, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_WELCOME_HEADER, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( GetDlgItem(GetParent(hwndDlg), IDC_HEADER), szBuffer );
- LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(GetParent(hwndDlg), IDCANCEL), szBuffer );
ShowWindow( GetDlgItem(GetParent(hwndDlg),IDBACK), FALSE );
@@ -1421,16 +1422,16 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
SCF_ALL,
(LPARAM)&chfmt );
- LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDCANCEL), szBuffer );
- LoadAndFormatString( hInstance, IDS_NEXT_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_NEXT_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDNEXT), szBuffer );
- LoadAndFormatString( hInstance, IDS_SEND_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_SEND_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDFINISH), szBuffer );
- LoadAndFormatString( hInstance, IDS_BACK_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_BACK_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDBACK), szBuffer );
ShowWindow( hwndPages[1], SW_HIDE );
@@ -1453,7 +1454,7 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
}
return TRUE;
case IDNEXT:
- if ( iActualPage < elementsof(hwndPages) - 1 )
+ if ( iActualPage < SAL_N_ELEMENTS(hwndPages) - 1 )
{
ShowWindow( hwndPages[iActualPage], SW_HIDE );
ShowWindow( hwndPages[++iActualPage], SW_SHOW );
@@ -1466,20 +1467,20 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndPages[1], IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
- Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_TITLE), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_TITLE), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sTitle = szBuffer;
- Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_DESCRIPTION), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_DESCRIPTION), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sComment = szBuffer;
- Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_EMAIL), szBuffer, elementsof(szBuffer) );
+ Edit_GetText( GetDlgItem(hwndPages[1], IDC_EDIT_EMAIL), szBuffer, SAL_N_ELEMENTS(szBuffer) );
pParams->sEmail = szBuffer;
if ( pParams->fAllowContact && !pParams->sEmail.length() )
{
TCHAR szMessage[MAX_TEXT_BUFFER];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_NOEMAILADDRESS, szMessage, elementsof(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_NOEMAILADDRESS, szMessage, SAL_N_ELEMENTS(szMessage) );
MessageBox( hwndDlg, szMessage, NULL, MB_ICONERROR | MB_OK );
break; // Don't end the dialog
@@ -1522,7 +1523,7 @@ static void repatch_soffice_exe( void *pBuffer, size_t nBufSize )
wchar_t DescriptionBuffer[MAGIC_DESCRIPTION_COUNT];
memset( DescriptionBuffer, 0, sizeof(DescriptionBuffer) );
- wcsncpy( DescriptionBuffer, g_wstrProductKey.c_str(), elementsof(DescriptionBuffer) - 1 );
+ wcsncpy( DescriptionBuffer, g_wstrProductKey.c_str(), SAL_N_ELEMENTS(DescriptionBuffer) - 1 );
bool bPatched = false;
@@ -1919,7 +1920,7 @@ BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, D
{
TCHAR szTempPath[MAX_PATH];
-// if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+// if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
if ( GetCrashDataPath( szTempPath ) )
{
TCHAR szFileName[MAX_PATH];
@@ -1997,7 +1998,7 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
DWORD dwSize = 0;
TCHAR szShortImagePath[MAX_PATH];
- if ( GetShortPathName( lpImagePath, szShortImagePath, elementsof(szShortImagePath) ) &&
+ if ( GetShortPathName( lpImagePath, szShortImagePath, SAL_N_ELEMENTS(szShortImagePath) ) &&
EnumProcesses( aProcesses, sizeof(aProcesses), &dwSize ) )
{
unsigned nProcesses = dwSize / sizeof(aProcesses[0]);
@@ -2014,7 +2015,7 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
{
TCHAR szShortModulePath[MAX_PATH];
- if ( GetShortPathName( szModulePath, szShortModulePath, elementsof(szShortModulePath) ) )
+ if ( GetShortPathName( szModulePath, szShortModulePath, SAL_N_ELEMENTS(szShortModulePath) ) )
{
if ( 0 == _tcsicmp( szShortModulePath, szShortImagePath ) )
dwProcessId = aProcesses[i];
@@ -2087,10 +2088,10 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
TCHAR szProcessDescription[FORMATBUFSIZE];
TCHAR szHelpDescription[FORMATBUFSIZE];
- LoadAndFormatString( hInstance, IDS_MSG_CMDLINE_USAGE, szUsage, elementsof(szUsage) );
- LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID, szProcess, elementsof(szProcess) );
- LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID_DESCRIPTION, szProcessDescription, elementsof(szProcessDescription) );
- LoadAndFormatString( hInstance, IDS_MSG_PARAM_HELP_DESCRIPTION, szHelpDescription, elementsof(szHelpDescription) );
+ LoadAndFormatString( hInstance, IDS_MSG_CMDLINE_USAGE, szUsage, SAL_N_ELEMENTS(szUsage) );
+ LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID, szProcess, SAL_N_ELEMENTS(szProcess) );
+ LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID_DESCRIPTION, szProcessDescription, SAL_N_ELEMENTS(szProcessDescription) );
+ LoadAndFormatString( hInstance, IDS_MSG_PARAM_HELP_DESCRIPTION, szHelpDescription, SAL_N_ELEMENTS(szHelpDescription) );
_tprintf(
TEXT("\n%s: crashrep %s\n\n")
@@ -2183,7 +2184,7 @@ BOOL WriteCommentFile( LPCTSTR lpComment )
BOOL fSuccess = FALSE;
TCHAR szTempPath[MAX_PATH];
- if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+ if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
{
TCHAR szFileName[MAX_PATH];
@@ -2335,7 +2336,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
TEXT("ProductKey"),
TEXT("OpenOffice.org"),
szBuffer,
- elementsof(szBuffer),
+ SAL_N_ELEMENTS(szBuffer),
szModuleName )
)
{
@@ -2363,7 +2364,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
TEXT("Version"),
TEXT("buildid"),
TEXT("unknown"),
- g_szBuildId, elementsof(g_szBuildId),
+ g_szBuildId, SAL_N_ELEMENTS(g_szBuildId),
szModuleVersionName );
g_strDefaultLanguage = get_script_string( "instdb.inf", "DefaultLanguage" );
@@ -2372,7 +2373,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
TEXT("ErrorReport"),
TEXT("ErrorReportPort"),
TEXT("80"),
- szReportPort, elementsof(szReportPort),
+ szReportPort, SAL_N_ELEMENTS(szReportPort),
szModuleName
) )
{
@@ -2387,11 +2388,11 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
TEXT("ErrorReport"),
TEXT("ErrorReportServer"),
TEXT(""),
- szReportServer, elementsof(szReportServer),
+ szReportServer, SAL_N_ELEMENTS(szReportServer),
szModuleName
) )
{
- bSuccess = 0 != WideCharToMultiByte( CP_ACP, 0, szReportServer, -1, g_szReportServerA, elementsof(g_szReportServerA), NULL, NULL );
+ bSuccess = 0 != WideCharToMultiByte( CP_ACP, 0, szReportServer, -1, g_szReportServerA, SAL_N_ELEMENTS(g_szReportServerA), NULL, NULL );
}
LPCTSTR lpEnvString;
@@ -2624,13 +2625,13 @@ BOOL CALLBACK SendingStatusDialogProc(
pRequest = (RequestParams *)lParam;
- LoadAndFormatString( hInstance, IDS_SENDING_REPORT_HEADER, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_SENDING_REPORT_HEADER, szBuffer, SAL_N_ELEMENTS(szBuffer) );
SetWindowText( hwndDlg, szBuffer );
- LoadAndFormatString( hInstance, IDS_SENDING_REPORT_STATUS, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_SENDING_REPORT_STATUS, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Static_SetText( GetDlgItem(hwndDlg, IDC_SENDING_REPORT_STATUS), szBuffer );
- LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, elementsof(szBuffer) );
+ LoadAndFormatString( hInstance, IDS_CANCEL_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
Button_SetText( GetDlgItem(hwndDlg, IDCANCEL), szBuffer );
pRequest->hwndStatus = hwndDlg;
@@ -2767,7 +2768,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
{
TCHAR szMessage[1024];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, elementsof(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, SAL_N_ELEMENTS(szMessage) );
MessageBox( hwndParent, szMessage, NULL, MB_ICONERROR | MB_OK );
}
@@ -2776,8 +2777,8 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
TCHAR szMessage[1024];
TCHAR szTitle[1024];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, elementsof(szMessage) );
- LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_HEADER, szTitle, elementsof(szTitle) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, SAL_N_ELEMENTS(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_HEADER, szTitle, SAL_N_ELEMENTS(szTitle) );
MessageBox( hwndParent, szMessage, szTitle, MB_ICONINFORMATION | MB_OK );
}
@@ -2795,14 +2796,14 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
{
TCHAR szMessage[1024];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, elementsof(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, SAL_N_ELEMENTS(szMessage) );
_ftprintf( stderr, _T("ERROR: %s\n"), szMessage );
}
else
{
TCHAR szMessage[1024];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, elementsof(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, SAL_N_ELEMENTS(szMessage) );
_ftprintf( stderr, _T("SUCCESS: %s\n"), szMessage );
}
@@ -2813,7 +2814,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
{
TCHAR szMessage[1024];
- LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_DISK_FULL, szMessage, elementsof(szMessage) );
+ LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_DISK_FULL, szMessage, SAL_N_ELEMENTS(szMessage) );
if ( hwndParent )
MessageBox( hwndParent, szMessage, NULL, MB_ICONERROR | MB_OK );
@@ -2980,3 +2981,4 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
return exitcode;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/pch/precompiled_cui.cxx b/cui/inc/pch/precompiled_cui.cxx
index ff1079af431b..4d85e0351431 100644
--- a/cui/inc/pch/precompiled_cui.cxx
+++ b/cui/inc/pch/precompiled_cui.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_cui.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a75a7cf1f24d..8a3b81562bd2 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,6 +43,8 @@
#include <sfx2/minfitem.hxx>
#include <svl/stritem.hxx>
+#include <sal/macros.h>
+
#include "cuires.hrc"
#include "acccfg.hrc"
@@ -58,9 +61,7 @@
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -218,6 +219,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_X | KEY_MOD1 ,
KEY_Y | KEY_MOD1 ,
KEY_Z | KEY_MOD1 ,
+ KEY_SEMICOLON | KEY_MOD1 ,
+ KEY_BRACKETLEFT | KEY_MOD1 ,
+ KEY_BRACKETRIGHT | KEY_MOD1,
KEY_F1 | KEY_MOD1 ,
KEY_F2 | KEY_MOD1 ,
@@ -287,6 +291,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_X | KEY_SHIFT | KEY_MOD1,
KEY_Y | KEY_SHIFT | KEY_MOD1,
KEY_Z | KEY_SHIFT | KEY_MOD1,
+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 ,
+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 ,
+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
KEY_F1 | KEY_SHIFT | KEY_MOD1,
KEY_F2 | KEY_SHIFT | KEY_MOD1,
@@ -351,6 +358,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_X | KEY_MOD2 ,
KEY_Y | KEY_MOD2 ,
KEY_Z | KEY_MOD2 ,
+ KEY_SEMICOLON | KEY_MOD2 ,
+ KEY_BRACKETLEFT | KEY_MOD2 ,
+ KEY_BRACKETRIGHT | KEY_MOD2,
KEY_F1 | KEY_MOD2 ,
KEY_F2 | KEY_MOD2 ,
@@ -415,6 +425,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_X | KEY_SHIFT | KEY_MOD2,
KEY_Y | KEY_SHIFT | KEY_MOD2,
KEY_Z | KEY_SHIFT | KEY_MOD2,
+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 ,
+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 ,
+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
KEY_F1 | KEY_SHIFT | KEY_MOD2,
KEY_F2 | KEY_SHIFT | KEY_MOD2,
@@ -543,6 +556,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_X | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
@@ -572,7 +588,7 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_DELETE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2
};
-static USHORT KEYCODE_ARRAY_SIZE = (sizeof(KEYCODE_ARRAY) / sizeof(KEYCODE_ARRAY[0]));
+static USHORT KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
//-----------------------------------------------
// seems to be needed to layout the list box, which shows all
@@ -1697,3 +1713,5 @@ SvxShortcutAssignDlg::~SvxShortcutAssignDlg()
// .uno:InsertSymbol?Symbols:string=bla
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 022cc1cfb72c..46296a3f6f1f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,22 +32,12 @@
#include <stdlib.h>
#include <time.h>
-#ifndef _HELP_HXX //autogen
#include <vcl/help.hxx>
-#endif
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <vcl/decoview.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/scrbar.hxx>
-//added for issue73355
-//#ifndef _SV_SVDATA_HXX
-//#include <vcl/svdata.hxx>
-//#endif
-//issue73355 ends
-
#include <sfx2/app.hxx>
#include <sfx2/sfxdlg.hxx>
#include <sfx2/viewfrm.hxx>
@@ -77,9 +68,7 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
-#ifndef _UNOTOOLS_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
-#endif
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/ui/ItemStyle.hpp>
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
@@ -92,9 +81,7 @@
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
-#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_
#include <com/sun/star/ui/UIElementType.hpp>
-#endif
#include <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -5725,7 +5712,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
{
BitmapEx aBitmap = aImage.GetBitmapEx();
- BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
aImage = Image( aBitmapex);
}
aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify
@@ -5889,7 +5876,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
{
BitmapEx aBitmap = aImage.GetBitmapEx();
- BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
aImage = Image( aBitmapex);
}
if ( bOK && !!aImage )
@@ -6058,3 +6045,5 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a
return aRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 952de1f9275e..46f9576058e0 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -585,7 +586,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
Any value;
sal_Bool tmp = false;
- value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty(
+ value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty(
::rtl::OUString::createFromAscii(
"Office.Scripting/ScriptDisplaySettings/ShowBasic" ) );
@@ -598,7 +599,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
bShowBasic = FALSE;
}
- value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty(
+ value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty(
::rtl::OUString::createFromAscii(
"Office.Scripting/ScriptDisplaySettings/ShowSF" ) );
@@ -1796,3 +1797,5 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic,
pEntry = NextSibling( pEntry );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 8592dbaded5f..8a5d00fa6216 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,4 @@ void SvxEventConfigPage::Reset( const SfxItemSet& )
_SvxMacroTabPage::Reset();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 9b5453553ef3..5cb41f93a829 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1052,3 +1053,5 @@ void SvxMacroAssignSingleTabDialog::SetTabPage( SfxTabPage* pTabPage )
SetUniqueId( pPage->GetUniqueId() );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3e99f3e95b5f..b52f8c29a6f3 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1251,3 +1252,5 @@ SvxScriptSelectorDialog::GetSelectedHelpText()
{
return aCommands.GetHelpText( aCommands.GetLastSelectedEntry() );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index 4d3240597259..c4c55b9ebe1b 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,3 +171,4 @@ int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 303b54688eea..304407cdba07 100755..100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2150,3 +2151,5 @@ void ExplainButton::Click()
{
RequestHelp( HelpEvent() );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index f1cc2a869d6a..9b23a1386963 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
#include <cuires.hrc>
#include <dialmgr.hxx>
#include <vcl/decoview.hxx>
+#include <sal/macros.h>
#include "hangulhanjadlg.hrc"
@@ -252,7 +254,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY )
{
this, &aAuditBox, &aStatusText
};
- for ( sal_uInt32 i = 0; i < sizeof( pResize ) / sizeof( pResize[0] ); ++i )
+ for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pResize ); ++i )
{
aSize = pResize[i]->GetSizePixel( );
pResize[i]->SetSizePixel( Size( aSize.Width() + _nX, aSize.Height() + _nY ) );
@@ -265,7 +267,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY )
{
&aStatusText, &aHelpBtn, &aCancelBtn
};
- for ( sal_uInt32 i = 0; i < sizeof( pMoveDown ) / sizeof( pMoveDown[0] ); ++i )
+ for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pMoveDown ); ++i )
{
aPos = pMoveDown[i]->GetPosPixel();
aPos.Y() += _nY;
@@ -279,7 +281,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY )
{
&aIgnoreBtn, &aIgnoreAllBtn, &aChangeBtn, &aChangeAllBtn, &aOptionsBtn, &aHelpBtn, &aCancelBtn
};
- for ( sal_uInt32 i = 0; i < sizeof( pMoveRight ) / sizeof( pMoveRight[0] ); ++i )
+ for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pMoveRight ); ++i )
{
aPos = pMoveRight[i]->GetPosPixel();
aPos.X() += _nX;
@@ -287,3 +289,5 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY )
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 04d9fbcc58e4..c8421973817b 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -32,9 +32,7 @@
#include <svtools/stdctrl.hxx>
#include <vcl/edit.hxx>
#include <svtools/svxbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/dialog.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index b8b6d2567a47..6348b73d4e14 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,7 +313,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
// the font may not be in the list =>
// try to find a font name token in list and select found font,
// else select topmost entry
- FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND );
+ bool bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND );
if( !bFound )
{
for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i )
@@ -587,3 +588,5 @@ IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index cd67d1ab5bb3..18177096d2a4 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,6 +48,7 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <comphelper/processfactory.hxx>
#include <svx/svxdlg.hxx>
+#include <sal/macros.h>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
@@ -72,7 +74,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
// hide the options for the japanese search
Control* pFieldsToMove[] = { &m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint };
- implMoveControls(pFieldsToMove, sizeof(pFieldsToMove)/sizeof(pFieldsToMove[0]), nDifference, &m_flOptions);
+ implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flOptions);
m_aSoundsLikeCJK.Hide();
m_aSoundsLikeCJKSettings.Hide();
@@ -171,7 +173,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
&m_pbApproxSettings, &m_aHalfFullFormsCJK, &m_aSoundsLikeCJK, &m_aSoundsLikeCJKSettings,
&m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint };
- implMoveControls(pFieldsToMove, sizeof(pFieldsToMove)/sizeof(pFieldsToMove[0]), nDifference, &m_flWhere);
+ implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flWhere);
Point pt = m_rbAllFields.GetPosPixel();
pt.X() = m_ftForm.GetPosPixel().X();
@@ -275,7 +277,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
RID_STR_SEARCH_END,
RID_STR_SEARCH_WHOLE
};
- for ( size_t i=0; i<sizeof(nResIds)/sizeof(nResIds[0]); ++i )
+ for ( size_t i=0; i<SAL_N_ELEMENTS(nResIds); ++i )
m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) );
m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE);
@@ -411,23 +413,22 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
else if (&m_aSoundsLikeCJKSettings == pButton)
{
SfxItemSet aSet( SFX_APP()->GetPool() );
- //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
- aDlg->Execute(); //CHINA001 aDlg.Execute();
+ DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ aDlg->Execute();
- INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+ INT32 nFlags = aDlg->GetTransliterationFlags();
m_pSearchEngine->SetTransliterationFlags(nFlags);
m_cbCase.Check(m_pSearchEngine->GetCaseSensitive());
OnCheckBoxToggled( &m_cbCase );
m_aHalfFullFormsCJK.Check( !m_pSearchEngine->GetIgnoreWidthCJK() );
OnCheckBoxToggled( &m_aHalfFullFormsCJK );
- delete aDlg; //add for CHINA001
+ delete aDlg;
}
}
@@ -725,13 +726,13 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
&m_pbSearchAgain, &m_pbClose };
if (!bEnable)
- for (sal_uInt32 i=0; i<sizeof(pAffectedControls)/sizeof(pAffectedControls[0]); ++i)
+ for (sal_uInt32 i=0; i<SAL_N_ELEMENTS(pAffectedControls); ++i)
{
pAffectedControls[i]->SetUpdateMode(bEnable);
pAffectedControls[i]->EnablePaint(bEnable);
}
else
- for (sal_uInt32 i=0; i<sizeof(pAffectedControls)/sizeof(pAffectedControls[0]); ++i)
+ for (sal_uInt32 i=0; i<SAL_N_ELEMENTS(pAffectedControls); ++i)
{
pAffectedControls[i]->EnablePaint(bEnable);
pAffectedControls[i]->SetUpdateMode(bEnable);
@@ -963,3 +964,4 @@ void FmSearchDialog::SaveParams() const
m_pConfig->setParams( aCurrentSettings );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a205db2a28c9..97d8f17803ae 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -705,7 +706,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
aFtMSShowContent.SetText( aOutStr );
// get locale wrapper (singleton)
- const LocaleDataWrapper& aLocaleData = SvtSysLocale().GetLocaleData();
+ const SvtSysLocale aSysLocale;
+ const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData();
// ChangeDate/Time
aAccess = aLocaleData.getDate( pData->aThemeChangeDate );
@@ -1267,3 +1269,4 @@ IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dial
return 0L;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 8bbbfb5f8df2..beb0774c7bd0 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,280 +41,6 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_...
-// --------------------
-// - SvxGraphicFilter -
-// --------------------
-/*
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
-{
- const Graphic& rGraphic = rFilterObject.GetGraphic();
- ULONG nRet;
-
- if( rGraphic.GetType() == GRAPHIC_BITMAP )
- {
- SfxViewFrame* pViewFrame = SfxViewFrame::Current();
- SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL;
- Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL;
- Graphic aGraphic;
-
- switch( rReq.GetSlot() )
- {
- case( SID_GRFFILTER_INVERT ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Invert() )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Invert() )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_SMOOTH ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Filter( BMP_FILTER_SMOOTH ) )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Filter( BMP_FILTER_SMOOTH ) )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_SHARPEN ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Filter( BMP_FILTER_SHARPEN ) )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Filter( BMP_FILTER_SHARPEN ) )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_REMOVENOISE ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Filter( BMP_FILTER_REMOVENOISE ) )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Filter( BMP_FILTER_REMOVENOISE ) )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_SOBEL ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Filter( BMP_FILTER_SOBEL_GREY ) )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Filter( BMP_FILTER_SOBEL_GREY ) )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_MOSAIC ):
- {
- GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, FALSE );
-
- if( aDlg.Execute() == RET_OK )
- aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
- }
- break;
-
- case( SID_GRFFILTER_EMBOSS ):
- {
- GraphicFilterEmboss aDlg( pWindow, rGraphic, RP_MM );
-
- if( aDlg.Execute() == RET_OK )
- aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
- }
- break;
-
- case( SID_GRFFILTER_POSTER ):
- {
- GraphicFilterPoster aDlg( pWindow, rGraphic, 16 );
-
- if( aDlg.Execute() == RET_OK )
- aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
- }
- break;
-
- case( SID_GRFFILTER_POPART ):
- {
- if( pShell )
- pShell->SetWaitCursor( TRUE );
-
- if( rGraphic.IsAnimated() )
- {
- Animation aAnimation( rGraphic.GetAnimation() );
-
- if( aAnimation.Filter( BMP_FILTER_POPART ) )
- aGraphic = aAnimation;
- }
- else
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- if( aBmpEx.Filter( BMP_FILTER_POPART ) )
- aGraphic = aBmpEx;
- }
-
- if( pShell )
- pShell->SetWaitCursor( FALSE );
- }
- break;
-
- case( SID_GRFFILTER_SEPIA ):
- {
- GraphicFilterSepia aDlg( pWindow, rGraphic, 10 );
-
- if( aDlg.Execute() == RET_OK )
- aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
- }
- break;
-
- case( SID_GRFFILTER_SOLARIZE ):
- {
- GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, FALSE );
-
- if( aDlg.Execute() == RET_OK )
- aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
- }
- break;
-
- default:
- {
- DBG_ERROR( "SvxGraphicFilter: selected filter slot not yet implemented" );
- nRet = SVX_GRAPHICFILTER_UNSUPPORTED_SLOT;
- }
- break;
- }
-
- if( aGraphic.GetType() != GRAPHIC_NONE )
- {
- rFilterObject.SetGraphic( aGraphic );
- nRet = SVX_GRAPHICFILTER_ERRCODE_NONE;
- }
- }
- else
- nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
-
- return nRet;
-}
-
-// -----------------------------------------------------------------------------
-
-void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet )
-{
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER ) )
- rSet.DisableItem( SID_GRFFILTER );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_INVERT ) )
- rSet.DisableItem( SID_GRFFILTER_INVERT );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) )
- rSet.DisableItem( SID_GRFFILTER_SMOOTH );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) )
- rSet.DisableItem( SID_GRFFILTER_SHARPEN );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) )
- rSet.DisableItem( SID_GRFFILTER_REMOVENOISE );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) )
- rSet.DisableItem( SID_GRFFILTER_SOBEL );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) )
- rSet.DisableItem( SID_GRFFILTER_MOSAIC );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) )
- rSet.DisableItem( SID_GRFFILTER_EMBOSS );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POSTER ) )
- rSet.DisableItem( SID_GRFFILTER_POSTER );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POPART ) )
- rSet.DisableItem( SID_GRFFILTER_POPART );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) )
- rSet.DisableItem( SID_GRFFILTER_SEPIA );
-
- if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) )
- rSet.DisableItem( SID_GRFFILTER_SOLARIZE );
-};
-*/
// --------------------------------------
// - GraphicFilterDialog::PreviewWindow -
// --------------------------------------
@@ -754,3 +481,5 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
return aRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 297b1ad921c4..ba85929192f4 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -413,3 +414,5 @@ void SvxHpLinkDlg::PageCreated( USHORT /*nId*/, IconChoicePage& rPage )
OSL_ENSURE( xDocumentFrame.is(), "SvxHpLinkDlg::PageCreated: macro assignment functionality won't work with a proper frame!" );
rHyperlinkPage.SetDocumentFrame( xDocumentFrame );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 950d400bb42e..2da453213f5d 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT
else
maCbbTargets.SetText( rTarget );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index e3115875fab2..4d0f2d91d12f 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
FreeResource();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index c5bf6d8ffa39..ac6cdd178eae 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,7 @@
#include <cuires.hrc>
#include "dlgname.hxx"
-#include "defdlgname.hxx" //CHINA001
+#include "defdlgname.hxx"
#include "dlgname.hrc"
#include <dialmgr.hxx>
@@ -80,9 +81,6 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String
}
}
-/* -----------------------------27.02.2002 15:22------------------------------
-
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
{
if(aCheckNameHdl.IsSet())
@@ -234,3 +232,4 @@ void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index a94161c0a1ed..fc1921b47cce 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -76,7 +76,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
Maximum = 999 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " Pixel" ;
+ CustomUnitText [ en-US ] = " Pixel" ;
First = 1 ;
Last = 999 ;
SpinSize = 1 ;
@@ -101,7 +101,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
Maximum = 999 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " Pixel" ;
+ CustomUnitText [ en-US ] = " Pixel" ;
First = 1 ;
Last = 999 ;
SpinSize = 1 ;
@@ -179,7 +179,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
SpinSize = 1 ;
};
@@ -258,7 +258,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2198a42c3fcf..cb986f6dd1dd 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1908,3 +1909,5 @@ namespace svx
//.............................................................................
} // namespace svx
//.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index dc50bd8f205d..db9ab3647e41 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -516,3 +517,4 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
return( 0L );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a87d7710f484..095e959cdca6 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
#include "hldoctp.hxx"
#include "hyperdlg.hrc"
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx"
sal_Char __READONLY_DATA sHash[] = "#";
sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME;
@@ -372,3 +373,5 @@ SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( String& aStrPath )
else
return Type_ExistsFile;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 79fde6c7a64c..f0d3cf1878e8 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx