[Libreoffice-commits] core.git: 24 commits - accessibility/inc accessibility/source avmedia/source basctl/source canvas/source chart2/source connectivity/source cppu/source cui/source dbaccess/inc dbaccess/source desktop/source editeng/source extensions/inc extensions/source filter/source forms/source formula/source fpicker/source framework/inc idlc/inc idlc/source include/editeng include/formula include/sfx2 include/svl include/svtools include/svx include/vcl lotuswordpro/source oox/source pyuno/source reportdesign/inc reportdesign/source scaddins/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source solenv/bin starmath/inc starmath/source svl/source svtools/source svx/inc svx/source sw/inc sw/source unotools/source uui/source vcl/source vcl/unx wizards/source writerfilter/inc writerfilter/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Mon May 19 11:05:22 PDT 2014
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 2
accessibility/inc/accessibility/helper/accessiblestrings.hrc | 1
accessibility/inc/pch/precompiled_acc.hxx | 4
accessibility/source/extended/textwindowaccessibility.cxx | 4
avmedia/source/viewer/mediawindow.src | 12
basctl/source/dlged/dlgresid.src | 3
basctl/source/inc/dlgresid.hrc | 2
canvas/source/cairo/cairo_canvas.hxx | 8
canvas/source/cairo/cairo_canvasbitmap.hxx | 10
canvas/source/cairo/cairo_canvascustomsprite.hxx | 8
canvas/source/cairo/cairo_canvashelper.hxx | 4
canvas/source/cairo/cairo_repainttarget.hxx | 2
canvas/source/cairo/cairo_spritecanvas.hxx | 12
canvas/source/cairo/cairo_surfaceprovider.hxx | 12
canvas/source/cairo/cairo_textlayout.hxx | 2
chart2/source/controller/dialogs/Bitmaps.hrc | 12
chart2/source/controller/dialogs/Bitmaps.src | 7
chart2/source/controller/dialogs/ResourceIds.hrc | 1
chart2/source/controller/dialogs/Strings.src | 8
chart2/source/controller/dialogs/Strings_Statistic.src | 3
chart2/source/controller/inc/MenuResIds.hrc | 1
chart2/source/controller/inc/ShapeController.hrc | 1
chart2/source/controller/main/DrawCommandDispatch.hrc | 1
chart2/source/controller/menus/ShapeContextMenu.src | 1
chart2/source/controller/menus/ShapeEditContextMenu.src | 1
chart2/source/inc/Strings.hrc | 7
connectivity/source/inc/resource/ado_res.hrc | 2
connectivity/source/inc/resource/calc_res.hrc | 2
connectivity/source/inc/resource/common_res.hrc | 2
connectivity/source/inc/resource/conn_shared_res.hrc | 1
connectivity/source/inc/resource/dbase_res.hrc | 2
connectivity/source/inc/resource/evoab2_res.hrc | 2
connectivity/source/inc/resource/file_res.hrc | 1
connectivity/source/inc/resource/hsqldb_res.hrc | 2
connectivity/source/inc/resource/kab_res.hrc | 1
connectivity/source/inc/resource/macab_res.hrc | 1
connectivity/source/inc/resource/mork_res.hrc | 2
connectivity/source/inc/resource/mozab_res.hrc | 2
connectivity/source/resource/conn_log_res.src | 2
connectivity/source/resource/conn_shared_res.src | 5
cppu/source/threadpool/thread.cxx | 1
cppu/source/threadpool/threadpool.cxx | 1
cppu/source/threadpool/threadpool.hxx | 13 -
cui/source/customize/macropg.src | 1
cui/source/dialogs/colorpicker.src | 8
cui/source/dialogs/hangulhanjadlg.hrc | 1
cui/source/dialogs/svuidlg.hrc | 1
cui/source/inc/cuires.hrc | 1
cui/source/options/optgdlg.src | 2
cui/source/tabpages/frmdirlbox.src | 2
dbaccess/inc/dbaccess_slotid.hrc | 1
dbaccess/source/core/api/KeySet.cxx | 3
dbaccess/source/core/inc/dbamiscres.hrc | 2
dbaccess/source/core/resource/strings.src | 2
dbaccess/source/ext/macromigration/dbmm_global.hrc | 9
dbaccess/source/ext/macromigration/macromigration.src | 10
dbaccess/source/inc/dbastrings.hrc | 2
dbaccess/source/inc/dbustrings.hrc | 4
dbaccess/source/inc/stringconstants.hrc | 1
dbaccess/source/sdbtools/inc/sdbt_resource.hrc | 2
dbaccess/source/ui/app/app.src | 1
dbaccess/source/ui/browser/sbagrid.src | 1
dbaccess/source/ui/dlg/AutoControls.src | 3
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 31 --
dbaccess/source/ui/dlg/ConnectionPage.hrc | 1
dbaccess/source/ui/dlg/ConnectionPage.src | 1
dbaccess/source/ui/dlg/admincontrols.hrc | 3
dbaccess/source/ui/dlg/dbadmin.hrc | 1
dbaccess/source/ui/dlg/dbadmin.src | 19 -
dbaccess/source/ui/dlg/dbadmin2.src | 2
dbaccess/source/ui/dlg/dbadminsetup.hrc | 2
dbaccess/source/ui/dlg/dbadminsetup.src | 11
dbaccess/source/ui/dlg/indexdialog.hrc | 1
dbaccess/source/ui/dlg/paramdialog.hrc | 1
dbaccess/source/ui/imagelists/dbimagelists.src | 9
dbaccess/source/ui/inc/dbu_dlg.hrc | 1
dbaccess/source/ui/inc/dbu_qry.hrc | 1
dbaccess/source/ui/inc/dbu_resource.hrc | 14 -
dbaccess/source/ui/inc/sbagrid.hrc | 1
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 7
dbaccess/source/ui/misc/WizardPages.src | 1
dbaccess/source/ui/misc/dbumiscres.src | 1
dbaccess/source/ui/querydesign/Query.hrc | 1
dbaccess/source/ui/querydesign/query.src | 2
desktop/source/app/desktop.src | 1
desktop/source/deployment/gui/dp_gui.hrc | 1
desktop/source/deployment/gui/dp_gui_dialog.src | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.src | 4
desktop/source/deployment/manager/dp_manager.src | 1
desktop/source/deployment/registry/help/dp_help.hrc | 1
desktop/source/deployment/unopkg/unopkg.src | 1
editeng/source/editeng/editeng.src | 2
editeng/source/items/svxitems.src | 1
extensions/inc/extensio.hrc | 1
extensions/source/abpilot/abpresid.hrc | 9
extensions/source/abpilot/abspilot.src | 5
extensions/source/bibliography/bib.hrc | 1
extensions/source/bibliography/datman.hrc | 1
extensions/source/dbpilots/dbpresid.hrc | 21 -
extensions/source/propctrlr/formresid.hrc | 9
extensions/source/propctrlr/propresid.hrc | 2
filter/source/graphicfilter/eps/epsstr.src | 1
filter/source/pdf/pdf.src | 1
filter/source/xsltdialog/xmlfilterdialogstrings.src | 1
forms/source/inc/frm_resource.hrc | 2
forms/source/inc/property.hrc | 5
forms/source/resource/strings.src | 1
forms/source/resource/xforms.src | 1
formula/source/core/inc/core_resource.hrc | 3
formula/source/ui/dlg/formdlgs.hrc | 1
formula/source/ui/dlg/formdlgs.src | 2
formula/source/ui/dlg/parawin.src | 3
formula/source/ui/inc/ForResId.hrc | 2
fpicker/source/office/OfficeFilePicker.hrc | 1
fpicker/source/office/iodlg.hrc | 1
framework/inc/framework.hrc | 2
idlc/inc/idlc/astattribute.hxx | 4
idlc/inc/idlc/inheritedinterface.hxx | 2
idlc/source/astconstant.cxx | 2
idlc/source/astdump.cxx | 4
idlc/source/astenum.cxx | 4
idlc/source/astinterface.cxx | 4
idlc/source/astoperation.cxx | 2
idlc/source/astservice.cxx | 2
idlc/source/aststruct.cxx | 4
idlc/source/aststructinstance.cxx | 4
idlc/source/attributeexceptions.hxx | 2
idlc/source/idlcmain.cxx | 2
idlc/source/options.cxx | 6
include/editeng/editids.hrc | 1
include/editeng/editrids.hrc | 1
include/editeng/memberids.hrc | 1
include/formula/compiler.hrc | 1
include/sfx2/sfx.hrc | 16 -
include/sfx2/sfxsids.hrc | 13 -
include/svl/memberid.hrc | 2
include/svtools/controldims.hrc | 1
include/svtools/svtools.hrc | 7
include/svx/dialogs.hrc | 12
include/svx/svdstr.hrc | 2
include/svx/svxids.hrc | 18 -
include/svx/svxitems.hrc | 1
include/vcl/fpicker.hrc | 1
lotuswordpro/source/filter/bento.hxx | 4
lotuswordpro/source/filter/lwpfilter.cxx | 3
lotuswordpro/source/filter/lwpsdwfileloader.cxx | 2
lotuswordpro/source/filter/lwpsdwfileloader.hxx | 3
lotuswordpro/source/filter/lwptblformula.cxx | 6
lotuswordpro/source/filter/lwptblformula.hxx | 6
lotuswordpro/source/filter/lwpunoheader.hxx | 10
lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx | 9
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 14 -
oox/source/drawingml/diagram/diagram.hxx | 8
pyuno/source/module/pyuno.cxx | 3
pyuno/source/module/pyuno_callable.cxx | 3
pyuno/source/module/pyuno_runtime.cxx | 3
reportdesign/inc/RptResId.hrc | 2
reportdesign/source/core/inc/core_resource.hrc | 3
reportdesign/source/inc/stringconstants.hrc | 3
reportdesign/source/inc/xmlstrings.hrc | 1
reportdesign/source/ui/dlg/CondFormat.src | 1
reportdesign/source/ui/dlg/GroupsSorting.hrc | 1
reportdesign/source/ui/dlg/GroupsSorting.src | 2
reportdesign/source/ui/report/report.src | 2
sc/inc/sc.hrc | 3
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src | 1
sc/source/ui/dbgui/pvfundlg.src | 4
sc/source/ui/drawfunc/drformsh.src | 2
sc/source/ui/drawfunc/objdraw.src | 22 -
sc/source/ui/pagedlg/pagedlg.hrc | 2
sc/source/ui/pagedlg/pagedlg.src | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 5
sc/source/ui/src/hdrcont.src | 7
sc/source/ui/src/popup.src | 3
sc/source/ui/src/scfuncs.src | 2
sc/source/ui/src/scstring.src | 1
sc/source/ui/src/toolbox.src | 1
scaddins/source/analysis/analysis.hrc | 3
scaddins/source/datefunc/datefunc.hrc | 5
scaddins/source/datefunc/datefunc.src | 4
scaddins/source/pricing/pricing.hrc | 5
scaddins/source/pricing/pricing.src | 12
sd/inc/app.hrc | 1
sd/inc/glob.hrc | 1
sd/source/core/glob.src | 1
sd/source/filter/html/pubdlg.src | 1
sd/source/ui/app/menuids_tmpl.src | 5
sd/source/ui/app/popup.src | 11
sd/source/ui/app/popup2_tmpl.src | 22 -
sd/source/ui/app/res_bmp.src | 2
sd/source/ui/app/tbxids_tmpl.src | 3
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/inc/pubdlg.hrc | 15 -
sd/source/ui/inc/res_bmp.hrc | 1
sd/source/ui/inc/sdtreelb.hxx | 5
sd/source/ui/inc/strings.hrc | 2
sfx2/inc/filedlghelper.hrc | 1
sfx2/source/appl/app.src | 2
sfx2/source/dialog/dialog.src | 1
sfx2/source/dialog/filedlghelper.src | 2
sfx2/source/dialog/recfloat.src | 1
sfx2/source/doc/doc.hrc | 2
sfx2/source/doc/doc.src | 1
sfx2/source/doc/templatelocnames.src | 3
sfx2/source/inc/fltoptint.hxx | 2
sfx2/source/view/view.src | 1
solenv/bin/fix-includes.pl | 6
starmath/inc/starmath.hrc | 1
starmath/source/commands.src | 3
starmath/source/smres.src | 1
starmath/source/toolbox.src | 3
svl/source/misc/mediatyp.src | 3
svtools/source/contnr/fileview.src | 1
svtools/source/contnr/templwin.hrc | 1
svtools/source/control/ctrlbox.src | 1
svtools/source/dialogs/addresstemplate.hrc | 1
svtools/source/java/javaerror.src | 2
svx/inc/globlmn_tmpl.hrc | 6
svx/source/accessibility/accessibility.src | 3
svx/source/dialog/bmpmask.src | 2
svx/source/dialog/contdlg.hrc | 5
svx/source/dialog/contdlg.src | 1
svx/source/dialog/docrecovery.hrc | 1
svx/source/dialog/imapdlg.hrc | 6
svx/source/dialog/imapdlg.src | 2
svx/source/dialog/prtqry.src | 1
svx/source/dialog/sdstring.src | 22 -
svx/source/engine3d/float3d.src | 1
svx/source/items/svxitems.src | 1
svx/source/sidebar/area/AreaPropertyPanel.src | 1
svx/source/sidebar/text/TextPropertyPanel.src | 3
svx/source/src/app.hrc | 1
svx/source/src/app.src | 1
svx/source/stbctrls/stbctrls.src | 1
svx/source/svdraw/svdstr.src | 7
svx/source/tbxctrls/extrusioncontrols.src | 1
sw/inc/access.hrc | 1
sw/inc/comcore.hrc | 4
sw/inc/dochdl.hrc | 1
sw/inc/fldui.hrc | 2
sw/inc/globals.hrc | 4
sw/inc/poolfmt.hrc | 5
sw/inc/rcid.hrc | 5
sw/source/core/frmedt/tblsel.cxx | 3
sw/source/core/inc/pagefrm.hrc | 1
sw/source/core/layout/flycnt.cxx | 4
sw/source/core/uibase/dbui/mailmergechildwindow.src | 1
sw/source/core/uibase/docvw/annotation.hrc | 2
sw/source/core/uibase/docvw/docvw.hrc | 2
sw/source/core/uibase/inc/app.hrc | 2
sw/source/core/uibase/inc/frmui.hrc | 1
sw/source/core/uibase/inc/globdoc.hrc | 4
sw/source/core/uibase/inc/popup.hrc | 1
sw/source/core/uibase/inc/shells.hrc | 1
sw/source/core/uibase/inc/table.hrc | 3
sw/source/core/uibase/inc/utlui.hrc | 5
sw/source/core/uibase/inc/web.hrc | 2
sw/source/core/uibase/ribbar/inputwin.hrc | 1
sw/source/core/uibase/utlui/navipi.src | 1
sw/source/core/uibase/wrtsh/wrtsh.hrc | 2
sw/source/core/undo/undo.hrc | 1
sw/source/core/undo/undraw.cxx | 4
sw/source/core/unocore/unochart.cxx | 4
sw/source/ui/app/app.src | 7
sw/source/ui/app/error.src | 2
sw/source/ui/app/mn.src | 7
sw/source/ui/dbui/mmaddressblockpage.src | 1
sw/source/ui/dbui/mmgreetingspage.src | 1
sw/source/ui/dochdl/dochdl.src | 3
sw/source/ui/utlui/utlui.src | 1
unotools/source/config/configitem.cxx | 5
uui/source/alreadyopen.src | 2
uui/source/filechanged.src | 2
uui/source/getcontinuations.hxx | 4
uui/source/iahndl-authentication.cxx | 42 +--
uui/source/iahndl-errorhandler.cxx | 18 -
uui/source/iahndl-filter.cxx | 34 +-
uui/source/iahndl-ioexceptions.cxx | 6
uui/source/iahndl-locking.cxx | 26 +-
uui/source/iahndl-ssl.cxx | 20 -
uui/source/iahndl.cxx | 112 ++++----
uui/source/iahndl.hxx | 20 -
uui/source/ids.hrc | 4
uui/source/interactionhandler.cxx | 2
uui/source/lockfailed.src | 2
uui/source/masterpasscrtdlg.cxx | 4
uui/source/masterpassworddlg.cxx | 4
uui/source/nameclashdlg.cxx | 4
uui/source/nameclashdlg.hrc | 2
uui/source/nameclashdlg.hxx | 8
uui/source/openlocked.src | 2
uui/source/passwordcontainer.cxx | 20 -
uui/source/passwordcontainer.hxx | 10
uui/source/passworddlg.src | 2
uui/source/passworderrs.src | 2
uui/source/requeststringresolver.hxx | 8
uui/source/secmacrowarnings.cxx | 2
uui/source/sslwarndlg.cxx | 4
uui/source/trylater.src | 2
uui/source/unknownauthdlg.cxx | 4
vcl/source/src/images.src | 8
vcl/unx/generic/dtrans/X11_clipboard.hxx | 52 ++--
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 2
vcl/unx/generic/dtrans/X11_droptarget.cxx | 1
vcl/unx/generic/dtrans/X11_selection.hxx | 124 ++++-----
vcl/unx/generic/dtrans/X11_service.cxx | 1
wizards/source/euro/euro.src | 32 --
wizards/source/formwizard/dbwizres.src | 128 ----------
wizards/source/importwizard/importwi.src | 38 --
wizards/source/template/template.src | 24 -
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/inc/resourcemodel/util.hxx | 9
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 76 ++---
writerfilter/source/dmapper/StyleSheetTable.hxx | 12
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 6
writerfilter/source/dmapper/TblStylePrHandler.cxx | 2
writerfilter/source/dmapper/TblStylePrHandler.hxx | 4
writerfilter/source/resourcemodel/TagLogger.cxx | 36 +-
xmlsecurity/inc/xmlsecurity/biginteger.hxx | 2
xmlsecurity/inc/xmlsecurity/global.hrc | 1
xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h | 4
xmlsecurity/qa/certext/SanCertExt.cxx | 12
xmlsecurity/source/component/certificatecontainer.cxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 6
xmlsecurity/source/component/documentdigitalsignatures.hxx | 2
xmlsecurity/source/component/registerservices.cxx | 4
xmlsecurity/source/dialogs/certificatechooser.cxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/dialogs.hrc | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 1
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/framework/xsec_framework.cxx | 14 -
xmlsecurity/source/helper/documentsignaturehelper.cxx | 6
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 4
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 4
xmlsecurity/source/helper/xsecctl.cxx | 2
xmlsecurity/source/helper/xsecparser.cxx | 2
xmlsecurity/source/helper/xsecparser.hxx | 2
xmlsecurity/source/helper/xsecsign.cxx | 2
xmlsecurity/source/helper/xsecverify.cxx | 2
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx | 2
xmlsecurity/source/xmlsec/diagnose.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 6
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 30 +-
xmlsecurity/source/xmlsec/serialnumberadapter.hxx | 8
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2
355 files changed, 519 insertions(+), 1554 deletions(-)
New commits:
commit 132e7c4549ddef708fd0da12718a6991afbe7b08
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 13:31:32 2014 +0200
writerfilter: remove using namespace from headers
Change-Id: Ibbb234a15de9ddb71552ef083ade72d2ac724ee0
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index 68b4359..ca2f85b 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -1045,7 +1045,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
mpTableDataHandler->endTable(mTableDataStack.size() - 1);
}
- catch (uno::Exception const& e)
+ catch (css::uno::Exception const& e)
{
(void) e;
#if OSL_DEBUG_LEVEL > 0
diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx
index 8d022a9..a77c7e8 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -19,21 +19,20 @@
#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
+
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <string>
namespace writerfilter
{
- using namespace ::std;
- using namespace ::com::sun::star;
-
- string xmlify(const string & str);
+ std::string xmlify(const std::string & str);
#if OSL_DEBUG_LEVEL > 1
- string toString(uno::Reference< text::XTextRange > textRange);
+ std::string toString(css::uno::Reference< css::text::XTextRange > textRange);
#endif
}
+
#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 76cb88f..8c0f9d5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -83,7 +83,7 @@ class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropert
sal_Int32 m_nCellIndex;
sal_Int32 m_nRowIndex;
- TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, uno::Sequence<beans::PropertyValue>& rFrameProperties);
+ TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, css::uno::Sequence<css::beans::PropertyValue>& rFrameProperties);
CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges);
RowPropertyValuesSeq_t endTableGetRowProperties();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 1c6a977..f2d61e0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -181,8 +181,8 @@ struct TextAppendContext
const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >& xCur ) :
xTextAppend( xAppend )
{
- xCursor.set(xCur, uno::UNO_QUERY);
- xInsertPosition.set(xCursor, uno::UNO_QUERY);
+ xCursor.set(xCur, css::uno::UNO_QUERY);
+ xInsertPosition.set(xCursor, css::uno::UNO_QUERY);
}
};
@@ -246,7 +246,7 @@ struct RedlineParams
sal_Int32 m_nToken;
/// This can hold properties of runs that had formatted 'track changes' properties
- uno::Sequence<beans::PropertyValue> m_aRevertProperties;
+ css::uno::Sequence<css::beans::PropertyValue> m_aRevertProperties;
};
typedef boost::shared_ptr< RedlineParams > RedlineParamsPtr;
@@ -272,19 +272,19 @@ struct LineNumberSettings
/// Contains information about a table that will be potentially converted to a floating one at the section end.
struct FloatingTableInfo
{
- uno::Reference<text::XTextRange> m_xStart;
- uno::Reference<text::XTextRange> m_xEnd;
- uno::Sequence<beans::PropertyValue> m_aFrameProperties;
+ css::uno::Reference<css::text::XTextRange> m_xStart;
+ css::uno::Reference<css::text::XTextRange> m_xEnd;
+ css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties;
sal_Int32 m_nTableWidth;
- FloatingTableInfo(uno::Reference<text::XTextRange> xStart, uno::Reference<text::XTextRange> xEnd, const uno::Sequence<beans::PropertyValue>& aFrameProperties, sal_Int32 nTableWidth)
+ FloatingTableInfo(css::uno::Reference<css::text::XTextRange> xStart, css::uno::Reference<css::text::XTextRange> xEnd, const css::uno::Sequence<css::beans::PropertyValue>& aFrameProperties, sal_Int32 nTableWidth)
: m_xStart(xStart),
m_xEnd(xEnd),
m_aFrameProperties(aFrameProperties),
m_nTableWidth(nTableWidth)
{
}
- uno::Any getPropertyValue(const OUString &propertyName);
+ css::uno::Any getPropertyValue(const OUString &propertyName);
};
class DomainMapper;
@@ -304,7 +304,7 @@ private:
::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xComponentContext;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPageStyles;
::com::sun::star::uno::Reference< ::com::sun::star::text::XText > m_xBodyText;
- ::com::sun::star::uno::Reference<text::XTextContent> m_xEmbedded;
+ ::com::sun::star::uno::Reference< css::text::XTextContent > m_xEmbedded;
TextAppendStack m_aTextAppendStack;
@@ -365,9 +365,9 @@ private:
bool m_bIsCustomFtnMark;
//registered frame properties
- ::com::sun::star::uno::Sequence< beans::PropertyValue > m_aFrameProperties;
- ::com::sun::star::uno::Reference< text::XTextRange > m_xFrameStartRange;
- ::com::sun::star::uno::Reference< text::XTextRange > m_xFrameEndRange;
+ ::com::sun::star::uno::Sequence< css::beans::PropertyValue > m_aFrameProperties;
+ ::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameStartRange;
+ ::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameEndRange;
// Redline stack
std::stack< std::vector< RedlineParamsPtr > > m_aRedlines;
@@ -388,11 +388,11 @@ private:
bool m_bSdt;
bool m_bIsFirstRun;
- uno::Reference< text::XTextCursor > xTOCMarkerCursor;
- uno::Reference< text::XTextCursor > mxTOCTextCursor;
+ css::uno::Reference< css::text::XTextCursor > xTOCMarkerCursor;
+ css::uno::Reference< css::text::XTextCursor > mxTOCTextCursor;
//annotation import
- uno::Reference< beans::XPropertySet > m_xAnnotationField;
+ css::uno::Reference< css::beans::XPropertySet > m_xAnnotationField;
sal_Int32 m_nAnnotationId;
AnnotationPositions_t m_aAnnotationPositions;
@@ -414,10 +414,10 @@ private:
public:
DomainMapper_Impl(
DomainMapper& rDMapper,
- uno::Reference < uno::XComponentContext > xContext,
- uno::Reference< lang::XComponent > xModel,
+ css::uno::Reference < css::uno::XComponentContext > xContext,
+ css::uno::Reference< css::lang::XComponent > xModel,
SourceDocumentType eDocumentType,
- uno::Reference< text::XTextRange > xInsertTextRange,
+ css::uno::Reference< css::text::XTextRange > xInsertTextRange,
bool bIsNewDoc );
virtual ~DomainMapper_Impl();
@@ -440,7 +440,7 @@ public:
{
return m_xTextDocument;
}
- void SetDocumentSettingsProperty( const OUString& rPropName, const uno::Any& rValue );
+ void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue );
void CreateRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xRange, RedlineParamsPtr& pRedline );
@@ -481,7 +481,7 @@ public:
void finishParagraph( PropertyMapPtr pPropertyMap );
void appendTextPortion( const OUString& rString, PropertyMapPtr pPropertyMap );
void appendTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >,
- const uno::Sequence< beans::PropertyValue >& );
+ const css::uno::Sequence< css::beans::PropertyValue >& );
void appendOLE( const OUString& rStreamName, OLEHandlerPtr pOleHandler );
void appendStarMath( const Value& v );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter(
@@ -580,36 +580,36 @@ public:
void handleFieldAsk
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties);
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleAutoNum
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties);
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleAuthor
(OUString const& rFirstParam,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties,
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
FieldId eFieldId);
void handleDocProperty
(FieldContextPtr pContext,
OUString const& rFirstParam,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties);
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleToc
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties,
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
const OUString & sTOCServiceName);
void handleIndex
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
- uno::Reference< uno::XInterface > & xFieldInterface,
- uno::Reference< beans::XPropertySet > xFieldProperties,
+ css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+ css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
const OUString & sTOCServiceName);
void handleBibliography
@@ -701,7 +701,7 @@ public:
void SetCurrentRedlineDate( const OUString& sDate );
void SetCurrentRedlineId( sal_Int32 nId );
void SetCurrentRedlineToken( sal_Int32 nToken );
- void SetCurrentRedlineRevertProperties( const uno::Sequence<beans::PropertyValue>& aProperties );
+ void SetCurrentRedlineRevertProperties( const css::uno::Sequence<css::beans::PropertyValue>& aProperties );
void RemoveCurrentRedline( );
void ResetParaMarkerRedline( );
void SetCurrentRedlineInitials( const OUString& sInitials );
@@ -762,8 +762,8 @@ public:
std::vector<FloatingTableInfo> m_aPendingFloatingTables;
/// Append a property to a sub-grabbag if necessary (e.g. 'lineRule', 'auto')
- void appendGrabBag(std::vector<beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, const OUString& aValue);
- void appendGrabBag(std::vector<beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, std::vector<beans::PropertyValue>& rValue);
+ void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, const OUString& aValue);
+ void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, std::vector<css::beans::PropertyValue>& rValue);
/// Enable, disable an check status of grabbags
void enableInteropGrabBag(const OUString& aName);
@@ -774,10 +774,10 @@ public:
OUString m_aInteropGrabBagName;
/// A toplevel dmapper grabbag, like 'pPr'.
- std::vector<beans::PropertyValue> m_aInteropGrabBag;
+ std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
/// A sub-grabbag of m_aInteropGrabBag, like 'spacing'.
- std::vector<beans::PropertyValue> m_aSubInteropGrabBag;
+ std::vector<css::beans::PropertyValue> m_aSubInteropGrabBag;
/// ST_PositivePercentage values we received
std::queue<OUString> m_aPositivePercentages;
@@ -791,7 +791,7 @@ public:
private:
void PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType eType);
- std::vector<uno::Reference< drawing::XShape > > m_vTextFramesForChaining ;
+ std::vector<css::uno::Reference< css::drawing::XShape > > m_vTextFramesForChaining ;
};
} //namespace dmapper
} //namespace writerfilter
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 83567e4..de75314 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -50,7 +50,7 @@ enum StyleType
struct StyleSheetTable_Impl;
class StyleSheetEntry
{
- std::vector<beans::PropertyValue> m_aInteropGrabBag;
+ std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
public:
OUString sStyleIdentifierI;
OUString sStyleIdentifierD;
@@ -64,13 +64,13 @@ public:
OUString sStyleName1;
PropertyMapPtr pProperties;
OUString sConvertedStyleName;
- std::vector<beans::PropertyValue> aLatentStyles; ///< Attributes of latentStyles
- std::vector<beans::PropertyValue> aLsdExceptions; ///< List of lsdException attribute lists
+ std::vector<css::beans::PropertyValue> aLatentStyles; ///< Attributes of latentStyles
+ std::vector<css::beans::PropertyValue> aLsdExceptions; ///< List of lsdException attribute lists
bool bAutoRedefine; ///< Writer calls this auto-update.
- void AppendInteropGrabBag(beans::PropertyValue aValue);
- beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles, has a name.
- beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing styles, just a list of properties.
+ void AppendInteropGrabBag(css::beans::PropertyValue aValue);
+ css::beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles, has a name.
+ css::beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing styles, just a list of properties.
StyleSheetEntry();
virtual ~StyleSheetEntry();
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index bbe8403..e08cdba 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -39,9 +39,9 @@ typedef TableManager<Handle_t , TablePropertyMapPtr > DomainMapperTableManager_B
class TablePropertiesHandler
{
private:
- vector< PropertyMapPtr > m_rPropertiesStack;
+ std::vector< PropertyMapPtr > m_rPropertiesStack;
PropertyMapPtr m_pCurrentProperties;
- std::vector<beans::PropertyValue>* m_pCurrentInteropGrabBag;
+ std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
DomainMapperTableManager_Base_t *m_pTableManager;
bool m_bOOXML;
@@ -61,7 +61,7 @@ public:
m_pCurrentProperties = pProperties;
};
- void SetInteropGrabBag(std::vector<beans::PropertyValue>& rValue);
+ void SetInteropGrabBag(std::vector<css::beans::PropertyValue>& rValue);
private:
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index d835be8..ffd8dd6 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -25,6 +25,8 @@
#include "dmapperLoggers.hxx"
+using namespace css;
+
namespace writerfilter {
namespace dmapper {
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 3422718..cb13b26 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -57,7 +57,7 @@ private:
TblStyleType m_nType;
PropertyMapPtr m_pProperties;
- std::vector<beans::PropertyValue> m_aInteropGrabBag;
+ std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
// Properties
virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
@@ -71,7 +71,7 @@ public:
inline TblStyleType getType() { return m_nType; };
OUString getTypeString();
void appendInteropGrabBag(const OUString& aKey, const OUString& aValue);
- beans::PropertyValue getInteropGrabBag(const OUString& aName);
+ css::beans::PropertyValue getInteropGrabBag(const OUString& aName);
private:
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 247a41c..3d5bf47 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -24,6 +24,8 @@
#include <resourcemodel/QNameToString.hxx>
#include <boost/unordered_map.hpp>
+using namespace css;
+
namespace writerfilter
{
TagLogger::TagLogger(const char* name)
@@ -38,12 +40,12 @@ namespace writerfilter
}
#ifdef DEBUG_IMPORT
- void TagLogger::setFileName( const string & filename )
+ void TagLogger::setFileName( const std::string & filename )
{
if ( pWriter )
endDocument();
- string fileName;
+ std::string fileName;
char * temp = getenv("TAGLOGGERTMP");
if (temp != NULL)
@@ -51,7 +53,7 @@ namespace writerfilter
else
fileName += "/tmp";
- string sPrefix = filename;
+ std::string sPrefix = filename;
size_t nLastSlash = sPrefix.find_last_of('/');
size_t nLastBackslash = sPrefix.find_last_of('\\');
size_t nCutPos = nLastSlash;
@@ -87,19 +89,19 @@ namespace writerfilter
TagLogger::Pointer_t TagLogger::getInstance(const char * name)
{
- typedef boost::unordered_map<string, TagLogger::Pointer_t> TagLoggerHashMap_t;
+ typedef boost::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t;
static TagLoggerHashMap_t tagLoggers;
TagLoggerHashMap_t::iterator aIt = tagLoggers.end();
- string sName = name;
+ std::string sName = name;
if (! tagLoggers.empty())
aIt = tagLoggers.find(sName);
if (aIt == tagLoggers.end())
{
TagLogger::Pointer_t pTagLogger(new TagLogger(name));
- pair<string, TagLogger::Pointer_t> entry(sName, pTagLogger);
+ std::pair<std::string, TagLogger::Pointer_t> entry(sName, pTagLogger);
aIt = tagLoggers.insert(entry).first;
}
@@ -107,7 +109,7 @@ namespace writerfilter
}
#ifdef DEBUG_DOMAINMAPPER
- void TagLogger::element(const string & name)
+ void TagLogger::element(const std::string & name)
{
startElement(name);
endElement();
@@ -148,7 +150,7 @@ namespace writerfilter
#endif
#if OSL_DEBUG_LEVEL > 1
- void TagLogger::startElement(const string & name)
+ void TagLogger::startElement(const std::string & name)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlTextWriterStartElement( pWriter, xmlName );
@@ -156,7 +158,7 @@ namespace writerfilter
}
#endif
- void TagLogger::attribute(const string & name, const string & value)
+ void TagLogger::attribute(const std::string & name, const std::string & value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlChar* xmlValue = xmlCharStrdup( value.c_str() );
@@ -167,12 +169,12 @@ namespace writerfilter
}
#if OSL_DEBUG_LEVEL > 1
- void TagLogger::attribute(const string & name, const OUString & value)
+ void TagLogger::attribute(const std::string & name, const OUString & value)
{
attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
- void TagLogger::attribute(const string & name, sal_uInt32 value)
+ void TagLogger::attribute(const std::string & name, sal_uInt32 value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
@@ -180,11 +182,11 @@ namespace writerfilter
xmlFree( xmlName );
}
- void TagLogger::attribute(const string & name, const uno::Any aAny)
+ void TagLogger::attribute(const std::string & name, const uno::Any aAny)
{
- string aTmpStrInt;
- string aTmpStrFloat;
- string aTmpStrString;
+ std::string aTmpStrInt;
+ std::string aTmpStrFloat;
+ std::string aTmpStrString;
sal_Int32 nInt = 0;
float nFloat = 0.0;
@@ -208,7 +210,7 @@ namespace writerfilter
xmlFree( xmlName );
}
- void TagLogger::chars(const string & rChars)
+ void TagLogger::chars(const std::string & rChars)
{
xmlChar* xmlChars = xmlCharStrdup( rChars.c_str() );
xmlTextWriterWriteString( pWriter, xmlChars );
@@ -277,7 +279,7 @@ namespace writerfilter
{
m_pLogger->startElement( "sprm" );
- string sName;
+ std::string sName;
if (mpIdToString != IdToString::Pointer_t())
sName = mpIdToString->toString(rSprm.getId());
commit 4f6e343344dec57addcaebda94c4b8cad935a7ae
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 12:42:51 2014 +0200
fix-includes.pl: accessibility
Change-Id: I61bd6e7f104f23e5480350a9b1bd6ba31b95a9cb
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index b906b3b..2655b89 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -49,7 +49,7 @@
#include <comphelper/accessibletexthelper.hxx>
#include <rtl/ref.hxx>
-#include "svtools/svtools.hrc"
+#include <svtools/svtools.hrc>
#include <vcl/svapp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <queue>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 2e35f82..0d4e407 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -14,8 +14,8 @@
also fixes all possible problems, so it's usually better to use it).
*/
-#include "comphelper/accessibleeventnotifier.hxx"
-#include "unotools/accessiblerelationsethelper.hxx"
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
#include <algorithm>
#include <boost/noncopyable.hpp>
#include <boost/unordered_map.hpp>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 052aac6..58ed5fc 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -18,8 +18,8 @@
*/
#include <accessibility/extended/textwindowaccessibility.hxx>
-#include "comphelper/accessibleeventnotifier.hxx"
-#include "unotools/accessiblerelationsethelper.hxx"
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/convert.hxx>
commit 06ee6336abfc7421b7a693df9bec16d76c4d9d8d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 12:06:42 2014 +0200
fix-includes.pl: framework
Change-Id: I360d2124ece10ca939a45b9307daf760aaefc557
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 1e97280..9b28da9 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -20,7 +20,7 @@
#ifndef _FRAMEWORK_HRC
#define _FRAMEWORK_HRC
-#include "svl/solar.hrc"
+#include <svl/solar.hrc>
#define RID_FWK_START 260
commit 6f6f8aff6334dd9673ce7da3301e41f4651542ed
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 12:02:48 2014 +0200
fix-includes.pl: idlc
Change-Id: I62da508151614277d59e831c7506c3ec715348f4
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 013ac66..6765d3c7 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -22,8 +22,8 @@
#include <idlc/astdeclaration.hxx>
#include "idlc/astscope.hxx"
-#include "registry/types.h"
-#include "rtl/ustring.hxx"
+#include <registry/types.h>
+#include <rtl/ustring.hxx>
namespace typereg { class Writer; }
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index 603b8a8..8065e48 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -22,7 +22,7 @@
#include "idlc/idlc.hxx"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
class AstInterface;
class AstType;
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index e72a28f..42129f2 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -20,7 +20,7 @@
#include <idlc/astconstant.hxx>
#include <idlc/astscope.hxx>
-#include "registry/writer.hxx"
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 56136ea..6e052fb 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -29,8 +29,8 @@
#include <idlc/astsequence.hxx>
#include "idlc/astoperation.hxx"
-#include "registry/version.h"
-#include "registry/writer.hxx"
+#include <registry/version.h>
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 8b95dc2..13bd877 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -19,8 +19,8 @@
#include <idlc/astenum.hxx>
-#include "registry/version.h"
-#include "registry/writer.hxx"
+#include <registry/version.h>
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 20349ae..3fd0a7e 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -22,8 +22,8 @@
#include <idlc/astoperation.hxx>
#include "idlc/idlc.hxx"
-#include "registry/version.h"
-#include "registry/writer.hxx"
+#include <registry/version.h>
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 3ee0bb9..55e5293 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -23,7 +23,7 @@
#include <idlc/astparameter.hxx>
#include <idlc/errorhandler.hxx>
-#include "registry/writer.hxx"
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/astservice.cxx b/idlc/source/astservice.cxx
index 94ab1dc..794a527 100644
--- a/idlc/source/astservice.cxx
+++ b/idlc/source/astservice.cxx
@@ -18,7 +18,7 @@
*/
-#include "sal/config.h"
+#include <sal/config.h>
#include "idlc/astmember.hxx"
#include "idlc/astoperation.hxx"
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 3938d4d..abc4bfed 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -20,8 +20,8 @@
#include <idlc/aststruct.hxx>
#include <idlc/astmember.hxx>
-#include "registry/version.h"
-#include "registry/writer.hxx"
+#include <registry/version.h>
+#include <registry/writer.hxx>
using namespace ::rtl;
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index 20b6ac3..f547746 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -23,8 +23,8 @@
#include "idlc/asttype.hxx"
#include "idlc/idlctypes.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/string.hxx"
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
namespace {
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index aa19b49..e1a3033 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_IDLC_SOURCE_ATTRIBUTEEXCEPTIONS_HXX
#define INCLUDED_IDLC_SOURCE_ATTRIBUTEEXCEPTIONS_HXX
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
struct AttributeExceptions {
struct Part {
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 89b770b..52e05f0 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -19,7 +19,7 @@
#include "idlc/idlc.hxx"
-#include "sal/main.h"
+#include <sal/main.h>
#include <string.h>
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 095a971..c04603d 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -20,9 +20,9 @@
#include "idlc/options.hxx"
-#include "osl/diagnose.h"
-#include "rtl/string.hxx"
-#include "rtl/strbuf.hxx"
+#include <osl/diagnose.h>
+#include <rtl/string.hxx>
+#include <rtl/strbuf.hxx>
#include <stdio.h>
#include <string.h>
commit 4671e7b8a40fd296d907248f7dcecbc6d29315fa
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 11:57:34 2014 +0200
fix-includes.pl: xmlsecurity
Change-Id: Ie3dd8674e1fa927d15eeb6a64a0cad24b8825262
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index 45b2eee..f4f64e2 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -24,7 +24,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include "com/sun/star/uno/Sequence.h"
+#include <com/sun/star/uno/Sequence.h>
OUString bigIntegerToNumericString( const ::com::sun::star::uno::Sequence< sal_Int8 >& serial );
::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& serialNumber );
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
index e443b42..14f1d38 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
@@ -20,9 +20,9 @@
#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H
#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H
-#include "sal/config.h"
+#include <sal/config.h>
-#include "sal/types.h"
+#include <sal/types.h>
// Cf. xmlsec's configure.in:
#if SAL_TYPES_SIZEOFPOINTER != 4
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index f5e182b..12f0317 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "test/officeconnection.hxx"
+#include <test/officeconnection.hxx>
#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/ExtAltNameType.hpp>
@@ -27,16 +27,16 @@
#include <com/sun/star/security/XCertificate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/Reference.hxx"
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/Reference.hxx>
-#include "cppuhelper/bootstrap.hxx"
+#include <cppuhelper/bootstrap.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
-#include "sal/types.h"
-#include "comphelper/sequence.hxx"
+#include <sal/types.h>
+#include <comphelper/sequence.hxx>
#include <rtl/ustring.hxx>
#include <neon/ne_ssl.h>
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 958a7b4..70513b0 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <certificatecontainer.hxx>
+#include "certificatecontainer.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <sal/config.h>
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 3823978..42f0bb0 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <documentdigitalsignatures.hxx>
+#include "documentdigitalsignatures.hxx"
#include <xmlsecurity/digitalsignaturesdialog.hxx>
#include <xmlsecurity/certificatechooser.hxx>
#include <xmlsecurity/certificateviewer.hxx>
@@ -40,9 +40,9 @@
#include <unotools/securityoptions.hxx>
#include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/security/SerialNumberAdapter.hpp>
-#include "comphelper/documentconstants.hxx"
+#include <comphelper/documentconstants.hxx>
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <stdio.h>
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 5b00d6d..cdcdffc 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -22,7 +22,7 @@
#include <cppuhelper/implbase2.hxx>
-#include "com/sun/star/lang/XInitialization.hpp"
+#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 5891487..8eb5d6a 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -22,8 +22,8 @@
#include <cppuhelper/factory.hxx>
-#include <documentdigitalsignatures.hxx>
-#include <certificatecontainer.hxx>
+#include "documentdigitalsignatures.hxx"
+#include "certificatecontainer.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index d8fb708..a3c1676 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -29,9 +29,9 @@
#include <com/sun/star/security/CertificateCharacters.hpp>
#include <com/sun/star/security/SerialNumberAdapter.hpp>
-#include <resourcemanager.hxx>
+#include "resourcemanager.hxx"
#include <vcl/msgbox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 296ac47..99177dc 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -26,7 +26,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/datetime.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
#include "dialogs.hrc"
#include "resourcemanager.hxx"
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 94a9ba8..590a2f2 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -47,7 +47,7 @@
#include <tools/date.hxx>
#include <tools/time.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
#include "dialogs.hrc"
#include "digitalsignaturesdialog.hrc"
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 7433517..28fa791 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <tools/urlobj.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
#include <vcl/msgbox.hxx>
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 6f0c002..22fcf96 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -24,13 +24,13 @@
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <decryptorimpl.hxx>
-#include <encryptorimpl.hxx>
-#include <signaturecreatorimpl.hxx>
-#include <signatureverifierimpl.hxx>
-#include <saxeventkeeperimpl.hxx>
-#include <xmlencryptiontemplateimpl.hxx>
-#include <xmlsignaturetemplateimpl.hxx>
+#include "decryptorimpl.hxx"
+#include "encryptorimpl.hxx"
+#include "signaturecreatorimpl.hxx"
+#include "signatureverifierimpl.hxx"
+#include "saxeventkeeperimpl.hxx"
+#include "xmlencryptiontemplateimpl.hxx"
+#include "xmlsignaturetemplateimpl.hxx"
using namespace ::rtl;
using namespace ::cppu;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 41d0bab..46fe20b 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -25,11 +25,11 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include "com/sun/star/beans/XPropertySet.hpp"
+#include <com/sun/star/beans/XPropertySet.hpp>
-#include "comphelper/documentconstants.hxx"
+#include <comphelper/documentconstants.hxx>
#include <tools/debug.hxx>
-#include "rtl/uri.hxx"
+#include <rtl/uri.hxx>
using namespace ::com::sun::star::uno;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 9b5b5f1..2722ca4f 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -20,9 +20,9 @@
#include <xmlsecurity/xmlsignaturehelper.hxx>
#include <xmlsecurity/documentsignaturehelper.hxx>
-#include <xsecctl.hxx>
+#include "xsecctl.hxx"
-#include <xmlsignaturehelper2.hxx>
+#include "xmlsignaturehelper2.hxx"
#include <tools/stream.hxx>
#include <tools/debug.hxx>
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 6dd1bfa..cda4ce6 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -18,7 +18,7 @@
*/
#include <xmlsecurity/xmlsignaturehelper.hxx>
-#include <xmlsignaturehelper2.hxx>
+#include "xmlsignaturehelper2.hxx"
#include <tools/solar.h>
#include <unotools/streamhelper.hxx>
@@ -27,7 +27,7 @@
#include <com/sun/star/embed/XStorageRawAccess.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include "rtl/uri.hxx"
+#include <rtl/uri.hxx>
using namespace com::sun::star;
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 369e6dc..7fdddc3 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -18,7 +18,7 @@
*/
-#include <xsecctl.hxx>
+#include "xsecctl.hxx"
#include <tools/debug.hxx>
#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index b663975..de675e1 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -20,7 +20,7 @@
#include "xsecparser.hxx"
#include <tools/debug.hxx>
-#include "cppuhelper/exc_hlp.hxx"
+#include <cppuhelper/exc_hlp.hxx>
#include <string.h>
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 43e0d89..ae8671e 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX
#define INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX
-#include <xsecctl.hxx>
+#include "xsecctl.hxx"
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index baedd74..a44aa7c 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -18,7 +18,7 @@
*/
-#include <xsecctl.hxx>
+#include "xsecctl.hxx"
#include <tools/debug.hxx>
#include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp>
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 10fdd16..1489635 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -18,7 +18,7 @@
*/
-#include <xsecctl.hxx>
+#include "xsecctl.hxx"
#include "xsecparser.hxx"
#include <tools/debug.hxx>
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index eb5140e..1a93e95 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#include "com/sun/star/uno/SecurityException.hpp"
+#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1<
diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx
index 34db25b..f867a77 100644
--- a/xmlsecurity/source/xmlsec/diagnose.cxx
+++ b/xmlsecurity/source/xmlsec/diagnose.cxx
@@ -20,8 +20,8 @@
#include "diagnose.hxx"
#include <stdio.h>
#include <stdarg.h>
-#include "rtl/instance.hxx"
-#include "rtl/bootstrap.hxx"
+#include <rtl/instance.hxx>
+#include <rtl/bootstrap.hxx>
namespace xmlsecurity {
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
index 185291a..1de5159 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
@@ -33,7 +33,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#include "com/sun/star/uno/SecurityException.hpp"
+#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/CertAltNameEntry.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 08c61f9..84d35b6 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -47,7 +47,7 @@
#include <list>
#include "xmlsecurity/xmlsec-wrapper.h"
-#include "sal/types.h"
+#include <sal/types.h>
class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3<
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 411b482..8ca0d7d 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -24,9 +24,9 @@
#include "xmlsecurity/xmlsec-wrapper.h"
#include "xmlsec/mscrypto/app.h"
-#include "com/sun/star/xml/crypto/SecurityEnvironment.hpp"
-#include "com/sun/star/xml/crypto/XMLSecurityContext.hpp"
-#include "comphelper/processfactory.hxx"
+#include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
+#include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace cssu = com::sun::star::uno;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 88f2861..1075d70 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <rtl/uuid.h>
-#include "com/sun/star/xml/crypto/SecurityOperationStatus.hpp"
+#include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
#include "xmlsignature_mscryptimpl.hxx"
#include "xmldocumentwrapper_xmlsecimpl.hxx"
#include "xmlelementwrapper_xmlsecimpl.hxx"
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index 2932cbb..fa34cd5 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#include "com/sun/star/uno/SecurityException.hpp"
+#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/CertAltNameEntry.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 498fe14..4d58c74 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -38,7 +38,7 @@
#include <sal/log.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <vector>
-#include "boost/scoped_array.hpp"
+#include <boost/scoped_array.hpp>
#include <osl/thread.h>
#include "secerror.hxx"
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index d10f04a..32478f4 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
#include "pk11func.h"
#include "keyhi.h"
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index 3777105..fb444e7 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -26,7 +26,7 @@
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "com/sun/star/uno/SecurityException.hpp"
+#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificate.hpp>
#include "cert.h"
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index 9e9da4f..9ffddc0 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -17,21 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sal/config.h"
-
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/security/XSerialNumberAdapter.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/supportsservice.hxx"
-#include "cppuhelper/weak.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/security/XSerialNumberAdapter.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/weak.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
#include "xmlsecurity/biginteger.hxx"
#include "serialnumberadapter.hxx"
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
index 947274a..3e8a9e9 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
@@ -20,11 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX
-#include "sal/config.h"
+#include <sal/config.h>
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "sal/types.h"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 91f2d90..8223a9f 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -23,7 +23,7 @@
*/
#include "xmlstreamio.hxx"
#include <rtl/ustring.hxx>
-#include "rtl/uri.hxx"
+#include <rtl/uri.hxx>
#include <libxml/uri.h>
#include "xmlsecurity/xmlsec-wrapper.h"
commit bd8b38be3d0c54085875a8b28a3fec33291bb018
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 11:54:42 2014 +0200
fix-includes.pl: uui
Change-Id: I3624890c9b8a69b2ab1efbb3554c99076eb75bb1
diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index ae83440..49ed785 100644
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_ALREADYOPEN_TITLE
{
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index 67d68c2..4d7e92c 100644
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_FILECHANGED_TITLE
{
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index cc2d35e..1742dd5 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -20,8 +20,8 @@
#ifndef UUI_IDS_HRC
#define UUI_IDS_HRC
-#include "svl/solar.hrc"
-#include "tools/errcode.hxx"
+#include <svl/solar.hrc>
+#include <tools/errcode.hxx>
#define RID_KEEP_PASSWORD (RID_UUI_START + 0)
#define RID_SAVE_PASSWORD (RID_UUI_START + 1)
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index 33ed662..be9f43a 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_LOCKFAILED_TITLE
{
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index ffa3885..f954c74 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -20,7 +20,7 @@
#include <sal/macros.h>
#include <vcl/msgbox.hxx>
-#include <ids.hrc>
+#include "ids.hrc"
#include "masterpasscrtdlg.hxx"
// MasterPasswordCreateDialog---------------------------------------------------
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index b879370..0b2a6af 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -19,7 +19,7 @@
#include <vcl/msgbox.hxx>
-#include <ids.hrc>
+#include "ids.hrc"
#include "masterpassworddlg.hxx"
// MasterPasswordDialog---------------------------------------------------
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 6839c63..8aee0a6 100644
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_OPENLOCKED_TITLE
{
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index b07346b..28379a3 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_ENTER_PASSWORD_TO_OPEN
{
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 9b327a9..65b7eac 100644
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_ERROR_PASSWORD_TO_OPEN_WRONG
{
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index c5f06af..991520f 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -19,7 +19,7 @@
#include <vcl/msgbox.hxx>
-#include <ids.hrc>
+#include "ids.hrc"
#include "sslwarndlg.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
index d457842..4459c15 100644
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
@@ -19,7 +19,7 @@
#define __RSC
-#include <ids.hrc>
+#include "ids.hrc"
String STR_TRYLATER_TITLE
{
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 0e172e7..3e315f2 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -19,7 +19,7 @@
#include <vcl/msgbox.hxx>
-#include <ids.hrc>
+#include "ids.hrc"
#include "unknownauthdlg.hxx"
#include <comphelper/processfactory.hxx>
commit 9d498d23dc26265af8d858f842c18caefe7584fd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 11:52:41 2014 +0200
fix-includes.pl: extend this to resource files, too
Change-Id: Icd95ef188aa04ce25a1c251701aa27a5516b5077
diff --git a/solenv/bin/fix-includes.pl b/solenv/bin/fix-includes.pl
index 6460ad2..2b3553f 100755
--- a/solenv/bin/fix-includes.pl
+++ b/solenv/bin/fix-includes.pl
@@ -49,7 +49,7 @@ sub check_headers
}
}
# If a local file is defined global, make it local
- elsif($line =~ /#include <((\w*)\.(hxx|h))>/){
+ elsif($line =~ /#include <((\w*)\.(hxx|h|hrc|src))>/){
# check if file exists, then it must be local so replace the <> to ""
if(-e "$dir/$1" ){
print "global header $line\n";
@@ -69,13 +69,13 @@ sub check_headers
close($fh);
}
-# routine that checks the headers of every cxx,hxx,c,h file in a directory
+# routine that checks the headers of every cxx,hxx,c,h,hrc,src file in a directory
sub check_routine
{
my ($dir) = @_;
opendir(my $fh, $dir) or die "Program stopping, could't open directory \n";
while(my $file = readdir($fh)){
- if($file =~ m/\.(cxx|hxx|c|h)$/i ){
+ if($file =~ m/\.(cxx|hxx|c|h|hrc|src)$/i ){
check_headers($dir,"$dir/$file", at subdirs);
}
}
commit bbbbbfc18616c81cf39efb122cf83dbf1b0c1006
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 11:50:39 2014 +0200
fix-includes.pl: uui
Change-Id: Iad30f8d988e9541a896d9b1702c7a3e8afd8d8fd
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index cb8b9f0..d7e80cb 100644
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_UUI_SOURCE_GETCONTINUATIONS_HXX
#define INCLUDED_UUI_SOURCE_GETCONTINUATIONS_HXX
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
namespace com { namespace sun { namespace star {
namespace task {
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 152aece..006cdf0 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -17,27 +17,27 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "comphelper/processfactory.hxx"
-
-#include "com/sun/star/task/DocumentPasswordRequest.hpp"
-#include "com/sun/star/task/DocumentPasswordRequest2.hpp"
-#include "com/sun/star/task/DocumentMSPasswordRequest.hpp"
-#include "com/sun/star/task/DocumentMSPasswordRequest2.hpp"
-#include "com/sun/star/task/MasterPasswordRequest.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionPassword.hpp"
-#include "com/sun/star/task/XInteractionPassword2.hpp"
-#include "com/sun/star/task/XInteractionRetry.hpp"
-#include "com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp"
-#include "com/sun/star/ucb/URLAuthenticationRequest.hpp"
-
-#include "osl/diagnose.h"
-#include "rtl/digest.h"
-#include "osl/mutex.hxx"
-#include "tools/errcode.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/abstdlg.hxx"
-#include "vcl/svapp.hxx"
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/task/DocumentPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentPasswordRequest2.hpp>
+#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentMSPasswordRequest2.hpp>
+#include <com/sun/star/task/MasterPasswordRequest.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionPassword.hpp>
+#include <com/sun/star/task/XInteractionPassword2.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
+#include <com/sun/star/ucb/URLAuthenticationRequest.hpp>
+
+#include <osl/diagnose.h>
+#include <rtl/digest.h>
+#include <osl/mutex.hxx>
+#include <tools/errcode.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/abstdlg.hxx>
+#include <vcl/svapp.hxx>
#include "ids.hrc"
#include "getcontinuations.hxx"
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index ae9253e..97d608a 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -17,17 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "osl/mutex.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/msgbox.hxx"
+#include <osl/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionDisapprove.hpp"
-#include "com/sun/star/task/XInteractionRetry.hpp"
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
-#include "tools/errinf.hxx"
-#include "svtools/svtools.hrc"
+#include <tools/errinf.hxx>
+#include <svtools/svtools.hrc>
#include "ids.hrc"
#include "getcontinuations.hxx"
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 8db6255..7c9854d 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -17,23 +17,23 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "com/sun/star/beans/XPropertyAccess.hpp"
-#include "com/sun/star/container/XContainerQuery.hpp"
-#include "com/sun/star/container/XNameContainer.hpp"
-#include "com/sun/star/document/AmbigousFilterRequest.hpp"
-#include "com/sun/star/document/FilterOptionsRequest.hpp"
-#include "com/sun/star/document/NoSuchFilterRequest.hpp"
-#include "com/sun/star/document/XImporter.hpp"
-#include "com/sun/star/document/XInteractionFilterOptions.hpp"
-#include "com/sun/star/document/XInteractionFilterSelect.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
-
-#include "osl/mutex.hxx"
-#include "comphelper/sequenceashashmap.hxx"
-#include "vcl/svapp.hxx"
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/container/XContainerQuery.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/document/AmbigousFilterRequest.hpp>
+#include <com/sun/star/document/FilterOptionsRequest.hpp>
+#include <com/sun/star/document/NoSuchFilterRequest.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/document/XInteractionFilterOptions.hpp>
+#include <com/sun/star/document/XInteractionFilterSelect.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+
+#include <osl/mutex.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <vcl/svapp.hxx>
#include "getcontinuations.hxx"
#include "fltdlg.hxx"
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index 0406f60..62b165a 100644
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include "ids.hrc"
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index c07227f..46e9c0b 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -19,19 +19,19 @@
#include <memory>
-#include "com/sun/star/document/ChangedByOthersRequest.hpp"
-#include "com/sun/star/document/LockedDocumentRequest.hpp"
-#include "com/sun/star/document/LockedOnSavingRequest.hpp"
-#include "com/sun/star/document/LockFileIgnoreRequest.hpp"
-#include "com/sun/star/document/OwnLockOnDocumentRequest.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionDisapprove.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-
-#include "osl/mutex.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/msgbox.hxx"
+#include <com/sun/star/document/ChangedByOthersRequest.hpp>
+#include <com/sun/star/document/LockedDocumentRequest.hpp>
+#include <com/sun/star/document/LockedOnSavingRequest.hpp>
+#include <com/sun/star/document/LockFileIgnoreRequest.hpp>
+#include <com/sun/star/document/OwnLockOnDocumentRequest.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+
+#include <osl/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
#include "ids.hrc"
#include "getcontinuations.hxx"
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 1ea45b8..774ae96 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -18,20 +18,20 @@
*/
-#include "com/sun/star/security/CertificateValidity.hpp"
-#include "com/sun/star/security/XCertificateExtension.hpp"
-#include "com/sun/star/security/XSanExtension.hpp"
+#include <com/sun/star/security/CertificateValidity.hpp>
+#include <com/sun/star/security/XCertificateExtension.hpp>
+#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/ExtAltNameType.hpp>
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/ucb/CertificateValidationRequest.hpp"
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/ucb/CertificateValidationRequest.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include "svl/zforlist.hxx"
-#include "vcl/svapp.hxx"
+#include <svl/zforlist.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include "ids.hrc"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 41b7bd3..09970d9 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -19,64 +19,64 @@
#include <memory>
-#include "com/sun/star/awt/XWindow.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/configuration/backend/MergeRecoveryRequest.hpp"
-#include "com/sun/star/configuration/backend/StratumCreationException.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/document/BrokenPackageRequest.hpp"
-#include "com/sun/star/task/DocumentMacroConfirmationRequest.hpp"
-#include "com/sun/star/java/WrongJavaVersionException.hpp"
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/script/ModuleSizeExceededRequest.hpp"
-#include "com/sun/star/task/ErrorCodeIOException.hpp"
-#include "com/sun/star/task/ErrorCodeRequest.hpp"
-#include "com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp"
-#include "com/sun/star/task/InteractionHandler.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionAskLater.hpp"
-#include "com/sun/star/task/XInteractionDisapprove.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/task/XInteractionRetry.hpp"
-#include "com/sun/star/ucb/InteractiveAppException.hpp"
-#include "com/sun/star/ucb/InteractiveLockingLockedException.hpp"
-#include "com/sun/star/ucb/InteractiveLockingNotLockedException.hpp"
-#include "com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp"
-#include "com/sun/star/ucb/InteractiveNetworkConnectException.hpp"
-#include "com/sun/star/ucb/InteractiveNetworkOffLineException.hpp"
-#include "com/sun/star/ucb/InteractiveNetworkReadException.hpp"
-#include "com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp"
-#include "com/sun/star/ucb/InteractiveNetworkWriteException.hpp"
-#include "com/sun/star/ucb/InteractiveWrongMediumException.hpp"
-#include "com/sun/star/ucb/NameClashException.hpp"
-#include "com/sun/star/ucb/NameClashResolveRequest.hpp"
-#include "com/sun/star/ucb/UnsupportedNameClashException.hpp"
-#include "com/sun/star/ucb/XInteractionReplaceExistingData.hpp"
-#include "com/sun/star/ucb/XInteractionSupplyName.hpp"
-#include "com/sun/star/xforms/InvalidDataOnSubmitException.hpp"
-#include "com/sun/star/loader/CannotActivateFactoryException.hpp"
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/configuration/backend/MergeRecoveryRequest.hpp>
+#include <com/sun/star/configuration/backend/StratumCreationException.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/document/BrokenPackageRequest.hpp>
+#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
+#include <com/sun/star/java/WrongJavaVersionException.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
+#include <com/sun/star/task/ErrorCodeIOException.hpp>
+#include <com/sun/star/task/ErrorCodeRequest.hpp>
+#include <com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionAskLater.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/ucb/InteractiveAppException.hpp>
+#include <com/sun/star/ucb/InteractiveLockingLockedException.hpp>
+#include <com/sun/star/ucb/InteractiveLockingNotLockedException.hpp>
+#include <com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp>
+#include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
+#include <com/sun/star/ucb/InteractiveNetworkOffLineException.hpp>
+#include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
+#include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
+#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
+#include <com/sun/star/ucb/InteractiveWrongMediumException.hpp>
+#include <com/sun/star/ucb/NameClashException.hpp>
+#include <com/sun/star/ucb/NameClashResolveRequest.hpp>
+#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
+#include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp>
+#include <com/sun/star/ucb/XInteractionSupplyName.hpp>
+#include <com/sun/star/xforms/InvalidDataOnSubmitException.hpp>
+#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <rtl/strbuf.hxx>
-#include "osl/conditn.hxx"
-#include "tools/rcid.h"
-#include "tools/errinf.hxx"
-#include "osl/mutex.hxx"
-#include "osl/thread.hxx"
-#include "tools/diagnose_ex.h"
-#include "comphelper/documentconstants.hxx"
-#include "svtools/sfxecode.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/svapp.hxx"
-#include "unotools/configmgr.hxx"
-#include "toolkit/helper/vclunohelper.hxx"
-#include "comphelper/processfactory.hxx"
-#include "comphelper/namedvaluecollection.hxx"
-#include "typelib/typedescription.hxx"
-#include "unotools/confignode.hxx"
+#include <osl/conditn.hxx>
+#include <tools/rcid.h>
+#include <tools/errinf.hxx>
+#include <osl/mutex.hxx>
+#include <osl/thread.hxx>
+#include <tools/diagnose_ex.h>
+#include <comphelper/documentconstants.hxx>
+#include <svtools/sfxecode.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+#include <unotools/configmgr.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <typelib/typedescription.hxx>
+#include <unotools/confignode.hxx>
#include "ids.hrc"
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 1325e7a..1888c37 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -22,19 +22,19 @@
#include <vector>
-#include "osl/mutex.hxx"
-#include "rtl/ustring.hxx"
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/task/InteractionClassification.hpp"
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/task/InteractionClassification.hpp>
-#include "tools/errcode.hxx"
-#include "tools/rc.hxx"
-#include "tools/wintypes.hxx"
+#include <tools/errcode.hxx>
+#include <tools/rc.hxx>
+#include <tools/wintypes.hxx>
namespace com { namespace sun { namespace star {
namespace awt {
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 1cded67..225ff82 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XInteractionHandler2.hpp>
-#include <iahndl.hxx>
+#include "iahndl.hxx"
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 3bb6003..ffa3885 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -21,7 +21,7 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <masterpasscrtdlg.hxx>
+#include "masterpasscrtdlg.hxx"
// MasterPasswordCreateDialog---------------------------------------------------
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 7cd1225..b879370 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -20,7 +20,7 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <masterpassworddlg.hxx>
+#include "masterpassworddlg.hxx"
// MasterPasswordDialog---------------------------------------------------
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index f05feda..201c6ab 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "vcl/msgbox.hxx"
-#include "osl/file.hxx"
+#include <vcl/msgbox.hxx>
+#include <osl/file.hxx>
#include "ids.hrc"
#include "nameclashdlg.hrc"
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index ffc8181..9ba5841 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX
#define INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/edit.hxx"
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/edit.hxx>
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 23f4058..488a048 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -17,18 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "comphelper/processfactory.hxx"
-#include "cppuhelper/factory.hxx"
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/task/NoMasterException.hpp"
-#include "com/sun/star/task/PasswordContainer.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
-#include "com/sun/star/ucb/AuthenticationRequest.hpp"
-#include "com/sun/star/ucb/URLAuthenticationRequest.hpp"
-#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp"
-#include "com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp"
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/task/NoMasterException.hpp>
+#include <com/sun/star/task/PasswordContainer.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
+#include <com/sun/star/ucb/AuthenticationRequest.hpp>
+#include <com/sun/star/ucb/URLAuthenticationRequest.hpp>
+#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
+#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
#include "passwordcontainer.hxx"
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 98a5cf7..768096a 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
#define INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase2.hxx>
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleServiceFactory.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
-#include "com/sun/star/task/XPasswordContainer2.hpp"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
+#include <com/sun/star/task/XPasswordContainer2.hpp>
namespace com {
namespace sun {
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 7d2634e..3e720f4 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
#define INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/task/XInteractionRequestStringResolver.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/implbase2.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/task/XInteractionRequestStringResolver.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <cppuhelper/implbase2.hxx>
class UUIInteractionHelper;
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index e7533e8..272112b 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <comphelper/sequence.hxx>
-#include "comphelper/documentconstants.hxx"
+#include <comphelper/documentconstants.hxx>
#include <comphelper/processfactory.hxx>
#include <sal/macros.h>
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 88ba2e5..c5f06af 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -20,7 +20,7 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <sslwarndlg.hxx>
+#include "sslwarndlg.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index cb4d962..0e172e7 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -20,7 +20,7 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <unknownauthdlg.hxx>
+#include "unknownauthdlg.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
commit acde3e430edfe118d3aa2bc9ebc1593877b98f4a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 04:51:06 2014 +0200
sd: remove using namespace from headers
Change-Id: I918733eb5f78b40ae990975035d11e396274c5cc
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index f359b8a..72f6e7d 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -400,7 +400,7 @@ void SdPageObjsTLB::InitEntry(SvTreeListEntry* pEntry,
pEntry->ReplaceItem( pStr, nColToHilite );
}
-void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem)
+void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem)
{
if (pEntry)
{
@@ -800,7 +800,7 @@ void SdPageObjsTLB::AddShapeList (
bIsExcluded ? rIconProvider.maImgPageObjsExcl : rIconProvider.maImgPageObjs);
if (mbSaveTreeItemState)
{
- vector<OUString>::iterator iteStart = maTreeItem.begin();
+ std::vector<OUString>::iterator iteStart = maTreeItem.begin();
while (iteStart != maTreeItem.end())
{
OUString strEntry = GetEntryText(pEntry);
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 08debfa..dad48ca 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -30,7 +30,6 @@
#include <tools/ref.hxx>
#include "sdxfer.hxx"
#include <vector>
-using namespace std;
#include <boost/scoped_ptr.hpp>
#include <boost/function.hpp>
@@ -134,7 +133,7 @@ protected:
::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
- vector<OUString> maTreeItem;
+ std::vector<OUString> maTreeItem;
bool mbSaveTreeItemState;
OUString maSelectionEntryText;
@@ -215,7 +214,7 @@ public:
void Clear();
void SetSaveTreeItemStateFlag(bool bState){mbSaveTreeItemState = bState;}
- void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem);
+ void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem);
/** return selected entries
nDepth == 0 -> pages
commit 224172996aeb1ef7ba078a1da63ba4f1923ebbc3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 04:50:48 2014 +0200
oox: remove using namespace from headers
Change-Id: Iaf33c536c86a372aed2a719b6f87a8e03a5481ea
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index ae611c9..1218187 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -35,8 +35,6 @@ namespace com { namespace sun { namespace star {
namespace xml { namespace dom { class XDocument; } }
} } }
-using namespace ::com::sun::star;
-
namespace oox { namespace drawingml {
namespace dgm {
@@ -156,8 +154,8 @@ typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
-typedef std::map< OUString, uno::Reference<xml::dom::XDocument> > DiagramDomMap;
-typedef uno::Sequence< uno::Sequence< uno::Any > > DiagramRelsMap;
+typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap;
+typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap;
@@ -300,7 +298,7 @@ public:
DiagramRelsMap & getDataRelsMap() { return maDataRelsMap; }
void addTo( const ShapePtr & pShape );
- uno::Sequence<beans::PropertyValue> getDomsAsPropertyValues() const;
+ css::uno::Sequence<css::beans::PropertyValue> getDomsAsPropertyValues() const;
private:
void build( );
DiagramDataPtr mpData;
commit 67467b93f28ebcefb821559cb2677d8f0acd4629
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 19 04:50:18 2014 +0200
vcl: remove using namespace from headers
Change-Id: I57439b09e95bf385436501921ca8db1469758105
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 5852321..6269927 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -33,17 +33,17 @@ namespace x11 {
class X11Clipboard :
public ::cppu::WeakComponentImplHelper2 <
- ::com::sun::star::datatransfer::clipboard::XSystemClipboard,
- ::com::sun::star::lang::XServiceInfo
+ css::datatransfer::clipboard::XSystemClipboard,
+ css::lang::XServiceInfo
>,
public SelectionAdaptor
{
- com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents;
- com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
+ css::uno::Reference< css::datatransfer::XTransferable > m_aContents;
+ css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
SelectionManager& m_rSelectionManager;
- com::sun::star::uno::Reference< ::com::sun::star::lang::XInitialization > m_xSelectionManager;
- ::std::list< com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners;
+ css::uno::Reference< css::lang::XInitialization > m_xSelectionManager;
+ ::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
Atom m_aSelection;
protected:
@@ -65,59 +65,59 @@ namespace x11 {
*/
virtual OUString SAL_CALL getImplementationName( )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/*
* XClipboard
*/
- virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setContents(
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::datatransfer::XTransferable >& xTrans,
+ const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getName()
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/*
* XClipboardEx
*/
virtual sal_Int8 SAL_CALL getRenderingCapabilities()
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/*
* XClipboardNotifier
*/
virtual void SAL_CALL addClipboardListener(
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeClipboardListener(
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/*
* SelectionAdaptor
*/
- virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::datatransfer::XTransferable > getTransferable() SAL_OVERRIDE;
virtual void clearTransferable() SAL_OVERRIDE;
virtual void fireContentsChanged() SAL_OVERRIDE;
- virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::uno::XInterface > getReference() throw() SAL_OVERRIDE;
};
- Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
- com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance(
- const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
+ css::uno::Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
+ css::uno::Reference< css::uno::XInterface > SAL_CALL X11Clipboard_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
} // namepspace
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index ba3849f..3b9138b 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -29,8 +29,6 @@
#include <X11/Xlib.h>
#include <postx.h>
-using namespace com::sun::star::uno;
-
namespace x11 {
class SelectionManager;
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index 51bd3c0..eb726e8 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -21,6 +21,7 @@
#include <X11_selection.hxx>
using namespace x11;
+using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
using namespace com::sun::star::datatransfer;
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 1b64428..80d3aa9 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -43,8 +43,6 @@
#define XDND_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndSupport"
#define XDND_DROPTARGET_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndDropTarget"
-using namespace ::com::sun::star::uno;
-
namespace x11 {
class PixmapHolder; // in bmp.hxx
@@ -54,10 +52,10 @@ namespace x11 {
class SelectionAdaptor
{
public:
- virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() = 0;
+ virtual css::uno::Reference< css::datatransfer::XTransferable > getTransferable() = 0;
virtual void clearTransferable() = 0;
virtual void fireContentsChanged() = 0;
- virtual com::sun::star::uno::Reference< XInterface > getReference() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > getReference() = 0;
// returns a reference that will keep the SelectionAdaptor alive until the
// refernce is released
@@ -67,9 +65,9 @@ namespace x11 {
class DropTarget :
public ::cppu::WeakComponentImplHelper3<
- ::com::sun::star::datatransfer::dnd::XDropTarget,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::lang::XServiceInfo
+ css::datatransfer::dnd::XDropTarget,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
>
{
public:
@@ -78,26 +76,26 @@ namespace x11 {
sal_Int8 m_nDefaultActions;
XLIB_Window m_aTargetWindow;
class SelectionManager* m_pSelectionManager;
- com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >
+ css::uno::Reference< css::datatransfer::dnd::XDragSource >
m_xSelectionManager;
- ::std::list< com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > >
+ ::std::list< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > >
m_aListeners;
DropTarget();
virtual ~DropTarget();
// convenience functions that loop over listeners
- void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtde ) throw();
- void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw();
- void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw();
- void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw();
+ void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtde ) throw();
+ void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw();
+ void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw();
+ void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw();
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& args ) throw ( css::uno::Exception, std::exception ) SAL_OVERRIDE;
// XDropTarget
- virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isActive() throw(std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) SAL_OVERRIDE;
virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE;
@@ -106,19 +104,19 @@ namespace x11 {
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString >
+ virtual css::uno::Sequence< OUString >
SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
};
class SelectionManagerHolder :
public ::cppu::WeakComponentImplHelper3<
- ::com::sun::star::datatransfer::dnd::XDragSource,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::lang::XServiceInfo
+ css::datatransfer::dnd::XDragSource,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
>
{
::osl::Mutex m_aMutex;
- com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >
+ css::uno::Reference< css::datatransfer::dnd::XDragSource >
m_xRealDragSource;
public:
SelectionManagerHolder();
@@ -127,30 +125,30 @@ namespace x11 {
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString >
+ virtual css::uno::Sequence< OUString >
SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) throw( css::uno::Exception, std::exception ) SAL_OVERRIDE;
// XDragSource
virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) SAL_OVERRIDE;
virtual void SAL_CALL startDrag(
- const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
+ const css::datatransfer::dnd::DragGestureEvent& trigger,
sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
- const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener
+ const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
+ const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener
) throw(std::exception) SAL_OVERRIDE;
};
class SelectionManager :
public ::cppu::WeakImplHelper4<
- ::com::sun::star::datatransfer::dnd::XDragSource,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::awt::XEventHandler,
- ::com::sun::star::frame::XTerminateListener
+ css::datatransfer::dnd::XDragSource,
+ css::lang::XInitialization,
+ css::awt::XEventHandler,
+ css::frame::XTerminateListener
>,
public SelectionAdaptor
{
@@ -165,7 +163,7 @@ namespace x11 {
// property used to transfer the data
struct IncrementalTransfer
{
- Sequence< sal_Int8 > m_aData;
+ css::uno::Sequence< sal_Int8 > m_aData;
int m_nBufferPos;
XLIB_Window m_aRequestor;
Atom m_aProperty;
@@ -187,8 +185,8 @@ namespace x11 {
SelectionAdaptor* m_pAdaptor;
Atom m_aAtom;
::osl::Condition m_aDataArrived;
- Sequence< sal_Int8 > m_aData;
- Sequence< ::com::sun::star::datatransfer::DataFlavor >
+ css::uno::Sequence< sal_Int8 > m_aData;
+ css::uno::Sequence< css::datatransfer::DataFlavor >
m_aTypes;
std::vector< Atom > m_aNativeTypes;
// this is used for caching
@@ -251,8 +249,8 @@ namespace x11 {
oslThread m_aDragExecuteThread;
::osl::Condition m_aDragRunning;
XLIB_Window m_aWindow;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list